rundock 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f14472ccefd47f2343c17934f3a59c1942b19554
-  data.tar.gz: e76b60e727665179ef6f25f6852d3855041d31f2
+  metadata.gz: 87276a62d3a318643a6fd4e1db23ef2bc8734406
+  data.tar.gz: 41189493f366d574722b6342fa5b325c33e4e8ee
 SHA512:
-  metadata.gz: 07c04ad61de0ca22ec4119523e98aee2533da4dba31fb3f5f2217e41906e331167b437b15361e13d6ff3e82ea9136f7e5d87522c769e27799d26c8df08001fae
-  data.tar.gz: 587f5eb7be9c3d8a2234fd37ab82db2ff6cb6df3b839d95e108c31b8f79547445d69f99de3bb4b09bb4d51960eaa0b39ab84e50c5eec711ddab4981c9573dbc8
+  metadata.gz: 62eb6c047d635fdd4af13f00cec08f776c254f0a260c9da20ddae46a5debdea17ba9be90928b207e29560d67cf12e4a501bbd0d297980c3020326f94664b3222
+  data.tar.gz: 972d42c65730a9e5ba759135603e4c5ff56dda98d724540903de8122bdbf4892297816ba57f62bfa2be29304e711e8b62f4c3faa71f6e1df5e2b64119e948881

data/.rubocop.yml

@@ -72,5 +72,8 @@ Style/MethodMissing:
 Style/FormatStringToken:
   Enabled: false
 
+Security/Open:
+  Enabled: false
+
 Lint/UnusedMethodArgument:
   Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v1.1.6
+
+Fix
+
+- Fix error if merging scenario task and external task
+- Fix rundock ssh of comma separated host arguments
+
+Update
+
+- Support multi external task file
+- Support filtered tasks
+
 ## v1.1.5
 
 Update

data/default_ssh.yml

@@ -2,7 +2,7 @@
 # Default ssh options are here.
 #
 :port: 22
-:paranoid: false
+:verify_host_key: false
 #:user: "youre_name"
 #:keys: ["/path/to/private_key"]
 #:passphrase: "yourpassphrase"

data/lib/rundock/attribute/node_attribute.rb

@@ -4,6 +4,7 @@ module Rundock
       attr_accessor :nodename
       attr_accessor :nodeinfo
       attr_accessor :task_info
+      attr_accessor :filtered_tasks
       attr_accessor :errexit
       attr_accessor :cwd
       attr_accessor :sudo

data/lib/rundock/backend.rb

@@ -59,7 +59,14 @@ module Rundock
 
         return nil if exec_options[:dry_run]
 
-        result = @backend.run_command(command)
+        begin
+          result = @backend.run_command(command)
+        rescue StandardError => e
+          Logger.error(e.to_s)
+          raise CommandResultStatusError if exec_options[:errexit]
+          return nil
+        end
+
         exit_status = result.exit_status
 
         Logger.formatter.indent do

data/lib/rundock/builder/hook_builder.rb

@@ -29,7 +29,7 @@ module Rundock
             return []
           end
         elsif hook_attributes.nil?
-          Logger.warn("Hook source is not found. (enables:#{enables.join(',')})") unless enables.empty?
+          Logger.info("Hook source is not found. (enables:#{enables.join(',')})") unless enables.empty?
           return []
         end
 

data/lib/rundock/builder/operation_builder.rb

@@ -72,7 +72,9 @@ module Rundock
       def build_cli
         scen = Scenario.new
 
-        @options[:host].split(',').each do |host|
+        hosts = @options[:host].split(',')
+        hosts.each do |host|
+          @options[:host] = host
           backend = BackendBuilder.new(@options, host, nil).build
           node = Node.new(host, backend)
           node.hooks = HookBuilder.new(@options).build(['all'], nil)
@@ -109,6 +111,8 @@ module Rundock
         node_attributes.nodename = @options[:host] unless node_attributes.nodename
         node_attributes.errexit = !cli_options[:run_anyway]
         node_attributes.dry_run = cli_options[:dry_run] ? true : false
+        node_attributes.filtered_tasks = cli_options[:filtered_tasks] &&
+                                         cli_options[:filtered_tasks].split(',')
         Rundock::OperationFactory.instance(:command).create(Array(command), node_attributes.list)
       end
 
@@ -128,7 +132,9 @@ module Rundock
                                     else
                                       !cli_options[:run_anyway]
                                     end
-          node_attributes.dry_run = cli_options && cli_options[:dry_run]
+          node_attributes.dry_run = cli_options[:dry_run]
+          node_attributes.filtered_tasks = cli_options[:filtered_tasks] &&
+                                           cli_options[:filtered_tasks].split(',')
         end
 
         # override by scenario

data/lib/rundock/builder/task_builder.rb

@@ -6,17 +6,28 @@ module Rundock
       DEFAULT_TASKS_FILE_PATH = './tasks.yml'
 
       def build(scenario_tasks)
-        tasks = {} unless scenario_tasks
-
+        tasks = if scenario_tasks.nil?
+                  {}
+                else
+                  scenario_tasks
+                end
         return scenario_tasks unless @options[:tasks]
-        if FileTest.exist?(@options[:tasks])
-          tasks.merge!(YAML.load_file(@options[:tasks]).deep_symbolize_keys)
-          Logger.info("merged tasks file #{@options[:tasks]}")
-        elsif FileTest.exist?(DEFAULT_TASKS_FILE_PATH)
-          Logger.warn("tasks file is not found. use #{DEFAULT_TASKS_FILE_PATH}")
-          tasks.merge!(YAML.load_file(DEFAULT_TASKS_FILE_PATH).deep_symbolize_keys)
-        else
-          Logger.warn("Task path is not available. (#{@options[:tasks]})")
+        return tasks if @options[:tasks].nil?
+
+        task_files = @options[:tasks].split(',')
+
+        task_files.each do |tk|
+          tk.gsub!(/~/, Dir.home)
+
+          if FileTest.exist?(tk)
+            tasks.merge!(YAML.load_file(tk).deep_symbolize_keys)
+            Logger.info("merged tasks file #{tk}")
+          elsif FileTest.exist?(DEFAULT_TASKS_FILE_PATH)
+            Logger.warn("tasks file is not found. use #{DEFAULT_TASKS_FILE_PATH}")
+            tasks.merge!(YAML.load_file(DEFAULT_TASKS_FILE_PATH).deep_symbolize_keys)
+          else
+            Logger.warn("Task path is not available. (#{tk})")
+          end
         end
 
         tasks

data/lib/rundock/cli.rb

@@ -32,9 +32,10 @@ module Rundock
     option :sudo, type: :boolean, default: false
     option :default_ssh_opts, type: :string, aliases: ['-d'], default: DEFAULT_SSH_OPTIONS_DEFAULT_FILE_PATH
     option :targetgroup, type: :string, aliases: ['-g']
-    option :tasks, type: :string, aliases: ['-t']
+    option :tasks, type: :string, aliases: ['-t'], banner: 'You can specify comma separated task file paths.[ex: task_file1,task_file2,..]'
+    option :filtered_tasks, type: :string, aliases: ['-T'], banner: 'You can specify comma separated tasks.[ex: task1,task2,..]'
     option :hooks, type: :string, aliases: ['-k']
-    option :run_anyway, type: :boolean, default: false
+    option :run_anyway, type: :boolean, aliases: ['-r'], default: false
     option :dry_run, type: :boolean, aliases: ['-n']
     def do(*scenario_file_path)
       scenario_file_path = [DEFAULT_SCENARIO_FILE_PATH] if scenario_file_path.empty?
@@ -46,7 +47,8 @@ module Rundock
     desc 'ssh [options]', 'Run rundock ssh with various options'
     option :command, type: :string, aliases: ['-c']
     option :default_ssh_opts, type: :string, aliases: ['-d'], default: DEFAULT_SSH_OPTIONS_DEFAULT_FILE_PATH
-    option :tasks, type: :string, aliases: ['-t']
+    option :tasks, type: :string, aliases: ['-t'], banner: 'You can specify comma separated task file paths.[ex: task_file1,task_file2,..]'
+    option :filtered_tasks, type: :string, aliases: ['-T'], banner: 'You can specify comma separated tasks.[ex: task1,task2,..]'
     option :hooks, type: :string, aliases: ['-k']
     option :host, type: :string, aliases: ['-h'], banner: 'You can specify comma separated hosts.[ex: host1,host2,..]'
     option :targetgroup, type: :string, aliases: ['-g']
@@ -56,7 +58,7 @@ module Rundock
     option :ssh_config, type: :string, aliases: ['-F']
     option :ask_password, type: :boolean, default: false
     option :sudo, type: :boolean, default: false
-    option :run_anyway, type: :boolean, default: false
+    option :run_anyway, type: :boolean, aliases: ['-r'], default: false
     option :dry_run, type: :boolean, aliases: ['-n']
     def ssh
       opts = {}

data/lib/rundock/node.rb

@@ -29,6 +29,7 @@ module Rundock
       @operations.each do |ope|
         Logger.debug("run operation: #{ope.class}")
         node_attributes << ope.attributes
+        ope.attributes[:nodename] = @name
         ope.run(@backend, ope.attributes)
       end
 

data/lib/rundock/operation/task.rb

@@ -17,6 +17,8 @@ module Rundock
             next
           end
 
+          next if !attributes[:filtered_tasks].nil? && !attributes[:filtered_tasks].include?(task_name)
+
           scenario = Rundock::Builder::ScenarioBuilder.new(nil, nil).build_task(
             attributes[:task_info][task_name.to_sym], backend, Rundock::Attribute::NodeAttribute.new(attributes)
           )

data/lib/rundock/version.rb

@@ -1,3 +1,3 @@
 module Rundock
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
 end

data/rundock.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rundock/version'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler