ey-deploy 0.7.1 → 0.8.0

data/lib/ey-deploy/cli.rb

@@ -10,36 +10,41 @@ 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 :framework_env, :type     => :string,
+                                  :required => true,
+                                  :desc     => "Ruby web framework environment",
+                                  :aliases  => ["-e"]
 
-    method_option :stack,     :type     => :string,
-                              :desc     => "Web stack (so we can restart it correctly)"
+    method_option :config,        :type     => :string,
+                                  :desc     => "Additional configuration"
 
-    method_option :instances, :type     => :array,
-                              :desc     => "Instances in cluster"
+    method_option :stack,         :type     => :string,
+                                  :desc     => "Web stack (so we can restart it correctly)"
 
-    method_option :verbose,   :type     => :boolean,
-                              :default  => false,
-                              :desc     => "Verbose output",
-                              :aliases  => ["-v"]
+    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)
@@ -51,20 +56,25 @@ module EY
       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 :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"]
 
-    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_role, :type => :string,
-                                 :desc => "Value for #current_role in hooks"
+    method_option :framework_env, :type     => :string,
+                                  :required => true,
+                                  :desc     => "Ruby web framework environment",
+                                  :aliases  => ["-e"]
 
-    method_option :current_name, :type => :string,
-                                 :desc => "Value for #current_name 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)

data/lib/ey-deploy/configuration.rb

@@ -83,7 +83,7 @@ module EY
     end
 
     def environment
-      node['environment']['framework_env']
+      configuration['framework_env']
     end
 
     def latest_release

data/lib/ey-deploy/deploy.rb

@@ -6,13 +6,15 @@ require 'yaml'
 
 module EY
   class DeployBase < Task
+    include LoggedOutput
+
     # default task
     def deploy
       update_repository_cache
       require_custom_tasks
       push_code
 
-      puts "~> Starting full deploy"
+      info "~> Starting full deploy"
       copy_repository_cache
 
       with_failed_release_cleanup do
@@ -31,7 +33,7 @@ module EY
 
       cleanup_old_releases
 
-      puts "~> Finalizing deploy"
+      info "~> Finalizing deploy"
     rescue Exception
       puts_deploy_failure
       raise
@@ -86,7 +88,7 @@ module EY
 
     # task
     def push_code
-      puts "~> Pushing code to all servers"
+      info "~> Pushing code to all servers"
       barrier *(EY::Server.all.map do |server|
         need_later { server.push_code }
       end)
@@ -95,7 +97,7 @@ module EY
     # task
     def restart
       @restart_failed = true
-      puts "~> Restarting app servers"
+      info "~> Restarting app servers"
       roles :app_master, :app, :solo do
         restart_command = case c.stack
         when "nginx_unicorn"
@@ -117,7 +119,7 @@ module EY
     # task
     def bundle
       if File.exist?("#{c.latest_release}/Gemfile")
-        puts "~> Gemfile detected, bundling gems"
+        info "~> Gemfile detected, bundling gems"
         lockfile = File.join(c.latest_release, "Gemfile.lock")
 
         bundler_version = if File.exist?(lockfile)
@@ -136,7 +138,7 @@ module EY
     # task
     def cleanup_old_releases
       @cleanup_failed = true
-      puts "~> Cleaning up old releases"
+      info "~> Cleaning up old releases"
       sudo "ls #{c.release_dir} | head -n -3 | xargs -I{} rm -rf #{c.release_dir}/{}"
       @cleanup_failed = false
     end
@@ -144,15 +146,18 @@ module EY
     # task
     def rollback
       if c.all_releases.size > 1
-        puts "~> Rolling back to previous release"
         c.release_path = c.previous_release
+
+        revision = File.read(File.join(c.release_path, 'REVISION')).strip
+        info "~> Rolling back to previous release: #{short_log_message(revision)}"
+
         run_with_callbacks(:symlink, c.previous_release)
         cleanup_latest_release
         bundle
-        puts "~> Restarting with previous release"
+        info "~> Restarting with previous release"
         with_maintenance_page { run_with_callbacks(:restart) }
       else
-        puts "~> Already at oldest release, nothing to roll back to"
+        info "~> Already at oldest release, nothing to roll back to"
         exit(1)
       end
     end
@@ -163,22 +168,22 @@ module EY
       @migrations_reached = true
       roles :app_master, :solo do
         cmd = "cd #{c.latest_release} && #{c.framework_envs} #{c.migration_command}"
-        puts "~> Migrating: #{cmd}"
+        info "~> Migrating: #{cmd}"
         run(cmd)
       end
     end
 
     # task
     def copy_repository_cache
-      puts "~> Copying to #{c.release_path}"
+      info "~> 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"
+      info "~> Ensuring proper ownership"
       sudo("chown -R #{c.user}:#{c.group} #{c.deploy_to}")
     end
 
     def symlink_configs(release_to_link=c.latest_release)
-      puts "~> Symlinking configs"
+      info "~> Symlinking configs"
       [ "chmod -R g+w #{release_to_link}",
         "rm -rf #{release_to_link}/log #{release_to_link}/public/system #{release_to_link}/tmp/pids",
         "mkdir -p #{release_to_link}/tmp",
@@ -199,7 +204,7 @@ module EY
 
     # task
     def symlink(release_to_link=c.latest_release)
-      puts "~> Symlinking code"
+      info "~> 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
@@ -213,6 +218,7 @@ module EY
       if File.exist?("#{c.latest_release}/deploy/#{what}.rb")
         eysd_path = $0   # invoke others just like we were invoked
         run "#{eysd_path} _#{VERSION}_ hook '#{what}' --app '#{config.app}' --release-path #{config.release_path}" do |server, cmd|
+          cmd << " --framework-env '#{c.environment}'"
           cmd << " --current-role '#{server.role}'"
           cmd << " --current-name '#{server.name}'" if server.name
           cmd
@@ -224,19 +230,19 @@ module EY
 
     def puts_deploy_failure
       if @cleanup_failed
-        puts "~> [Relax] Your site is running new code, but cleaning up old deploys failed"
+        info "~> [Relax] Your site is running new code, but cleaning up old deploys failed"
       elsif @maintenance_up
-        puts "~> [Attention] Maintenance page still up, consider the following before removing:"
-        puts " * any deploy hooks ran, be careful if they were destructive" if @callbacks_reached
-        puts " * any migrations ran, be careful if they were destructive" if @migrations_reached
+        info "~> [Attention] Maintenance page still up, consider the following before removing:"
+        info " * any deploy hooks ran, be careful if they were destructive" if @callbacks_reached
+        info " * any migrations ran, be careful if they were destructive" if @migrations_reached
         if @symlink_changed
-          puts " * your new code is symlinked as current"
+          info " * your new code is symlinked as current"
         else
-          puts " * your old code is still symlinked as current"
+          info " * your old code is still symlinked as current"
         end
-        puts " * application servers failed to restart" if @restart_failed
+        info " * application servers failed to restart" if @restart_failed
       else
-        puts "~> [Relax] Your site is still running old code and nothing destructive could have occurred"
+        info "~> [Relax] Your site is still running old code and nothing destructive could have occurred"
       end
     end
 
@@ -267,17 +273,17 @@ module EY
     DEFAULT_10_BUNDLER = '1.0.0.beta.1'
 
     def warn_about_missing_lockfile
-      puts "!>"
-      puts "!> WARNING: Gemfile.lock is missing!"
-      puts "!> You can get different gems in production than what you tested with."
-      puts "!> You can get different gems on every deployment even if your Gemfile hasn't changed."
-      puts "!> Deploying may take a long time."
-      puts "!>"
-      puts "!> Fix this by running \"git add Gemfile.lock; git commit\" and deploying again."
-      puts "!> If you don't have a Gemfile.lock, run \"bundle lock\" to create one."
-      puts "!>"
-      puts "!> This deployment will use bundler #{DEFAULT_09_BUNDLER} to run 'bundle install'."
-      puts "!>"
+      info "!>"
+      info "!> WARNING: Gemfile.lock is missing!"
+      info "!> You can get different gems in production than what you tested with."
+      info "!> You can get different gems on every deployment even if your Gemfile hasn't changed."
+      info "!> Deploying may take a long time."
+      info "!>"
+      info "!> Fix this by running \"git add Gemfile.lock; git commit\" and deploying again."
+      info "!> If you don't have a Gemfile.lock, run \"bundle lock\" to create one."
+      info "!>"
+      info "!> This deployment will use bundler #{DEFAULT_09_BUNDLER} to run 'bundle install'."
+      info "!>"
     end
 
     def get_bundler_version(lockfile)

data/lib/ey-deploy/logged_output.rb

@@ -9,7 +9,10 @@ module EY
       end
 
       def <<(output)
-        @streams.each { |s| s << output }
+        @streams.each do |s|
+          s << output
+          s.flush
+        end
         self
       end
     end # Tee
@@ -37,12 +40,14 @@ module EY
       EY::LoggedOutput.verbose?
     end
 
-    def logfile
-      EY::LoggedOutput.logfile
+    def info(msg)
+      with_logfile do |log|
+        Tee.new($stdout, log) << (msg + "\n")
+      end
     end
 
     def logged_system(cmd)
-      File.open(logfile, 'a') do |log|
+      with_logfile do |log|
         out = verbose? ? Tee.new($stdout, log) : log
         err = Tee.new($stderr, log)    # we always want to see errors
 
@@ -54,5 +59,14 @@ module EY
       end
     end
 
+    private
+    def with_logfile
+      File.open(logfile, 'a') {|f| yield f }
+    end
+
+    def logfile
+      EY::LoggedOutput.logfile
+    end
+
   end
 end

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

@@ -13,13 +13,22 @@ module EY
           strategy.create_revision_file(c.release_path)
         end
 
+        def short_log_message(revision)
+          strategy.short_log_message(revision)
+        end
+
         def strategy
           klass = Module.nesting[1]
+          # Use [] to access attributes instead of calling methods so
+          # that we get nils instead of NoMethodError.
+          #
+          # Rollback doesn't know about the repository location (nor
+          # should it need to), but it would like to use #short_log_message.
           klass.new(
-            :repository_cache => c.repository_cache,
-            :app => c.app,
-            :repo => c.repo,
-            :ref => c.branch
+            :repository_cache => c[:repository_cache],
+            :app => c[:app],
+            :repo => c[:repo],
+            :ref => c[:branch]
           )
         end
       end
@@ -53,6 +62,7 @@ module EY
                         opts[:ref]
                       end
 
+        info "~> Deploying revision #{short_log_message(to_checkout)}"
         logged_system("#{git} checkout -q '#{to_checkout}'") || logged_system("#{git} reset -q --hard '#{to_checkout}'")
       end
 
@@ -60,6 +70,10 @@ module EY
         `#{git} show --pretty=format:"%H" | head -1 > "#{dir}/REVISION"`
       end
 
+      def short_log_message(rev)
+        `#{git} log --pretty=oneline --abbrev-commit '#{rev}^..#{rev}'`.strip
+      end
+
     private
       def git
         "git --git-dir #{opts[:repository_cache]}/.git --work-tree #{opts[:repository_cache]}"

data/lib/ey-deploy/version.rb

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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 1
-  version: 0.7.1
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 -07:00
+date: 2010-06-30 00:00:00 -07:00
 default_executable: eysd
 dependencies: 
 - !ruby/object:Gem::Dependency