Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update to released versions of things.

  • Loading branch information...
commit e298c6cdc125f339ca8bcbe030a2de5c857aa83d 1 parent 66e0577
Myron Marston authored
2  Appraisals
View
@@ -1,5 +1,5 @@
appraise "typhoeus-new" do
- gem 'typhoeus', :git => "https://github.com/typhoeus/typhoeus.git"
+ gem 'typhoeus', '~> 0.5'
end
appraise "typhoeus-old" do
3  Gemfile
View
@@ -2,9 +2,6 @@ source :rubygems
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
gem 'jruby-openssl', :platforms => :jruby
3  gemfiles/typhoeus-new.gemfile
View
@@ -3,7 +3,6 @@
source :rubygems
gem "appraisal"
-gem "webmock", :git=>"https://github.com/i0rek/webmock.git", :branch=>"typhoeus_0.5.0"
gem "jruby-openssl", :platforms=>:jruby
gem "yard"
gem "relish", "~> 0.6"
@@ -13,6 +12,6 @@ gem "redcarpet", "~> 1.17.2"
gem "github-markup"
gem "ruby-debug", :platforms=>[:mri_18, :jruby]
gem "debugger", :platforms=>:mri_19
-gem "typhoeus", :git=>"https://github.com/typhoeus/typhoeus.git"
+gem "typhoeus", "~> 0.5"
gemspec :path=>"../"
29 gemfiles/typhoeus-new.gemfile.lock
View
@@ -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
remote: /Users/myron/code/vcr
specs:
- vcr (2.2.5)
+ vcr (2.3.0)
GEM
remote: http://rubygems.org/
@@ -61,7 +45,7 @@ GEM
http_parser.rb (>= 0.5.3)
em-socksify (0.2.1)
eventmachine (>= 1.0.0.beta.4)
- ethon (0.5.1)
+ ethon (0.5.3)
ffi (~> 1.0.11)
mime-types (~> 1.18)
eventmachine (1.0.0)
@@ -129,6 +113,11 @@ GEM
term-ansicolor (1.0.7)
tilt (1.3.3)
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)
yard (0.8.3)
@@ -165,8 +154,8 @@ DEPENDENCIES
simplecov (~> 0.5.3)
sinatra (~> 1.3.2)
timecop (~> 0.3.5)
- typhoeus!
+ typhoeus (~> 0.5)
vcr!
- webmock!
+ webmock (~> 1.9)
yajl-ruby (~> 1.1.0)
yard
2  gemfiles/typhoeus-old.gemfile.lock
View
@@ -1,7 +1,7 @@
PATH
remote: /Users/myron/code/vcr
specs:
- vcr (2.2.5)
+ vcr (2.3.0)
GEM
remote: http://rubygems.org/
4 vcr.gemspec
View
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'shoulda', '~> 2.9.2'
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 'httpclient', '~> 2.2'
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'patron', '~> 0.4.15'
s.add_development_dependency 'em-http-request', '~> 1.0.2'
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'
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.