rundock 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0491b048401872650ce67684e7e23556866b43e3
-  data.tar.gz: 6bd121b04391da55428ba012f7ed550427a7d0cd
+  metadata.gz: eef77dde29974f83d4bef90d7ac82886ebfc46d5
+  data.tar.gz: 484b9c3e7f4f4f557a3ecb1d3d5ce506566bc45d
 SHA512:
-  metadata.gz: b218e32fb3145065062a7d8c7d869e948898361c38a0b63af2c692d6987d2373a20d8fd04187c3f58700b87f6d4cd63411a2292e41311c429570f9bdbb953308
-  data.tar.gz: 1e327e599076b186c71d67e260b2195d3f19c1b5103b01d5940ad90641b29db8974e726b507895d6eebc0a9dcba0723c919ed4313471fc024d8ff182cd39f35d
+  metadata.gz: adf8f0dc23a9a4f38db95b77eb804ac336dae9aba7d0a8d671572221c635c8ec8fc6fd3b71ef0cc8979162f22253b603345a85b33578e413bbe30005037622be
+  data.tar.gz: a8b0d0a20eb279a2ae8f46cbe800a38fe266736d4087a0eccb15546cea74d7e13525245e72706a999376e64fd622cad4198b8f4245a6b9408a8b397ab781f5da

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## v0.2.2
+
+Fix
+
+- Fix ssh options conflict bugs
+- Support docker 1.6.2 for Circle CI environtment
+
+## v0.2.1
+
+Improvements
+
+- Support error-exit options.(like shellscript set -e/+e)
+- Change file path option name from '*_yaml' to '*'
+- Add a option that stdout can no-header
+
 ## v0.2.0
 
 Refactoring

data/README.md

@@ -12,6 +12,28 @@ $ gem install rundock
 
 ## Usage
 
+Edit your hostgroup to "hostgroup.yml" like this sample.
+
+```
+# node section
+- node: 192.168.1.11
+- node: host-alias-01
+---
+# host information section
+host-alias-01:
+  host: 192.168.1.12
+  ssh_opts:
+    port: 2222
+    user: anyuser
+    keys: ["~/.ssh/id_rsa_anyuser"]
+```
+
+and execute rundock.
+
+    $ rundock ssh -g /path/to/your-dir/hostgroup.yml -c 'your-gread-command'
+
+or
+
 Edit your operation scenario to "[scenario.yml](https://github.com/hiracy/rundock/blob/master/scenario_sample.yml)" like this sample.
 
 ```
@@ -37,19 +59,26 @@ host-alias-01:
 ---
 # task information section
 update_gem:
-  - "sudo gem update --system"
-  - "sudo gem update"
+  command:
+    - "sudo gem update --system"
+    - "sudo gem update"
 install_bundler:
-  - "sudo gem install bundler --no-ri --no-rdoc"
+  command:
+    - "sudo gem install bundler --no-ri --no-rdoc"
 ```
 
-and do rundock.
+and execute rundock.
 
-    $ rundock do -s /path/to/your-dir/scenario.yml
+    $ rundock do /path/to/your-dir/scenario.yml
 
-You can also specify [ssh_options.yml](http://net-ssh.github.io/net-ssh/classes/Net/SSH.html)(Net::SSH options) file contents that you specified "-d" option to the default ssh options.
+You can also specify [default_ssh_options.yml](https://github.com/hiracy/rundock/blob/master/default_ssh.yml) [(Net::SSH options)](http://net-ssh.github.io/net-ssh/classes/Net/SSH.html) file contents that you specified "-d" option to the default ssh options.
 
-    $ rundock do -s /path/to/your-dir/scenario.yml -d /path/to/your-dir/ssh_options.yml
+```
+$ rundock ssh -g /path/to/your-dir/hostgroup.yml -c 'your-gread-command' -d /path/to/your-dir/default_ssh_options.yml
+```
+```
+$ rundock do -s /path/to/your-dir/scenario.yml -d /path/to/your-dir/default_ssh_options.yml
+```
 
 For more detail. You can see from `rundock -h` command.
 

data/Rakefile

@@ -6,15 +6,6 @@ run_commands = [
     'echo \'Hello Rundock.\' > /var/tmp/hello_rundock'
 ]
 
-run_scenarios = %w(
-  use_default_ssh_scenario
-  simple_echo_scenario
-)
-
-run_groups = %w(
-  simple_host_group
-)
-
 def execute(command, clean_env)
   puts "[EXECUTE:] #{command}"
 
@@ -42,8 +33,9 @@ def setup_docker(platform, timeout, interval)
   raise 'Docker Error.' unless found
 end
 
-def do_rundock_ssh(commands, platform, groups)
+def do_rundock_ssh(commands, platform)
   base_dir = "#{ENV['HOME']}/.rundock/#{platform}"
+  groups_files_pattern = ["#{base_dir}/groups/*.yml"]
 
   if platform == 'localhost'
     commands.each do |cmd|
@@ -52,38 +44,42 @@ def do_rundock_ssh(commands, platform, groups)
   else
     commands.each do |cmd|
       execute('bundle exec exe/rundock' \
-        " ssh -c \"#{cmd}\" -h 127.0.0.1 -p 22222 -u tester" \
+        " ssh -c \"#{cmd}\" -h 172.17.42.1 -p 22222 -u tester" \
         " -i #{ENV['HOME']}/.ssh/id_rsa_rundock_spec_#{platform}_tmp -l debug", true)
-      groups.each do |g|
+      Dir.glob(groups_files_pattern).each do |g|
         execute('bundle exec exe/rundock' \
-          " ssh -c \"#{cmd}\" -g #{base_dir}/scenarios/#{g}.yml -p 22222 -u tester" \
+          " ssh -c \"#{cmd}\" -g #{g} -p 22222 -u tester" \
           " -i #{ENV['HOME']}/.ssh/id_rsa_rundock_spec_#{platform}_tmp -l debug", true)
       end
     end
   end
 end
 
-def do_rundock_scenarios(scenarios, platform)
+def do_rundock_scenarios(platform)
   if platform == 'localhost'
     base_dir = './spec/integration/platforms/localhost'
+    scenario_files_pattern = ['./spec/integration/platforms/localhost/scenarios/*.yml']
   else
     base_dir = "#{ENV['HOME']}/.rundock/#{platform}"
+    scenario_files_pattern = ["#{base_dir}/scenarios/*.yml"]
   end
 
-  scenarios.each do |scenario|
-    default_ssh_opt = ''
+  Dir.glob(scenario_files_pattern).each do |scenario|
     if scenario =~ /use_default_ssh/ && platform != 'localhost'
       default_ssh_opt = " -d #{base_dir}/integration_default_ssh.yml"
+    else
+      default_ssh_opt = ''
     end
 
     execute('bundle exec exe/rundock' \
-       " do -s #{base_dir}/scenarios/#{scenario}.yml#{default_ssh_opt} -l debug", true)
+       " do #{scenario}#{default_ssh_opt} -l debug", true)
   end
 end
 
 desc 'Cleaning environments'
 
 task :clean do
+  execute('rm -f /var/tmp/hello_rundock*', false)
   Dir.glob('./spec/integration/platforms/*').each do |platform|
     next if platform =~ /localhost$/
     execute("#{platform}/setup.sh --clean", false)
@@ -132,8 +128,8 @@ namespace :spec do
         desc "Run rundock for #{target}"
 
         task :rundock do
-          do_rundock_ssh(run_commands, target, run_groups)
-          do_rundock_scenarios(run_scenarios, target)
+          do_rundock_ssh(run_commands, target)
+          do_rundock_scenarios(target)
         end
 
         desc "Run serverspec tests for #{target}"
@@ -141,7 +137,7 @@ namespace :spec do
         RSpec::Core::RakeTask.new(:serverspec) do |t|
           ENV['TARGET_HOST'] = target
           t.ruby_opts = '-I ./spec/integration'
-          t.pattern = './spec/integration/recipes/*_spec.rb'
+          t.pattern = ['./spec/integration/recipes/*_spec.rb']
         end
       end
     end

data/lib/rundock/backend.rb

@@ -25,18 +25,18 @@ module Rundock
         @backend = create_specinfra_backend
       end
 
-      def run_commands(cmd, options = {})
+      def run_commands(cmd, exec_options = {})
         Array(cmd).each do |c|
-          run_command(c)
+          run_command(c, exec_options)
         end
       end
 
       private
 
-      def run_command(cmd, options = {})
+      def run_command(cmd, exec_options = {})
         command = cmd.strip
-        command = "cd #{Shellwords.escape(options[:cwd])} && #{command}" if options[:cwd]
-        command = "sudo -H -u #{Shellwords.escape(user)} -- /bin/sh -c #{command}" if options[:user]
+        command = "cd #{Shellwords.escape(exec_options[:cwd])} && #{command}" if exec_options[:cwd]
+        command = "sudo -H -u #{Shellwords.escape(user)} -- /bin/sh -c #{command}" if exec_options[:user]
 
         Logger.debug(%(Start executing: "#{command}"))
 
@@ -46,11 +46,12 @@ module Rundock
         Logger.formatter.indent do
           Logger.error("#{result.stderr}") unless result.stderr.blank?
           Logger.info("#{result.stdout.strip}") unless result.stdout.strip.blank?
+          Logger.debug("errexit: #{exec_options[:errexit]}")
           Logger.debug("exit status: #{exit_status}")
         end
 
-        if options[:no_continue_if_error] && exit_status != 0
-          raise CommandResultStatucError
+        if exec_options[:errexit] && exit_status != 0
+          raise CommandResultStatusError
         end
 
         result
@@ -81,19 +82,15 @@ module Rundock
       private
 
       def parse(options)
-        if options['ssh_config'] && FileTest.exists?(options['ssh_config'])
-          ssh_opts = Net::SSH::Config.for(options['host'], [options['ssh_config']])
+        if options[:ssh_config] && FileTest.exists?(options[:ssh_config])
+          ssh_opts = Net::SSH::Config.for(options[:host], [options[:ssh_config]])
         else
-          ssh_opts = Net::SSH::Config.for(options['host'])
+          ssh_opts = Net::SSH::Config.for(options[:host])
         end
 
-        ssh_opts[:host_name] = options['host']
-        ssh_opts[:user] = options['user']
-        ssh_opts[:keys] = options['keys']
-        ssh_opts[:keys] = Array(options['key']) if !ssh_opts[:keys] && options['key']
-        ssh_opts[:port] = options['port']
-        ssh_opts[:password] = parse_password_from_stdin if options['ask_password']
-
+        ssh_opts[:host_name] = options[:host]
+        ssh_opts[:keys] = Array(options[:key]) if options[:key]
+        ssh_opts[:password] = parse_password_from_stdin if options[:ask_password]
         ssh_opts.merge!(filter_net_ssh_options(options))
 
         Logger.debug(%(Net::SSH Options: "#{ssh_opts}"))
@@ -111,7 +108,7 @@ module Rundock
       def filter_net_ssh_options(options)
         opts = {}
         options.each do |k, v|
-          opts[k.to_sym] = v if Net::SSH::VALID_OPTIONS.include?(k.to_sym)
+          opts[k] = v if Net::SSH::VALID_OPTIONS.include?(k)
         end
 
         opts

data/lib/rundock/builder/backend_builder.rb

@@ -15,12 +15,14 @@ module Rundock
         opts.merge!(@options)
 
         # update ssh options for node from node_info
-        opts.merge!(@node_info[@nodename]['ssh_opts'])
+        opts.merge!(@node_info[@nodename.to_sym][:ssh_opts])
+
         # delete trash ssh_options(node[host::ssh_options])
-        @node_info[@nodename].delete('ssh_opts')
+        @node_info[@nodename.to_sym].delete(:ssh_opts)
 
         # add any attributes for host from node_info
-        opts.merge!(@node_info[@nodename])
+        opts.merge!(@node_info[@nodename.to_sym])
+
         Backend.create(backend_type, opts)
       end
 
@@ -30,35 +32,34 @@ module Rundock
         opts = {}
 
         if !@node_info ||
-           !@node_info[@nodename]
-          @node_info = { @nodename => {} }
+           !@node_info[@nodename.to_sym]
+          @node_info = { @nodename.to_sym => {} }
         end
-        @node_info[@nodename]['ssh_opts'] = {} unless @node_info[@nodename]['ssh_opts']
-        is_local = @nodename =~ /localhost|127\.0\.0\.1/
+        @node_info[@nodename.to_sym][:ssh_opts] = {} unless @node_info[@nodename.to_sym][:ssh_opts]
 
         # replace default ssh options if exists
-        @options.keys.select { |o| o =~ /(\w+)_ssh_default$/ }.each do |oo|
-          opt = oo.gsub(/_ssh_default/, '')
+        @options.keys.select { |o| o.to_s =~ /(\w+)_ssh_default$/ }.each do |oo|
           # no use default ssh options if local
-          # (like docker or localhost with port access host should not use default ssh options)
-          @node_info[@nodename]['ssh_opts'][opt] = @options[oo] if !is_local && !@node_info[@nodename]['ssh_opts'][opt]
+          # set unless scenario file and cli options specified and not localhost
+          next if @nodename =~ /localhost|127\.0\.0\.1/
+          opt = oo.to_s.gsub(/_ssh_default/, '').to_sym
+          if !@node_info[@nodename.to_sym][:ssh_opts][opt] && !@options[opt]
+            @node_info[@nodename.to_sym][:ssh_opts][opt] = @options[oo]
+          end
         end
 
         # replace cli ssh options if exists
-        %w(user key port ssh_config ask_password sudo).each { |o| @node_info[@nodename]['ssh_opts'][o] = @options[o] if @options[o] }
-
-        opts['host'] = @nodename
+        %w(:user :key :port :ssh_config :ask_password :sudo).each { |o| @node_info[@nodename.to_sym][:ssh_opts][o] = @options[o] if @options[o] }
 
+        opts[:host] = @nodename
         opts
       end
 
       def parse_backend_type
-        is_local = @nodename =~ /localhost|127\.0\.0\.1/
-
-        if is_local &&
-           !@node_info[@nodename]['ssh_opts']['port'] &&
-           !@node_info[@nodename]['ssh_opts']['user'] &&
-           !@node_info[@nodename]['ssh_opts']['ssh_config']
+        if @nodename =~ /localhost|127\.0\.0\.1/ &&
+           !@node_info[@nodename.to_sym][:ssh_opts][:port] &&
+           !@node_info[@nodename.to_sym][:ssh_opts][:user] &&
+           !@node_info[@nodename.to_sym][:ssh_opts][:ssh_config]
           backend_type = :local
         else
           backend_type = :ssh

data/lib/rundock/builder/default_ssh_builder.rb

@@ -12,8 +12,8 @@ module Rundock
       def build
         opts = {}
 
-        if @options['default_ssh_opts_yaml'] && FileTest.exist?(@options['default_ssh_opts_yaml'])
-          def_ssh_file = @options['default_ssh_opts_yaml']
+        if @options[:default_ssh_opts] && FileTest.exist?(@options[:default_ssh_opts])
+          def_ssh_file = @options[:default_ssh_opts]
         else
           def_ssh_file = PRESET_SSH_OPTIONS_DEFAULT_FILE_PATH
         end
@@ -21,7 +21,7 @@ module Rundock
         File.open(def_ssh_file) do |f|
           YAML.load_documents(f) do |y|
             y.each do |k, v|
-              opts["#{k}_ssh_default"] = v
+              opts["#{k}_ssh_default".to_sym] = v
             end
           end
         end

data/lib/rundock/builder/operation_builder.rb

@@ -0,0 +1,88 @@
+module Rundock
+  module Builder
+    class OperationBuilder < Base
+      def build_first(scenario, node_info, tasks)
+        if @options[:hostgroup] && !@options[:command]
+          raise CommandArgNotFoundError, %("--command or -c" option is required if hostgroup specified.)
+        end
+
+        node = nil
+        scen = Scenario.new
+        node_attributes = { :task => {} }
+        tasks.each { |k, v| node_attributes[:task][k] = v } if tasks
+        scen.node_info = node_info
+        scen.tasks = tasks
+
+        # use scenario file
+        scenario.each do |n|
+          scen.nodes.push(node) if node
+
+          n.deep_symbolize_keys.each do |k, v|
+            if k == :node
+              backend = BackendBuilder.new(@options, v, node_info).build
+              node = Node.new(v, backend)
+              node_attributes[:nodename] = v
+
+              if @options[:command]
+                node.add_operation(build_cli_command_operation(@options[:command], @options))
+              end
+            else
+              if @options[:command] && (k == :command || k == :task)
+                Logger.debug(%("--command or -c" option is specified and ignore scenario file.))
+                next
+              end
+
+              next unless node
+
+              ope = build_operations(k, Array(v), node_attributes, @options)
+              node.add_operation(ope)
+            end
+          end
+        end
+
+        scen.nodes.push(node) if node
+        scen
+      end
+
+      def build_task(tasks, backend, node_attributes)
+        node = Node.new(node_attributes[:nodename], backend)
+        scen = Scenario.new
+
+        tasks.each do |k, v|
+          ope = build_operations(k, Array(v), node_attributes, nil)
+          node.add_operation(ope)
+        end
+
+        scen.nodes.push(node) if node
+        scen
+      end
+
+      def build_cli
+        scen = Scenario.new
+
+        @options[:host].split(',').each do |host|
+          backend = BackendBuilder.new(@options, host, nil).build
+          node = Node.new(host, backend)
+          node.add_operation(build_cli_command_operation(@options[:command], @options))
+          scen.nodes.push(node)
+        end
+
+        scen
+      end
+
+      private
+
+      def build_cli_command_operation(command, cli_options)
+        node_attributes = {}
+        node_attributes[:errexit] = !cli_options[:run_anyway]
+        Rundock::OperationFactory.instance(:command).create(Array(command), nil)
+      end
+
+      def build_operations(ope_type, ope_content, node_attributes, cli_options)
+        node_attributes[:errexit] = !cli_options[:run_anyway] if cli_options
+        node_attributes[:errexit] = true if cli_options.nil?
+        Rundock::OperationFactory.instance(ope_type).create(Array(ope_content), node_attributes)
+      end
+    end
+  end
+end

data/lib/rundock/builder/scenario_builder.rb

@@ -13,82 +13,45 @@ module Rundock
 
       def build
         # parse default ssh file
-        opts = @default_ssh_builder.build
-        opts.merge!(@options)
+        @options.merge!(@default_ssh_builder.build)
 
         # use host specified
-        return build_scenario_with_host(opts) if opts['host']
+        return build_scenario_with_cli if @options[:host]
 
         # use scenario file
-        build_scenario(opts)
+        build_scenario_with_file
       end
 
-      private
-
-      def build_scenario_with_host(options)
-        raise CommandArgNotFoundError, %("--command or -c" option is not specified.) unless options['command']
-
-        scen = Scenario.new
-
-        options['host'].split(',').each do |host|
-          backend = BackendBuilder.new(options, host, nil).build
-          node = Node.new(host, backend)
-          node.add_operation(Rundock::OperationFactory.instance(:command).create(Array(options['command']), nil))
-          scen << node
-        end
-
-        scen
+      def build_task(tasks, backend, node_attributes)
+        OperationBuilder.new(@options).build_task(tasks, backend, node_attributes)
       end
 
-      def build_scenario(options)
-        if options['hostgroup_yaml'] && !options['command']
-          raise CommandArgNotFoundError, %("--command or -c" option is required if hostgroup specified.)
-        end
+      private
 
-        type = [:main, :node_info, :tasks]
-        scenario_data = {}
+      def build_scenario_with_cli
+        raise CommandArgNotFoundError, %("--command or -c" option is not specified.) unless @options[:command]
+        ope = OperationBuilder.new(@options)
+        ope.build_cli
+      end
 
+      def build_scenario_with_file
         if @scenario_file
-          YAML.load_documents(@scenario_file).each_with_index do |data, idx|
-            scenario_data[type[idx]] = data
-          end
-        end
-
-        node = nil
-        scen = Scenario.new
-
-        # use scenario file
-        scenario_data[:main].each do |n|
-          scen << node if node
 
-          n.each do |k, v|
-            if k == 'node'
-              backend = BackendBuilder.new(options, v, scenario_data[:node_info]).build
-              node = Node.new(v, backend)
+          type = [:main, :node_info, :tasks]
+          scenario_data = {}
 
-              if options['command']
-                node.add_operation(
-                  Rundock::OperationFactory.instance(:command).create(Array(options['command']), nil))
-              end
+          YAML.load_documents(@scenario_file).each_with_index do |data, idx|
+            if idx == 0
+              scenario_data[type[idx]] = data
             else
-
-              if options['command'] && (k == 'command' || k == 'task')
-                Logger.debug(%("--command or -c" option is specified and ignore scenario file.))
-                next
-              end
-
-              ope = build_operations(k, v, scenario_data[:tasks], options)
-              node.add_operation(ope) if node
+              scenario_data[type[idx]] = data.deep_symbolize_keys unless data.nil?
             end
           end
         end
 
-        scen << node if node
-        scen
-      end
-
-      def build_operations(ope_type, ope_content, tasks, options)
-        Rundock::OperationFactory.instance(ope_type.to_sym).create(Array(ope_content), tasks)
+        ope = OperationBuilder.new(@options)
+        ope.build_first(
+          scenario_data[:main], scenario_data[:node_info], scenario_data[:tasks])
       end
     end
   end

data/lib/rundock/cli.rb

@@ -9,12 +9,14 @@ module Rundock
 
     class_option :log_level, type: :string, aliases: ['-l'], default: 'info'
     class_option :color, type: :boolean, default: true
+    class_option :header, type: :boolean, default: true
 
     def initialize(args, opts, config)
       super(args, opts, config)
 
       Rundock::Logger.level = ::Logger.const_get(options[:log_level].upcase)
       Rundock::Logger.formatter.colored = options[:color]
+      Rundock::Logger.formatter.show_header = options[:header]
     end
 
     desc 'version', 'Print version'
@@ -24,30 +26,31 @@ module Rundock
 
     desc 'do [SCENARIO] [options]', 'Run rundock from scenario file'
     option :sudo, type: :boolean, default: false
-    option :scenario_yaml, type: :string, aliases: ['-s'], default: DEFAULT_SCENARIO_FILE_PATH
-    option :default_ssh_opts_yaml, type: :string, aliases: ['-d'], default: DEFAULT_SSH_OPTIONS_DEFAULT_FILE_PATH
+    option :default_ssh_opts, type: :string, aliases: ['-d'], default: DEFAULT_SSH_OPTIONS_DEFAULT_FILE_PATH
+    option :run_anyway, type: :boolean, default: false
     def do(*scenario_file_path)
       scenario_file_path = [DEFAULT_SCENARIO_FILE_PATH] if scenario_file_path.empty?
-      opts = { :scenario_yaml => scenario_file_path[0] }
+      opts = { :scenario => scenario_file_path[0] }
 
-      Runner.run(opts.merge(options))
+      Runner.run(opts.merge(options.deep_symbolize_keys))
     end
 
     desc 'ssh [options]', 'Run rundock ssh with various options'
     option :command, type: :string, aliases: ['-c']
-    option :default_ssh_opts_yaml, type: :string, aliases: ['-d'], default: DEFAULT_SSH_OPTIONS_DEFAULT_FILE_PATH
+    option :default_ssh_opts, type: :string, aliases: ['-d'], default: DEFAULT_SSH_OPTIONS_DEFAULT_FILE_PATH
     option :host, type: :string, aliases: ['-h'], banner: 'You can specify comma separated hosts.[ex: host1,host2,..]'
-    option :hostgroup_yaml, type: :string, aliases: ['-g']
+    option :hostgroup, type: :string, aliases: ['-g']
     option :user, type: :string, aliases: ['-u']
     option :key, type: :string, aliases: ['-i']
     option :port, type: :numeric, aliases: ['-p']
     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
     def ssh
       opts = {}
 
-      Runner.run(opts.merge(options))
+      Runner.run(opts.merge(options.deep_symbolize_keys))
     end
   end
 end

data/lib/rundock/logger.rb

@@ -8,6 +8,7 @@ module Rundock
       attr_accessor :colored
       attr_accessor :indent_depth
       attr_accessor :color
+      attr_accessor :show_header
 
       def initialize(*args)
         super
@@ -15,7 +16,12 @@ module Rundock
       end
 
       def call(severity, datetime, progname, msg)
-        out = "[%5s:] %s%s\n" % [severity, ' ' * 2 * indent_depth, msg2str(msg)]
+        if @show_header
+          out = "[\%5s:] %s%s\n" % [severity, ' ' * 2 * indent_depth, msg2str(msg)]
+        else
+          out = "%s\n" % [msg2str(msg)]
+        end
+
         if colored
           colorize(out, severity)
         else

data/lib/rundock/node.rb

@@ -18,6 +18,10 @@ module Rundock
 
     def run
       Logger.debug("run name: #{@name}")
+      if @operations.blank?
+        Logger.warn("no operation running: #{@name}")
+        return
+      end
       @operations.each do |ope|
         Logger.debug("operation type: #{ope.class}")
         ope.run(@backend, ope.attributes)

data/lib/rundock/operation/command.rb

@@ -3,6 +3,11 @@ module Rundock
     class Command < Base
       def run(backend, attributes = {})
         @instruction.each do |i|
+          if i.is_a?(Hash)
+            attributes.merge!(i)
+            next
+          end
+
           backend.run_commands(i, attributes)
         end
       end

data/lib/rundock/operation/task.rb

@@ -3,12 +3,15 @@ module Rundock
     class Task < Base
       def run(backend, attributes = {})
         @instruction.each do |i|
-          unless attributes.key?(i)
-            Logger.warn("[WARN]task not found and ignored: #{i}")
+          unless attributes[:task].key?(i.to_sym)
+            Logger.warn("task not found and ignored: #{i}")
             next
           end
 
-          backend.run_commands(attributes[i])
+          scenario = Rundock::Builder::ScenarioBuilder.new(nil, nil).build_task(
+            attributes[:task][i.to_sym], backend, attributes)
+
+          scenario.run
         end
       end
     end

data/lib/rundock/runner.rb

@@ -7,7 +7,7 @@ module Rundock
 
     class << self
       def run(options)
-        Logger.info 'Starting Rundoc:'
+        Logger.debug 'Starting Rundoc:'
 
         runner = self.new(options)
         runner.build(options)
@@ -25,24 +25,28 @@ module Rundock
       @scenario.run
     end
 
+    def run_tasks
+      @scenario.run
+    end
+
     def build(options)
-      if options['scenario_yaml'] || options['hostgroup_yaml']
-        if options['scenario_yaml'] && !FileTest.exist?(options['scenario_yaml'])
-          raise ScenarioNotFoundError, "'#{options['scenario_yaml']}' scenario file is not found."
-        elsif options['hostgroup_yaml'] && !FileTest.exist?(options['hostgroup_yaml'])
-          raise ScenarioNotFoundError, "'#{options['hostgroup_yaml']}' hostgroup file is not found."
+      if options[:scenario] || options[:hostgroup]
+        if options[:scenario] && !FileTest.exist?(options[:scenario])
+          raise ScenarioNotFoundError, "'#{options[:scenario]}' scenario file is not found."
+        elsif options[:hostgroup] && !FileTest.exist?(options[:hostgroup])
+          raise ScenarioNotFoundError, "'#{options[:hostgroup]}' hostgroup file is not found."
         end
 
-        options['scenario_yaml'] = options['hostgroup_yaml'] if options['hostgroup_yaml']
+        options[:scenario] = options[:hostgroup] if options[:hostgroup]
 
         # parse scenario
-        if options['scenario_yaml'] =~ %r{^(http|https)://}
+        if options[:scenario] =~ %r{^(http|https)://}
           # read from http/https
-          open(options['scenario_yaml']) do |f|
+          open(options[:scenario]) do |f|
             @scenario = Rundock::Builder::ScenarioBuilder.new(options, f).build
           end
         else
-          File.open(options['scenario_yaml']) do |f|
+          File.open(options[:scenario]) do |f|
             @scenario = Rundock::Builder::ScenarioBuilder.new(options, f).build
           end
         end

data/lib/rundock/scenario.rb

@@ -1,7 +1,15 @@
 module Rundock
-  class Scenario < Array
+  class Scenario
+    attr_accessor :nodes
+    attr_accessor :node_info
+    attr_accessor :tasks
+
+    def initialize
+      @nodes = []
+    end
+
     def run
-      self.each(&:run)
+      @nodes.each(&:run)
     end
   end
 end

data/lib/rundock/version.rb

@@ -1,3 +1,3 @@
 module Rundock
-  VERSION = '0.2.0'
+  VERSION = '0.2.2'
 end

data/lib/rundock.rb

@@ -12,6 +12,7 @@ require 'rundock/backend'
 require 'rundock/builder/base'
 require 'rundock/builder/default_ssh_builder'
 require 'rundock/builder/backend_builder'
+require 'rundock/builder/operation_builder'
 require 'rundock/builder/scenario_builder'
 require 'rundock/runner'
 require 'rundock/cli'

data/rundock.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['hiracy']
   spec.email         = ['leizhen@mbr.nifty.com']
 
-  spec.summary       = 'Simple Execution framework for various servers'
+  spec.summary       = 'Simple and extensible server operation framework'
   spec.homepage      = 'https://github.com/hiracy/rundock'
   spec.license       = 'MIT'
 

data/scenario_sample.yml

@@ -38,16 +38,26 @@
   task:
     - echo_platform
     - echo_users
+  command:
+    - errexit: true
+    - "rm /tmp/riskyfile"
+    - errexit: false
+    - "rm /tmp/safetyfile"
+    - "ls -1 /tmp"
 ---
-anyhost-01:
+- anyhost-01:
   host: 192.168.1.11
   ssh_opts:
     port: 22
     user: anyuser
+- anyhost-02:
+  host: 192.168.1.12
 ---
 echo_platform:
-  - "hostname"
-  - "uname -a"
+  command:
+    - "hostname"
+    - "uname -a"
 echo_users:
-  - "whoami"
-  - "w"
+  command:
+    - "whoami"
+    - "w"

data/spec/integration/{scenarios → groups}/simple_host_group.yml

@@ -4,7 +4,7 @@
 - node: anyhost-01
 ---
 anyhost-01:
-  host: 127.0.0.1
+  host: 172.17.42.1
   ssh_opts:
     port: 22222
     user: tester

data/spec/integration/platforms/centos6/setup.sh

@@ -6,6 +6,7 @@ PROJECT_NAME=rundock_spec
 PLATFORM_NAME=centos6
 PLATFORM_DIR="${PROJECT_ROOT}/platforms/${PLATFORM_NAME}"
 DOCKER_IMAGE_NAME="${PROJECT_NAME}/${PLATFORM_NAME}"
+DOCKER_ADDRESS="172.17.42.1"
 DOCKER_CACHE_DIR="${HOME}/docker"
 DOCKER_CACHE_IMAGE_PATH="${DOCKER_CACHE_DIR}/${PLATFORM_NAME}.tar"
 DOCKER_SSH_PORT=22222
@@ -15,12 +16,17 @@ DOCKER_SSH_KEY_PUBLIC_LOCAL="${HOME}/.ssh/id_rsa_${PROJECT_NAME}_${PLATFORM_NAME
 DOCKER_SSH_KEY_PUBLIC_REMOTE="${PLATFORM_DIR}/authorized_keys"
 DOCKER_SSH_CONFIG="${HOME}/.ssh/config_${PROJECT_NAME}_${PLATFORM_NAME}"
 RUNDOCK_SCENARIO_DIR="${PROJECT_ROOT}/scenarios"
+RUNDOCK_GROUP_DIR="${PROJECT_ROOT}/groups"
 RUNDOCK_CACHE_DIR="${HOME}/.rundock/${PLATFORM_NAME}"
 RUNDOCK_DEFAULT_SSH_YML="${RUNDOCK_CACHE_DIR}/integration_default_ssh.yml"
 RUNDOCK_SCENARIO_CACHE_DIR="${RUNDOCK_CACHE_DIR}/scenarios"
+RUNDOCK_GROUP_CACHE_DIR="${RUNDOCK_CACHE_DIR}/groups"
 
 if [ "${1}x" = "--cleanx" ];then
   if sudo docker ps | grep "${DOCKER_IMAGE_NAME}" > /dev/null; then
+    rm -f "/var/tmp/hello_rundock*"
+    rm -f "${RUNDOCK_SCENARIO_CACHE_DIR}/*.yml"
+    rm -f "${RUNDOCK_GROUP_CACHE_DIR}/*.yml"
     rm -f "${DOCKER_CACHE_IMAGE_PATH}"
     rm -f "${DOCKER_SSH_KEY_PRIVATE}"
     rm -f "${DOCKER_SSH_KEY_PUBLIC_LOCAL}"
@@ -34,6 +40,7 @@ if [ "${1}x" = "--cleanx" ];then
 fi
 
 mkdir -p "${RUNDOCK_SCENARIO_CACHE_DIR}"
+mkdir -p "${RUNDOCK_GROUP_CACHE_DIR}"
 
 if [ ! -f ${RUNDOCK_DEFAULT_SSH_YML} ]; then
 (
@@ -47,8 +54,11 @@ EOP
 fi
 
 cp ${RUNDOCK_SCENARIO_DIR}/* ${RUNDOCK_SCENARIO_CACHE_DIR}
+cp ${RUNDOCK_GROUP_DIR}/* ${RUNDOCK_GROUP_CACHE_DIR}
 
-find ${RUNDOCK_SCENARIO_CACHE_DIR} -type f -name "*_scenario.yml" -or -name "*_group.yml" | \
+find ${RUNDOCK_SCENARIO_CACHE_DIR} -type f -name "*_scenario.yml" | \
+  xargs sed -i -e "s#<replaced_by_platforms>#${DOCKER_SSH_KEY_PRIVATE}#g"
+find ${RUNDOCK_GROUP_CACHE_DIR} -type f -name "*_group.yml" | \
   xargs sed -i -e "s#<replaced_by_platforms>#${DOCKER_SSH_KEY_PRIVATE}#g"
 
 sudo docker ps | grep "${DOCKER_IMAGE_NAME}" && { echo "docker image is already standing."; exit 0; }
@@ -68,10 +78,10 @@ sudo docker build -t "${DOCKER_IMAGE_NAME}" ${PLATFORM_DIR}
 rm -f ${DOCKER_SSH_KEY_PUBLIC_REMOTE}
 mkdir -p ${DOCKER_CACHE_DIR}
 sudo docker save "${DOCKER_IMAGE_NAME}" > ${DOCKER_CACHE_IMAGE_PATH}
-sudo docker run -d --privileged -p ${DOCKER_SSH_PORT}:22 "${DOCKER_IMAGE_NAME}"
+sudo docker run -d --privileged -p ${DOCKER_ADDRESS}:${DOCKER_SSH_PORT}:22 "${DOCKER_IMAGE_NAME}"
 
 echo "Host ${PLATFORM_NAME}"                          >  $DOCKER_SSH_CONFIG
-echo "        HostName 127.0.0.1"                     >> $DOCKER_SSH_CONFIG
+echo "        HostName ${DOCKER_ADDRESS}"             >> $DOCKER_SSH_CONFIG
 echo "        User     ${DOCKER_SSH_USER}"            >> $DOCKER_SSH_CONFIG
 echo "        Port     ${DOCKER_SSH_PORT}"            >> $DOCKER_SSH_CONFIG
 echo "        IdentityFile ${DOCKER_SSH_KEY_PRIVATE}" >> $DOCKER_SSH_CONFIG

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

@@ -0,0 +1,14 @@
+- node: localhost
+  command:
+    - errexit: false
+    - "rm /noexistdir/noexistfile1"
+    - "rm /noexistdir/noexistfile2"
+  task:
+    - err_task
+---
+---
+err_task:
+  command:
+    - "uname -a"
+    - errexit: false
+    - "rm /noexistdir/noexistfile2"

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

@@ -6,4 +6,5 @@
 ---
 ---
 write_echo:
-  - "echo 'Hello Rundock from Scenario.' > /var/tmp/hello_rundock_from_scenario"
+  command:
+    - "echo 'Hello Rundock from Scenario.' > /var/tmp/hello_rundock_from_scenario"

data/spec/integration/scenarios/simple_echo_scenario.yml

@@ -14,20 +14,22 @@
     - write_echo
 ---
 anyhost-01:
-  host: 127.0.0.1
+  host: 172.17.42.1
   ssh_opts:
     port: 22222
     user: tester
     key: "<replaced_by_platforms>"
 anyhost-02:
-  host: "127.0.0.1"
+  host: "172.17.42.1"
   ssh_opts:
     port: 22222
     user: tester
     keys: ["<replaced_by_platforms>"]
 ---
 echo_platform:
-  - "hostname"
-  - "uname -a"
+  command:
+    - "hostname"
+    - "uname -a"
 write_echo:
-  - "echo 'Hello Rundock from Scenario.' > /var/tmp/hello_rundock_from_scenario"
+  command:
+    - "echo 'Hello Rundock from Scenario.' > /var/tmp/hello_rundock_from_scenario"

data/spec/integration/spec_helper.rb

@@ -9,6 +9,7 @@ if ENV['TARGET_HOST'] != 'localhost'
   options = Net::SSH::Config.for(host, ["#{ENV['HOME']}/.ssh/config_rundock_spec_#{ENV['TARGET_HOST']}"])
 
   options[:user] ||= Etc.getlogin
+  options[:paranoid] = false
 
   set :host,        options[:host_name] || host
   set :ssh_options, options

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,6 +155,7 @@ files:
 - lib/rundock/builder/backend_builder.rb
 - lib/rundock/builder/base.rb
 - lib/rundock/builder/default_ssh_builder.rb
+- lib/rundock/builder/operation_builder.rb
 - lib/rundock/builder/scenario_builder.rb
 - lib/rundock/cli.rb
 - lib/rundock/ext/hash.rb
@@ -170,14 +171,15 @@ files:
 - lib/rundock/version.rb
 - rundock.gemspec
 - scenario_sample.yml
+- spec/integration/groups/simple_host_group.yml
 - spec/integration/platforms/centos6/Dockerfile
 - spec/integration/platforms/centos6/setup.sh
+- spec/integration/platforms/localhost/scenarios/run_anyway_scenario.yml
 - spec/integration/platforms/localhost/scenarios/simple_echo_scenario.yml
 - spec/integration/platforms/localhost/scenarios/use_default_ssh_scenario.yml
 - spec/integration/recipes/simple_echo_scenario_spec.rb
 - spec/integration/recipes/simple_echo_spec.rb
 - spec/integration/scenarios/simple_echo_scenario.yml
-- spec/integration/scenarios/simple_host_group.yml
 - spec/integration/scenarios/use_default_ssh_scenario.yml
 - spec/integration/spec_helper.rb
 homepage: https://github.com/hiracy/rundock
@@ -203,5 +205,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Simple Execution framework for various servers
+summary: Simple and extensible server operation framework
 test_files: []