capistrano-mackerel 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcf4bab425f17e1f0965535ab30cfc68b5d9f290
-  data.tar.gz: 5d9648039c9f9844e819ff4a3711b9fd9abf45cf
+  metadata.gz: 62220dc181ad49ed1e4af1a13305e7ac3ad421af
+  data.tar.gz: 031a001f71c03198748d99586b3b157ab02ba658
 SHA512:
-  metadata.gz: adf3a6a5d02802100120ef2dc53d9bc9e3f4fe3400420970b33e98266313ab8b6d67cdf85a470c72efee50863e9a41fc488d6d8b2701caf12f6705faf0ceefab
-  data.tar.gz: 5b548b5ed15408fbeff4c05921b489cf7b8cce5f34329cc772fbf50e0c3dc7ff2cfa5299ff709b408034d9d5820353fee628baf89d938eba11cade589414679d
+  metadata.gz: 2f86a2c23fb00adcd9d94e569f97f112fb21a3c0a50ab32d35ad4c3387836d18c1490c390978f21ee628a67ba050ad0e9d603d97888af7e17162f06d6563b271
+  data.tar.gz: 8ccdf9dbceb8011322d06b2a055e9ce74d77ad11d5ff0506c612c61172b5a57efcd270008f9f22d4af110e396876eb1f407b025ef1c107507b76140d5b9edce4

data/lib/capistrano/mackerel/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Mackerel
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'.freeze
   end
 end

data/lib/capistrano/tasks/hooks.rake

@@ -9,29 +9,42 @@ end
 namespace :mackerel do
   desc 'Set hooks'
   task :hooks do
-    tasks = fetch(:mackerel_annotate_tasks)
+    tasks = fetch(:mackerel_annotate_tasks).uniq
     tasks.each do |task|
-      before task, 'mackerel:starting' do
+      unless Rake::Task.task_defined?(task)
+        abort "Error: Task '#{task}' is not defined."
+      end
+
+      task_name = task.tr(':', '_')
+
+      before task, "mackerel:starting_#{task_name}" do
         results = fetch(:mackerel_measurements, {})
         results[task] = Time.now.to_i
         set :mackerel_measurements, results
       end
 
-      after task, 'mackerel:finished' do
+      after task, "mackerel:finished_#{task_name}" do
         finish_time = Time.now.to_i
 
         results = fetch(:mackerel_measurements)
         start_time = results[task]
 
-        client = Mackerel::Client.new(mackerel_api_key: fetch(:mackerel_api_key))
-        client.post_graph_annotation({
-          title: task,
-          description: "Processing time for '#{task}'",
-          from: start_time,
-          to: finish_time,
-          service: fetch(:mackerel_service),
-          roles: fetch(:mackerel_roles)
-        })
+        run_locally do
+          info "Task '#{task}' took #{finish_time - start_time} sec."
+        end
+
+        api_key = fetch(:mackerel_api_key)
+        if api_key
+          client = Mackerel::Client.new(mackerel_api_key: api_key)
+          client.post_graph_annotation({
+            title: task,
+            description: "Processing time for '#{task}'",
+            from: start_time,
+            to: finish_time,
+            service: fetch(:mackerel_service),
+            roles: fetch(:mackerel_roles)
+          })
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-mackerel
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Katsuma Tanaka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano