Permalink
Browse files

Upgrade bundle to fix dependency issues

  • Loading branch information...
quirkey committed Aug 13, 2012
1 parent 9973f89 commit f96fd377e13a26e721c8c85c53ff40fd71ba3d25
Showing with 46 additions and 41 deletions.
  1. +3 −2 Gemfile
  2. +42 −38 Gemfile.lock
  3. +1 −1 lib/soca/cli.rb
View
@@ -4,8 +4,8 @@ source "http://rubygems.org"
gem 'json', '~>1.4.6'
gem 'mime-types', '~>1.16'
gem 'typhoeus', '~>0.2.4'
-gem 'thor', '~>0.14.0'
-gem 'jim', '~>0.3.1'
+gem 'thor', '~>0.15'
+gem 'jim', '~>0.3'
gem 'compass', '~>0.11'
gem 'mustache', '~>0.99'
gem 'coffee-script', '~>2.2'
@@ -16,6 +16,7 @@ group :development do
end
group :test do
+ gem "mocha"
gem "shoulda", ">= 0"
end
View
@@ -1,70 +1,73 @@
GEM
remote: http://rubygems.org/
specs:
+ activesupport (3.2.8)
+ i18n (~> 0.6)
+ multi_json (~> 1.0)
archive-tar-minitar (0.5.2)
- chunky_png (1.2.5)
+ chunky_png (1.2.6)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.2)
- compass (0.11.5)
+ coffee-script-source (1.3.3)
+ compass (0.12.2)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
downlow (0.1.4)
archive-tar-minitar (>= 0.5.2)
rubyzip (>= 0.9.4)
- execjs (1.2.9)
+ execjs (1.4.0)
multi_json (~> 1.0)
- fakeweb (1.3.0)
- fssm (0.2.7)
+ ffi (1.1.5)
+ fssm (0.2.9)
git (1.2.5)
- jeweler (1.6.4)
+ i18n (0.6.0)
+ jeweler (1.8.4)
bundler (~> 1.0)
git (>= 1.2.5)
rake
- jim (0.3.1)
+ rdoc
+ jim (0.3.3)
downlow (~> 0.1.3)
- downlow (~> 0.1.4)
- fakeweb (>= 1.2.8)
- fssm
- fssm (~> 0.2.0)
- jeweler
- leftright
- mocha
- rack-test
- rake
- shoulda
- test-unit
- thor
- thor (~> 0.14.4)
+ listen
+ thor (~> 0.15)
version_sorter (~> 1.1.0)
- version_sorter (~> 1.1.0)
- yajl-ruby
yajl-ruby
json (1.4.6)
keychain_services (0.1.1)
- leftright (0.9.1)
+ listen (0.4.7)
+ rb-fchange (~> 0.0.5)
+ rb-fsevent (~> 0.9.1)
+ rb-inotify (~> 0.8.8)
metaclass (0.0.1)
- mime-types (1.16)
- mocha (0.10.0)
+ mime-types (1.19)
+ mocha (0.12.3)
metaclass (~> 0.0.1)
- multi_json (1.0.3)
+ multi_json (1.3.6)
mustache (0.99.4)
- rack (1.3.3)
- rack-test (0.6.1)
- rack (>= 1.0)
rake (0.9.2.2)
- rubyzip (0.9.4)
- sass (3.1.8)
- shoulda (2.11.3)
- test-unit (2.4.0)
- thor (0.14.6)
+ rb-fchange (0.0.5)
+ ffi
+ rb-fsevent (0.9.1)
+ rb-inotify (0.8.8)
+ ffi (>= 0.5.0)
+ rdoc (3.12)
+ json (~> 1.4)
+ rubyzip (0.9.9)
+ sass (3.2.0)
+ shoulda (3.1.1)
+ shoulda-context (~> 1.0)
+ shoulda-matchers (~> 1.2)
+ shoulda-context (1.0.0)
+ shoulda-matchers (1.2.0)
+ activesupport (>= 3.0.0)
+ thor (0.15.4)
typhoeus (0.2.4)
mime-types
mime-types
version_sorter (1.1.0)
- yajl-ruby (1.0.0)
+ yajl-ruby (1.1.0)
PLATFORMS
ruby
@@ -73,12 +76,13 @@ DEPENDENCIES
coffee-script (~> 2.2)
compass (~> 0.11)
jeweler
- jim (~> 0.3.1)
+ jim (~> 0.3)
json (~> 1.4.6)
keychain_services (~> 0.1.1)
mime-types (~> 1.16)
+ mocha
mustache (~> 0.99)
rake
shoulda
- thor (~> 0.14.0)
+ thor (~> 0.15)
typhoeus (~> 0.2.4)
View
@@ -39,7 +39,7 @@ def initialize(*)
end
self.appdir = options[:appdir] || File.expand_path(Dir.pwd)
self.config_file = options[:config]
- self.debug = self.class.debugging || options[:debug]
+ self.debug = options[:debug]
if debug
Soca.debug = true
logger.level = Logger::DEBUG

0 comments on commit f96fd37

Please sign in to comment.