update the Gemfile.lock + bump a new version

Citrrus · Jun 12, 2012 · b297bd1 · b297bd1
1 parent ac85af8
commit b297bd1
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 98 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,124 +1,131 @@
 PATH
   remote: .
   specs:
-    locomotive-heroku (0.0.1)
+    locomotive-heroku (0.0.2)
       heroku-api (~> 0.1.0)
-      rails (~> 3.2.1)
+      rails (~> 3.2.5)
 
 PATH
   remote: ../../engine
   specs:
-    locomotive_cms (2.0.0.rc1)
+    locomotive_cms (2.0.0.rc8)
       RedCloth (~> 4.2.8)
       actionmailer-with-request (~> 0.3.0)
       bson_ext (~> 1.5.2)
       cancan (~> 1.6.7)
-      carrierwave-mongoid (~> 0.1.3)
+      carrierwave-mongoid (~> 0.2.1)
       cells (~> 3.8.0)
       codemirror-rails (~> 2.21)
-      custom_fields (~> 2.0.0.rc5)
-      devise (~> 1.5.3)
+      custom_fields (~> 2.0.0.rc12)
+      devise (~> 2.1.0)
+      devise-encryptable (~> 0.1.1)
       dragonfly (~> 0.9.8)
       flash_cookie_session (~> 1.1.1)
-      fog (~> 1.1.2)
+      fog (~> 1.3.1)
       formtastic (~> 2.0.2)
-      haml (~> 3.1.4)
+      haml (~> 3.1.6)
       highline (~> 1.6.2)
       httparty (~> 0.8.1)
-      jquery-rails (~> 1.0.16)
+      jquery-rails (~> 1.0.19)
       kaminari (~> 0.13.0)
-      locomotive-aloha-rails (~> 0.20.1.1)
+      locomotive-aloha-rails (~> 0.20.1.4)
       locomotive-mongoid-tree (~> 0.6.2)
-      locomotive-tinymce-rails (~> 3.4.7.1)
+      locomotive-tinymce-rails (~> 3.4.7.2)
       locomotive_liquid (= 2.2.2)
       mimetype-fu (~> 0.1.2)
       mongo (~> 1.5.2)
-      mongoid (~> 2.4.5)
+      mongoid (~> 2.4.9)
+      multi_json (~> 1.3.4)
       rack-cache (~> 1.1)
-      rails (~> 3.2.1)
+      rails (~> 3.2.5)
       rails-backbone (~> 0.6.1)
       rake (~> 0.9.2)
       responders (~> 0.6.4)
       rmagick (~> 2.12.2)
       sanitize (~> 2.0.3)
+      unidecoder (~> 1.1.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
-      mail (~> 2.4.0)
+    actionmailer (3.2.5)
+      actionpack (= 3.2.5)
+      mail (~> 2.4.4)
     actionmailer-with-request (0.3.0)
       rails (>= 3)
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
+    actionpack (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.5)
+      activesupport (= 3.2.5)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
+    activeresource (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
+    activesupport (3.2.5)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.0)
+    arel (3.0.2)
     bcrypt-ruby (3.0.1)
     bson (1.5.2)
     bson_ext (1.5.2)
       bson (= 1.5.2)
     builder (3.0.0)
     cancan (1.6.7)
-    carrierwave (0.5.8)
-      activesupport (~> 3.0)
-    carrierwave-mongoid (0.1.3)
-      carrierwave (>= 0.5.6)
+    carrierwave (0.6.2)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+    carrierwave-mongoid (0.2.1)
+      carrierwave (~> 0.6.1)
       mongoid (~> 2.1)
-    cells (3.8.2)
+    cells (3.8.5)
       actionpack (~> 3.0)
       railties (~> 3.0)
     chunky_png (1.2.5)
-    codemirror-rails (2.22)
+    codemirror-rails (2.24)
       railties (~> 3.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.2.0)
-    compass (0.12.rc.1)
+    coffee-script-source (1.3.3)
+    compass (0.12.1)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    compass-rails (1.0.0.rc.3)
-      compass (~> 0.12.rc.0)
-    custom_fields (2.0.0.rc5)
+    compass-rails (1.0.2)
+      compass (>= 0.12.0, < 0.14)
+    custom_fields (2.0.0.rc12)
       activesupport (~> 3.2.1)
-      carrierwave-mongoid (~> 0.1.3)
-      mongoid (~> 2.4.3)
-    database_cleaner (0.7.1)
-    devise (1.5.3)
+      carrierwave-mongoid (~> 0.2.1)
+      mongoid (~> 2.4.9)
+    database_cleaner (0.8.0)
+    devise (2.1.0)
       bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
-      warden (~> 1.1)
+      orm_adapter (~> 0.0.7)
+      railties (~> 3.1)
+      warden (~> 1.1.1)
+    devise-encryptable (0.1.1)
+      devise (>= 2.1.0.rc)
     diff-lcs (1.1.3)
-    dragonfly (0.9.10)
+    dragonfly (0.9.12)
       rack
     ejs (1.0.0)
     erubis (2.7.0)
-    excon (0.9.5)
-    execjs (1.3.0)
+    excon (0.13.4)
+    execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (2.5.2)
       activesupport (>= 2.3.9)
@@ -127,92 +134,92 @@ GEM
       railties (>= 3.0.0)
     flash_cookie_session (1.1.3)
       rails (~> 3.0)
-    fog (1.1.2)
+    fog (1.3.1)
       builder
-      excon (~> 0.9.0)
+      excon (~> 0.13.0)
       formatador (~> 0.2.0)
       mime-types
-      multi_json (~> 1.0.3)
+      multi_json (~> 1.0)
       net-scp (~> 1.0.4)
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
-    formatador (0.2.1)
+    formatador (0.2.3)
     formtastic (2.0.2)
       rails (~> 3.0)
-    fssm (0.2.8.1)
-    haml (3.1.4)
-    heroku-api (0.1.0)
-      excon (~> 0.9.4)
-    highline (1.6.11)
+    fssm (0.2.9)
+    haml (3.1.6)
+    heroku-api (0.1.8)
+      excon (~> 0.13.3)
+    highline (1.6.12)
     hike (1.2.1)
-    httparty (0.8.1)
-      multi_json
+    httparty (0.8.3)
+      multi_json (~> 1.0)
       multi_xml
     i18n (0.6.0)
-    journey (1.0.1)
+    journey (1.0.3)
     jquery-rails (1.0.19)
       railties (~> 3.0)
       thor (~> 0.14)
-    json (1.6.5)
+    json (1.7.3)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    locomotive-aloha-rails (0.20.1.1)
+    locomotive-aloha-rails (0.20.1.4)
       actionpack (~> 3.2.1)
     locomotive-mongoid-tree (0.6.2)
       mongoid (~> 2.0)
-    locomotive-tinymce-rails (3.4.7.1)
-      actionpack (~> 3.2.1)
+    locomotive-tinymce-rails (3.4.7.2)
+      actionpack (~> 3.0)
     locomotive_liquid (2.2.2)
-    mail (2.4.1)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
+    mime-types (1.18)
     mimetype-fu (0.1.2)
     mocha (0.9.12)
     mongo (1.5.2)
       bson (= 1.5.2)
-    mongoid (2.4.5)
+    mongoid (2.4.11)
       activemodel (~> 3.1)
-      mongo (~> 1.3)
+      mongo (<= 1.6.2)
       tzinfo (~> 0.3.22)
-    multi_json (1.0.4)
-    multi_xml (0.4.1)
+    multi_json (1.3.6)
+    multi_xml (0.5.1)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.3.0)
-    nokogiri (1.5.0)
-    orm_adapter (0.0.6)
+    net-ssh (2.5.2)
+    nokogiri (1.5.4)
+    orm_adapter (0.0.7)
     polyglot (0.3.3)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
+    rails (3.2.5)
+      actionmailer (= 3.2.5)
+      actionpack (= 3.2.5)
+      activerecord (= 3.2.5)
+      activeresource (= 3.2.5)
+      activesupport (= 3.2.5)
       bundler (~> 1.0)
-      railties (= 3.2.1)
+      railties (= 3.2.5)
     rails-backbone (0.6.1)
       coffee-script (~> 2.2.0)
       ejs (~> 1.0.0)
       railties (>= 3.1.0)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
+    railties (3.2.5)
+      actionpack (= 3.2.5)
+      activesupport (= 3.2.5)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -234,18 +241,20 @@ GEM
     ruby-hmac (0.4.0)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
-    sass (3.1.15)
-    shoulda-matchers (1.0.0)
-    sprockets (2.1.2)
+    sass (3.1.19)
+    shoulda-matchers (1.1.0)
+      activesupport (>= 3.0.0)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
+    thor (0.15.2)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.33)
+    unidecoder (1.1.1)
     warden (1.1.1)
       rack (>= 1.0)
 

diff --git a/lib/locomotive/heroku.rb b/lib/locomotive/heroku.rb
@@ -1,5 +1,3 @@
-puts "\t...loading heroku extension"
-
 require 'heroku-api'
 require 'locomotive/heroku/patches'
 require 'locomotive/heroku/custom_domain'

diff --git a/lib/locomotive/heroku/version.rb b/lib/locomotive/heroku/version.rb
@@ -1,5 +1,5 @@
 module Locomotive
   module Heroku
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end
diff --git a/locomotive_heroku.gemspec b/locomotive_heroku.gemspec
@@ -16,6 +16,6 @@ Gem::Specification.new do |s|
   s.files = Dir['{app,config,db,lib}/**/*'] + ['MIT-LICENSE', 'Rakefile', 'README.textile']
   s.test_files = Dir['{test, spec}/**/*']
 
-  s.add_dependency 'rails', '~> 3.2.1'
+  s.add_dependency 'rails', '~> 3.2.5'
   s.add_dependency 'heroku-api', '~> 0.1.0'
 end