Skip to content
This repository has been archived by the owner on Apr 5, 2018. It is now read-only.

Commit

Permalink
Merge pull request #18 from josephruscio/feature/update_scamp
Browse files Browse the repository at this point in the history
Update Scamp to track from rubygems.
  • Loading branch information
mheffner committed Mar 30, 2012
2 parents 81fad5a + a826682 commit 9bfa3b3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 18 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ gem 'yajl-ruby', :require => [ 'yajl', 'yajl/json_gem' ]
gem 'faraday', '~> 0.7.5'
gem "nokogiri", "~> 1.5.0"

#gem "scamp", "~> 0.1.1"
gem "scamp", "~> 1.0.1"
#gem "scamp", :path => ENV['HOME'] + "/git/clones/Scamp"
gem "scamp", :git => 'https://github.com/wjessop/Scamp.git', :branch => 'master'
#gem "scamp", :git => 'https://github.com/wjessop/Scamp.git', :branch => 'master'

#gem "can-has-lolcat", "~> 1.1.0"
#gem "can-has-lolcat", :path => "../can-has-lolcat"
Expand Down
28 changes: 12 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,19 @@ GIT
specs:
can-has-lolcat (1.1.0)

GIT
remote: https://github.com/wjessop/Scamp.git
revision: af7c35bff34a28865bab940c7aafe6aa3728dd3f
branch: master
specs:
scamp (0.2.1)
em-http-request (~> 1.0.0.beta.4)
eventmachine (~> 1.0.0.beta.4)
yajl-ruby (~> 0.8.3)

GEM
remote: http://rubygems.org/
specs:
addressable (2.2.6)
em-http-request (1.0.0)
cookiejar (0.3.0)
em-http-request (1.0.2)
addressable (>= 2.2.3)
cookiejar
em-socksify
eventmachine (>= 1.0.0.beta.3)
http_parser.rb (>= 0.5.2)
em-socksify (0.1.0)
eventmachine
eventmachine (>= 1.0.0.beta.4)
http_parser.rb (>= 0.5.3)
em-socksify (0.2.0)
eventmachine (>= 1.0.0.beta.4)
eventmachine (1.0.0.beta.4)
faraday (0.7.5)
addressable (~> 2.2.6)
Expand All @@ -49,6 +41,10 @@ GEM
rack (1.3.3)
rake (0.9.2)
rcov (0.9.10)
scamp (1.0.1)
em-http-request (~> 1.0.0.beta.4)
eventmachine (~> 1.0.0.beta.4)
yajl-ruby (~> 0.8.3)
shoulda (2.11.3)
yajl-ruby (0.8.3)

Expand All @@ -65,6 +61,6 @@ DEPENDENCIES
papertrail-cli (~> 0.8.2)
rack (= 1.3.3)
rcov
scamp!
scamp (~> 1.0.1)
shoulda
yajl-ruby

0 comments on commit 9bfa3b3

Please sign in to comment.