edshot99/eBooru
1
0
Fork 0
forked from e621ng/e621ng
Code Issues 11 Releases 1 Activity

Update for gemfile windows support

Browse Source 
* Exclude gems that don't work on windows (kgio, dalli, gctools)
* Add new gems necessary on windows (memcache-client as dalli
replacement, tzinfo-data)
* Update gems where the old version couldn't be installed on windows but
the new version can (nokogiri, pg, bcrypt)

I don't think this should break anything on non-windows platforms since
the additions/removals only take effect on windows, and the version
updates don't appear to have changed anything huge.
This commit is contained in:
Toks 2015-05-13 17:39:27 -04:00
parent ac6d1fa498
commit 90a1694f62
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Gemfile
View File

@ -21,8 +21,10 @@ gem "pry", :group => [:test, :development]
gem "byebug", :group => [:test, :development]
gem "rails", "~> 4.1.8"
gem "pg"
gem "kgio"
gem "dalli"
gem "kgio", :platforms => :ruby
gem "dalli", :platforms => :ruby
gem "memcache-client", :platforms => [:mswin, :mingw, :x64_mingw]
gem "tzinfo-data", :platforms => [:mswin, :mingw, :x64_mingw]
gem "delayed_job"
gem "delayed_job_active_record"
gem "simple_form"
@ -58,7 +60,7 @@ gem 'aws-s3', :require => "aws/s3", :git => "https://github.com/fnando/aws-s3.gi
group :production do
gem 'unicorn', :platforms => :ruby
# gem 'unicorn-worker-killer'
gem 'gctools'
gem 'gctools', :platforms => :ruby
gem 'capistrano-unicorn', :require => false
end

27
Gemfile.lock
View File

@ -46,9 +46,12 @@ GEM
addressable (2.3.6)
arel (5.0.1.20140414130214)
awesome_print (1.2.0)
bcrypt (3.1.7)
bcrypt (3.1.10)
bcrypt (3.1.10-x64-mingw32)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
bcrypt-ruby (3.1.5-x64-mingw32)
bcrypt (>= 3.1.3)
buftok (0.2.0)
builder (3.2.2)
byebug (3.2.0)
@ -104,6 +107,7 @@ GEM
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
ffaker (1.24.0)
ffi (1.9.8-x64-mingw32)
gctools (0.2.3)
hashie (3.3.1)
highline (1.6.21)
@ -132,12 +136,13 @@ GEM
nokogiri (~> 1.4)
ntlm-http (~> 0.1, >= 0.1.1)
webrobots (>= 0.0.9, < 0.2)
memcache-client (1.8.5)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
metaclass (0.0.4)
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.5.3)
mini_portile (0.6.2)
minitest (5.4.3)
mocha (1.0.0)
metaclass (~> 0.0.1)
@ -160,8 +165,10 @@ GEM
net-ssh (>= 2.6.5)
netrc (0.10.2)
newrelic_rpm (3.9.6.257)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
nokogiri (1.6.6.2-x64-mingw32)
mini_portile (~> 0.6.0)
nokogumbo (1.2.0)
nokogiri
ntlm-http (0.1.1)
@ -171,7 +178,8 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
pg (0.17.1)
pg (0.18.1)
pg (0.18.1-x64-mingw32)
protected_attributes (1.0.7)
activemodel (>= 4.0.1, < 5.0)
pry (0.9.12.6)
@ -203,6 +211,10 @@ GEM
rest-client (1.7.2)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rest-client (1.7.2-x64-mingw32)
ffi (~> 1.9)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rmagick (2.15.0)
ruby-prof (0.14.2)
rubyzip (1.1.6)
@ -271,6 +283,8 @@ GEM
simple_oauth (~> 0.3.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
tzinfo-data (1.2015.4)
tzinfo (>= 1.0.0)
uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
@ -293,6 +307,7 @@ GEM
PLATFORMS
ruby
x64-mingw32
DEPENDENCIES
awesome_print
@ -314,6 +329,7 @@ DEPENDENCIES
gctools
kgio
mechanize
memcache-client
mocha
net-sftp
net-ssh
@ -341,6 +357,7 @@ DEPENDENCIES
therubyracer
timecop
twitter
tzinfo-data
uglifier
unicorn
vcr