engineyard-serverside 2.0.0.rc1 → 2.0.0

data/lib/engineyard-serverside/deploy.rb

@@ -118,6 +118,7 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
 
       def restart_with_maintenance_page
         require_custom_tasks
+        load_ey_yml
         enable_maintenance_page
         restart
         disable_maintenance_page
@@ -387,7 +388,7 @@ WRAP
       # Rollback doesn't know about the repository location (nor
       # should it need to), but it would like to use #short_log_message.
       def strategy
-        ENV['GIT_SSH'] = ssh_executable
+        ENV['GIT_SSH'] = ssh_executable.to_s
         @strategy ||= config.strategy_class.new(
           shell,
           :repository_cache => config.paths.repository_cache.to_s,
@@ -447,6 +448,7 @@ WRAP
       rescue Exception
         shell.status "Release #{config.paths.active_release} failed, saving release to #{config.paths.releases_failed}."
         sudo "mv #{config.paths.active_release} #{config.paths.releases_failed}"
+        clean_release_directory(config.paths.releases_failed)
         raise
       end
 

data/lib/engineyard-serverside/deploy_hook.rb

@@ -87,10 +87,18 @@ Please fix this error before retrying.
           shell.logged_system(Escape.shell_command(["sh", "-l", "-c", cmd])).success?
         end
 
+        def run!(cmd)
+          run(cmd) or raise("run!: Command failed. #{cmd}")
+        end
+
         def sudo(cmd)
           shell.logged_system(Escape.shell_command(["sudo", "sh", "-l", "-c", cmd])).success?
         end
 
+        def sudo!(cmd)
+          sudo(cmd) or raise("sudo!: Command failed. #{cmd}")
+        end
+
         # convenience functions for running on certain instance types
         def on_app_master(&blk)                 on_roles(%w[solo app_master],          &blk) end
         def on_app_servers(&blk)                on_roles(%w[solo app_master app],      &blk) end

data/lib/engineyard-serverside/lockfile_parser.rb

@@ -2,7 +2,7 @@ require 'yaml'
 module EY
   module Serverside
     class LockfileParser
-      DEFAULT = "1.1.3"
+      DEFAULT = "1.1.5"
 
       def self.default_version
         DEFAULT

data/lib/engineyard-serverside/maintenance.rb

@@ -17,7 +17,7 @@ module EY
       def manually_enable
         if paths.deployed?
           enable
-          shell.info "Maintenance page enabled"
+          shell.status "Maintenance page enabled"
         else
           shell.fatal "Cannot enabled maintenance page. Application #{config.app_name} has never been deployed."
           false
@@ -27,7 +27,7 @@ module EY
       def manually_disable
         if paths.deployed?
           disable
-          shell.info "Maintenance page disabled"
+          shell.status "Maintenance page disabled"
         else
           shell.fatal "Cannot enabled maintenance page. Application #{config.app_name} has never been deployed."
           false

data/lib/engineyard-serverside/servers.rb

@@ -51,7 +51,7 @@ module EY
       # method and it doesn't yield and it's better than raising)
       def roles(*select_roles, &block)
         if block_given?
-          return yield roles(*select_roles)
+          return yield(roles(*select_roles))
         end
 
         roles_set = Set.new select_roles.flatten.compact.map{|r| r.to_sym}

data/lib/engineyard-serverside/shell.rb

@@ -2,34 +2,12 @@ require 'logger'
 require 'pathname'
 require 'systemu'
 require 'engineyard-serverside/shell/formatter'
+require 'engineyard-serverside/shell/command_result'
+require 'engineyard-serverside/shell/yieldio'
 
 module EY
   module Serverside
     class Shell
-      class YieldIO
-        def initialize(&block)
-          @block = block
-        end
-        def <<(str)
-          @block.call str
-        end
-      end
-
-      class CommandResult < Struct.new(:command, :exitstatus, :output)
-        def success?
-          exitstatus.zero?
-        end
-
-        def inspect
-          <<-EOM
-$ #{command}
-#{output}
-
-# => #{exitstatus}
-          EOM
-        end
-      end
-
       attr_reader :logger
 
       def initialize(options)

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

@@ -0,0 +1,20 @@
+module EY
+  module Serverside
+    class Shell
+      class CommandResult < Struct.new(:command, :exitstatus, :output)
+        def success?
+          exitstatus.zero?
+        end
+
+        def inspect
+          <<-EOM
+$ #{command}
+#{output}
+
+($?: #{exitstatus})
+          EOM
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module EY
+  module Serverside
+    class Shell
+      class YieldIO
+        def initialize(&block)
+          @block = block
+        end
+        def <<(str)
+          @block.call str
+        end
+      end
+    end
+  end
+end

data/lib/engineyard-serverside/task.rb

@@ -28,9 +28,6 @@ module EY
         if deploy_file
           shell.status "Loading deployment task overrides from #{deploy_file}"
           instance_eval(deploy_file.read)
-          true
-        else
-          false
         end
       end
 
@@ -45,8 +42,6 @@ module EY
           shell.status "Loading deploy configuration in #{ey_yml}"
           data = YAML.load_file(ey_yml.to_s)
           config.load_ey_yml_data(data, shell)
-        else
-          false
         end
       rescue Exception
         shell.error "Error loading YAML in #{ey_yml}"

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.0.0.rc1'
+    VERSION = '2.0.0'
   end
 end

data/spec/custom_deploy_spec.rb

@@ -90,13 +90,13 @@ describe "the EY::Serverside::Deploy API" do
 
     it "requires 'eydeploy.rb' and adds any defined methods to the deploy" do
       write_eydeploy 'eydeploy.rb'
-      @deploy.require_custom_tasks.should be_true
+      @deploy.require_custom_tasks
       @deploy.got_new_methods.should == 'from the file on disk'
     end
 
     it "falls back to 'config/eydeploy.rb'" do
       write_eydeploy 'config/eydeploy.rb'
-      @deploy.require_custom_tasks.should be_true
+      @deploy.require_custom_tasks
       @deploy.got_new_methods.should == 'from the file on disk'
     end
 
@@ -108,7 +108,7 @@ describe "the EY::Serverside::Deploy API" do
       end
 
       deploy = TestDeploySuper.new(test_servers, @config, test_shell)
-      deploy.require_custom_tasks.should be_true
+      deploy.require_custom_tasks
       deploy.value.should == "base + derived"
     end
   end

data/spec/deploy_hook_spec.rb

@@ -63,6 +63,16 @@ describe "deploy hooks" do
         deploy_hook.eval_hook('run("true")').should be_true
         deploy_hook.eval_hook('run("false")').should be_false
       end
+
+      it "raises when the bang method alternative is used" do
+        lambda {
+          deploy_hook.eval_hook('run!("false")')
+        }.should raise_error(RuntimeError)
+        out = read_output
+        out.should =~ %r|FATAL: Exception raised in deploy hook /data/app_name/releases/\d+/deploy/fake_test_hook.rb.|
+        out.should =~ %r|RuntimeError: .*run!.*Command failed. false|
+        out.should =~ %r|Please fix this error before retrying.|
+      end
     end
 
     context "#sudo" do
@@ -77,6 +87,20 @@ describe "deploy hooks" do
         hook.callback_context.shell.should_receive(:logged_system).with(cmd).and_return(result)
         hook.eval_hook('sudo("do it as root") || raise("failed")')
       end
+
+      it "raises when the bang method alternative is used" do
+        hook = deploy_hook
+        cmd = "sudo sh -l -c false"
+        result = EY::Serverside::Shell::CommandResult.new(cmd, 1, "fail")
+        hook.callback_context.shell.should_receive(:logged_system).with(cmd).and_return(result)
+        lambda {
+          hook.eval_hook('sudo!("false")')
+        }.should raise_error(RuntimeError)
+        out = read_output
+        out.should =~ %r|FATAL: Exception raised in deploy hook /data/app_name/releases/\d+/deploy/fake_test_hook.rb.|
+        out.should =~ %r|RuntimeError: .*sudo!.*Command failed. false|
+        out.should =~ %r|Please fix this error before retrying.|
+      end
     end
 
     context "capistrano-ish methods" do

data/spec/lockfile_parser_spec.rb

@@ -19,8 +19,8 @@ describe "the bundler version retrieved from the lockfile" do
   end
 
   it "has a default version" do
-    EY::Serverside::LockfileParser.default_version.should == "1.1.3"
-    EY::Serverside::LockfileParser::DEFAULT.should == "1.1.3"
+    EY::Serverside::LockfileParser.default_version.should == "1.1.5"
+    EY::Serverside::LockfileParser::DEFAULT.should == "1.1.5"
   end
 
   it "returns the default version for a 1.0 lockfile without a bundler dependency" do

metadata

@@ -1,108 +1,119 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: engineyard-serverside
-version: !ruby/object:Gem::Version 
-  hash: 2346291293
-  prerelease: 6
-  segments: 
-  - 2
-  - 0
-  - 0
-  - rc
-  - 1
-  version: 2.0.0.rc1
+version: !ruby/object:Gem::Version
+  version: 2.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.3.2
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: timecop
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: engineyard-cloud-client
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.5
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 description: 
 email: cloud@engineyard.com
-executables: 
+executables:
 - engineyard-serverside
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/engineyard-serverside
 - lib/engineyard-serverside/cli.rb
 - lib/engineyard-serverside/cli_helpers.rb
@@ -120,8 +131,10 @@ files:
 - lib/engineyard-serverside/rails_asset_support.rb
 - lib/engineyard-serverside/server.rb
 - lib/engineyard-serverside/servers.rb
+- lib/engineyard-serverside/shell/command_result.rb
 - lib/engineyard-serverside/shell/formatter.rb
 - lib/engineyard-serverside/shell/helpers.rb
+- lib/engineyard-serverside/shell/yieldio.rb
 - lib/engineyard-serverside/shell.rb
 - lib/engineyard-serverside/strategies/git.rb
 - lib/engineyard-serverside/task.rb
@@ -451,40 +464,32 @@ files:
 - spec/support/integration.rb
 homepage: http://github.com/engineyard/engineyard-serverside
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2659746554228302927
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
-test_files: 
+test_files:
 - spec/basic_deploy_spec.rb
 - spec/bundler_deploy_spec.rb
 - spec/configuration_spec.rb