updating to rails 3.2.11

openSUSE · Jan 10, 2013 · 353c812 · 353c812
1 parent 820f9c0
commit 353c812
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 34 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,31 +1,31 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
+    actionmailer (3.2.10)
+      actionpack (= 3.2.10)
       mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionpack (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.10)
+      activesupport (= 3.2.10)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
+    activeresource (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
+    activesupport (3.2.10)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
@@ -53,7 +53,8 @@ GEM
       multi_json (~> 1.0)
     fast_gettext (0.7.0)
     fssm (0.2.9)
-    gettext (2.3.3)
+    gettext (2.3.6)
+      levenshtein
       locale
     gettext_i18n_rails (0.8.0)
       fast_gettext (>= 0.4.8)
@@ -67,7 +68,8 @@ GEM
     jquery-rails (2.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.5)
+    json (1.7.6)
+    levenshtein (0.2.2)
     locale (2.0.8)
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -76,7 +78,7 @@ GEM
     memcache-client (1.8.5)
     mime-types (1.19)
     minitest (2.5.1)
-    multi_json (1.4.0)
+    multi_json (1.5.0)
     mysql2 (0.3.11)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
@@ -85,7 +87,7 @@ GEM
     net-ssh (2.6.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    nokogiri (1.5.5)
+    nokogiri (1.5.6)
     pkg-config (1.1.4)
     polyglot (0.3.3)
     rack (1.4.1)
@@ -95,32 +97,32 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
+    rails (3.2.10)
+      actionmailer (= 3.2.10)
+      actionpack (= 3.2.10)
+      activerecord (= 3.2.10)
+      activeresource (= 3.2.10)
+      activesupport (= 3.2.10)
       bundler (~> 1.0)
-      railties (= 3.2.9)
-    rails-i18n (0.7.1)
+      railties (= 3.2.10)
+    rails-i18n (0.7.2)
       i18n (~> 0.5)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+    railties (3.2.10)
+      actionpack (= 3.2.10)
+      activesupport (= 3.2.10)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
+    rake (0.9.6)
     rdoc (3.12)
       json (~> 1.4)
-    sass (3.2.3)
+    sass (3.2.4)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    sprockets (2.2.1)
+    sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -135,7 +137,7 @@ GEM
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
-    xmlhash (1.3.4)
+    xmlhash (1.3.5)
       pkg-config
 
 PLATFORMS

diff --git a/config/deploy.rb b/config/deploy.rb
@@ -44,7 +44,7 @@
 
 after :deploy, 'deploy:cleanup' # only keep 5 releases
 
-io = IO.popen('ruby -rbundler -e "Bundler.settings[:frozen] = 1; Bundler.definition.resolve.to_a.each { |s| puts \"rubygem(1.9.1:#{s.name}) = #{s.version}\" }"')
+io = IO.popen('BUNDLE_FROZEN=1 BUNDLE_WITHOUT=test:development bundle show --paths | sed -e "s,.*/,,; s,^,rubygem(1.9.1:,; s,-\([^-]*\)$,:\1),"')
 zypperlines = io.readlines
 
 begin
@@ -66,6 +66,7 @@
     run "rm -r #{release_path}/tmp/cache"
     run "ln -s #{shared_path}/software.o.o.cache #{release_path}/tmp/cache"
     run "cd #{release_path}; zypper -n in -C \"#{zypperlines.join('" "')}\""
+    run "cd #{release_path}; bundle config --local frozen 1; bundle config --local without test:development")
     run "cd #{release_path}; bundle show"
     run "cd #{release_path}; bundle exec rake assets:precompile RAILS_ENV=production --trace"
   end