capistrano-graphite 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 512c233bfce7e7036369cb49ecb2d46213bd649f
-  data.tar.gz: 6c3f94242c0c73749664c5b0eee45e0488a01d17
+  metadata.gz: e48e072f4581052d43f423aff3686390a62f5774
+  data.tar.gz: b6410e0f760ea3dc98964fdab0c1ba8aa9c864ec
 SHA512:
-  metadata.gz: c38dfb78e037082feabc4b35e81d2885b9eabf6f6f858527f4d1dbf3c3f7e5ad5f3dd2ad65a9c834d247843dcbbd8a7aa83cb2c174f90ddfc437c5d86f6a6168
-  data.tar.gz: 9c82781ebabcdf39ef5807ba2cf634a94dff97984009fb4874c3f964aac1bd5616bcb211aca24065abf72b246486f55eccb0b4b37e1bd60d988f47e945836138
+  metadata.gz: a1c2b44eb0bbeca70d4d99a1e1c839a9123c5c62c6d29434ba098b80268fa2e7278155fe41e4e754bde2eb3749b5b04287d21d4f5bcd86027e1684faed673d86
+  data.tar.gz: 7957822f6df17e1f3ff350c0a21eb5328bc3453ee7708a569a030fb55e8b7c379f7604ab03368b6ff1ad41a9cc4fe2a598283d1c309faf867b445d6c005bee2f

data/README.md

@@ -1,12 +1,12 @@
 # Capistrano::Graphite
 [![Gem Version](http://img.shields.io/gem/v/capistrano-graphite.svg)][gem]
-[![Dependency Status](http://img.shields.io/gemnasium/scottsuch/capistrano-graphite.svg)][gemnasium]
 [![Build Status](http://img.shields.io/travis/scottsuch/capistrano-graphite.svg)][travis]
+[![Dependency Status](http://img.shields.io/gemnasium/scottsuch/capistrano-graphite.svg)][gemnasium]
 [![Code Climate](http://img.shields.io/codeclimate/github/scottsuch/capistrano-graphite.svg)][codeclimate]
 
 [gem]: https://rubygems.org/gems/capistrano-graphite
-[gemnasium]: https://gemnasium.com/scottsuch/capistrano-graphite
 [travis]: http://travis-ci.org/scottsuch/capistrano-graphite
+[gemnasium]: https://gemnasium.com/scottsuch/capistrano-graphite
 [codeclimate]: https://codeclimate.com/github/scottsuch/capistrano-graphite
 This gem works with Capistrano v3.1.0 and above and was based off the work on [this gem](https://github.com/hellvinz/graphite-notify) which works with Capistrano v2.x.
 

data/capistrano-graphite.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_dependency             "capistrano", "~> 3.0"
+  spec.add_development_dependency "bundler",    "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

data/lib/capistrano/graphite.rb

@@ -1,24 +1,25 @@
 require 'capistrano'
 require 'net/http'
 require 'uri'
+require 'sshkit'
+require 'sshkit/dsl'
 
 set :local_user, ENV['USER']
 
 class GraphiteInterface
-  def self.events_enabled
+  def self.events_enabled(action)
     if fetch(:graphite_enable_events).to_i == 1
+      # We only post an event if graphite_enable_events was set to 1
+      GraphiteInterface.new.post_event(action)
       return 1
     elsif fetch(:graphite_enable_events).to_i == 0
-      puts "Not sending an event: graphite_enable_events was set to 0."
       return 0
     else
-      warn "Not sending an event: graphite_enable_events was assigned an "\
-            "invalid value."
-      return 0
+      return -1
     end
   end
 
-  def self.post_event(action)
+  def post_event(action)
     uri = URI::parse("#{fetch(:graphite_url)}")
     req = Net::HTTP::Post.new(uri.path)
     req.basic_auth(uri.user, uri.password) if uri.user
@@ -30,21 +31,32 @@ class GraphiteInterface
   end
 end
 
-
 namespace :deploy do
   desc 'notify graphite that a deployment occured'
   task :graphite_deploy do
-    if GraphiteInterface.events_enabled == 1
+    on roles(:all) do |host|
       action = "deploy"
-      GraphiteInterface.post_event(action)
+      if GraphiteInterface.events_enabled(action) == 1
+        info("#{action.capitalize} event posted to graphite.")
+      elsif GraphiteInterface.events_enabled(action) == 0
+        info("No event posted: graphite_enable_events set to 0.")
+      else
+        warn("No event posted: graphite_enable_events set to invalid variable.")
+      end
     end
   end
 
   desc 'notify graphite that a rollback occured'
   task :graphite_rollback do
-    if GraphiteIntervace.events_enabled == 1
-      action = "rollback"
-      GraphiteInterface.post_event(action)
+    on roles(:all) do |host|
+      action = "deploy"
+      if GraphiteInterface.events_enabled(action) == 1
+        info("#{action.capitalize} event posted to graphite.")
+      elsif GraphiteInterface.events_enabled(action) == 0
+        info("No event posted: graphite_enable_events set to 0.")
+      else
+        warn("No event posted: graphite_enable_events set to invalid variable.")
+      end
     end
   end
 

data/lib/capistrano/graphite/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Graphite
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-graphite
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - scottsuch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement