engineyard-serverside 1.6.0.pre4 → 1.6.0.pre5

data/lib/engineyard-serverside/deploy.rb

@@ -428,21 +428,22 @@ WRAP
 
       def puts_deploy_failure
         if @cleanup_failed
-          shell.status "[Relax] Your site is running new code, but clean up of old deploys failed."
+          shell.notice "[Relax] Your site is running new code, but clean up of old deploys failed."
         elsif @maintenance_up
-          shell.status "[Attention] Maintenance page still up, consider the following before removing:"
-          info " * Deploy hooks ran. This might cause problems for reverting to old code." if @callbacks_reached
-          info " * Migrations ran. This might cause problems for reverting to old code." if @migrations_reached
+          message = "[Attention] Maintenance page still up, consider the following before removing:\n"
+          message << " * Deploy hooks ran. This might cause problems for reverting to old code.\n" if @callbacks_reached
+          message << " * Migrations ran. This might cause problems for reverting to old code.\n" if @migrations_reached
           if @symlink_changed
-            info " * Your new code is symlinked as current."
+            message << " * Your new code is symlinked as current.\n"
           else
-            info " * Your old code is still symlinked as current."
+            message << " * Your old code is still symlinked as current.\n"
           end
-          info " * Application servers failed to restart." if @restart_failed
-          info ""
-          shell.status "Need help? File a ticket for support."
+          message << " * Application servers failed to restart.\n" if @restart_failed
+          message << "\n"
+          message << "Need help? File a ticket for support.\n"
+          shell.notice message
         else
-          shell.status "[Relax] Your site is still running old code and nothing destructive has occurred."
+          shell.notice "[Relax] Your site is still running old code and nothing destructive has occurred."
         end
       end
 

data/lib/engineyard-serverside/shell.rb

@@ -62,9 +62,10 @@ module EY
         unknown msg.gsub(/^/,'     ')
       end
 
-      def fatal(msg)   logger.fatal   msg end
-      def error(msg)   logger.error   msg end
-      def warning(msg) logger.warn    msg end
+      def fatal(msg)   logger.fatal   "FATAL: #{msg}"   end
+      def error(msg)   logger.error   "ERROR: #{msg}"   end
+      def warning(msg) logger.warn    "WARNING: #{msg}" end
+      def notice(msg)  logger.warn    msg end
       def info(msg)    logger.info    msg end
       def debug(msg)   logger.debug   msg end
       def unknown(msg) logger.unknown msg end

data/lib/engineyard-serverside/shell/formatter.rb

@@ -16,7 +16,9 @@ module EY
 
         def build_message(severity, stamp, message)
           if %w[WARN ERROR FATAL].include?(severity)
-            prepend("#{stamp}!> ", "#{severity_name(severity)}#{message}")
+            prepend("#{stamp}!> ", "#{message}")
+          elsif severity == "WARN"
+            prepend("#{stamp}!> ", "#{message}")
           elsif severity == "INFO"
             prepend(stamp, message)
           else
@@ -36,14 +38,14 @@ module EY
             end
           when "INFO"
             # Need to differentiate info messages more when we're running in verbose mode
-            @stdout << (@verbose ? "\n#{thor_shell.set_color(msg, :white, true)}" : msg)
+            @stdout << (@verbose && msg.index('~>') ? "\n#{thor_shell.set_color(msg, :white, true)}" : msg)
             @stdout.flush
           when "WARN"
-            @stdout << "\n" << thor_shell.set_color(msg, :yellow, true)
-            @stdout.flush
+            @stderr << "\n" << thor_shell.set_color(msg, :yellow, true)
+            @stderr.flush
           when "ERROR"
-            @stdout << "\n" << thor_shell.set_color(msg, :red, true)
-            @stdout.flush
+            @stderr << "\n" << thor_shell.set_color(msg, :red, true)
+            @stderr.flush
           else
             @stderr << msg
             @stderr.flush
@@ -61,16 +63,6 @@ module EY
           end
         end
 
-        def severity_name(severity)
-          if %w[INFO DEBUG ANY].include?(severity)
-            ""
-          elsif severity =='WARN'
-            "WARNING: "
-          else
-            "#{severity}: "
-          end
-        end
-
         def thor_shell
           thor_shell ||= Thor::Shell::Color.new
         end

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.6.0.pre4'
+    VERSION = '1.6.0.pre5'
   end
 end

data/spec/custom_deploy_spec.rb

@@ -54,11 +54,29 @@ describe "the EY::Serverside::Deploy API" do
   describe "ey.yml loading" do
     before(:each) do
       @tempdir = `mktemp -d -t ey_yml_spec.XXXXX`.strip
-      @config = EY::Serverside::Deploy::Configuration.new('repository_cache' => @tempdir, 'environment_name' => 'env_name', 'account_name' => 'acc', 'migrate' => 'rake db:migrate', 'config' => {'branch' => 'branch_from_config'}.to_json)
-      @deploy = TestDeploy.new(@config, test_shell)
+      @config = EY::Serverside::Deploy::Configuration.new({
+        'repository_cache' => @tempdir,
+        'environment_name' => 'env_name',
+        'account_name' => 'acc',
+        'migrate' => nil,
+        'config' => {'branch' => 'branch_from_config'}.to_json
+      })
+
+      @deploy = FullTestDeploy.new(@config, test_shell)
+
+      @yaml_data = {
+        'environments' => {
+          'env_name' => {
+            'copy_exclude' => ['.git'],
+            'migrate' => true,
+            'migration_command' => 'uh oh',
+            'branch' => 'branch_from_ey_yaml'
+          }
+        }
+      }
     end
 
-    def write_ey_yml(relative_path, data = {'environments' => {'env_name' => {'copy_exclude' => ['.git'], 'migrate' => true, 'branch' => 'branch_from_ey_yaml'}}})
+    def write_ey_yml(relative_path, data)
       FileUtils.mkdir_p(File.join(
         @tempdir,
         File.dirname(relative_path)))
@@ -69,25 +87,25 @@ describe "the EY::Serverside::Deploy API" do
     end
 
     it "requires 'ey.yml' and adds any defined methods to the deploy" do
-      write_ey_yml 'ey.yml'
+      write_ey_yml 'ey.yml', @yaml_data
       @deploy.load_ey_yml
       @deploy.config.copy_exclude.should == ['.git']
     end
 
     it "falls back to 'config/ey.yml'" do
-      write_ey_yml 'config/ey.yml'
+      write_ey_yml 'config/ey.yml', @yaml_data
       @deploy.load_ey_yml
       @deploy.config.copy_exclude.should == ['.git']
     end
 
     it "loads at lower priority than command line options" do
-      write_ey_yml 'ey.yml'
+      write_ey_yml 'ey.yml', @yaml_data
       @deploy.load_ey_yml
-      @deploy.config.migration_command.should == 'rake db:migrate'
+      @deploy.config.migrate?.should == false
     end
 
     it "loads at lower priority than json config option" do
-      write_ey_yml 'ey.yml'
+      write_ey_yml 'ey.yml', @yaml_data
       @deploy.load_ey_yml
       @deploy.config.branch.should == 'branch_from_config'
     end

data/spec/shell_spec.rb

@@ -12,16 +12,16 @@ describe EY::Serverside::Shell do
     @shell = EY::Serverside::Shell.new(:verbose => true, :stdout => @output, :stderr => @output, :log_path => Pathname.new(Dir.tmpdir).join("engineyard-serverside-#{Time.now.to_i}-${$$}.log"), :start_time => time1)
 
     Timecop.freeze(time1) do
-      @shell.debug('test1')
-      @shell.warning('test2')
+      @shell.debug('debug')
+      @shell.notice('notice')
     end
     Timecop.freeze(time2) do
       @shell.status('STATUS')
-      @shell.debug("test11\ntest12\ntest13")
-      @shell.warning("test21\ntest22\ntest23")
+      @shell.debug("multi\nline\ndebug")
+      @shell.warning("multi\nline\nwarning")
     end
     Timecop.freeze(time3) do
-      @shell.substatus("test31\ntest32\ntest33")
+      @shell.substatus("multi\nline\nsubstatus")
     end
 
     tstp_1 = "+    00s "
@@ -30,19 +30,21 @@ describe EY::Serverside::Shell do
     notstp = "         "
     @output.rewind
     @output.read.should == <<-OUTPUT
-#{notstp} test1
-#{tstp_1} !> WARNING: test2
+#{notstp} debug
 
-\e[1m#{tstp_2} ~> STATUS
-\e[0m#{notstp} test11
-#{notstp} test12
-#{notstp} test13
-#{tstp_2} !> WARNING: test21
-#{tstp_2} !> test22
-#{tstp_2} !> test23
-#{notstp}  ~ test31
-#{notstp}  ~ test32
-#{notstp}  ~ test33
+\e[1m\e[33m#{tstp_1} !> notice
+\e[0m
+\e[1m\e[37m#{tstp_2} ~> STATUS
+\e[0m#{notstp} multi
+#{notstp} line
+#{notstp} debug
+
+\e[1m\e[33m#{tstp_2} !> WARNING: multi
+#{tstp_2} !> line
+#{tstp_2} !> warning
+\e[0m#{notstp}  ~ multi
+#{notstp}  ~ line
+#{notstp}  ~ substatus
     OUTPUT
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 897803393
+  hash: -2759328146
   prerelease: 6
   segments: 
   - 1
   - 6
   - 0
   - pre
-  - 4
-  version: 1.6.0.pre4
+  - 5
+  version: 1.6.0.pre5
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-26 00:00:00 Z
+date: 2012-02-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -330,6 +330,7 @@ files:
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
 - spec/fixtures/gemfiles/1.0.21-rails-31-with-sqlite
+- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
@@ -401,6 +402,7 @@ test_files:
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
 - spec/fixtures/gemfiles/1.0.21-rails-31-with-sqlite
+- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb