ey-deploy 0.2.7 → 0.3.0

data/lib/ey-deploy.rb

@@ -1,3 +1,5 @@
+require 'escape'
+
 $LOAD_PATH.push(File.expand_path("ey-deploy", File.dirname(__FILE__)))
 
 require 'version'
@@ -6,6 +8,7 @@ require 'strategies/git'
 require 'task'
 require 'server'
 require 'deploy'
+require 'deploy_hook'
 require 'cli'
 require 'configuration'
 
@@ -13,4 +16,4 @@ module EY
   def self.node
     @node ||= JSON.parse(`sudo cat /etc/chef/dna.json`)
   end
-end
+end

data/lib/ey-deploy/cli.rb

@@ -26,9 +26,22 @@ module EY
 
     desc "deploy", "Deploy code from /data/<app>"
     def deploy(default_task=:deploy)
+      invoke :propagate
       EY::Deploy.run(options.merge("default_task" => default_task))
     end
 
+    method_option :app,          :type     => :string,
+                                 :required => true,
+                                 :desc     => "Which application's hooks to run",
+                                 :aliases  => ["-a"]
+
+    method_option :release_path, :type => :string,
+                                 :desc => "Value for #release_path in hooks (mostly for internal coordination)",
+                                 :aliases => ["-r"]
+    desc "hook [NAME]", "Run a particular deploy hook"
+    def hook(hook_name)
+      EY::DeployHook.new(options).run(hook_name)
+    end
 
     desc "check", "Check whether the client gem is compatible with the server gem"
     def check(client_version, server_requirement)
@@ -54,5 +67,34 @@ module EY
         exit 3
       end
     end
+
+    desc "propagate", "Propagate the ey-deploy gem to the other instances in the cluster. This will install exactly version #{VERSION} and remove other versions if found."
+    def propagate
+      config          = EY::Deploy::Configuration.new
+      gem_filename    = "ey-deploy-#{VERSION}.gem"
+      local_gem_file  = File.join(Gem.dir, 'cache', gem_filename)
+      remote_gem_file = File.join(Dir.tmpdir, gem_filename)
+      gem_binary      = File.join(Gem.default_bindir, 'gem')
+
+      EY::Server.config = config
+
+      EY::Server.all.find_all do |server|
+        !server.local?            # of course this machine has it
+      end.find_all do |server|
+        has_gem_cmd = "/usr/local/ey_resin/ruby/bin/gem list ey-deploy | grep -q '(#{VERSION})'"
+        !server.run(has_gem_cmd)  # doesn't have only this exact version
+      end.each do |server|
+        puts "~> Installing ey-deploy on #{server.hostname}"
+
+        system(Escape.shell_command([
+              'scp', '-i', "#{ENV['HOME']}/.ssh/internal",
+              "-o", "StrictHostKeyChecking=no",
+              local_gem_file,
+              "#{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}'")
+      end
+    end
   end
-end
+end

data/lib/ey-deploy/configuration.rb

@@ -1,17 +1,18 @@
 require 'json'
+require 'thor'
 
 module EY
   class Deploy::Configuration
-    DEFAULT_CONFIG = {
+    DEFAULT_CONFIG = Thor::CoreExt::HashWithIndifferentAccess.new({
       "branch"       => "master",
-      "copy_exclude" => ".git",
       "strategy"     => "Git",
-    }
+    })
 
     attr_reader :configuration
     alias :c :configuration
 
     def initialize(opts={})
+      @release_path = opts[:release_path]
       config = JSON.parse(opts["config"] || "{}")
       @configuration = DEFAULT_CONFIG.merge(config).merge(opts)
     end
@@ -20,14 +21,35 @@ module EY
     def method_missing(meth, *args, &blk)
       c.key?(meth.to_s) ? c[meth.to_s] : super
     end
-    def respond_to?(meth)
+
+    def respond_to?(meth, include_private=false)
       c.key?(meth.to_s) ? true : super
     end
 
+    def [](key)
+      if respond_to?(key.to_sym)
+        send(key.to_sym)
+      else
+        c[key]
+      end
+    end
+
+    def has_key?(key)
+      if respond_to?(key.to_sym)
+        true
+      else
+        c.has_key?(key)
+      end
+    end
+
     def node
       EY.node
     end
 
+    def revision
+      IO.read(File.join(latest_release, 'REVISION'))
+    end
+
     def repository_cache
       configuration['repository_cache'] || File.join(deploy_to, "/shared/cached-copy")
     end

data/lib/ey-deploy/deploy.rb

@@ -91,7 +91,7 @@ module EY
     # task
     def copy_repository_cache
       puts "~> copying to #{c.release_path}"
-      sudo("mkdir -p #{c.release_path} && rsync -aq #{c.exclusions} #{c.repository_cache}/* #{c.release_path}")
+      sudo("mkdir -p #{c.release_path} && rsync -aq #{c.exclusions} #{c.repository_cache}/ #{c.release_path}")
 
       puts "~> ensuring proper ownership"
       sudo("chown -R #{c.user}:#{c.group} #{c.deploy_to}")
@@ -126,46 +126,14 @@ module EY
       end
     end
 
-    # before_symlink
-    # before_restart
-
-    class CallbackContext
-      def initialize(deploy)
-        @deploy = deploy
-      end
-
-      def method_missing(meth, *args, &blk)
-        if @deploy.respond_to?(meth)
-          @deploy.send(meth, *args, &blk)
-        elsif @deploy.config.respond_to?(meth)
-          @deploy.config.send(meth, *args, &blk)
-        else
-          super
-        end
-      end
-
-      def respond_to(meth)
-        if @deploy.respond_to?(meth) || @deploy.config.respond_to?(meth)
-          true
-        else
-          super
-        end
-      end
-    end
-
-    def callback_context
-      @context ||= CallbackContext.new(self)
-    end
-
-    def callback(what)
+    def callback(what, roles=@roles)
       if File.exist?("#{c.latest_release}/deploy/#{what}.rb")
-        Dir.chdir(c.latest_release) do
-          puts "~> running deploy hook: deploy/#{what}.rb"
-          callback_context.instance_eval(IO.read("#{c.latest_release}/deploy/#{what}.rb"))
+        eysd_path = $0   # invoke others just like we were invoked
+        EY::Server.from_roles(roles).each do |server|
+          server.run("#{eysd_path} hook '#{what}' --app '#{config.app}' --release-path #{config.release_path}")
         end
       end
     end
-
   end
 
   class Deploy < DeployBase

data/lib/ey-deploy/deploy_hook.rb

@@ -0,0 +1,52 @@
+require 'ey-deploy/verbose_system'
+
+module EY
+  class DeployHook < Task
+    include VerboseSystem
+
+    def initialize(options)
+      super(EY::Deploy::Configuration.new(options))
+    end
+
+    def callback_context
+      @context ||= CallbackContext.new(self, config)
+    end
+
+    def run(hook)
+      if File.exist?("#{c.latest_release}/deploy/#{hook}.rb")
+        Dir.chdir(c.latest_release) do
+          puts "~> running deploy hook: deploy/#{hook}.rb"
+          callback_context.instance_eval(IO.read("#{c.latest_release}/deploy/#{hook}.rb"))
+        end
+      end
+    end
+
+    class CallbackContext
+      def initialize(hook_runner, config)
+        @hook_runner, @configuration = hook_runner, config
+      end
+
+      def method_missing(meth, *args, &blk)
+        if @configuration.respond_to?(meth)
+          @configuration.send(meth, *args, &blk)
+        else
+          super
+        end
+      end
+
+      def respond_to?(meth, include_private=false)
+        @configuration.respond_to?(meth, include_private) || super
+      end
+
+      def run(cmd)
+        system(@hook_runner.prepare_run(cmd))
+      end
+
+      def sudo(cmd)
+        system(@hook_runner.prepare_sudo(cmd))
+      end
+    end
+
+  end
+end
+

data/lib/ey-deploy/server.rb

@@ -73,9 +73,9 @@ module EY
 
     def run(command)
       if local?
-        system(command.gsub(/\\"/, '"'))
+        system(command)
       else
-        system(%|#{ssh_command} #{config.user}@#{hostname} "#{command}"|)
+        system(ssh_command + " " + Escape.shell_command(["#{config.user}@#{hostname}", command]))
       end
     end
 

data/lib/ey-deploy/task.rb

@@ -29,14 +29,22 @@ module EY
 
     def run(cmd)
       EY::Server.from_roles(@roles).each do |server|
-        server.run %|sh -c \\"#{cmd} 2>&1\\"|
+        server.run prepare_run(cmd)
       end
     end
 
     def sudo(cmd)
       EY::Server.from_roles(@roles).each do |server|
-        server.run %|sudo sh -c \\"#{cmd} 2>&1\\"|
+        server.run prepare_sudo(cmd)
       end
     end
+
+    def prepare_run(command)
+      Escape.shell_command ["sh", "-l", "-c", command]
+    end
+
+    def prepare_sudo(command)
+      Escape.shell_command ["sudo", "sh", "-l", "-c", command]
+    end
   end
 end

data/lib/ey-deploy/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = "0.2.7"
+  VERSION = "0.3.0"
 end

data/spec/deploy_hook_spec.rb

@@ -0,0 +1,95 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "deploy hook's context" do
+  before(:each) do
+    @hook_runner = EY::DeployHook.new(options)
+    @callback_context = EY::DeployHook::CallbackContext.new(@hook_runner, @hook_runner.config)
+  end
+
+  def run_hook(options={}, &blk)
+    raise ArgumentError unless block_given?
+    options.each do |k, v|
+      @hook_runner.config.configuration[k] = v    # ugh
+    end
+
+    # The hooks on the filesystem are run by passing a string to
+    # context.instance_eval, not a block. However, using a block
+    # should allow us to get the same degree of test coverage and
+    # still let us have things like syntax checking work on this spec
+    # file.
+    @callback_context.instance_eval(&blk)
+  end
+
+  context "the #run method" do
+    it "is available" do
+      run_hook { respond_to?(:run) }.should be_true
+    end
+
+    it "runs commands like the shell does" do
+      ENV['COUNT'] = 'Chocula'
+      File.unlink("/tmp/deploy_hook_spec.the_count") rescue nil
+
+      run_hook { run("echo $COUNT > /tmp/deploy_hook_spec.the_count") }
+
+      IO.read("/tmp/deploy_hook_spec.the_count").strip.should == "Chocula"
+    end
+
+    it "returns true/false to indicate the command's success" do
+      run_hook { run("true") }.should be_true
+      run_hook { run("false") }.should be_false
+    end
+  end
+
+  context "the #sudo method" do
+    it "is available" do
+      run_hook { respond_to?(:sudo) }.should be_true
+    end
+
+    it "runs things with sudo" do
+      @callback_context.should_receive(:system).with("sudo sh -l -c 'do it as root'").and_return(true)
+
+      run_hook { sudo("do it as root") }
+    end
+  end
+
+  context "capistrano-ish methods" do
+    it "has them" do
+      run_hook { respond_to?(:latest_release)   }.should be_true
+      run_hook { respond_to?(:previous_release) }.should be_true
+      run_hook { respond_to?(:all_releases)     }.should be_true
+      run_hook { respond_to?(:current_path)     }.should be_true
+      run_hook { respond_to?(:shared_path)      }.should be_true
+      run_hook { respond_to?(:release_dir)      }.should be_true
+      run_hook { respond_to?(:release_path)     }.should be_true
+    end
+  end
+
+  context "the @configuration ivar" do
+    it "is available" do
+      run_hook { @configuration.nil? }.should be_false
+    end
+
+    it "has the configuration in it" do
+      run_hook('bert' => 'ernie') { @configuration.bert }.should == 'ernie'
+    end
+
+    it "can be accessed with method calls, with [:symbols], or ['strings']" do
+      run_hook('bert' => 'ernie') { @configuration.bert }.should == 'ernie'
+      run_hook('bert' => 'ernie') { @configuration[:bert] }.should == 'ernie'
+      run_hook('bert' => 'ernie') { @configuration['bert'] }.should == 'ernie'
+    end
+
+    [:repository_cache,
+      :release_path,
+      :branch,
+      :shared_path,
+      :deploy_to,
+      :user,
+      :revision,
+      :environment].each do |attribute|
+      it "has the #{attribute.inspect} attribute for compatibility with chef-deploy" do
+        run_hook { @configuration.has_key?(attribute) }.should be_true
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
 $LOAD_PATH.push File.expand_path("../lib", File.dirname(__FILE__))
 
 Bundler.require :default, :test
+require 'pp'
+require 'ey-deploy'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 7
-  version: 0.2.7
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-07 00:00:00 -07:00
+date: 2010-05-12 00:00:00 -07:00
 default_executable: eysd
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,16 +31,30 @@ dependencies:
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: json
+  name: escape
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 0
+        - 4
+        version: 0.0.4
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: json
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: 
 email: cloud@engineyard.com
 executables: 
@@ -55,6 +69,7 @@ files:
 - lib/ey-deploy/compatibility.rb
 - lib/ey-deploy/configuration.rb
 - lib/ey-deploy/deploy.rb
+- lib/ey-deploy/deploy_hook.rb
 - lib/ey-deploy/server.rb
 - lib/ey-deploy/strategies/git.rb
 - lib/ey-deploy/task.rb
@@ -128,5 +143,5 @@ signing_key:
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
 test_files: 
-- spec/ey-deploy_spec.rb
+- spec/deploy_hook_spec.rb
 - spec/spec_helper.rb

data/spec/ey-deploy_spec.rb

@@ -1,7 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe "ey-deploy" do
-  it "should do nothing" do
-    true.should == true
-  end
-end