capistrano-hivequeen 1.0.0 → 1.1.0

data/lib/capistrano/hivequeen.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'excon'
 require 'base64'
 require 'capistrano/hivequeen/version'
+require 'capistrano/hivequeen/multiio'
 
 # Special cases:
 # - environment not found
@@ -54,6 +55,8 @@ class HiveQueen
       state = $! ? 'failed' : 'succeeded'
       puts "Finishing deployment in Hivequeen. State: #{state}"
       params = {:deployment => {:state => state}}
+      deploy_log = logger.device.history
+      params[:deployment][:deploy_log] = deploy_log if deploy_log
       put_or_post('PUT', "/environments/#{environment_id}/deployments/#{deployment_id}.json", params)
     end
 

data/lib/capistrano/hivequeen/capistrano_configuration.rb

@@ -1,4 +1,8 @@
 Capistrano::Configuration.instance(:must_exist).load do
+  # Capture capistrano log output
+  @logger = Capistrano::Logger.new(:output => HiveQueen::MultiIO.new)
+  @logger.level = Capistrano::Logger::DEBUG
+
   HiveQueen.endpoint = hivequeen_endpoint
   HiveQueen.project = application
   HiveQueen.logger = logger
@@ -30,6 +34,11 @@ Capistrano::Configuration.instance(:must_exist).load do
   # Option to skip background tasks
   set :skip_bg, false
 
+  # Command to get the changes being deployed
+  set :changelog_command do
+    `git log #{current_commit}...#{real_revision} --pretty="%n%h %an: %s (%ar)" --stat --no-color`
+  end
+
   # Load capistrano multi-stage extension
   require 'fileutils' # required until https://github.com/capistrano/capistrano-ext/commit/930ca840a0b4adad0ec53546790b3f5ffe726538 is released
   require 'capistrano/ext/multistage'
@@ -40,6 +49,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   HiveQueen.environments.each do |env|
     name = env['name']
     hive_queen_id = env['id']
+    current_commit = env['current_commit']
 
     desc "Use environment #{name}"
     task name do
@@ -52,6 +62,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       set :stage, name.to_sym
       set :rails_env, name
       set :environment_id, hive_queen_id
+      set :current_commit, current_commit
       unless exists?(:branch)
         set :branch, environment['branch']
       end

data/lib/capistrano/hivequeen/deploy.rb

@@ -14,11 +14,14 @@ Capistrano::Configuration.instance.load do
     task :start do
       # TODO: is there a better way to determine what cap tasks are running?
       tasks = ARGV.reject{|task_name| stage.to_s == task_name}
+
       params = {
         :task => tasks.join(' '),
         :commit => real_revision,
         :override => override
       }
+      params[:change_log] = changelog_command if current_commit
+
       begin
         deployment = HiveQueen.start_deployment(environment_id, params)
         set :deployment_id, deployment['id']

data/lib/capistrano/hivequeen/multiio.rb

@@ -0,0 +1,23 @@
+# Keeps an in-memory history of printed lines (to persist to HQ),
+# and puts to stderr (capistrano's default)
+class HiveQueen
+  class MultiIO
+    require 'stringio'
+
+    def initialize(output = $stderr)
+      @memory = StringIO.new
+      @output = output
+    end
+
+    def puts(msg)
+      [@memory, @output].each{|t| t.puts(msg)}
+    end
+
+    # Read the history from memory
+    def history
+      @memory.rewind
+      @memory.read
+    end
+
+  end
+end

data/lib/capistrano/hivequeen/version.rb

@@ -1,6 +1,6 @@
 class HiveQueen
   class Version
-    @@version = '1.0.0'
+    @@version = '1.1.0'
 
     def self.to_s
       @@version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-hivequeen
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000 Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
-  requirement: &70240114614400 !ruby/object:Gem::Requirement
+  requirement: &70268421688220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70240114614400
+  version_requirements: *70268421688220
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70240114612720 !ruby/object:Gem::Requirement
+  requirement: &70268421687740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.11.2
   type: :runtime
   prerelease: false
-  version_requirements: *70240114612720
+  version_requirements: *70268421687740
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70240114611740 !ruby/object:Gem::Requirement
+  requirement: &70268421687360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70240114611740
+  version_requirements: *70268421687360
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &70240114610620 !ruby/object:Gem::Requirement
+  requirement: &70268421686800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70240114610620
+  version_requirements: *70268421686800
 description: Capistrano extensions for interacting with HiveQueen
 email: aaron@kickstarter.com
 executables: []
@@ -68,6 +68,7 @@ files:
 - lib/capistrano/hivequeen.rb
 - lib/capistrano/hivequeen/capistrano_configuration.rb
 - lib/capistrano/hivequeen/deploy.rb
+- lib/capistrano/hivequeen/multiio.rb
 - lib/capistrano/hivequeen/setup.rb
 - lib/capistrano/hivequeen/version.rb
 homepage: http://github.com/kickstarter/capistrano-hivequeen