ors 0.1.1 → 0.1.2

data/lib/ors/command.rb

@@ -14,7 +14,7 @@ module ORS
         klass = command.to_s.capitalize
 
         if command =~ /-*version/i
-          puts "ORS v#{ORS::VERSION}"
+          info "ORS v#{ORS::VERSION}"
         else
           if available_commands.include? klass
             ORS::Config.parse_options options
@@ -23,7 +23,7 @@ module ORS
             if ORS::Config.valid_options?
               Base.run ORS::Commands.const_get(klass)
             else
-              puts "ERROR: Invalid options given."
+              info "ERROR: Invalid options given."
               Base.run Help
             end
           else

data/lib/ors/commands/env.rb

@@ -3,12 +3,11 @@ module ORS::Commands
   class Env < Base
 
     def execute
-      puts "ORS Config"
-      puts "=" * 80
+      puts "ORS v#{ORS::VERSION} configuration:\n\n"
 
       [:name, :environment, :use_gateway, :pretending, :log_lines, :rails2, :gateway, :deploy_user,
-       :repo, :base_path, :web_servers, :app_servers, :migration_server, :console_server].each do |config_variable|
-        puts "#{config_variable}: #{ORS::Config.send(config_variable)}"
+       :repo, :base_path, :web_servers, :app_servers, :migration_server, :console_server, :cron_server].each do |config_variable|
+        puts "%20s: %-40s" % [config_variable, ORS::Config.send(config_variable).inspect]
       end
     end
 

data/lib/ors/commands/update.rb

@@ -7,6 +7,9 @@ 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, %(cd #{base_path}),
+                                   %(if [ -f config/schedule.rb ]; then bundle exec whenever; fi)
     end
 
   end

data/lib/ors/config.rb

@@ -4,7 +4,7 @@ module ORS
     CONFIG_FILENAME="config/deploy.yml"
 
     mattr_accessor :name, :environment, :use_gateway, :pretending, :log_lines, :rails2
-    mattr_accessor :gateway, :deploy_user, :repo, :base_path, :web_servers, :app_servers, :migration_server, :console_server
+    mattr_accessor :gateway, :deploy_user, :repo, :base_path, :web_servers, :app_servers, :migration_server, :console_server, :cron_server
 
     self.environment = "production"
     self.pretending = false
@@ -37,6 +37,7 @@ module ORS
           self.app_servers      = %w(eel jellyfish squid)
           self.migration_server = "tuna"
           self.console_server   = "tuna"
+          self.cron_server      = "tuna"
         end
       end
 

data/lib/ors/helpers.rb

@@ -7,10 +7,10 @@ module ORS
       info "[#{server}] installing codebase..."
 
       execute_command server, %(cd #{base_path}),
-                             %(rm -rf #{deploy_directory}),
-                             %(git clone #{repo}:#{name} #{deploy_directory}),
-                             %(mkdir -p #{deploy_directory}/tmp/pids),
-                             %(mkdir -p #{deploy_directory}/log)
+                              %(rm -rf #{deploy_directory}),
+                              %(git clone #{repo}:#{name} #{deploy_directory}),
+                              %(mkdir -p #{deploy_directory}/tmp/pids),
+                              %(mkdir -p #{deploy_directory}/log)
     end
 
     def setup_ruby server

data/lib/ors/version.rb

@@ -1,3 +1,3 @@
 module ORS
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/ors/command_spec.rb

@@ -22,7 +22,7 @@ describe ORS::Command do
     end
 
     it "should show the version when given version as a command" do
-      mock(ORS::Command).puts("ORS v#{ORS::VERSION}")
+      mock(ORS::Command).info("ORS v#{ORS::VERSION}")
       subject.run ["version"]
     end
 

data/spec/ors/commands/update_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe ORS::Commands::Update do
+
+  context "#run" do
+    it "should update code, bundle install, and set up cron" do
+      stub(subject).all_servers { :all_servers }
+      stub(subject).ruby_servers { :ruby_servers }
+      stub(subject).cron_server { :cron_server }
+
+      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))
+
+      subject.execute
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ors
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jason Dew and John Long
@@ -104,6 +104,7 @@ files:
 - spec/ors/commands/deploy_spec.rb
 - spec/ors/commands/help_spec.rb
 - spec/ors/commands/logs_spec.rb
+- spec/ors/commands/update_spec.rb
 - spec/ors/config_spec.rb
 - spec/ors/helpers_spec.rb
 - spec/ors/log_unifier_spec.rb
@@ -149,6 +150,7 @@ test_files:
 - spec/ors/commands/deploy_spec.rb
 - spec/ors/commands/help_spec.rb
 - spec/ors/commands/logs_spec.rb
+- spec/ors/commands/update_spec.rb
 - spec/ors/config_spec.rb
 - spec/ors/helpers_spec.rb
 - spec/ors/log_unifier_spec.rb