engineyard-serverside 1.3.5 → 1.3.6

data/lib/engineyard-serverside.rb

@@ -26,7 +26,11 @@ module EY
   end
 
   def self.dna_json
-    @dna_json ||= `sudo cat /etc/chef/dna.json`
+    @dna_json ||= if File.exist?('/etc/chef/dna.json')
+                    `sudo cat /etc/chef/dna.json`
+                  else
+                    {}.to_json
+                  end
   end
 
   RemoteFailure = Class.new StandardError

data/lib/engineyard-serverside/deploy.rb

@@ -24,7 +24,7 @@ module EY
 
       with_failed_release_cleanup do
         create_revision_file
-        bundle
+        run_with_callbacks(:bundle)
         symlink_configs
         conditionally_enable_maintenance_page
         run_with_callbacks(:migrate)
@@ -99,9 +99,9 @@ module EY
     end
 
     def run_with_callbacks(task)
-      callback(:"before_#{task}")
+      callback("before_#{task}")
       send(task)
-      callback(:"after_#{task}")
+      callback("after_#{task}")
     end
 
     # task
@@ -232,14 +232,8 @@ module EY
     def callback(what)
       @callbacks_reached ||= true
       if File.exist?("#{c.release_path}/deploy/#{what}.rb")
-        base_command = [$0, "_#{VERSION}_", 'hook', what.to_s,
-          '--app', config.app.to_s,
-          '--release-path', config.release_path.to_s,
-        ]
-
-        run Escape.shell_command(base_command) do |server, cmd|
+        run Escape.shell_command(base_callback_command_for(what)) do |server, cmd|
           per_instance_args = [
-            '--framework-env', c.environment.to_s,
             '--current-roles', server.roles.join(' '),
             '--config', c.to_json,
           ]
@@ -251,6 +245,19 @@ module EY
 
     protected
 
+    def base_callback_command_for(what)
+      [$0, version_specifier, 'hook', what.to_s,
+        '--app', config.app.to_s,
+        '--release-path', config.release_path.to_s,
+        '--framework-env', c.environment.to_s,
+      ].compact
+    end
+
+    def version_specifier
+      "_#{VERSION}_"
+    end
+
+
     def puts_deploy_failure
       if @cleanup_failed
         info "~> [Relax] Your site is running new code, but cleaning up old deploys failed"

data/lib/engineyard-serverside/strategies/git.rb

@@ -4,9 +4,9 @@ module EY
   module Strategies
     class Git
       module Helpers
+
         def update_repository_cache
-          strategy.fetch
-          unless strategy.checkout
+          unless strategy.fetch && strategy.checkout
             abort "*** [Error] Git could not checkout (#{strategy.to_checkout}) ***"
           end
         end
@@ -132,6 +132,7 @@ module EY
 
         ENV['GIT_SSH'] = @git_ssh.path
       end
+
     end
   end
 end

data/lib/engineyard-serverside/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
 end

data/spec/real_deploy_spec.rb

@@ -6,6 +6,17 @@ module EY::Strategies::IntegrationSpec
     def update_repository_cache
       cached_copy = File.join(c.shared_path, 'cached-copy')
 
+      deploy_hook_dir = File.join(cached_copy, 'deploy')
+      FileUtils.mkdir_p(deploy_hook_dir)
+      %w[bundle migrate symlink restart].each do |action|
+        %w[before after].each do |prefix|
+          hook = "#{prefix}_#{action}"
+          File.open(File.join(deploy_hook_dir, "#{hook}.rb"), 'w') do |f|
+            f.write(%Q{run 'touch "#{c.release_path}/#{hook}.ran"'})
+          end
+        end
+      end
+
       FileUtils.mkdir_p(File.join(c.shared_path, 'config'))
 
       FileUtils.mkdir_p(cached_copy)
@@ -76,11 +87,24 @@ describe "deploying an application" do
     end
 
     def run(cmd)
-      #$stderr.puts(cmd)
       @commands << cmd
       super
     end
 
+    def version_specifier
+      # Normally, the deploy task invokes the hook task by executing
+      # the rubygems-generated wrapper (it's what's in $PATH). It
+      # specifies the version to make sure that the pieces don't get
+      # out of sync. However, in test mode, there's no
+      # rubygems-generated wrapper, and so the hook task doesn't get
+      # run because thor thinks we're trying to invoke the _$VERSION_
+      # task instead, which doesn't exist.
+      #
+      # By stripping that out, we can get the hooks to actually run
+      # inside this test.
+      nil
+    end
+
     def restart
       FileUtils.touch("#{c.release_path}/restart")
     end
@@ -116,12 +140,13 @@ describe "deploying an application" do
 
     # run a deploy
     config = EY::Deploy::Configuration.new({
-        "strategy"  => "IntegrationSpec",
-        "deploy_to" => @deploy_dir,
-        "group"     => `id -gn`.strip,
-        "stack"     => 'nginx_passenger',
-        "migrate"   => "ruby -e 'puts ENV[\"PATH\"]' > #{@deploy_dir}/path-when-migrating",
-        'app'       => 'foo'
+        "strategy"      => "IntegrationSpec",
+        "deploy_to"     => @deploy_dir,
+        "group"         => `id -gn`.strip,
+        "stack"         => 'nginx_passenger',
+        "migrate"       => "ruby -e 'puts ENV[\"PATH\"]' > #{@deploy_dir}/path-when-migrating",
+        'app'           => 'foo',
+        'framework_env' => 'staging'
       })
 
     $0 = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
@@ -151,4 +176,14 @@ describe "deploying an application" do
     File.read(File.join(@deploy_dir, 'path-when-migrating')).should include('ey_bundler_binstubs')
   end
 
+  it "runs all the hooks" do
+    File.exist?(File.join(@deploy_dir, 'current', 'before_bundle.ran' )).should be_true
+    File.exist?(File.join(@deploy_dir, 'current', 'after_bundle.ran'  )).should be_true
+    File.exist?(File.join(@deploy_dir, 'current', 'before_migrate.ran')).should be_true
+    File.exist?(File.join(@deploy_dir, 'current', 'after_migrate.ran' )).should be_true
+    File.exist?(File.join(@deploy_dir, 'current', 'before_symlink.ran')).should be_true
+    File.exist?(File.join(@deploy_dir, 'current', 'after_symlink.ran' )).should be_true
+    File.exist?(File.join(@deploy_dir, 'current', 'before_restart.ran')).should be_true
+    File.exist?(File.join(@deploy_dir, 'current', 'after_restart.ran' )).should be_true
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 3
-  - 5
-  version: 1.3.5
+  - 6
+  version: 1.3.6
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 -07:00
+date: 2010-11-08 00:00:00 -08:00
 default_executable: engineyard-serverside
 dependencies: []
 
@@ -235,7 +235,6 @@ files:
 - LICENSE
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
-- spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
 - spec/fixtures/valid_hook.rb
@@ -287,7 +286,6 @@ summary: A gem that deploys ruby applications on EY Cloud instances
 test_files: 
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
-- spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
 - spec/fixtures/valid_hook.rb