rundock 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87276a62d3a318643a6fd4e1db23ef2bc8734406
-  data.tar.gz: 41189493f366d574722b6342fa5b325c33e4e8ee
+  metadata.gz: 41eab756e59dece15df6f146b5e1c7bfe5130165
+  data.tar.gz: e06935ab43506d934940fead88343ac6b2f28f8c
 SHA512:
-  metadata.gz: 62eb6c047d635fdd4af13f00cec08f776c254f0a260c9da20ddae46a5debdea17ba9be90928b207e29560d67cf12e4a501bbd0d297980c3020326f94664b3222
-  data.tar.gz: 972d42c65730a9e5ba759135603e4c5ff56dda98d724540903de8122bdbf4892297816ba57f62bfa2be29304e711e8b62f4c3faa71f6e1df5e2b64119e948881
+  metadata.gz: c8b825b2ba472f9acdd8e0a0a640ce53ba2c9fc2fdc0b65ddc25a020a2eb47b09d4d953104ab3d3d6d3724b8fed50df88fc55e4873ac2fec599aab3b11d64fb6
+  data.tar.gz: 1612a61ce7d34945b7782bfa16fde756a5b8426bd06ecb2b4354c7bbb3f57b04d580ebf44c03f359fb410f17ce7f2a644bae259fb6077fb4ebb3740ac9bf447b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.1.7
+
+Update
+
+- Support multi external task file
+
 ## v1.1.6
 
 Fix

data/Rakefile

@@ -83,6 +83,10 @@ def do_rundock_scenarios(platform)
       options = " -t ./spec/integration/tasks/#{Regexp.last_match(1)}.yml"
     elsif scenario =~ %r{^*scenarios/(.*target_by_option)_scenario.yml$}
       options = " -g #{base_dir}/targets/#{Regexp.last_match(1)}.yml"
+    elsif scenario =~ %r{^*scenarios/(.*task_with_filtering)_scenario.yml$}
+      options = ' -T do_task_1,do_task_2'
+    elsif scenario =~ %r{^*scenarios/(.*task_with_merging)_scenario.yml$}
+      options = " -t ./spec/integration/tasks/#{Regexp.last_match(1)}.yml"
     end
 
     execute('bundle exec exe/rundock' \

data/lib/rundock/backend.rb

@@ -78,6 +78,8 @@ module Rundock
           Logger.debug("exit status: #{exit_status}")
         end
 
+        Logger.formatter.simple_output(result.stdout.strip) if Logger.formatter.suppress_logging && !result.stdout.strip.blank?
+
         raise CommandResultStatusError if exec_options[:errexit] && exit_status != 0
 
         result

data/lib/rundock/cli.rb

@@ -12,6 +12,7 @@ module Rundock
     class_option :header, type: :boolean, default: true
     class_option :short_header, type: :boolean, default: false
     class_option :date_header, type: :boolean, default: true
+    class_option :suppress_logging, type: :boolean, default: false
 
     def initialize(args, opts, config)
       super(args, opts, config)
@@ -21,6 +22,7 @@ module Rundock
       Rundock::Logger.formatter.show_header = options[:header]
       Rundock::Logger.formatter.short_header = options[:short_header]
       Rundock::Logger.formatter.date_header = options[:date_header]
+      Rundock::Logger.formatter.suppress_logging = options[:suppress_logging]
     end
 
     desc 'version', 'Print version'

data/lib/rundock/logger.rb

@@ -33,6 +33,7 @@ module Rundock
       attr_accessor :show_header
       attr_accessor :short_header
       attr_accessor :date_header
+      attr_accessor :suppress_logging
       attr_accessor :buffer
 
       def initialize(*args)
@@ -100,8 +101,13 @@ module Rundock
         @lock = false
       end
 
+      def simple_output(msg)
+        puts msg2str(msg)
+      end
+
       def formatted_message(severity, datetime, progname, msg)
-        out = if !@show_header
+        out = if @suppress_logging
+              elsif !@show_header
                 "%s\n" % [msg2str(msg)]
               elsif !@date_header
                 "%5s: %s%s\n" % [

data/lib/rundock/version.rb

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

data/spec/integration/platforms/localhost/scenarios/task_with_filtering_scenario.yml

@@ -0,0 +1,23 @@
+- target: localhost
+  command:
+    - "rm -rf /var/tmp/hello_rundock_from_task_with_filtering"
+  task:
+    - do_task_1
+    - do_not_task_1
+    - do_task_2
+    - do_not_task_2
+---
+---
+do_task_1:
+  command:
+    - mkdir /var/tmp/hello_rundock_from_task_with_filtering
+    - echo 'Hello Rundock from task with filtering do task 1.' > /var/tmp/hello_rundock_from_task_with_filtering/do_task_1
+do_not_task_1:
+  command:
+    - echo 'Hello Rundock from task with filtering do not task 1.' > /var/tmp/hello_rundock_from_task_with_filtering/do_not_task_1
+do_task_2:
+  command:
+    - echo 'Hello Rundock from task with filtering do task 2.' > /var/tmp/hello_rundock_from_task_with_filtering/do_task_2
+do_not_task_2:
+  command:
+    - echo 'Hello Rundock from task with filtering do not task 2.' > /var/tmp/hello_rundock_from_task_with_filtering/do_not_task_2

data/spec/integration/platforms/localhost/scenarios/task_with_merging_scenario.yml

@@ -0,0 +1,12 @@
+- target: localhost
+  command:
+    - "rm -rf /var/tmp/hello_rundock_from_task_with_merging"
+  task:
+    - do_task_1
+    - do_task_2
+---
+---
+do_task_1:
+  command:
+    - mkdir /var/tmp/hello_rundock_from_task_with_merging
+    - echo 'Hello Rundock from task with merging do task 1.' > /var/tmp/hello_rundock_from_task_with_merging/do_task_1

data/spec/integration/recipes/task_with_filtering_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe file('/var/tmp/hello_rundock_from_task_with_filtering/do_task_1') do
+  it { should be_file }
+  its(:content) { should match(/Hello Rundock from task with filtering do task 1/) }
+end
+
+describe file('/var/tmp/hello_rundock_from_task_with_filtering/do_task_2') do
+  it { should be_file }
+  its(:content) { should match(/Hello Rundock from task with filtering do task 2/) }
+end
+
+describe file('/var/tmp/hello_rundock_from_task_with_filtering/do_not_task_1') do
+  it { should_not be_file }
+end
+
+describe file('/var/tmp/hello_rundock_from_task_with_filtering/do_not_task_2') do
+  it { should_not be_file }
+end

data/spec/integration/recipes/task_with_merging_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe file('/var/tmp/hello_rundock_from_task_with_merging/do_task_1') do
+  it { should be_file }
+  its(:content) { should match(/Hello Rundock from task with merging do task 1/) }
+end
+
+describe file('/var/tmp/hello_rundock_from_task_with_merging/do_task_2') do
+  it { should be_file }
+  its(:content) { should match(/Hello Rundock from task with merging do task 2/) }
+end

data/spec/integration/scenarios/task_with_filtering_scenario.yml

@@ -0,0 +1,30 @@
+- target: anyhost-01
+  command:
+    - "rm -rf /var/tmp/hello_rundock_from_task_with_filtering"
+  task:
+    - do_task_1
+    - do_not_task_1
+    - do_task_2
+    - do_not_task_2
+---
+anyhost-01:
+  target_type: host
+  host: <replaced_by_platforms_host>
+  ssh_opts:
+    port: <replaced_by_platforms_port>
+    user: tester
+    key: "<replaced_by_platforms_key>"
+---
+do_task_1:
+  command:
+    - mkdir /var/tmp/hello_rundock_from_task_with_filtering
+    - echo 'Hello Rundock from task with filtering do task 1.' > /var/tmp/hello_rundock_from_task_with_filtering/do_task_1
+do_not_task_1:
+  command:
+    - echo 'Hello Rundock from task with filtering do not task 1.' > /var/tmp/hello_rundock_from_task_with_filtering/do_not_task_1
+do_task_2:
+  command:
+    - echo 'Hello Rundock from task with filtering do task 2.' > /var/tmp/hello_rundock_from_task_with_filtering/do_task_2
+do_not_task_2:
+  command:
+    - echo 'Hello Rundock from task with filtering do not task 2.' > /var/tmp/hello_rundock_from_task_with_filtering/do_not_task_2

data/spec/integration/scenarios/task_with_merging_scenario.yml

@@ -0,0 +1,19 @@
+- target: anyhost-01
+  command:
+    - "rm -rf /var/tmp/hello_rundock_from_task_with_merging"
+  task:
+    - do_task_1
+    - do_task_2
+---
+anyhost-01:
+  target_type: host
+  host: <replaced_by_platforms_host>
+  ssh_opts:
+    port: <replaced_by_platforms_port>
+    user: tester
+    key: "<replaced_by_platforms_key>"
+---
+do_task_1:
+  command:
+    - mkdir /var/tmp/hello_rundock_from_task_with_merging
+    - echo 'Hello Rundock from task with merging do task 1.' > /var/tmp/hello_rundock_from_task_with_merging/do_task_1

data/spec/integration/tasks/task_with_merging.yml

@@ -0,0 +1,3 @@
+do_task_2:
+  command:
+    - echo 'Hello Rundock from task with merging do task 2.' > /var/tmp/hello_rundock_from_task_with_merging/do_task_2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -223,6 +223,8 @@ files:
 - spec/integration/platforms/localhost/scenarios/target_group_scenario.yml
 - spec/integration/platforms/localhost/scenarios/task_by_option_scenario.yml
 - spec/integration/platforms/localhost/scenarios/task_with_args_scenario.yml
+- spec/integration/platforms/localhost/scenarios/task_with_filtering_scenario.yml
+- spec/integration/platforms/localhost/scenarios/task_with_merging_scenario.yml
 - spec/integration/platforms/localhost/scenarios/task_with_recursive_args_scenario.yml
 - spec/integration/platforms/localhost/scenarios/use_default_ssh_scenario.yml
 - spec/integration/platforms/localhost/targets/target_by_option.yml
@@ -241,6 +243,8 @@ files:
 - spec/integration/recipes/target_by_option_spec.rb
 - spec/integration/recipes/task_by_option_spec.rb
 - spec/integration/recipes/task_with_args_spec.rb
+- spec/integration/recipes/task_with_filtering_spec.rb
+- spec/integration/recipes/task_with_merging_spec.rb
 - spec/integration/recipes/task_with_recursive_args_spec.rb
 - spec/integration/scenarios/all_file_hooks_by_option_scenario.yml
 - spec/integration/scenarios/cwd_scenario.yml
@@ -257,11 +261,14 @@ files:
 - spec/integration/scenarios/target_group_scenario.yml
 - spec/integration/scenarios/task_by_option_scenario.yml
 - spec/integration/scenarios/task_with_args_scenario.yml
+- spec/integration/scenarios/task_with_filtering_scenario.yml
+- spec/integration/scenarios/task_with_merging_scenario.yml
 - spec/integration/scenarios/task_with_recursive_args_scenario.yml
 - spec/integration/scenarios/use_default_ssh_scenario.yml
 - spec/integration/spec_helper.rb
 - spec/integration/targets/target_by_option.yml
 - spec/integration/tasks/task_by_option.yml
+- spec/integration/tasks/task_with_merging.yml
 homepage: https://github.com/hiracy/rundock
 licenses:
 - MIT