ey-deploy 0.3.1 → 0.3.2

data/lib/ey-deploy.rb

@@ -14,6 +14,26 @@ require 'configuration'
 
 module EY
   def self.node
-    @node ||= JSON.parse(`sudo cat /etc/chef/dna.json`)
+    @node ||= deep_indifferentize(JSON.parse(dna_json))
   end
+
+  def self.dna_json
+    @dna_json ||= `sudo cat /etc/chef/dna.json`
+  end
+
+  private
+  def self.deep_indifferentize(thing)
+    if thing.kind_of?(Hash)
+      indifferent_hash = Thor::CoreExt::HashWithIndifferentAccess.new
+      thing.each do |k, v|
+        indifferent_hash[k] = deep_indifferentize(v)
+      end
+      indifferent_hash
+    elsif thing.kind_of?(Array)
+      thing.map {|x| deep_indifferentize(x)}
+    else
+      thing
+    end
+  end
+
 end

data/lib/ey-deploy/cli.rb

@@ -93,7 +93,7 @@ module EY
               "#{config.user}@#{server.hostname}:#{remote_gem_file}",
             ]))
         server.run("sudo #{gem_binary} uninstall -a -x ey-deploy 2>/dev/null")
-        server.run("sudo #{gem_binary} install '#{remote_gem_file}'")
+        server.run("sudo #{gem_binary} install --no-rdoc --no-ri '#{remote_gem_file}'")
       end
     end
   end

data/lib/ey-deploy/deploy.rb

@@ -16,9 +16,19 @@ module EY
       create_revision_file
       bundle
       symlink_configs
+
+      callback(:before_migrate)
       migrate
+      callback(:after_migrate)
+
+      callback(:before_symlink)
       symlink
+      callback(:after_symlink)
+
+      callback(:before_restart)
       restart
+      callback(:after_restart)
+
       cleanup
 
       puts "~> finalizing deploy"
@@ -37,7 +47,6 @@ module EY
       puts "~> Restarting app servers"
       puts "~> restarting app: #{c.latest_release}"
       roles :app_master, :app, :solo do
-        callback(:before_restart)
         restart_command = case c.stack
         when "nginx_unicorn"
           sudo("/etc/init.d/unicorn_#{c.app} deploy")
@@ -46,7 +55,6 @@ module EY
         when "nginx_passenger", "apache_passenger"
           sudo("touch #{c.latest_release}/tmp/restart.txt")
         end
-        callback(:after_restart)
       end
     end
 
@@ -79,7 +87,6 @@ module EY
     def migrate
       roles :app_master, :solo do
         if c.migrate?
-          callback(:before_migrate)
           puts "~> migrating"
           cmd = "cd #{c.latest_release} && #{c.framework_envs} #{c.migration_command}"
           puts "~> Migrating: #{cmd}"
@@ -119,7 +126,6 @@ module EY
 
     # task
     def symlink(release_to_link=c.latest_release)
-      callback(:before_symlink)
       puts "~> symlinking code"
       begin
         sudo "rm -f #{c.current_path} && ln -nfs #{release_to_link} #{c.current_path} && chown -R #{c.user}:#{c.group} #{c.current_path}"
@@ -130,10 +136,10 @@ module EY
       end
     end
 
-    def callback(what, roles=@roles)
+    def callback(what)
       if File.exist?("#{c.latest_release}/deploy/#{what}.rb")
         eysd_path = $0   # invoke others just like we were invoked
-        EY::Server.from_roles(roles).each do |server|
+        EY::Server.all.each do |server|
           server.run("#{eysd_path} hook '#{what}' --app '#{config.app}' --release-path #{config.release_path}")
         end
       end

data/lib/ey-deploy/deploy_hook.rb

@@ -24,6 +24,7 @@ module EY
     class CallbackContext
       def initialize(hook_runner, config)
         @hook_runner, @configuration = hook_runner, config
+        @node = node
       end
 
       def method_missing(meth, *args, &blk)
@@ -45,6 +46,34 @@ module EY
       def sudo(cmd)
         system(@hook_runner.prepare_sudo(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
+      def on_db_master(&blk)                  on_roles(%w[solo db_master],           &blk) end
+      def on_db_slaves(&blk)                  on_roles(%w[db_slave],                 &blk) end
+      def on_db_servers(&blk)                 on_roles(%w[solo db_master db_slave],  &blk) end
+      def on_app_servers_and_utilities(&blk)  on_roles(%w[solo app_master app util], &blk) end
+
+      def on_utilities(*names, &blk)
+        names.flatten!
+        on_roles(%w[util]) do
+          blk.call if names.empty? || names.include?(current_name)
+        end
+      end
+
+      private
+      def on_roles(desired_roles)
+        yield if desired_roles.include?(current_role.to_s)
+      end
+
+      def current_role
+        node[:instance_role]
+      end
+
+      def current_name
+        node[:name]
+      end
     end
 
   end

data/lib/ey-deploy/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/deploy_hook_spec.rb

@@ -1,6 +1,13 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe "deploy hook's context" do
+describe "the deploy-hook API" do
+  before(:all) do
+    module EY
+      def self.dna_json=(j) @dna_json = j; @node = nil end
+    end
+    EY.dna_json = {}.to_json
+  end
+
   before(:each) do
     @hook_runner = EY::DeployHook.new(options)
     @callback_context = EY::DeployHook::CallbackContext.new(@hook_runner, @hook_runner.config)
@@ -20,7 +27,7 @@ describe "deploy hook's context" do
     @callback_context.instance_eval(&blk)
   end
 
-  context "the #run method" do
+  context "#run" do
     it "is available" do
       run_hook { respond_to?(:run) }.should be_true
     end
@@ -40,7 +47,7 @@ describe "deploy hook's context" do
     end
   end
 
-  context "the #sudo method" do
+  context "#sudo" do
     it "is available" do
       run_hook { respond_to?(:sudo) }.should be_true
     end
@@ -64,6 +71,35 @@ describe "deploy hook's context" do
     end
   end
 
+  context "the @node ivar" do
+    before(:each) do
+      EY.dna_json = {
+        'instance_role' => 'solo',
+        'applications' => {
+          'myapp' => {
+            'type' => 'rails',
+            'branch' => 'master',
+          }
+        }
+      }.to_json
+    end
+
+    it "is available" do
+      run_hook { @node.nil? }.should be_false
+    end
+
+    it "has indifferent access" do
+      run_hook { @node[:instance_role]  }.should == 'solo'
+      run_hook { @node['instance_role'] }.should == 'solo'
+    end
+
+    it "has deep indifferent access" do
+      run_hook { @node['applications']['myapp']['type'] }.should == 'rails'
+      run_hook { @node[:applications]['myapp'][:type]   }.should == 'rails'
+      run_hook { @node[:applications][:myapp][:type]    }.should == 'rails'
+    end
+  end
+
   context "the @configuration ivar" do
     it "is available" do
       run_hook { @configuration.nil? }.should be_false
@@ -92,4 +128,76 @@ describe "deploy hook's context" do
       end
     end
   end
+
+  context "has methods to run code only on certain instances" do
+    def scenarios
+      [
+        {:instance_role => 'solo'},
+        {:instance_role => 'app_master'},
+        {:instance_role => 'app'},
+        {:instance_role => 'db_master'},
+        {:instance_role => 'db_slave'},
+        {:instance_role => 'util', :name => "alpha"},
+        {:instance_role => 'util', :name => "beta"},
+        {:instance_role => 'util', :name => "gamma"},
+      ]
+    end
+
+    def where_code_runs_with(method, *args)
+      scenarios.map do |s|
+        EY.dna_json = s.to_json
+
+        if run_hook { send(method, *args) { 'ran!'} } == 'ran!'
+          result = s[:instance_role]
+          result << "_#{s[:name]}" if s[:name]
+          result
+        end
+      end.compact
+    end
+
+    it "#on_app_master runs on app masters and solos" do
+      where_code_runs_with(:on_app_master).should == %w(solo app_master)
+    end
+
+    it "#on_app_servers runs on app masters, app slaves, and solos" do
+      where_code_runs_with(:on_app_servers).should == %w(solo app_master app)
+    end
+
+    it "#on_db_master runs on DB masters and solos" do
+      where_code_runs_with(:on_db_master).should == %w(solo db_master)
+    end
+
+    it "#on_db_slaves runs on DB slaves only (not solos or masters)" do
+      where_code_runs_with(:on_db_slaves).should == %w(db_slave)
+    end
+
+    it "#on_db_servers runs on DB masters, DB slaves, and solos" do
+      where_code_runs_with(:on_db_servers).should == %w(solo db_master db_slave)
+    end
+
+    it "#on_app_servers_and_utilities does what it says on the tin" do
+      where_code_runs_with(:on_app_servers_and_utilities).should ==
+        %w(solo app_master app util_alpha util_beta util_gamma)
+    end
+
+    it "#on_utilities() runs on all utility instances" do
+      where_code_runs_with(:on_utilities).should ==
+        %w(util_alpha util_beta util_gamma)
+    end
+
+    it "#on_utilities('sometype') runs on only utilities of type 'sometype'" do
+      where_code_runs_with(:on_utilities, 'alpha').should == %w(util_alpha)
+    end
+
+    it "#on_utilities('type1', 'type2') runs on utilities of both types" do
+      where_code_runs_with(:on_utilities, 'alpha', 'beta').should ==
+        %w(util_alpha util_beta)
+    end
+
+    it "#on_utilities can be invoked with (['a', 'b']) or ('a', 'b')" do
+      where_code_runs_with(:on_utilities, %w[alpha beta]).should ==
+        where_code_runs_with(:on_utilities, 'alpha', 'beta')
+    end
+
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 -07:00
+date: 2010-05-26 00:00:00 -07:00
 default_executable: eysd
 dependencies: 
 - !ruby/object:Gem::Dependency