Skip to content

Commit

Permalink
Update to released versions of things.
Browse files Browse the repository at this point in the history
  • Loading branch information
myronmarston committed Nov 20, 2012
1 parent 66e0577 commit e298c6c
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 29 deletions.
2 changes: 1 addition & 1 deletion Appraisals
@@ -1,5 +1,5 @@
appraise "typhoeus-new" do appraise "typhoeus-new" do
gem 'typhoeus', :git => "https://github.com/typhoeus/typhoeus.git" gem 'typhoeus', '~> 0.5'
end end


appraise "typhoeus-old" do appraise "typhoeus-old" do
Expand Down
3 changes: 0 additions & 3 deletions Gemfile
Expand Up @@ -2,9 +2,6 @@ source :rubygems


gem 'appraisal' gem 'appraisal'


gem 'typhoeus', :git => "https://github.com/typhoeus/typhoeus.git"
gem 'webmock', :git => "https://github.com/i0rek/webmock.git", :branch => "typhoeus_0.5.0"

gemspec gemspec


gem 'jruby-openssl', :platforms => :jruby gem 'jruby-openssl', :platforms => :jruby
Expand Down
3 changes: 1 addition & 2 deletions gemfiles/typhoeus-new.gemfile
Expand Up @@ -3,7 +3,6 @@
source :rubygems source :rubygems


gem "appraisal" gem "appraisal"
gem "webmock", :git=>"https://github.com/i0rek/webmock.git", :branch=>"typhoeus_0.5.0"
gem "jruby-openssl", :platforms=>:jruby gem "jruby-openssl", :platforms=>:jruby
gem "yard" gem "yard"
gem "relish", "~> 0.6" gem "relish", "~> 0.6"
Expand All @@ -13,6 +12,6 @@ gem "redcarpet", "~> 1.17.2"
gem "github-markup" gem "github-markup"
gem "ruby-debug", :platforms=>[:mri_18, :jruby] gem "ruby-debug", :platforms=>[:mri_18, :jruby]
gem "debugger", :platforms=>:mri_19 gem "debugger", :platforms=>:mri_19
gem "typhoeus", :git=>"https://github.com/typhoeus/typhoeus.git" gem "typhoeus", "~> 0.5"


gemspec :path=>"../" gemspec :path=>"../"
29 changes: 9 additions & 20 deletions gemfiles/typhoeus-new.gemfile.lock
@@ -1,23 +1,7 @@
GIT
remote: https://github.com/i0rek/webmock.git
revision: aeac5cc6a1ac7a313c138514d66cd536802b9dc4
branch: typhoeus_0.5.0
specs:
webmock (1.8.9)
addressable (>= 2.2.7)
crack (>= 0.1.7)

GIT
remote: https://github.com/typhoeus/typhoeus.git
revision: 6f4e9079ade2f90c20341dddd022ab1d153400ec
specs:
typhoeus (0.5.0.rc)
ethon (= 0.5.1)

PATH PATH
remote: /Users/myron/code/vcr remote: /Users/myron/code/vcr
specs: specs:
vcr (2.2.5) vcr (2.3.0)


GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
Expand Down Expand Up @@ -61,7 +45,7 @@ GEM
http_parser.rb (>= 0.5.3) http_parser.rb (>= 0.5.3)
em-socksify (0.2.1) em-socksify (0.2.1)
eventmachine (>= 1.0.0.beta.4) eventmachine (>= 1.0.0.beta.4)
ethon (0.5.1) ethon (0.5.3)
ffi (~> 1.0.11) ffi (~> 1.0.11)
mime-types (~> 1.18) mime-types (~> 1.18)
eventmachine (1.0.0) eventmachine (1.0.0)
Expand Down Expand Up @@ -129,6 +113,11 @@ GEM
term-ansicolor (1.0.7) term-ansicolor (1.0.7)
tilt (1.3.3) tilt (1.3.3)
timecop (0.3.5) timecop (0.3.5)
typhoeus (0.5.2)
ethon (~> 0.5.3)
webmock (1.9.0)
addressable (>= 2.2.7)
crack (>= 0.1.7)
yajl-ruby (1.1.0) yajl-ruby (1.1.0)
yard (0.8.3) yard (0.8.3)


Expand Down Expand Up @@ -165,8 +154,8 @@ DEPENDENCIES
simplecov (~> 0.5.3) simplecov (~> 0.5.3)
sinatra (~> 1.3.2) sinatra (~> 1.3.2)
timecop (~> 0.3.5) timecop (~> 0.3.5)
typhoeus! typhoeus (~> 0.5)
vcr! vcr!
webmock! webmock (~> 1.9)
yajl-ruby (~> 1.1.0) yajl-ruby (~> 1.1.0)
yard yard
2 changes: 1 addition & 1 deletion gemfiles/typhoeus-old.gemfile.lock
@@ -1,7 +1,7 @@
PATH PATH
remote: /Users/myron/code/vcr remote: /Users/myron/code/vcr
specs: specs:
vcr (2.2.5) vcr (2.3.0)


GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
Expand Down
4 changes: 2 additions & 2 deletions vcr.gemspec
Expand Up @@ -27,7 +27,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'shoulda', '~> 2.9.2' s.add_development_dependency 'shoulda', '~> 2.9.2'


s.add_development_dependency 'fakeweb', '~> 1.3.0' s.add_development_dependency 'fakeweb', '~> 1.3.0'
s.add_development_dependency 'webmock', '~> 1.8.3' s.add_development_dependency 'webmock', '~> 1.9'


s.add_development_dependency 'faraday', '~> 0.8' s.add_development_dependency 'faraday', '~> 0.8'
s.add_development_dependency 'httpclient', '~> 2.2' s.add_development_dependency 'httpclient', '~> 2.2'
Expand All @@ -45,7 +45,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'patron', '~> 0.4.15' s.add_development_dependency 'patron', '~> 0.4.15'
s.add_development_dependency 'em-http-request', '~> 1.0.2' s.add_development_dependency 'em-http-request', '~> 1.0.2'
s.add_development_dependency 'curb', '~> 0.8.0' s.add_development_dependency 'curb', '~> 0.8.0'
s.add_development_dependency 'typhoeus', '>= 0.3.3', '< 0.5.0' s.add_development_dependency 'typhoeus', '~> 0.5'
s.add_development_dependency 'yajl-ruby', '~> 1.1.0' s.add_development_dependency 'yajl-ruby', '~> 1.1.0'
end end
end end

0 comments on commit e298c6c

Please sign in to comment.