rundock 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 925ab13ad979b5530cb89efe8959dc41fcebf645
-  data.tar.gz: 832c4b8fd3795c6b7890dabad8b5e42d03508913
+  metadata.gz: fa664318ebae9c57a378f4e5ccef806395eb2fbc
+  data.tar.gz: 45d2618d0d9b0e76180ca754d5f4d39d3009abe2
 SHA512:
-  metadata.gz: 8bf6370c8170c3331cf428e62bac57e7a2ba8930d2bc87936e3d876e292c584aeb604d8c6dcac716aca44c6fe6d7334fd9c78fe3bae17850f10f886765df9f45
-  data.tar.gz: c5c840860294fc05324a380a80aa104dacac3179f16ff94a94178561fa0c204dc91cee641a0cfee6aee6820ccdf883a88cadaa3a46f0ae1967943a80ebf1a022
+  metadata.gz: 2f9114c8b24850151732f713e4d9311d90d75b0597032af5c402a427aa7d1de4b2bce37e3c9de0e76fb86ef58472f7fd606bc82faeb37bd82780f9ed5458ae59
+  data.tar.gz: 70295a6126b533ed8863bef489f2483d9269f006a7984bb46b22cb1d9271ae7daf9249a443a68f96b00b37d47455c402416450f6b26cd5d5e7ea3f571f155bc3

data/lib/rundock/ext/string.rb

@@ -0,0 +1,6 @@
+class String
+  def just(pad, max)
+    return self.ljust(max, pad) if length <= max
+    return "#{self[0..(max - 3)]}.." if length > max
+  end
+end

data/lib/rundock/operation/base.rb

@@ -15,6 +15,12 @@ module Rundock
       def run(backend, attributes = {})
         raise OperationNotImplementedError
       end
+
+      def logging(message, severity)
+        h_host = @attributes[:nodename].just(' ', 15)
+        h_ope = "start #{self.class.to_s.split('::').last.downcase}:"
+        Logger.send(severity.to_sym, "#{h_host} #{h_ope} #{message}")
+      end
     end
   end
 end

data/lib/rundock/operation/command.rb

@@ -8,7 +8,7 @@ module Rundock
             next
           end
 
-          Logger.info("start command: #{i}")
+          logging(i, 'info')
 
           backend.run_commands(
             assign_args(i, attributes[:task_args]), attributes

data/lib/rundock/operation/task.rb

@@ -15,8 +15,7 @@ module Rundock
             attributes[:task_info][task_name.to_sym], backend, Rundock::Attribute::NodeAttribute.new(attributes)
           )
 
-          Logger.info("start task: #{task_name}")
-
+          logging(i, 'info')
           Logger.formatter.rec_lock
 
           scenario.run

data/lib/rundock/plugin/operation/deploy.rb

@@ -60,7 +60,7 @@ module Rundock
           erb_options = ''
           erb_options = " erb: true trim_mode: #{trim_mode}" if is_erb
 
-          Logger.info("deploy localhost: #{opt[:src]} remote:#{attributes[:nodeinfo][:host]}:#{opt[:dst]}#{erb_options}")
+          logging("deploy localhost: #{opt[:src]} remote:#{attributes[:nodeinfo][:host]}:#{opt[:dst]}#{erb_options}", 'info')
           Logger.debug("deploy erb binding: #{opt[:binding]}") if is_erb
 
           val_binding = if is_erb

data/lib/rundock/plugin/operation/host_inventory.rb

@@ -19,7 +19,7 @@ module Rundock
     class HostInventory < Base
       def run(backend, attributes)
         attributes[:host_inventory].each do |hi|
-          Logger.info(to_inventory(backend, hi))
+          logging(to_inventory(backend, hi), 'info')
         end
       end
 

data/lib/rundock/plugin/operation/sample_operation.rb

@@ -35,7 +35,7 @@ module Rundock
           end
         end
 
-        Logger.info("do #{cmd}#{args_line}")
+        logging("do #{cmd}#{args_line}", 'info')
         result = backend.run_command("#{cmd}#{args_line}")
         Logger.info(result.stdout)
       end

data/lib/rundock/version.rb

@@ -1,3 +1,3 @@
 module Rundock
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/lib/rundock.rb

@@ -1,6 +1,7 @@
 require 'rundock/version'
 require 'rundock/ext/object/blank'
 require 'rundock/ext/hash'
+require 'rundock/ext/string'
 require 'rundock/logger'
 require 'rundock/operation/base'
 require 'rundock/operation/task'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,6 +167,7 @@ files:
 - lib/rundock/cli.rb
 - lib/rundock/ext/hash.rb
 - lib/rundock/ext/object/blank.rb
+- lib/rundock/ext/string.rb
 - lib/rundock/gem/helper.rb
 - lib/rundock/gem/tasks.rb
 - lib/rundock/hook/base.rb