ors 0.2.4 → 0.2.5

data/lib/ors/commands/changes.rb

@@ -3,10 +3,9 @@ module ORS::Commands
   class Changes < Base
 
     def execute
-      results = execute_command console_server, %(cd #{deploy_directory}), %(git show | head -1), :capture => true
-      if results =~ /commit (.*)/
-        system 'git', 'log', [$1, "remotes/origin/#{environment}"].join("..") 
-      end
+      results = execute_command console_server, prepare_environment, %(git show | head -1), :capture => true
+
+      system('git', 'log', [$1, "remotes/origin/#{environment}"].join("..")) if results =~ /commit (.*)/
     end
 
   end

data/lib/ors/commands/check.rb

@@ -4,10 +4,7 @@ module ORS::Commands
       timestamps = app_servers.map do |server|
         [
          "[#{server}] ",
-         execute_command(server,
-                         %(cd #{deploy_directory}),
-                         %(cat restart.timestamp),
-                         :capture => true)
+         execute_command(server, prepare_environment, %(cat restart.timestamp), :capture => true)
         ].join
       end.join("\n")
 

data/lib/ors/commands/console.rb

@@ -1,11 +1,9 @@
 module ORS::Commands
   class Console < Base
     def execute
-      execute_command console_server,
-                      %(source ~/.rvm/scripts/rvm),
-                      %(cd #{deploy_directory}),
-                      %(if [ -f script/rails ]; then bundle exec rails console #{environment}; else ./script/console #{environment}; fi),
-                      :exec => true
+      execute_command console_server, prepare_environment,
+                                      %(if [ -f script/rails ]; then bundle exec rails console #{environment}; else ./script/console #{environment}; fi),
+                                      :exec => true
     end
 
     def help

data/lib/ors/commands/exec.rb

@@ -5,9 +5,7 @@ module ORS::Commands
     def execute
       info "executing command for #{name} #{environment}..."
 
-      execute_command migration_server, %(source ~/.rvm/scripts/rvm),
-                                        %(cd #{deploy_directory}),
-                                        %(bundle exec #{ENV["CMD"]})
+      execute_command migration_server, prepare_environment, %(bundle exec #{ENV["CMD"]})
     end
 
   end

data/lib/ors/commands/logs.rb

@@ -5,10 +5,9 @@ module ORS::Commands
       all_logs = app_servers.map do |server|
         [
          server,
-         execute_command(server,
-                         %(cd #{deploy_directory}),
-                         %(tail -n #{log_lines} log/#{environment}.log),
-                         :capture => true)
+         execute_command(server, prepare_environment,
+                                 %(tail -n #{log_lines} log/#{environment}.log),
+                                 :capture => true)
         ]
       end
 

data/lib/ors/commands/runner.rb

@@ -7,11 +7,9 @@ module ORS::Commands
       rescue
         fatal "ERROR: Missing option --code 'ruby code'."
       end
-      results = execute_command console_server,
-                      %(source ~/.rvm/scripts/rvm),
-                      %({ cd #{deploy_directory} > /dev/null; }), # Silence RVM's "Using... gemset..."
-                      %(if [ -f script/rails ]; then bundle exec rails runner -e #{environment} \\"#{code}\\"; else ./script/runner -e #{environment} \\"#{code}\\"; fi),
-                      :capture => true, :quiet_ssh => true
+      results = execute_command console_server, prepare_environment,
+                                                %(if [ -f script/rails ]; then bundle exec rails runner -e #{environment} \\"#{code}\\"; else ./script/runner -e #{environment} \\"#{code}\\"; fi),
+                                                :capture => true, :quiet_ssh => true
       results.sub!(/\AUsing BufferedLogger due to exception: .*?\n/, '') # The central_logger gem spits this out without any way of shutting it up
       puts results
     end

data/lib/ors/commands/setup.rb

@@ -5,16 +5,15 @@ module ORS::Commands
     def execute
       info "setting up #{name} #{environment}..."
 
-      info "Are you sure? ('crashandburn' + ctrl+D^2)"
-      if STDIN.read == "crashandburn"
+      info "Are you sure? ('yes' + ctrl+D^2)"
+      if STDIN.read == "yes"
         execute_in_parallel(all_servers) {|server| setup_repo server }
         execute_in_parallel(ruby_servers) {|server| setup_ruby server }
 
-        execute_command migration_server, %(source ~/.rvm/scripts/rvm),
-                                          %(cd #{deploy_directory}),
+        execute_command migration_server, prepare_environment,
                                           %(RAILS_ENV=#{environment} bundle exec rake db:create)
       else
-        info "Stopping crash and burn setup"
+        info "Setup aborted."
       end
     end
 

data/lib/ors/commands/update.rb

@@ -8,8 +8,7 @@ module ORS::Commands
       execute_in_parallel(all_servers) {|server| update_code server }
       execute_in_parallel(ruby_servers) {|server| bundle_install server }
 
-      execute_command cron_server, %(source ~/.rvm/scripts/rvm),
-                                   %(cd #{deploy_directory}),
+      execute_command cron_server, prepare_environment,
                                    %(if [ -f config/schedule.rb ]; then bundle exec whenever --update-crontab --set environment=#{environment} -i #{name}_#{environment}; fi)
     end
 

data/lib/ors/helpers.rb

@@ -16,58 +16,54 @@ module ORS
     def setup_ruby server
       info "[#{server}] installing ruby and gems..."
 
-      execute_command server, %(source ~/.rvm/scripts/rvm),
-                             %(cd #{deploy_directory}),
-                             %(gem install rubygems-update),
-                             %(gem update --system),
-                             %(gem install bundler),
-                             %(bundle install --without development test osx_development > bundler.log)
+      execute_command server, prepare_environment,
+                              %(gem install rubygems-update),
+                              %(gem update --system),
+                              %(gem install bundler),
+                              %(bundle install --without development test osx_development > bundler.log)
     end
 
     def update_code server
       info "[#{server}] updating codebase..."
 
-      execute_command server, %(cd #{deploy_directory}),
-                             %(git fetch),
-                             %(git checkout -q -f origin/#{environment}),
-                             %(git reset --hard)
+      execute_command server, prepare_environment,
+                              %(git fetch),
+                              %(git checkout -q -f origin/#{environment}),
+                              %(git reset --hard)
     end
 
     def bundle_install server
       info "[#{server}] installing bundle..."
 
-      execute_command server, %(source ~/.rvm/scripts/rvm),
-                              %(cd #{deploy_directory}),
+      execute_command server, prepare_environment,
                               %(bundle install --without development test osx_development > bundler.log)
     end
 
     def start_server server
       info "[#{server}] starting unicorn..."
 
-      execute_command server, %(source ~/.rvm/scripts/rvm),
-                              %(cd #{deploy_directory}),
+      execute_command server, prepare_environment,
                               %(if [ -f config.ru ]; then RAILS_ENV=#{environment} bundle exec unicorn -c config/unicorn.rb -D -E #{environment}; else RAILS_ENV=#{environment} bundle exec unicorn_rails -c config/unicorn.rb -D -E #{environment}; fi)
     end
 
     def stop_server server
       info "[#{server}] stopping unicorn..."
 
-      execute_command server, %(cd #{deploy_directory}),
+      execute_command server, prepare_environment,
                               %(kill \\`cat tmp/pids/unicorn.pid\\`)
     end
 
     def restart_server server
       info "[#{server}] restarting unicorn..."
 
-      execute_command server, %(cd #{deploy_directory}),
+      execute_command server, prepare_environment,
                               %(kill -USR2 \\`cat tmp/pids/unicorn.pid\\`)
     end
 
     def run_migrations server
       info "[#{server}] running migrations..."
 
-      execute_command server, %(source ~/.rvm/scripts/rvm),
-                              %(cd #{deploy_directory}),
+      execute_command server, prepare_environment,
                               %(RAILS_ENV=#{environment} bundle exec rake db:migrate db:seed)
     end
 
@@ -131,6 +127,11 @@ module ORS
       end
     end
 
+    def prepare_environment
+      [%(source ~/.rvm/scripts/rvm),
+       %({ cd #{deploy_directory} > /dev/null; })] # Silence RVM's "Using... gemset..."
+    end
+
     def info message
       STDOUT.puts message
     end

data/lib/ors/version.rb

@@ -1,3 +1,3 @@
 module ORS
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/ors/commands/console_spec.rb

@@ -6,7 +6,7 @@ describe ORS::Commands::Console do
     it "should set pretending to true and call exec" do
       stub(subject).name {'abc/growhealthy'}
       stub(subject).environment {'production'}
-      mock(subject).execute_command(is_a(String), is_a(String), is_a(String), is_a(String), is_a(Hash)).returns("command")
+      mock(subject).execute_command(is_a(String), is_a(Array), is_a(String), is_a(Hash)).returns("command")
       subject.execute
     end
   end

data/spec/ors/commands/runner_spec.rb

@@ -29,13 +29,13 @@ describe ORS::Commands::Runner do
 
     it "should be successful with an argument to --code" do
       ORS::Config.parse_options %w(--code true)
-      mock(subject).execute_command(is_a(String), is_a(String), is_a(String), is_a(String), is_a(Hash)).returns("results")
+      mock(subject).execute_command(is_a(String), is_a(Array), is_a(String), is_a(Hash)).returns("results")
       lambda {subject.execute}.should_not raise_error
     end
 
     it "should be successful with an argument to -c" do
       ORS::Config.parse_options %w(-c true)
-      mock(subject).execute_command(is_a(String), is_a(String), is_a(String), is_a(String), is_a(Hash)).returns("results")
+      mock(subject).execute_command(is_a(String), is_a(Array), is_a(String), is_a(Hash)).returns("results")
       lambda {subject.execute}.should_not raise_error
     end
   end

data/spec/ors/commands/update_spec.rb

@@ -11,7 +11,7 @@ describe ORS::Commands::Update do
       mock(subject).info /updating/
       mock(subject).execute_in_parallel(:all_servers)
       mock(subject).execute_in_parallel(:ruby_servers)
-      mock(subject).execute_command(:cron_server, is_a(String), is_a(String), is_a(String))
+      mock(subject).execute_command(:cron_server, is_a(Array), is_a(String))
 
       subject.execute
     end

metadata

@@ -2,7 +2,7 @@
 name: ors
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Jason Dew and John Long
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-01 00:00:00 -04:00
+date: 2011-09-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency