ey-deploy 0.7.0 → 0.7.1

data/lib/ey-deploy.rb

@@ -1,7 +1,11 @@
 require 'escape'
 
 $LOAD_PATH.push(File.expand_path("ey-deploy", File.dirname(__FILE__)))
+$LOAD_PATH.unshift File.expand_path('vendor/thor/lib', File.dirname(__FILE__))
+$LOAD_PATH.unshift File.expand_path('vendor/open4/lib', File.dirname(__FILE__))
+$LOAD_PATH.unshift File.expand_path('vendor/dataflow', File.dirname(__FILE__))
 
+require 'dataflow'
 require 'version'
 require 'strategies/git'
 require 'task'

data/lib/ey-deploy/cli.rb

@@ -1,9 +1,9 @@
-$:.unshift File.expand_path('../vendor/thor/lib', File.dirname(__FILE__))
-
 require 'thor'
 
 module EY
   class CLI < Thor
+    include Dataflow
+
     def self.start(*)
       super
     rescue RemoteFailure
@@ -36,9 +36,17 @@ module EY
     method_option :instances, :type     => :array,
                               :desc     => "Instances in cluster"
 
+    method_option :verbose,   :type     => :boolean,
+                              :default  => false,
+                              :desc     => "Verbose output",
+                              :aliases  => ["-v"]
+
     desc "deploy", "Deploy code from /data/<app>"
     def deploy(default_task=:deploy)
       EY::Server.all = parse_instances(options[:instances])
+      EY::LoggedOutput.verbose = options[:verbose]
+      EY::LoggedOutput.logfile = File.join(ENV['HOME'], "#{options[:app]}-deploy.log")
+
       invoke :propagate
       EY::Deploy.run(options.merge("default_task" => default_task))
     end
@@ -88,25 +96,28 @@ module EY
 
       EY::Server.config = config
 
-      EY::Server.all.find_all do |server|
+      barrier(*(EY::Server.all.find_all do |server|
         !server.local?            # of course this machine has it
-      end.find_all do |server|
-        egrep_escaped_version = VERSION.gsub(/\./, '\.')
-        # the [,)] is to stop us from looking for e.g. 0.5.1, seeing
-        # 0.5.11, and mistakenly thinking 0.5.1 is there
-        has_gem_cmd = "#{gem_binary} list ey-deploy | grep \"ey-deploy \" | egrep -q '#{egrep_escaped_version}[,)]'"
-        !server.run(has_gem_cmd)  # doesn't have this exact version
-      end.each do |server|
-        puts "~> Installing ey-deploy on #{server.hostname}"
-
-        system(Escape.shell_command([
+      end.map do |server|
+        need_later do
+          egrep_escaped_version = VERSION.gsub(/\./, '\.')
+          # the [,)] is to stop us from looking for e.g. 0.5.1, seeing
+          # 0.5.11, and mistakenly thinking 0.5.1 is there
+          has_gem_cmd = "#{gem_binary} list ey-deploy | grep \"ey-deploy \" | egrep -q '#{egrep_escaped_version}[,)]'"
+
+          if !server.run(has_gem_cmd)  # doesn't have this exact version
+            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}",
+             "#{config.user}@#{server.hostname}:#{remote_gem_file}",
             ]))
-        server.run("sudo #{gem_binary} install --no-rdoc --no-ri '#{remote_gem_file}'")
-      end
+            server.run("sudo #{gem_binary} install --no-rdoc --no-ri '#{remote_gem_file}'")
+          end
+        end
+      end))
     end
 
     private

data/lib/ey-deploy/deploy.rb

@@ -31,7 +31,7 @@ module EY
 
       cleanup_old_releases
 
-      puts "~> finalizing deploy"
+      puts "~> Finalizing deploy"
     rescue Exception
       puts_deploy_failure
       raise
@@ -87,20 +87,21 @@ module EY
     # task
     def push_code
       puts "~> Pushing code to all servers"
-      EY::Server.all.each do |server|
-        server.push_code
-      end
+      barrier *(EY::Server.all.map do |server|
+        need_later { server.push_code }
+      end)
     end
 
     # task
     def restart
       @restart_failed = true
       puts "~> Restarting app servers"
-      puts "~> restarting app: #{c.latest_release}"
       roles :app_master, :app, :solo do
         restart_command = case c.stack
         when "nginx_unicorn"
-          sudo(%Q{if [ ! -d /proc/`cat /var/run/engineyard/unicorn_#{c.app}.pid` ]; then rm -f /var/run/engineyard/unicorn_#{c.app}.pid; fi})
+          pidfile = "/var/run/engineyard/unicorn_#{c.app}.pid"
+          condition = "[ -e #{pidfile} ] && [ ! -d /proc/`cat #{pidfile}` ]"
+          sudo("if #{condition}; then rm -f #{pidfile}; fi")
           sudo("/etc/init.d/unicorn_#{c.app} deploy")
         when "nginx_mongrel"
           sudo("monit restart all -g #{c.app}")
@@ -135,7 +136,7 @@ module EY
     # task
     def cleanup_old_releases
       @cleanup_failed = true
-      puts "~> cleaning up old releases"
+      puts "~> Cleaning up old releases"
       sudo "ls #{c.release_dir} | head -n -3 | xargs -I{} rm -rf #{c.release_dir}/{}"
       @cleanup_failed = false
     end
@@ -143,12 +144,12 @@ module EY
     # task
     def rollback
       if c.all_releases.size > 1
-        puts "~> rolling back to previous release"
+        puts "~> Rolling back to previous release"
         c.release_path = c.previous_release
         run_with_callbacks(:symlink, c.previous_release)
         cleanup_latest_release
         bundle
-        puts "~> restarting with previous release"
+        puts "~> Restarting with previous release"
         with_maintenance_page { run_with_callbacks(:restart) }
       else
         puts "~> Already at oldest release, nothing to roll back to"
@@ -161,7 +162,6 @@ module EY
       return unless c.migrate?
       @migrations_reached = true
       roles :app_master, :solo do
-        puts "~> migrating"
         cmd = "cd #{c.latest_release} && #{c.framework_envs} #{c.migration_command}"
         puts "~> Migrating: #{cmd}"
         run(cmd)
@@ -170,10 +170,10 @@ module EY
 
     # task
     def copy_repository_cache
-      puts "~> copying to #{c.release_path}"
+      puts "~> Copying to #{c.release_path}"
       sudo("mkdir -p #{c.release_path} && rsync -aq #{c.exclusions} #{c.repository_cache}/ #{c.release_path}")
 
-      puts "~> ensuring proper ownership"
+      puts "~> Ensuring proper ownership"
       sudo("chown -R #{c.user}:#{c.group} #{c.deploy_to}")
     end
 
@@ -199,7 +199,7 @@ module EY
 
     # task
     def symlink(release_to_link=c.latest_release)
-      puts "~> symlinking code"
+      puts "~> Symlinking code"
       sudo "rm -f #{c.current_path} && ln -nfs #{release_to_link} #{c.current_path} && chown -R #{c.user}:#{c.group} #{c.current_path}"
       @symlink_changed = true
     rescue Exception

data/lib/ey-deploy/deploy_hook.rb

@@ -1,9 +1,5 @@
-require 'ey-deploy/verbose_system'
-
 module EY
   class DeployHook < Task
-    include VerboseSystem
-
     def initialize(options)
       super(EY::Deploy::Configuration.new(options))
     end
@@ -13,14 +9,25 @@ module EY
     end
 
     def run(hook)
-      if File.exist?("#{c.latest_release}/deploy/#{hook}.rb")
+      hook_path = "#{c.latest_release}/deploy/#{hook}.rb"
+      if File.exist?(hook_path)
         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"))
+          if desc = syntax_error(hook_path)
+            hook_name = File.basename(hook_path)
+            abort "*** [Error] Invalid Ruby syntax in hook: #{hook_name} ***\n*** #{desc.chomp} ***"
+          else
+            callback_context.instance_eval(IO.read(hook_path))
+          end
         end
       end
     end
 
+    def syntax_error(file)
+      valid = Kernel.system("ruby -c #{file} 2>/tmp/ey_invalid_deploy_hook | grep 'Syntax OK' --quiet")
+      File.new("/tmp/ey_invalid_deploy_hook").gets unless valid
+    end
+
     class CallbackContext
       def initialize(config)
         @configuration = config

data/lib/ey-deploy/logged_output.rb

@@ -0,0 +1,58 @@
+require 'open4'
+
+module EY
+  module LoggedOutput
+
+    class Tee
+      def initialize(*streams)
+        @streams = streams.flatten
+      end
+
+      def <<(output)
+        @streams.each { |s| s << output }
+        self
+      end
+    end # Tee
+
+    @@logfile = File.join(ENV['HOME'], 'ey.log')
+    def self.logfile=(filename)
+      File.unlink filename if File.exist?(filename)  # start fresh
+      @@logfile = filename
+    end
+
+    def self.logfile
+      @@logfile
+    end
+
+    @@verbose = false
+    def self.verbose=(v)
+      @@verbose = !!v
+    end
+
+    def self.verbose?
+      @@verbose
+    end
+
+    def verbose?
+      EY::LoggedOutput.verbose?
+    end
+
+    def logfile
+      EY::LoggedOutput.logfile
+    end
+
+    def logged_system(cmd)
+      File.open(logfile, 'a') do |log|
+        out = verbose? ? Tee.new($stdout, log) : log
+        err = Tee.new($stderr, log)    # we always want to see errors
+
+        out <<  ":: running #{cmd}\n"
+
+        # :quiet means don't raise an error on nonzero exit status
+        status = Open4.spawn cmd, 0 => '', 1 => out, 2 => err, :quiet => true
+        status.exitstatus == 0
+      end
+    end
+
+  end
+end

data/lib/ey-deploy/server.rb

@@ -1,9 +1,9 @@
 require 'open-uri'
-require 'ey-deploy/verbose_system'
+require 'ey-deploy/logged_output'
 
 module EY
   class Server < Struct.new(:hostname, :role, :name)
-    include VerboseSystem
+    include LoggedOutput
 
     def initialize(*fields)
       super
@@ -52,14 +52,14 @@ module EY
     def push_code
       return if local?
       run "mkdir -p #{config.repository_cache}"
-      system(%|rsync --delete -aq -e "#{ssh_command}" #{config.repository_cache}/ #{config.user}@#{hostname}:#{config.repository_cache}|)
+      logged_system(%|rsync --delete -aq -e "#{ssh_command}" #{config.repository_cache}/ #{config.user}@#{hostname}:#{config.repository_cache}|)
     end
 
     def run(command)
       if local?
-        system(command)
+        logged_system(command)
       else
-        system(ssh_command + " " + Escape.shell_command(["#{config.user}@#{hostname}", command]))
+        logged_system(ssh_command + " " + Escape.shell_command(["#{config.user}@#{hostname}", command]))
       end
     end
 

data/lib/ey-deploy/strategies/git.rb

@@ -1,4 +1,4 @@
-require 'ey-deploy/verbose_system'
+require 'ey-deploy/logged_output'
 
 module EY
   module Strategies
@@ -24,7 +24,7 @@ module EY
         end
       end
 
-      include VerboseSystem
+      include LoggedOutput
 
       attr_reader :opts
 
@@ -39,10 +39,10 @@ module EY
 
       def fetch
         if usable_repository?
-          system("#{git} fetch origin")
+          logged_system("#{git} fetch -q origin")
         else
           FileUtils.rm_rf(opts[:repository_cache])
-          system("git clone #{opts[:repo]} #{opts[:repository_cache]}")
+          logged_system("git clone -q #{opts[:repo]} #{opts[:repository_cache]}")
         end
       end
 
@@ -53,7 +53,7 @@ module EY
                         opts[:ref]
                       end
 
-        system("#{git} checkout '#{to_checkout}'") || system("#{git} reset --hard '#{to_checkout}'")
+        logged_system("#{git} checkout -q '#{to_checkout}'") || logged_system("#{git} reset -q --hard '#{to_checkout}'")
       end
 
       def create_revision_file(dir)

data/lib/ey-deploy/task.rb

@@ -1,5 +1,6 @@
 module EY
   class Task
+    include Dataflow
 
     attr_reader :config
     alias :c :config
@@ -44,22 +45,15 @@ module EY
       run_on_roles(cmd, %w[sudo sh -l -c], &blk)
     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
-
     private
 
     def run_on_roles(cmd, wrapper=%w[sh -l -c])
-      EY::Server.from_roles(@roles).inject(false) do |acc, server|
+      results = EY::Server.from_roles(@roles).map do |server|
         to_run = block_given? ? yield(server, cmd.dup) : cmd
-        failure = !server.run(Escape.shell_command(wrapper + [to_run]))
-        acc || failure
-      end && raise(EY::RemoteFailure)
+        need_later { server.run(Escape.shell_command(wrapper + [to_run])) }
+      end
+      barrier *results
+      results.all? || raise(EY::RemoteFailure)
     end
   end
 end

data/lib/ey-deploy/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/lib/vendor/dataflow/HISTORY

@@ -0,0 +1,52 @@
+== 0.3.0 / 2009-08-29
+
+* Major enhancements
+ 
+  * "flow" abstraction for threading (use it to create threads and optionally 
+    pass it a variable to be bound output, or override it to modify need_later
+    for other threading strategies such as thread pools)
+
+  * Dataflow::FutureQueue
+
+  * Nested binding through variables possible
+ 
+* Minor enhancements
+  
+  * Better #inspect and UnificationError debugging output
+ 
+  * "barrier" abstraction for manually preventing execution until variable
+    arguments have been bound
+
+  * Use mixin methods as class/module methods optionally
+    e.g. Dataflow.local {|v| v }
+
+== 0.2.1 / 2009-07-29
+
+ * Minor enhancements
+   
+   * Leave __send__ and __id__ alone when acting as a proxy
+
+== 0.2.0 / 2009-07-09
+
+* Major enhancements
+ 
+  * Made equality between objects and dataflow variables more transparent
+    (load equality changes with: require 'dataflow/equality')
+ 
+* Minor enhancements
+  
+  * Made #inspect work with unbound variables to not crash deubggers/repls/etc
+ 
+  * Made relationship between lazy and dataflow behavior more strict
+
+== 0.1.1 / 2009-06-13
+ 
+* Minor enhancements
+ 
+  * Got the "require_path" set correctly so rubygems can be used =) 
+
+== 0.1.0 / 2009-06-13
+ 
+* 1 major enhancement
+ 
+  * Birthday!

data/lib/vendor/dataflow/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2009 Larry Diehl
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.