engineyard-serverside 2.7.8pre2 → 2.8.0.pre

data/spec/configuration_spec.rb

@@ -30,6 +30,7 @@ describe EY::Serverside::Deploy::Configuration do
       expect(@config.verbose).to eq(false)
       expect(@config.copy_exclude).to eq([])
       expect(@config.ignore_database_adapter_warning).to eq(false)
+      expect(@config.ignore_ey_config_warning).to eq(false)
       expect(@config.ignore_gemfile_lock_warning).to eq(false)
       expect(@config.bundle_without).to eq(%w[test development])
       expect(@config.extra_bundle_install_options).to eq(%w[--without test development])

data/spec/deploy_hook_spec.rb

@@ -32,7 +32,7 @@ describe "deploy hooks" do
 
     it "prints the failure to the log even when non-verbose" do
       out = read_output
-      expect(out).to match(%r|FATAL: Exception raised in deploy hook .*/deploy/before_deploy.rb.|)
+      expect(out).to match(%r|FATAL:\s+Exception raised in hook .*/deploy/before_deploy.rb.|)
       expect(out).to match(%r|RuntimeError:.*Hook failing in \(eval\)|)
       expect(out).to match(%r|Please fix this error before retrying.|)
     end
@@ -78,79 +78,91 @@ describe "deploy hooks" do
       # setup to run hooks since a deploy hasn't happened
       config.paths.new_release!
       config.paths.active_release.mkpath
-      EY::Serverside::DeployHook.new(config, test_shell, 'fake_test_hook')
+      hook = EY::Serverside::Callbacks::Hooks::App.new(
+        File.join(config.paths.active_release, 'deploy', 'fake_test_hook.rb')
+      )
+      #EY::Serverside::DeployHook.new(config, test_shell, 'fake_test_hook')
+      EY::Serverside::Callbacks::Executor::Ruby::Context.new(
+        config,
+        test_shell,
+        hook
+      )
     end
 
-    context "#run" do
-      it "is available" do
-        expect(deploy_hook.eval_hook('respond_to?(:run)')).to be_truthy
-      end
-
-      it "runs commands like the shell does" do
-        ENV['COUNT'] = 'Chocula'
-        File.unlink("/tmp/deploy_hook_spec.the_count") rescue nil
-
-        deploy_hook.eval_hook('run("echo $COUNT > /tmp/deploy_hook_spec.the_count")')
-
-        expect(IO.read("/tmp/deploy_hook_spec.the_count").strip).to eq("Chocula")
-      end
-
-      it "returns true/false to indicate the command's success" do
-        expect(deploy_hook.eval_hook('run("true")')).to be_truthy
-        expect(deploy_hook.eval_hook('run("false")')).to be_falsey
-      end
-
-      it "raises when the bang method alternative is used" do
-        expect {
-          deploy_hook.eval_hook('run!("false")')
-        }.to raise_error(RuntimeError)
-        out = read_output
-        expect(out).to match(%r|FATAL: Exception raised in deploy hook .*/deploy/fake_test_hook.rb.|)
-        expect(out).to match(%r|RuntimeError: .*run!.*Command failed. false|)
-        expect(out).to match(%r|Please fix this error before retrying.|)
-      end
-    end
-
-    context "#sudo" do
-      it "is available" do
-        expect(deploy_hook.eval_hook('respond_to?(:sudo)')).to be_truthy
-      end
-
-      it "runs things with sudo" do
-        hook = deploy_hook
-        mock_sudo do
-          hook.eval_hook('sudo("true") || raise("failed")')
-        end
-      end
-
-      it "raises when the bang method alternative is used" do
-        hook = deploy_hook
-        mock_sudo do
-          expect {
-            hook.eval_hook('sudo!("false")')
-          }.to raise_error(RuntimeError)
-        end
-        out = read_output
-        expect(out).to match(%r|FATAL: Exception raised in deploy hook .*/deploy/fake_test_hook.rb.|)
-        expect(out).to match(%r|RuntimeError: .*sudo!.*Command failed. false|)
-        expect(out).to match(%r|Please fix this error before retrying.|)
-      end
-    end
+    # Deprecated by inside tests - dwalters
+    #context "#run" do
+      #it "is available" do
+        #expect(deploy_hook.instance_eval('respond_to?(:run)')).to be_truthy
+      #end
+
+      #it "runs commands like the shell does" do
+        #ENV['COUNT'] = 'Chocula'
+        #File.unlink("/tmp/deploy_hook_spec.the_count") rescue nil
+
+        #deploy_hook.instance_eval('run("echo $COUNT > /tmp/deploy_hook_spec.the_count")')
+
+        #expect(IO.read("/tmp/deploy_hook_spec.the_count").strip).to eq("Chocula")
+      #end
+
+      #it "returns true/false to indicate the command's success" do
+        #expect(deploy_hook.instance_eval('run("true")')).to be_truthy
+        #expect(deploy_hook.instance_eval('run("false")')).to be_falsey
+      #end
+
+      #it "raises when the bang method alternative is used" do
+        ##expect {
+          #deploy_hook.instance_eval('run!("false")')
+        ##}.to raise_error(RuntimeError)
+        #out = read_output
+        #puts "out == '#{out}'"
+        #fail
+        #expect(out).to match(%r|FATAL:\s+Exception raised in hook .*/deploy/fake_test_hook.rb.|)
+        #expect(out).to match(%r|RuntimeError: .*run!.*Command failed. false|)
+        #expect(out).to match(%r|Please fix this error before retrying.|)
+      #end
+    #end
+
+    # Deprecated by inside tests - dwalters
+    #context "#sudo" do
+      #it "is available" do
+        #expect(deploy_hook.instance_eval('respond_to?(:sudo)')).to be_truthy
+      #end
+
+      #it "runs things with sudo" do
+        #hook = deploy_hook
+        #mock_sudo do
+          #hook.instance_eval('sudo("true") || raise("failed")')
+        #end
+      #end
+
+      #it "raises when the bang method alternative is used" do
+        #hook = deploy_hook
+        #mock_sudo do
+          #expect {
+            #hook.instance_eval('sudo!("false")')
+          #}.to raise_error(RuntimeError)
+        #end
+        #out = read_output
+        #expect(out).to match(%r|FATAL:\s+Exception raised in hook .*/deploy/fake_test_hook.rb.|)
+        #expect(out).to match(%r|RuntimeError: .*sudo!.*Command failed. false|)
+        #expect(out).to match(%r|Please fix this error before retrying.|)
+      #end
+    #end
 
     context "capistrano-ish methods" do
       it "has them" do
-        expect(deploy_hook.eval_hook('respond_to?(:latest_release)    ')).to be_truthy
-        expect(deploy_hook.eval_hook('respond_to?(:previous_release)  ')).to be_truthy
-        expect(deploy_hook.eval_hook('respond_to?(:all_releases)      ')).to be_truthy
-        expect(deploy_hook.eval_hook('respond_to?(:current_path)      ')).to be_truthy
-        expect(deploy_hook.eval_hook('respond_to?(:shared_path)       ')).to be_truthy
-        expect(deploy_hook.eval_hook('respond_to?(:release_dir)       ')).to be_truthy
-        expect(deploy_hook.eval_hook('respond_to?(:failed_release_dir)')).to be_truthy
-        expect(deploy_hook.eval_hook('respond_to?(:release_path)      ')).to be_truthy
+        expect(deploy_hook.instance_eval('respond_to?(:latest_release)    ')).to be_truthy
+        expect(deploy_hook.instance_eval('respond_to?(:previous_release)  ')).to be_truthy
+        expect(deploy_hook.instance_eval('respond_to?(:all_releases)      ')).to be_truthy
+        expect(deploy_hook.instance_eval('respond_to?(:current_path)      ')).to be_truthy
+        expect(deploy_hook.instance_eval('respond_to?(:shared_path)       ')).to be_truthy
+        expect(deploy_hook.instance_eval('respond_to?(:release_dir)       ')).to be_truthy
+        expect(deploy_hook.instance_eval('respond_to?(:failed_release_dir)')).to be_truthy
+        expect(deploy_hook.instance_eval('respond_to?(:release_path)      ')).to be_truthy
       end
 
       it "shows a deprecation warning that asks you to use config to access these variables" do
-        expect(deploy_hook.eval_hook('shared_path.nil?')).to be_falsey
+        expect(deploy_hook.instance_eval('shared_path.nil?')).to be_falsey
         out = read_output
         expect(out).to include("Use of `shared_path` (via method_missing) is deprecated in favor of `config.shared_path` for improved error messages and compatibility.")
         expect(out).to match(%r|in .*/deploy/fake_test_hook.rb|)
@@ -163,15 +175,15 @@ describe "deploy hooks" do
       end
 
       it "has account_name" do
-        expect(@hook.eval_hook('account_name')).to eq('acc')
+        expect(@hook.instance_eval('account_name')).to eq('acc')
       end
 
       it "has environment_name" do
-        expect(@hook.eval_hook('environment_name')).to eq('env')
+        expect(@hook.instance_eval('environment_name')).to eq('env')
       end
 
       it "has app_name" do
-        expect(@hook.eval_hook('app_name')).to eq('app')
+        expect(@hook.instance_eval('app_name')).to eq('app')
       end
     end
 
@@ -188,51 +200,53 @@ describe "deploy hooks" do
         })
       end
 
-      it "is deprecated through the @node ivar" do
-        expect(deploy_hook.eval_hook('@node.nil?')).to be_falsey
-        out = read_output
-        expect(out).to match(%r|Use of `@node` in deploy hooks is deprecated.|)
-        expect(out).to match(%r|Please use `config.node`, which provides access to the same object.|)
-        expect(out).to match(%r|.*/deploy/fake_test_hook.rb|)
-      end
+      # Test deprecated by inside tests and new implementation - dwalters
+      #it "is deprecated through the @node ivar" do
+        #expect(deploy_hook.instance_eval('@node.nil?')).to be_falsey
+        #out = read_output
+        #expect(out).to match(%r|Use of `@node` in deploy hooks is deprecated.|)
+        #expect(out).to match(%r|Please use `config.node`, which provides access to the same object.|)
+        #expect(out).to match(%r|.*/deploy/fake_test_hook.rb|)
+      #end
 
       it "is available" do
-        expect(deploy_hook.eval_hook('config.node.nil?')).to be_falsey
+        expect(deploy_hook.instance_eval('config.node.nil?')).to be_falsey
       end
 
       it "has indifferent access" do
-        expect(deploy_hook.eval_hook('config.node[:instance_role] ')).to eq('solo')
-        expect(deploy_hook.eval_hook('config.node["instance_role"]')).to eq('solo')
+        expect(deploy_hook.instance_eval('config.node[:instance_role] ')).to eq('solo')
+        expect(deploy_hook.instance_eval('config.node["instance_role"]')).to eq('solo')
       end
 
       it "has deep indifferent access" do
-        expect(deploy_hook.eval_hook('config.node["applications"]["myapp"]["type"]')).to eq('rails')
-        expect(deploy_hook.eval_hook('config.node[:applications]["myapp"][:type]  ')).to eq('rails')
-        expect(deploy_hook.eval_hook('config.node[:applications][:myapp][:type]   ')).to eq('rails')
+        expect(deploy_hook.instance_eval('config.node["applications"]["myapp"]["type"]')).to eq('rails')
+        expect(deploy_hook.instance_eval('config.node[:applications]["myapp"][:type]  ')).to eq('rails')
+        expect(deploy_hook.instance_eval('config.node[:applications][:myapp][:type]   ')).to eq('rails')
       end
     end
 
     context "config" do
       it "is available" do
-        expect(deploy_hook.eval_hook('config.nil?')).to be_falsey
+        expect(deploy_hook.instance_eval('config.nil?')).to be_falsey
       end
 
-      it "is deprecated through the @configuration ivar" do
-        expect(deploy_hook.eval_hook('@configuration.nil?')).to be_falsey
-        out = read_output
-        expect(out).to match(%r|Use of `@configuration` in deploy hooks is deprecated.|)
-        expect(out).to match(%r|Please use `config`, which provides access to the same object.|)
-        expect(out).to match(%r|.*/deploy/fake_test_hook.rb|)
-      end
+      # Test deprecated by inside tests and new implementation - dwalters
+      #it "is deprecated through the @configuration ivar" do
+        #expect(deploy_hook.instance_eval('@configuration.nil?')).to be_falsey
+        #out = read_output
+        #expect(out).to match(%r|Use of `@configuration` in deploy hooks is deprecated.|)
+        #expect(out).to match(%r|Please use `config`, which provides access to the same object.|)
+        #expect(out).to match(%r|.*/deploy/fake_test_hook.rb|)
+      #end
 
       it "has the configuration in it" do
-        expect(deploy_hook('bert' => 'ernie').eval_hook('config.bert')).to eq('ernie')
+        expect(deploy_hook('bert' => 'ernie').instance_eval('config.bert')).to eq('ernie')
       end
 
       it "can be accessed with method calls, with [:symbols], or ['strings']" do
-        expect(deploy_hook('bert' => 'ernie').eval_hook('config.bert   ')).to eq('ernie')
-        expect(deploy_hook('bert' => 'ernie').eval_hook('config[:bert] ')).to eq('ernie')
-        expect(deploy_hook('bert' => 'ernie').eval_hook('config["bert"]')).to eq('ernie')
+        expect(deploy_hook('bert' => 'ernie').instance_eval('config.bert   ')).to eq('ernie')
+        expect(deploy_hook('bert' => 'ernie').instance_eval('config[:bert] ')).to eq('ernie')
+        expect(deploy_hook('bert' => 'ernie').instance_eval('config["bert"]')).to eq('ernie')
       end
 
       [:repository_cache,
@@ -244,17 +258,17 @@ describe "deploy hooks" do
         :revision,
         :environment].each do |attribute|
         it "has the #{attribute.inspect} attribute for compatibility with chef-deploy" do
-          expect(deploy_hook.eval_hook("config.has_key?(#{attribute.inspect})")).to be_truthy
+          expect(deploy_hook.instance_eval("config.has_key?(#{attribute.inspect})")).to be_truthy
         end
       end
     end
 
     context "environment variables" do
       it "sets the framework env variables" do
-        expect(deploy_hook('framework_env' => 'production').eval_hook("ENV['RAILS_ENV']")).to eq('production')
-        expect(deploy_hook('framework_env' => 'production').eval_hook("ENV['RACK_ENV'] ")).to eq('production')
-        expect(deploy_hook('framework_env' => 'production').eval_hook("ENV['MERB_ENV'] ")).to eq('production')
-        expect(deploy_hook('framework_env' => 'production').eval_hook("ENV['NODE_ENV'] ")).to eq('production')
+        expect(deploy_hook('framework_env' => 'production').instance_eval("ENV['RAILS_ENV']")).to eq('production')
+        expect(deploy_hook('framework_env' => 'production').instance_eval("ENV['RACK_ENV'] ")).to eq('production')
+        expect(deploy_hook('framework_env' => 'production').instance_eval("ENV['MERB_ENV'] ")).to eq('production')
+        expect(deploy_hook('framework_env' => 'production').instance_eval("ENV['NODE_ENV'] ")).to eq('production')
       end
     end
 
@@ -277,7 +291,7 @@ describe "deploy hooks" do
       def where_code_runs_with(code)
         scenarios.select do |role, name|
           hook = deploy_hook('current_roles' => role.split(','), 'current_name' => name)
-          hook.eval_hook("#{code} { 'ran' } == 'ran'")
+          hook.instance_eval("#{code} { 'ran' } == 'ran'")
         end.map do |scenario|
           scenario.compact.join("_")
         end.compact
@@ -320,42 +334,44 @@ describe "deploy hooks" do
       end
     end
 
-    context "#syntax_error" do
-      it "returns nil for hook files containing valid Ruby syntax" do
-        hook_path = File.expand_path('../fixtures/valid_hook.rb', __FILE__)
-        expect(deploy_hook.syntax_error(hook_path)).to be_nil
-      end
-
-      it "returns a brief problem description for hook files containing valid Ruby syntax" do
-        hook_path = File.expand_path('../fixtures/invalid_hook.rb', __FILE__)
-        error = Regexp.escape("spec/fixtures/invalid_hook.rb:1: syntax error, unexpected '^'")
-        expect(deploy_hook.syntax_error(hook_path)).to match(/#{error}/)
-      end
-    end
-
-    context "errors in hooks" do
-      it "shows the error in a helpful way" do
-        expect {
-          deploy_hook.eval_hook('methedo_no_existo')
-        }.to raise_error(NameError)
-        out = read_output
-        expect(out).to match(%r|FATAL: Exception raised in deploy hook .*/deploy/fake_test_hook.rb.|)
-        expect(out).to match(%r|NameError: undefined local variable or method `methedo_no_existo' for|)
-        expect(out).to match(%r|Please fix this error before retrying.|)
-      end
-    end
-
-    context "is compatible with older deploy hook scripts" do
+    # Deprecated by new implementation and inside tests - dwalters
+    #context "#syntax_error" do
+      #it "returns nil for hook files containing valid Ruby syntax" do
+        #hook_path = File.expand_path('../fixtures/valid_hook.rb', __FILE__)
+        #expect(deploy_hook.syntax_error(hook_path)).to be_nil
+      #end
+
+      #it "returns a brief problem description for hook files containing valid Ruby syntax" do
+        #hook_path = File.expand_path('../fixtures/invalid_hook.rb', __FILE__)
+        #error = Regexp.escape("spec/fixtures/invalid_hook.rb:1: syntax error, unexpected '^'")
+        #expect(deploy_hook.syntax_error(hook_path)).to match(/#{error}/)
+      #end
+    #end
+
+    # Test deprecated by inside tests and new implementation - dwalters
+    #context "errors in hooks" do
+      #it "shows the error in a helpful way" do
+        #expect {
+          #deploy_hook.instance_eval('methedo_no_existo')
+        #}.to raise_error(NameError)
+        #out = read_output
+        #expect(out).to match(%r|FATAL:\s+Exception raised in hook .*/deploy/fake_test_hook.rb.|)
+        #expect(out).to match(%r|NameError: undefined local variable or method `methedo_no_existo' for|)
+        #expect(out).to match(%r|Please fix this error before retrying.|)
+      #end
+    #end
+
+    context "is compatible with older hook scripts" do
       it "#current_role returns the first role" do
-        expect(deploy_hook('current_roles' => %w(a b)).eval_hook('current_role')).to eq('a')
+        expect(deploy_hook('current_roles' => %w(a b)).instance_eval('current_role')).to eq('a')
       end
 
       it "has info, warning, debug, logged_system, and access to shell" do
-        expect(deploy_hook.eval_hook('respond_to?(:info)         ')).to be_truthy
-        expect(deploy_hook.eval_hook('respond_to?(:warning)      ')).to be_truthy
-        expect(deploy_hook.eval_hook('respond_to?(:debug)        ')).to be_truthy
-        expect(deploy_hook.eval_hook('respond_to?(:logged_system)')).to be_truthy
-        expect(deploy_hook.eval_hook('respond_to?(:shell)        ')).to be_truthy
+        expect(deploy_hook.instance_eval('respond_to?(:info)         ')).to be_truthy
+        expect(deploy_hook.instance_eval('respond_to?(:warning)      ')).to be_truthy
+        expect(deploy_hook.instance_eval('respond_to?(:debug)        ')).to be_truthy
+        expect(deploy_hook.instance_eval('respond_to?(:logged_system)')).to be_truthy
+        expect(deploy_hook.instance_eval('respond_to?(:shell)        ')).to be_truthy
       end
     end
   end

data/spec/fixtures/lockfiles/1.15.1-no-bundler

@@ -0,0 +1,51 @@
+PATH
+  remote: .
+  specs:
+    fog (0.3.7)
+      builder
+      excon (>= 0.2.3)
+      formatador (>= 0.0.15)
+      json
+      mime-types
+      net-ssh (~> 2.0.23)
+      nokogiri (~> 1.4.3.1)
+      ruby-hmac
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (2.1.2)
+    excon (0.2.3)
+    formatador (0.0.15)
+    gestalt (0.0.11)
+      formatador (>= 0.0.12)
+    json (1.4.6)
+    mime-types (1.16)
+    net-ssh (2.0.23)
+    nokogiri (1.4.3.1)
+    rake (0.8.7)
+    rspec (1.3.0)
+    ruby-hmac (0.4.0)
+    shindo (0.1.6)
+      formatador (>= 0.0.14)
+      gestalt (>= 0.0.11)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  builder
+  excon (>= 0.2.3)
+  fog!
+  formatador (>= 0.0.15)
+  json
+  mime-types
+  net-ssh (~> 2.0.23)
+  nokogiri (~> 1.4.3.1)
+  rake
+  rspec
+  ruby-hmac
+  shindo (= 0.1.6)
+
+BUNDLED WITH
+   1.15.1

data/spec/fixtures/repos/assets_error/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+gem 'ey_config'
+gem 'rails'

data/spec/fixtures/repos/assets_error/Gemfile.lock

@@ -0,0 +1,88 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.0)
+    erubis (2.7.0)
+    ey_config (0.0.5)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.3)
+    json (1.6.6)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.18)
+    multi_json (1.3.2)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
+      bundler (~> 1.0)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ey_config
+  rails
+  rake