capistrano-graphite 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2c1f690fc5d7ed7909edf58dce04a3037200d0e
-  data.tar.gz: 95ef00184776082bc7bc259eaaeeda993ab75a64
+  metadata.gz: 6eaec296dc80d5610159d2757c93f59a0c7cc0bf
+  data.tar.gz: 49b9598bf0b8d0feff72f56520dccd7785596d23
 SHA512:
-  metadata.gz: 1b37ac4b8ecf1ee70ff9ee499c5ffe84b578ba0d9a39c46751b23dff4d48e4061727a2a65e4c6b4d9f364cc513a8601bdf213871be40cd36ff97b5e26dee62ca
-  data.tar.gz: 629dd91c96526d18c8c64150ad5973d1f636a82845c87d687039a46fa14b7c2464e1abd7d414298026eece16fb0676f0fe53fed8e9aed11733c0220de9cde170
+  metadata.gz: 0c790ef4bdea8aacf3f8293c7350a4d774e5f2fca4eef0cf4195eed7893c5ee8ffa5d55f5a03d5b5123ead3db60632515439ce27d73f649e245b5386acbbc8b9
+  data.tar.gz: e3c519f1fde358e11ed0e804f71e7f66a9f2f144522ca933605436ec217addc9b6de4db9666f0cfa246630b3e20c6ec52ddefd071011ab0e66359bc88a78b63f

data/CHANGELOG.md

@@ -1,30 +1,33 @@
-## 1.0.3 (2015-01-08)
+## 1.0.4 (2015-02-26)
+ IMPROVEMENTS
+  - Allows for the overriding of graphite settings. [GH-28]
+  - Updates README.md with instructions for overrides.
 
+## 1.0.3 (2015-01-08)
+BUG FIXES:
+  - Fix bad logic in suppress option. [GH-27]
 
+IMPROVEMENTS
+ - Removed gem post install message.
+ - Safer setting of config values. [GH-24]
+ - Speedier builds via TravisCI Docker infrastructure. [GH-25]
 
 ## 1.0.2 (2014-11-19)
-
 BUG FIXES:
-  
   - Fix bug introduced by [GH-17].
   - Fix issue where notification could be sent on failed deploy/rollback.
 
 IMPROVEMENTS:
-
   - Cleaner Rake syntax.
 
 ## 1.0.1 (2014-11-19)
-
 BUG FIXES:
-
   - Fix bug where multiple events were sent to graphite. [GH-18]
 
 IMPROVEMENTS:
-
   - Update test command example in README.md. [GH-19]
   - Lint entire project with RuboCop. [GH-17]
   - Add `rake` task to lint with RuboCop when Travis is run. [GH-17]
 
 ## Previous Versions
-
 Sorry, no true documentation was kept prior to 1.0.1.

data/README.md

@@ -42,6 +42,17 @@ Disable sending events for a particular stage by setting the following:
 
 Note that the config `graphite_enable_events` was deprecated in version 1.0.0.
 
+Optionally, override the rest of graphite settings:
+
+    set :graphite_event_user, ENV.fetch('USER', 'unknown')
+    set :graphite_event_data, -> { fetch(:graphite_event_user) }
+    set :graphite_event_tags, -> (action) do
+      [fetch(:application), fetch(:stage), release_timestamp, action].join(',')
+    end
+    set :graphite_event_msg, -> (action) do
+      "#{action} #{fetch(:application)} in #{fetch(:stage)}"
+    end
+
 ### Test that it's working
 You can run the following on it's own assuming you have configured the graphite url
 

data/lib/capistrano/graphite.rb

@@ -12,15 +12,20 @@ class GraphiteInterface
     uri = URI.parse("#{fetch(:graphite_url)}")
     req = Net::HTTP::Post.new(uri.path)
     req.basic_auth(uri.user, uri.password) if uri.user
-    req.body = "{\"what\": \"#{action} #{fetch(:application)} in " \
-               "#{fetch(:stage)}\", \"tags\": \"#{fetch(:application)}," \
-               "#{fetch(:stage)},#{release_timestamp},#{action}\", \"data\": " \
-               "\"#{fetch(:local_user)}\"}"
+    req.body = event(action).to_s
 
     Net::HTTP.start(uri.host, uri.port) do |http|
       http.request(req)
     end
   end
+
+  def event(action)
+    {
+      'what' => fetch(:graphite_event_msg).call(action),
+      'tags' => fetch(:graphite_event_tags).call(action),
+      'data' => fetch(:graphite_event_data)
+    }
+  end
 end
 
 namespace :deploy do
@@ -50,7 +55,14 @@ end
 
 namespace :load do
   task :defaults do
-    set_if_empty :suppress_graphite_events, 'false'
-    set_if_empty :local_user, ENV['USER']
+    set :suppress_graphite_events, 'false'
+    set :graphite_event_user, ENV.fetch('USER', 'unknown')
+    set :graphite_event_data, -> { fetch(:graphite_event_user) }
+    set :graphite_event_tags, lambda do |action|
+      [fetch(:application), fetch(:stage), release_timestamp, action].join(',')
+    end
+    set :graphite_event_msg, lambda do |action|
+      "#{action} #{fetch(:application)} in #{fetch(:stage)}"
+    end
   end
 end

data/lib/capistrano/graphite/version.rb

@@ -3,6 +3,6 @@
 module Capistrano
   # This module holds the capistrano-graphite version information.
   module Graphite
-    VERSION = '1.0.3'
+    VERSION = '1.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-graphite
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - scottsuch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano