rundock 0.4.8 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ca8602714ab2dca12d312ddae3619c2e2632d29
-  data.tar.gz: 636b26551c99bb514b603f908a24778f1b2c1df4
+  metadata.gz: d57db6da4ef09d2b72d4100d7a0fefb1404bb06a
+  data.tar.gz: 0d778d72fffd50b046d32d86300d2847de359b3a
 SHA512:
-  metadata.gz: 32559507e9f787ae08b05de133926e52b37d361d53391b9578068a6a1090228117a5ffc2d675c63fdafb13cb728d40ab0dc0cb26a929fa7032ed5b6fa0b31191
-  data.tar.gz: 8c3be830faa2de8131a1109091d59ada52966045e916413a57bd92953741ffda92324f5c4323e157da41c7c7b9d1b274a7f03becb553eb0750765c1ba2382084
+  metadata.gz: 09f7c9a551f014b35ed6ae5dc03279694805a2a4b9745f9db66560b362d7a4ede30aedd1c8bfb44b52c822c4a138fe719157fe7ec9171f2d0023b7e3e45f7772
+  data.tar.gz: 65a57189d24d4da66da1652d0ee2ccd3b26b85d0f52bd6c05379cb37abfbd3fcfa4f82a9b23453d04d1a218d2c0ee6ba9c32fe92192447e64087552921c649c1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.4.9
+
+Update
+
+- Change the hook callback to include the operation info
+
 ## v0.4.2
 
 Update

data/lib/rundock/hook/base.rb

@@ -11,7 +11,7 @@ module Rundock
         @contents = contents
       end
 
-      def hook(log_buffer = [], node_info = {})
+      def hook(node_attributes = [], log_buffer = [])
         raise HookNotImplementedError
       end
     end

data/lib/rundock/node.rb

@@ -24,11 +24,11 @@ module Rundock
       Logger.debug("run node: #{@name}")
       Logger.warn("no operation running: #{@name}") if @operations.blank?
 
-      nodeinfo = nil
+      node_attributes = []
 
       @operations.each do |ope|
         Logger.debug("run operation: #{ope.class}")
-        nodeinfo = ope.attributes[:nodeinfo] if nodeinfo.nil?
+        node_attributes << ope.attributes
         ope.run(@backend, ope.attributes)
       end
 
@@ -36,7 +36,7 @@ module Rundock
 
       @hooks.each do |h|
         Logger.debug("run hook: #{h.name}")
-        h.hook(log_buffer, nodeinfo)
+        h.hook(node_attributes, log_buffer)
       end
 
       Logger.formatter.onrec = false

data/lib/rundock/plugin/hook/file.rb

@@ -32,9 +32,9 @@ module Rundock
     #     key:  ~/.ssh/id_rsa
     # ---
     class File < Base
-      def hook(log_buffer, node_info)
+      def hook(node_attributes, log_buffer)
         file = ::File.open(@contents[:filepath], 'w')
-        file.puts("[hookname:#{@name} node:#{node_info[:host]}]")
+        file.puts("[hookname:#{@name} node:#{node_attributes[0][:nodename]}]")
         log_buffer.each do |log|
           file.puts("[\%5s:] %s%s\n" % [log.severity, ' ' * 2 * log.indent_depth, log.msg])
         end

data/lib/rundock/version.rb

@@ -1,3 +1,3 @@
 module Rundock
-  VERSION = '0.4.8'
+  VERSION = '0.4.10'
 end

data/spec/integration/recipes/file_hook_spec.rb

@@ -7,11 +7,13 @@ end
 
 describe file('/var/tmp/hello_rundock_from_file_hook_array_1_scenario') do
   it { should be_file }
+  its(:content) { should match(/anyhost-01/) }
   its(:content) { should match(/hookname:file_array_1 /) }
 end
 
 describe file('/var/tmp/hello_rundock_from_file_hook_array_2_scenario') do
   it { should be_file }
+  its(:content) { should match(/anyhost-01/) }
   its(:content) { should match(/hookname:file_array_2 /) }
 end
 

data/spec/integration/scenarios/simple_file_hooks_scenario.yml

@@ -1,8 +1,10 @@
 - node: anyhost-01
   command:
     - "echo 'hookname:file_one ' > /var/tmp/hello_rundock_from_file_hook_one_scenario"
-    - "echo 'hookname:file_array_1 ' > /var/tmp/hello_rundock_from_file_hook_array_1_scenario"
-    - "echo 'hookname:file_array_2 ' > /var/tmp/hello_rundock_from_file_hook_array_2_scenario"
+    - "echo 'anyhost-01' > /var/tmp/hello_rundock_from_file_hook_array_1_scenario"
+    - "echo 'anyhost-01' > /var/tmp/hello_rundock_from_file_hook_array_2_scenario"
+    - "echo 'hookname:file_array_1 ' >> /var/tmp/hello_rundock_from_file_hook_array_1_scenario"
+    - "echo 'hookname:file_array_2 ' >> /var/tmp/hello_rundock_from_file_hook_array_2_scenario"
   hook:
     - file_one
     - file_array_1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.10
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler