instrumental_agent 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fec654f621fd1e8f11f79fca789690d2e3d9b52
-  data.tar.gz: 078bf7a001fab6ed9f982cf818e675def3aaf65f
+  metadata.gz: 95eafa56c7f6a610405a68634bd590c76d81a332
+  data.tar.gz: 5a1d84b622e6eb7cc931c2b29c170113fb3fdb6f
 SHA512:
-  metadata.gz: 4d2b8bdfa044822f00fb9b682817d2bc1c9108e26b544b93ee218212d7ce3b41ff88c0c422de21300e35638b7490f5a5032096d469ab322d1ab3f0c369012c63
-  data.tar.gz: 8a3494eb5e9c5932d54a7a2192d28ac181963c5d4f98567ca5cf54aa3381582eb2bed88439df664dd88a6fd4c0689c37e5ec8489e82d0fc15fffd58702cc04a8
+  metadata.gz: 77e15be11d00e7b900461a5321304ea8c39db039e2cdea298b2f1e6095986476d10d5f45ddfa457c26caa6fc26a41a0b515c62fa62802c3d323d529d4b917635
+  data.tar.gz: e9347c78c125ebc12a86970425d16e8c682a4355f8fe58e360edf23a7938e004ea6765d103970f2f57205cb6d163f59016574934c1548f10d35e4f5782108cde

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 2.1.0 [January 19, 2018]
+* Add support for capistrano 3
+
 ### 2.0.0 [August 21, 2017]
 * Add automatic tracking of common application metrics, official release
 

data/lib/instrumental/capistrano.rb

@@ -1,47 +1,5 @@
-require 'capistrano'
-require 'instrumental_agent'
-require 'etc'
-
-if Capistrano::Configuration.instance
-  Capistrano::Configuration.instance.load do
-    namespace :instrumental do
-      namespace :util do
-        desc "marker for beginning of deploy"
-        task :deploy_start do
-          set :instrumental_deploy_start, Time.now
-        end
-
-        desc "marker for end of deploy"
-        task :deploy_end do
-          set :instrumental_deploy_end, Time.now
-        end
-      end
-
-      desc "send a notice to instrumental about the deploy"
-      task :record_deploy_notice do
-        start_at = exists?(:instrumental_deploy_start) ? instrumental_deploy_start : Time.now
-        end_at = exists?(:instrumental_deploy_end) ? instrumental_deploy_end : start_at
-        deploy_duration_in_seconds = end_at - start_at
-        deployer = Etc.getlogin.chomp
-        agent_options = { :synchronous => true }
-        agent_options[:collector] = instrumental_host if exists?(:instrumental_host)
-        agent = Instrumental::Agent.new(instrumental_key, agent_options)
-        message = if exists?(:deploy_message)
-          deploy_message
-        else
-          "#{deployer} deployed #{current_revision}"
-        end
-        agent.notice(message,
-                     start_at,
-                     deploy_duration_in_seconds)
-        logger.info("Notified Instrumental of deployment")
-      end
-    end
-
-    before "deploy", "instrumental:util:deploy_start"
-    after  "deploy", "instrumental:util:deploy_end"
-    before "deploy:migrations", "instrumental:util:deploy_start"
-    after  "deploy:migrations", "instrumental:util:deploy_end"
-    after  "instrumental:util:deploy_end", "instrumental:record_deploy_notice"
-  end
+if Gem::Specification.find_by_name("capistrano").version >= Gem::Version.new("3.0.0")
+  load File.expand_path("../capistrano/capistrano3.rake", __FILE__)
+else
+  require_relative "capistrano/capistrano2"
 end

data/lib/instrumental/capistrano/capistrano2.rb

@@ -0,0 +1,47 @@
+require "etc"
+require "instrumental_agent"
+
+Capistrano::Configuration.instance.load do
+  _cset(:instrumental_hooks) { true }
+  _cset(:instrumental_key) { nil }
+  _cset(:deployer) { Etc.getlogin.chomp }
+
+  if fetch(:instrumental_hooks)
+    before "deploy", "instrumental:util:deploy_start"
+    after  "deploy", "instrumental:util:deploy_end"
+    before "deploy:migrations", "instrumental:util:deploy_start"
+    after  "deploy:migrations", "instrumental:util:deploy_end"
+    after  "instrumental:util:deploy_end", "instrumental:record_deploy_notice"
+  end
+
+  namespace :instrumental do
+    namespace :util do
+      desc "marker for beginning of deploy"
+      task :deploy_start do
+        set :instrumental_deploy_start, Time.now
+      end
+
+      desc "marker for end of deploy"
+      task :deploy_end do
+        set :instrumental_deploy_end, Time.now
+      end
+    end
+
+    desc "send a notice to instrumental about the deploy"
+    task :record_deploy_notice do
+      start_at                   = fetch(:instrumental_deploy_start, Time.now)
+      end_at                     = fetch(:instrumental_deploy_end, start_at)
+      deploy_duration_in_seconds = end_at - start_at
+      deployer                   = fetch(:deployer)
+      agent_options              = { :synchronous => true }
+      agent_options[:collector]  = instrumental_host if fetch(:instrumental_host, false)
+      agent                      = Instrumental::Agent.new(fetch(:instrumental_key), agent_options)
+      message                    = fetch(:deploy_message, "#{deployer} deployed #{current_revision}")
+
+      agent.notice(message,
+                   start_at,
+                   deploy_duration_in_seconds)
+      logger.info("Notified Instrumental of deployment")
+    end
+  end
+end

data/lib/instrumental/capistrano/capistrano3.rake

@@ -0,0 +1,56 @@
+require "etc"
+require "instrumental_agent"
+
+namespace :load do
+  task :defaults do
+    set :instrumental_hooks, true
+    set :instrumental_key,   nil
+    set :deployer,           Etc.getlogin.chomp
+  end
+end
+
+namespace :deploy do
+  before :starting, :check_instrumental_hooks do
+    invoke "instrumental:util:add_hooks" if fetch(:instrumental_hooks)
+  end
+end
+
+namespace :instrumental do
+  namespace :util do
+    desc "add instrumental hooks to deploy"
+    task :add_hooks do
+      before "deploy", "instrumental:util:deploy_start"
+      after  "deploy", "instrumental:util:deploy_end"
+      after  "instrumental:util:deploy_end", "instrumental:record_deploy_notice"
+    end
+
+    desc "marker for beginning of deploy"
+    task :deploy_start do
+      set :instrumental_deploy_start, Time.now
+    end
+
+    desc "marker for end of deploy"
+    task :deploy_end do
+      set :instrumental_deploy_end, Time.now
+    end
+  end
+
+  desc "send a notice to instrumental about the deploy"
+  task :record_deploy_notice do
+    start_at                   = fetch(:instrumental_deploy_start, Time.now)
+    end_at                     = fetch(:instrumental_deploy_end, start_at)
+    deploy_duration_in_seconds = end_at - start_at
+    deployer                   = fetch(:deployer)
+    agent_options              = { :synchronous => true }
+    agent_options[:collector]  = instrumental_host if fetch(:instrumental_host, false)
+    message                    = fetch(:deploy_message, "#{deployer} deployed #{fetch(:current_revision)}".strip)
+
+    if fetch(:instrumental_key)
+      agent = Instrumental::Agent.new(fetch(:instrumental_key), agent_options)
+      agent.notice(message,
+                   start_at,
+                   deploy_duration_in_seconds)
+      puts "Notified Instrumental of deployment"
+    end
+  end
+end

data/lib/instrumental/version.rb

@@ -1,3 +1,3 @@
 module Instrumental
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instrumental_agent
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Elijah Miller
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metrician
@@ -122,6 +122,8 @@ files:
 - instrumental_agent.gemspec
 - lib/instrumental/agent.rb
 - lib/instrumental/capistrano.rb
+- lib/instrumental/capistrano/capistrano2.rb
+- lib/instrumental/capistrano/capistrano3.rake
 - lib/instrumental/system_timer.rb
 - lib/instrumental/version.rb
 - lib/instrumental_agent.rb