chef-handler-serf 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a8af9e4bc554192319988cab6e9895c60405c89
-  data.tar.gz: 1206048452b98061e6442e8f696273c2ce10d311
+  metadata.gz: 9d5b41042c4f3c6ede6b781564b67d2a410c4dfc
+  data.tar.gz: 988b3172a0250f218d8d24247c7e6c09ccd191cd
 SHA512:
-  metadata.gz: bc65d14ebd4743082c21aa83dede9568b7a93190c3d5721740b872e26a0c640a4ff620b5442d7f5142959c990cb507274e3af7060b47109e2ec764b0c7ebf873
-  data.tar.gz: f64286ca22f6c14060321a6023fdb70c325e70250405efdc2e1668017485a3ddc159f225df30f20cadc090ca166a0ffc9e9ac6c23e6fb1f93c18489e85fdb295
+  metadata.gz: beb7f255645031b5fe6282695900b2e836f94d0cf23a653c940f11162e1dcfcc3f76b8852e91e2e9e771bb4815d591fc0e039b7d245a2843461708c1bedf006b
+  data.tar.gz: 95277d4861962526efa6b291ce7b2cb6f4d75b767eee9ebdb7ef9220ae7f193a76d55b2ddde3ebbf27457cf6e30f6133973142e2d13f0a0b7be5cbb6c257bc48

data/chef-handler-serf.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'chef-handler-serf'
-  spec.version       = '0.0.2'
+  spec.version       = '0.0.3'
   spec.authors       = ['Ranjib Dey']
   spec.email         = ['ranjib@pagerduty.com']
   spec.summary       = %q{Chef event handler for serf}

data/lib/chef/event_dispatch/serf.rb

@@ -27,23 +27,28 @@ class Chef
       end
 
       def run_start(version)
-        @conn.event(__method__.to_s, version)
+        payload = payload_to_json(version: version)
+        @conn.event(__method__.to_s, payload)
       end
 
       def converge_complete
-        @conn.event(__method__.to_s)
+        @conn.event(__method__.to_s, payload_to_json)
         @conn.close unless @conn.closed?
       end
 
       def resource_updated(res, action)
         if @publish_all or @subscribe.include?(res.to_s) or res.publish
-          payload = Chef::JSONCompat.to_json(
-            resource: res.to_s,
-            action: action.to_s
-          )
+          payload = payload_to_json(resource: res.to_s, action: action.to_s)
           @conn.event(__method__.to_s, payload)
         end
       end
+
+      private
+      def payload_to_json(data = {})
+        Chef::JSONCompat.to_json(
+          data.merge(node: Chef::Config[:node_name])
+        )
+      end
     end
   end
 end

data/spec/serf_handler_spec.rb

@@ -28,14 +28,21 @@ describe 'serf handler' do
 
     runner = Chef::Runner.new(rc)
 
-    expect(conn).to receive(:event).with(
-      'resource_updated',
-      '{"resource":"execute[pass]","action":"run"}'
+    pass_payload = Chef::JSONCompat.to_json(
+      resource: 'execute[pass]',
+      action: 'run',
+      node: Chef::Config[:node_name]
     )
-    expect(conn).to_not receive(:event).with(
-      'resource_updated',
-      '{"resource":"execute[fail]","action":"run"}'
+
+    fail_payload = Chef::JSONCompat.to_json(
+      resource: 'execute[fail]',
+      action: 'run',
+      node: Chef::Config[:node_name]
     )
+
+    expect(conn).to receive(:event).with('resource_updated', pass_payload)
+    expect(conn).to_not receive(:event).with('resource_updated', fail_payload)
     runner.converge
   end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-handler-serf
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef