ey-deploy 0.4.1 → 0.5.0

data/lib/ey-deploy/cli.rb

@@ -10,28 +10,32 @@ module EY
       exit(1)
     end
 
-    method_option :migrate, :type     => :string,
-                            :desc     => "Run migrations with this deploy",
-                            :aliases  => ["-m"]
+    method_option :migrate,   :type     => :string,
+                              :desc     => "Run migrations with this deploy",
+                              :aliases  => ["-m"]
 
-    method_option :branch,  :type     => :string,
-                            :desc     => "Branch to deploy from, defaults to master",
-                            :aliases  => ["-b"]
+    method_option :branch,    :type     => :string,
+                              :desc     => "Branch to deploy from, defaults to master",
+                              :aliases  => ["-b"]
 
-    method_option :repo,    :type     => :string,
-                            :desc     => "Remote repo to deploy",
-                            :aliases  => ["-r"]
+    method_option :repo,      :type     => :string,
+                              :desc     => "Remote repo to deploy",
+                              :aliases  => ["-r"]
 
-    method_option :app,     :type     => :string,
-                            :required => true,
-                            :desc     => "Application to deploy",
-                            :aliases  => ["-a"]
+    method_option :app,       :type     => :string,
+                              :required => true,
+                              :desc     => "Application to deploy",
+                              :aliases  => ["-a"]
 
-    method_option :config,  :type     => :string,
-                            :desc     => "Additional configuration"
+    method_option :config,    :type     => :string,
+                              :desc     => "Additional configuration"
+
+    method_option :instances, :type     => :array,
+                              :desc     => "Instances in cluster"
 
     desc "deploy", "Deploy code from /data/<app>"
     def deploy(default_task=:deploy)
+      EY::Server.all = parse_instances(options[:instances])
       invoke :propagate
       EY::Deploy.run(options.merge("default_task" => default_task))
     end
@@ -44,6 +48,13 @@ module EY
     method_option :release_path, :type => :string,
                                  :desc => "Value for #release_path in hooks (mostly for internal coordination)",
                                  :aliases => ["-r"]
+
+    method_option :current_role, :type => :string,
+                                 :desc => "Value for #current_role in hooks"
+
+    method_option :current_name, :type => :string,
+                                 :desc => "Value for #current_name in hooks"
+
     desc "hook [NAME]", "Run a particular deploy hook"
     def hook(hook_name)
       EY::DeployHook.new(options).run(hook_name)
@@ -77,5 +88,15 @@ module EY
         server.run("sudo #{gem_binary} install --no-rdoc --no-ri '#{remote_gem_file}'")
       end
     end
+
+    private
+
+    def parse_instances(instance_strings)
+      instance_strings.map do |s|
+        tuple = s.split(/,/)
+        {:hostname => tuple[0], :role => tuple[1], :name => tuple[2]}
+      end
+    end
+
   end
 end

data/lib/ey-deploy/deploy.rb

@@ -198,7 +198,11 @@ module EY
       @callbacks_reached ||= true
       if File.exist?("#{c.latest_release}/deploy/#{what}.rb")
         eysd_path = $0   # invoke others just like we were invoked
-        run "#{eysd_path} hook '#{what}' --app '#{config.app}' --release-path #{config.release_path}"
+        run "#{eysd_path} hook '#{what}' --app '#{config.app}' --release-path #{config.release_path}" do |server, cmd|
+          cmd << " --current-role '#{server.role}'"
+          cmd << " --current-name '#{server.name}'" if server.name
+          cmd
+        end
       end
     end
 

data/lib/ey-deploy/deploy_hook.rb

@@ -9,7 +9,7 @@ module EY
     end
 
     def callback_context
-      @context ||= CallbackContext.new(self, config)
+      @context ||= CallbackContext.new(config)
     end
 
     def run(hook)
@@ -22,8 +22,8 @@ module EY
     end
 
     class CallbackContext
-      def initialize(hook_runner, config)
-        @hook_runner, @configuration = hook_runner, config
+      def initialize(config)
+        @configuration = config
         @node = node
       end
 
@@ -40,11 +40,11 @@ module EY
       end
 
       def run(cmd)
-        system(@hook_runner.prepare_run(cmd))
+        system(Escape.shell_command(["sh", "-l", "-c", cmd]))
       end
 
       def sudo(cmd)
-        system(@hook_runner.prepare_sudo(cmd))
+        system(Escape.shell_command(["sudo", "sh", "-l", "-c", cmd]))
       end
 
       # convenience functions for running on certain instance types
@@ -67,13 +67,6 @@ module EY
         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/server.rb

@@ -5,6 +5,11 @@ module EY
   class Server < Struct.new(:hostname, :role, :name)
     include VerboseSystem
 
+    def initialize(*fields)
+      super
+      self.role = self.role.to_sym
+    end
+
     def self.config=(config)
       @@config = config
     end
@@ -24,41 +29,20 @@ module EY
       end
     end
 
-    def self.all
-      @servers ||= ([current] << app_slaves << db_master << db_slaves << utils).flatten.compact
-    end
-
-    def self.current
-      @current ||= new(open("http://169.254.169.254/latest/meta-data/local-hostname").read, EY.node["instance_role"].to_sym)
+    def self.from_hash(h)
+      new(h[:hostname], h[:role], h[:name])
     end
 
-    def self.app_slaves
-      @app_slaves ||= Array(EY.node["members"]).map do |slave|
-        new(slave, :app)
-      end.reject do |server|
-        server.hostname == current.hostname
-      end
-    end
-
-    def self.db_master
-      return @db_master if @db_master
-      if EY.node["instance_role"] == "solo"
-        @db_master = nil
-      else
-        @db_master = EY.node["db_host"] && new(EY.node["db_host"], :db_master)
-      end
+    def self.all
+      @all
     end
 
-    def self.db_slaves
-      EY.node["db_slaves"].map do |slave|
-        new(slave, :db_slave)
-      end
+    def self.all=(server_hashes)
+      @all = server_hashes.map { |s| from_hash(s) }
     end
 
-    def self.utils
-      EY.node["utility_instances"].map do |server|
-        new(server["hostname"], :util, server["name"])
-      end
+    def self.current
+      all.find {|s| s.local? }
     end
 
     def local?

data/lib/ey-deploy/task.rb

@@ -36,12 +36,12 @@ module EY
       end
     end
 
-    def run(cmd)
-      run_on_roles { prepare_run cmd }
+    def run(cmd, &blk)
+      run_on_roles(cmd, &blk)
     end
 
-    def sudo(cmd)
-      run_on_roles { prepare_sudo cmd }
+    def sudo(cmd, &blk)
+      run_on_roles(cmd, %w[sudo sh -l -c], &blk)
     end
 
     def prepare_run(command)
@@ -54,10 +54,10 @@ module EY
 
     private
 
-    def run_on_roles
-      cmd = yield
+    def run_on_roles(cmd, wrapper=%w[sh -l -c])
       EY::Server.from_roles(@roles).inject(false) do |acc, server|
-        failure = !server.run(cmd)
+        to_run = block_given? ? yield(server, cmd.dup) : cmd
+        failure = !server.run(Escape.shell_command(wrapper + [to_run]))
         acc || failure
       end && raise(EY::RemoteFailure)
     end

data/lib/ey-deploy/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

data/spec/deploy_hook_spec.rb

@@ -2,14 +2,14 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe "the deploy-hook API" do
   before(:each) do
-    @hook_runner = EY::DeployHook.new(options)
-    @callback_context = EY::DeployHook::CallbackContext.new(@hook_runner, @hook_runner.config)
+    hook = EY::DeployHook.new(options)
+    @callback_context = EY::DeployHook::CallbackContext.new(hook.config)
   end
 
   def run_hook(options={}, &blk)
     raise ArgumentError unless block_given?
     options.each do |k, v|
-      @hook_runner.config.configuration[k] = v    # ugh
+      @callback_context.configuration[k] = v
     end
 
     # The hooks on the filesystem are run by passing a string to
@@ -138,7 +138,8 @@ describe "the deploy-hook API" do
 
     def where_code_runs_with(method, *args)
       scenarios.map do |s|
-        EY.dna_json = s.to_json
+        @callback_context.configuration[:current_role] = s[:instance_role]
+        @callback_context.configuration[:current_name] = s[:name]
 
         if run_hook { send(method, *args) { 'ran!'} } == 'ran!'
           result = s[:instance_role]

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,23 +14,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-16 00:00:00 -07:00
+date: 2010-06-17 00:00:00 -07:00
 default_executable: eysd
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: rake
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  name: rake
-  prerelease: false
-  requirement: *id001
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: escape
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -39,22 +41,20 @@ dependencies:
         - 0
         - 4
         version: 0.0.4
-  name: escape
-  prerelease: false
-  requirement: *id002
   type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: json
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  name: json
-  prerelease: false
-  requirement: *id003
   type: :runtime
+  version_requirements: *id003
 description: 
 email: cloud@engineyard.com
 executables: