magic_recipes 0.0.4 → 0.0.5

data/lib/magic_recipes/assets.rb

@@ -50,11 +50,10 @@ module MagicRecipes
               end
               if use_rvm
                 run <<-CMD
-                  source '#{rvm_path}/scripts/rvm' && 
-                  rvm use #{rvm_ruby}-#{rvm_patch}@#{rvm_gemset} && 
-                  cd #{latest_release} && 
-                  #{rake} RAILS_ENV=#{rails_env} #{asset_env} assets:precompile
-                CMD
+                    #{rvm_cmd} && 
+                    cd #{latest_release} && 
+                    #{rake} RAILS_ENV=#{rails_env} #{asset_env} assets:precompile
+                  CMD
               else
                 run "cd #{latest_release} && #{rake} RAILS_ENV=#{rails_env} #{asset_env} assets:precompile"
               end

data/lib/magic_recipes/db.rb

@@ -10,8 +10,7 @@ module MagicRecipes
           task :seed do
             if use_rvm
               run <<-CMD
-                source '#{rvm_path}/scripts/rvm' && 
-                rvm use #{rvm_ruby}-#{rvm_patch}@#{rvm_gemset} && 
+                #{rvm_cmd} && 
                 cd #{latest_release} && 
                 #{rake} db:seed RAILS_ENV=#{rails_env}
               CMD
@@ -24,8 +23,7 @@ module MagicRecipes
           task :migrate do
             if use_rvm
               run <<-CMD
-                source '#{rvm_path}/scripts/rvm' && 
-                rvm use #{rvm_ruby}-#{rvm_patch}@#{rvm_gemset} && 
+                #{rvm_cmd} && 
                 cd #{latest_release} && 
                 #{rake} db:migrate RAILS_ENV=#{rails_env}
               CMD

data/lib/magic_recipes/private_pub.rb

@@ -38,8 +38,7 @@ module MagicRecipes
           task :start, roles: :app do
             if use_rvm
               run <<-CMD
-                source '#{rvm_path}/scripts/rvm' && 
-                rvm use #{rvm_ruby}-#{rvm_patch}@#{rvm_gemset} && 
+                #{rvm_cmd} && 
                 cd #{current_path} && 
                 RAILS_ENV=production bundle exec rackup private_pub.ru -s thin -E production -p #{private_pub_port} -o #{server_ip} -D
               CMD

data/lib/magic_recipes/rvm.rb

@@ -20,7 +20,9 @@ module MagicRecipes
         set :rvm_lib_path,          "#{rvm_path}/lib"
         set :remote_bin_path,       "#{rvm_path}/gems/ruby-#{rvm_ruby}-#{rvm_patch}/bin/"
         set :use_rvm,               true
-
+        
+        set :rvm_cmd,               "source '#{rvm_path}/scripts/rvm' && rvm use #{rvm_ruby}-#{rvm_patch}@#{rvm_gemset}"
+        
         # => set :default_environment, {
         # =>   'PATH'            => "#{rvm_path}/gems/ruby/1.9.1/bin:#{rvm_bin_path}/bin:#{remote_bin_path}:$PATH",
         # =>   'RUBY_VERSION'    => "#{rvm_ruby}",

data/lib/magic_recipes/thin.rb

@@ -22,8 +22,7 @@ module MagicRecipes
               reconf
               if use_rvm
                 run <<-CMD
-                  source '#{rvm_path}/scripts/rvm' && 
-                  rvm use #{rvm_ruby}-#{rvm_patch}@#{rvm_gemset} && 
+                  #{rvm_cmd} && 
                   cd #{current_path} && 
                   bundle exec thin #{command} -C config/thin_app.yml
                 CMD

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails