rundock 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bae0415498290a96be0d1867e1b8390995a818c
-  data.tar.gz: 72ecb870b1108accdd2c9ea8c38dd5291843379c
+  metadata.gz: 0491b048401872650ce67684e7e23556866b43e3
+  data.tar.gz: 6bd121b04391da55428ba012f7ed550427a7d0cd
 SHA512:
-  metadata.gz: cf8bde9f38284afd6b37c109dd58cdf22258d7bd2bc178ae4c4dae7e1ccb13329453228e85f1068548ce30a5a2440bb38cffd051b9f6edfefad78cfee1f45bbc
-  data.tar.gz: ae60ee17c14eff7a50b2bd0f0557d4e484c4f9d1d67c6076b8d78f6f7471945359fd3d4ca3f551e805fac9b4b1829dda9055c3fae6a3112e836d4df3b0b03aac
+  metadata.gz: b218e32fb3145065062a7d8c7d869e948898361c38a0b63af2c692d6987d2373a20d8fd04187c3f58700b87f6d4cd63411a2292e41311c429570f9bdbb953308
+  data.tar.gz: 1e327e599076b186c71d67e260b2195d3f19c1b5103b01d5940ad90641b29db8974e726b507895d6eebc0a9dcba0723c919ed4313471fc024d8ff182cd39f35d

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v0.2.0
+
+Refactoring
+
+- Refactoring Rundoc::Runner for build scnenario and options
+- Refactoring parse options and yaml files
+
+Improvements
+
+- Implement multi host execute for rundock ssh
+- Enable hostgroup file executing for rundock-ssh
+
 ## v0.1.0
 
 - The first public version.

data/Rakefile

@@ -11,37 +11,54 @@ run_scenarios = %w(
   simple_echo_scenario
 )
 
-def execute(command)
+run_groups = %w(
+  simple_host_group
+)
+
+def execute(command, clean_env)
   puts "[EXECUTE:] #{command}"
-  system command
+
+  if clean_env
+    Bundler.with_clean_env do
+      system command
+    end
+  else
+    system command
+  end
+  raise 'Execute Error.' unless $?.to_i == 0
 end
 
 def setup_docker(platform, timeout, interval)
-  Bundler.with_clean_env do
-    execute "./spec/integration/platforms/#{platform}/setup.sh &"
-    found = false
-    (timeout / interval).times do
-      execute 'sudo docker ps | grep rundock'
-      if $?.to_i == 0
-        found = true
-        break
-      end
-      sleep interval
+  execute("./spec/integration/platforms/#{platform}/setup.sh &", false)
+  found = false
+  (timeout / interval).times do
+    system 'sudo docker ps | grep rundock'
+    if $?.to_i == 0
+      found = true
+      break
     end
-    raise 'Docker Error.' unless found
+    sleep interval
   end
+  raise 'Docker Error.' unless found
 end
 
-def do_rundock_ssh(commands, platform)
+def do_rundock_ssh(commands, platform, groups)
+  base_dir = "#{ENV['HOME']}/.rundock/#{platform}"
+
   if platform == 'localhost'
     commands.each do |cmd|
-      execute "bundle exec exe/rundock ssh -c \"#{cmd}\" -h localhost -l debug"
+      execute("bundle exec exe/rundock ssh -c \"#{cmd}\" -h localhost -l debug", true)
     end
   else
     commands.each do |cmd|
-      execute 'bundle exec exe/rundock' \
+      execute('bundle exec exe/rundock' \
         " ssh -c \"#{cmd}\" -h 127.0.0.1 -p 22222 -u tester" \
-        " -i #{ENV['HOME']}/.ssh/id_rsa_rundock_spec_#{platform}_tmp -l debug"
+        " -i #{ENV['HOME']}/.ssh/id_rsa_rundock_spec_#{platform}_tmp -l debug", true)
+      groups.each do |g|
+        execute('bundle exec exe/rundock' \
+          " ssh -c \"#{cmd}\" -g #{base_dir}/scenarios/#{g}.yml -p 22222 -u tester" \
+          " -i #{ENV['HOME']}/.ssh/id_rsa_rundock_spec_#{platform}_tmp -l debug", true)
+      end
     end
   end
 end
@@ -59,26 +76,23 @@ def do_rundock_scenarios(scenarios, platform)
       default_ssh_opt = " -d #{base_dir}/integration_default_ssh.yml"
     end
 
-    execute 'bundle exec exe/rundock' \
-       " do -s #{base_dir}/scenarios/#{scenario}.yml#{default_ssh_opt} -l debug"
+    execute('bundle exec exe/rundock' \
+       " do -s #{base_dir}/scenarios/#{scenario}.yml#{default_ssh_opt} -l debug", true)
   end
 end
 
 desc 'Cleaning environments'
 
 task :clean do
-  Bundler.with_clean_env do
-    Dir.glob('./spec/integration/platforms/*').each do |platform|
-      execute "#{platform}/setup.sh --clean"
-    end
+  Dir.glob('./spec/integration/platforms/*').each do |platform|
+    next if platform =~ /localhost$/
+    execute("#{platform}/setup.sh --clean", false)
   end
 end
 
 desc 'execute rubocop'
 task :rubocop do
-  Bundler.with_clean_env do
-    execute 'rubocop'
-  end
+  execute('rubocop', false)
 end
 
 desc 'Run all tests.'
@@ -118,10 +132,8 @@ namespace :spec do
         desc "Run rundock for #{target}"
 
         task :rundock do
-          Bundler.with_clean_env do
-            do_rundock_ssh(run_commands, target)
-            do_rundock_scenarios(run_scenarios, target)
-          end
+          do_rundock_ssh(run_commands, target, run_groups)
+          do_rundock_scenarios(run_scenarios, target)
         end
 
         desc "Run serverspec tests for #{target}"

data/lib/rundock.rb

@@ -9,6 +9,10 @@ require 'rundock/operation_factory'
 require 'rundock/node'
 require 'rundock/scenario'
 require 'rundock/backend'
+require 'rundock/builder/base'
+require 'rundock/builder/default_ssh_builder'
+require 'rundock/builder/backend_builder'
+require 'rundock/builder/scenario_builder'
 require 'rundock/runner'
 require 'rundock/cli'
 

data/lib/rundock/builder/backend_builder.rb

@@ -0,0 +1,71 @@
+module Rundock
+  module Builder
+    class BackendBuilder < Base
+      def initialize(options, nodename, node_info)
+        super(options)
+        @nodename = nodename
+        @node_info = node_info
+      end
+
+      def build
+        opts = build_options
+
+        backend_type = parse_backend_type
+
+        opts.merge!(@options)
+
+        # update ssh options for node from node_info
+        opts.merge!(@node_info[@nodename]['ssh_opts'])
+        # delete trash ssh_options(node[host::ssh_options])
+        @node_info[@nodename].delete('ssh_opts')
+
+        # add any attributes for host from node_info
+        opts.merge!(@node_info[@nodename])
+        Backend.create(backend_type, opts)
+      end
+
+      private
+
+      def build_options
+        opts = {}
+
+        if !@node_info ||
+           !@node_info[@nodename]
+          @node_info = { @nodename => {} }
+        end
+        @node_info[@nodename]['ssh_opts'] = {} unless @node_info[@nodename]['ssh_opts']
+        is_local = @nodename =~ /localhost|127\.0\.0\.1/
+
+        # replace default ssh options if exists
+        @options.keys.select { |o| o =~ /(\w+)_ssh_default$/ }.each do |oo|
+          opt = oo.gsub(/_ssh_default/, '')
+          # 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]
+        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
+
+        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']
+          backend_type = :local
+        else
+          backend_type = :ssh
+        end
+
+        backend_type
+      end
+    end
+  end
+end

data/lib/rundock/builder/base.rb

@@ -0,0 +1,15 @@
+module Rundock
+  module Builder
+    class Base
+      BuilderNotImplementedError = Class.new(NotImplementedError)
+
+      def initialize(options)
+        @options = options
+      end
+
+      def build
+        raise BuilderNotImplementedError
+      end
+    end
+  end
+end

data/lib/rundock/builder/default_ssh_builder.rb

@@ -0,0 +1,33 @@
+require 'yaml'
+
+module Rundock
+  module Builder
+    class DefaultSshBuilder < Base
+      PRESET_SSH_OPTIONS_DEFAULT_FILE_PATH = "#{Gem::Specification.find_by_path('rundock').full_gem_path}/default_ssh.yml"
+
+      def initialize(options)
+        super(options)
+      end
+
+      def build
+        opts = {}
+
+        if @options['default_ssh_opts_yaml'] && FileTest.exist?(@options['default_ssh_opts_yaml'])
+          def_ssh_file = @options['default_ssh_opts_yaml']
+        else
+          def_ssh_file = PRESET_SSH_OPTIONS_DEFAULT_FILE_PATH
+        end
+
+        File.open(def_ssh_file) do |f|
+          YAML.load_documents(f) do |y|
+            y.each do |k, v|
+              opts["#{k}_ssh_default"] = v
+            end
+          end
+        end
+
+        opts
+      end
+    end
+  end
+end

data/lib/rundock/builder/scenario_builder.rb

@@ -0,0 +1,95 @@
+require 'yaml'
+
+module Rundock
+  module Builder
+    class ScenarioBuilder < Base
+      CommandArgNotFoundError = Class.new(StandardError)
+
+      def initialize(options, scenario_file_data)
+        super(options)
+        @scenario_file = scenario_file_data
+        @default_ssh_builder = DefaultSshBuilder.new(@options)
+      end
+
+      def build
+        # parse default ssh file
+        opts = @default_ssh_builder.build
+        opts.merge!(@options)
+
+        # use host specified
+        return build_scenario_with_host(opts) if opts['host']
+
+        # use scenario file
+        build_scenario(opts)
+      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
+      end
+
+      def build_scenario(options)
+        if options['hostgroup_yaml'] && !options['command']
+          raise CommandArgNotFoundError, %("--command or -c" option is required if hostgroup specified.)
+        end
+
+        type = [:main, :node_info, :tasks]
+        scenario_data = {}
+
+        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)
+
+              if options['command']
+                node.add_operation(
+                  Rundock::OperationFactory.instance(:command).create(Array(options['command']), nil))
+              end
+            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
+            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)
+      end
+    end
+  end
+end

data/lib/rundock/cli.rb

@@ -5,6 +5,7 @@ module Rundock
   class CLI < Thor
     DEFAULT_SCENARIO_FILE_PATH = './scenario.yml'
     DEFAULT_SSH_OPTIONS_DEFAULT_FILE_PATH = './default_ssh.yml'
+    DEFAULT_HOSTGROUP_FILE_PATH = './hostgroup.yml'
 
     class_option :log_level, type: :string, aliases: ['-l'], default: 'info'
     class_option :color, type: :boolean, default: true
@@ -33,9 +34,10 @@ module Rundock
     end
 
     desc 'ssh [options]', 'Run rundock ssh with various options'
-    option :command, type: :string, aliases: ['-c'], banner: "NOTICE: Scenario's task is ignored."
+    option :command, type: :string, aliases: ['-c']
     option :default_ssh_opts_yaml, type: :string, aliases: ['-d'], default: DEFAULT_SSH_OPTIONS_DEFAULT_FILE_PATH
-    option :host, type: :string, aliases: ['-h']
+    option :host, type: :string, aliases: ['-h'], banner: 'You can specify comma separated hosts.[ex: host1,host2,..]'
+    option :hostgroup_yaml, type: :string, aliases: ['-g']
     option :user, type: :string, aliases: ['-u']
     option :key, type: :string, aliases: ['-i']
     option :port, type: :numeric, aliases: ['-p']
@@ -44,6 +46,7 @@ module Rundock
     option :sudo, type: :boolean, default: false
     def ssh
       opts = {}
+
       Runner.run(opts.merge(options))
     end
   end

data/lib/rundock/runner.rb

@@ -1,13 +1,9 @@
 require 'rundock'
-require 'yaml'
-require 'tempfile'
 require 'open-uri'
 
 module Rundock
   class Runner
-    PRESET_SSH_OPTIONS_DEFAULT_FILE_PATH = "#{Gem::Specification.find_by_path('rundock').full_gem_path}/default_ssh.yml"
     ScenarioNotFoundError = Class.new(StandardError)
-    CommandArgNotFoundError = Class.new(StandardError)
 
     class << self
       def run(options)
@@ -19,7 +15,6 @@ module Rundock
       end
     end
 
-    attr_reader :backend
     attr_reader :scenario
 
     def initialize(options)
@@ -31,152 +26,30 @@ module Rundock
     end
 
     def build(options)
-      if options['scenario_yaml']
-        unless FileTest.exist?(options['scenario_yaml'])
+      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."
         end
 
+        options['scenario_yaml'] = options['hostgroup_yaml'] if options['hostgroup_yaml']
+
         # parse scenario
         if options['scenario_yaml'] =~ %r{^(http|https)://}
           # read from http/https
           open(options['scenario_yaml']) do |f|
-            @scenario = parse_scenario(f, options)
+            @scenario = Rundock::Builder::ScenarioBuilder.new(options, f).build
           end
         else
           File.open(options['scenario_yaml']) do |f|
-            @scenario = parse_scenario(f, options)
+            @scenario = Rundock::Builder::ScenarioBuilder.new(options, f).build
           end
         end
       else
-        @scenario = parse_scenario(nil, options)
-      end
-    end
-
-    private
-
-    def parse_default_ssh(options)
-      opts = {}
-
-      if options['default_ssh_opts_yaml'] && FileTest.exist?(options['default_ssh_opts_yaml'])
-        def_ssh_file = options['default_ssh_opts_yaml']
-      else
-        def_ssh_file = PRESET_SSH_OPTIONS_DEFAULT_FILE_PATH
+        # do rundock ssh
+        @scenario = Rundock::Builder::ScenarioBuilder.new(options, nil).build
       end
-
-      File.open(def_ssh_file) do |f|
-        YAML.load_documents(f) do |y|
-          y.each do |k, v|
-            opts["#{k}_ssh_default"] = v
-          end
-        end
-      end
-
-      opts
-    end
-
-    def parse_scenario(scen_file, options)
-      # parse default ssh file
-      opts = parse_default_ssh(options)
-      opts.merge!(options)
-
-      scen = Scenario.new
-
-      # no use scenario file
-      if opts['host']
-        scen << build_no_scenario_node_operation(opts)
-        return scen
-      end
-
-      type = [:main, :node_info, :tasks]
-      scenario_data = {}
-
-      if scen_file
-        YAML.load_documents(scen_file).each_with_index do |data, idx|
-          scenario_data[type[idx]] = data
-        end
-      end
-
-      node = nil
-
-      # use scenario file
-      scenario_data[:main].each do |n|
-        scen << node if node
-
-        n.each do |k, v|
-          if k == 'node'
-            node = Node.new(
-              v,
-              build_backend(v, scenario_data[:node_info], opts))
-          else
-            ope = build_operations(k, v, scenario_data[:tasks], opts)
-            node.add_operation(ope) if node
-          end
-        end
-      end
-
-      scen << node if node
-      scen
-    end
-
-    def build_no_scenario_node_operation(options)
-      raise CommandArgNotFoundError, %("--command or -c" option is not specified.) unless options['command']
-
-      node_info = { options['host'] => { 'ssh_opts' => {} } }
-
-      %w(user key port ssh_config ask_password sudo).each { |o| node_info[options['host']]['ssh_opts'][o] = options[o] if options[o]  }
-
-      node = Node.new(options['host'], build_backend(options['host'], node_info, options))
-      node.add_operation(Rundock::OperationFactory.instance(:command).create(Array(options['command']), nil))
-      node
-    end
-
-    def build_operations(ope_type, ope_content, tasks, options)
-      if options['command']
-        Logger.debug(%("--command or -c" option is specified and ignore scenario file.))
-        return Rundock::OperationFactory.instance(:command).create(Array(options['command']), nil)
-      end
-
-      Rundock::OperationFactory.instance(ope_type.to_sym).create(Array(ope_content), tasks)
-    end
-
-    def build_backend(host, node_info, options)
-      opts = {}
-
-      if !node_info ||
-         !node_info[host]
-        node_info = { host => {} }
-      end
-      node_info[host]['ssh_opts'] = {} unless node_info[host]['ssh_opts']
-      is_local = host =~ /localhost|127\.0\.0\.1/
-
-      # replace default ssh options if exists
-      options.keys.select { |o| o =~ /(\w+)_ssh_default$/ }.each do |oo|
-        opt = oo.gsub(/_ssh_default/, '')
-        # no use default ssh options if local
-        # (like docker or localhost with port access host should not use default ssh options)
-        node_info[host]['ssh_opts'][opt] = options[oo] if !is_local && !node_info[host]['ssh_opts'][opt]
-      end
-
-      if is_local &&
-         !node_info[host]['ssh_opts']['port'] &&
-         !node_info[host]['ssh_opts']['user'] &&
-         !node_info[host]['ssh_opts']['ssh_config']
-        backend_type = :local
-      else
-        backend_type = :ssh
-        opts['host'] = host
-      end
-
-      opts.merge!(options)
-
-      # update ssh options for node from node_info
-      opts.merge!(node_info[host]['ssh_opts'])
-      # delete trash ssh_options(node[host::ssh_options])
-      node_info[host].delete('ssh_opts')
-
-      # add any attributes for host from node_info
-      opts.merge!(node_info[host])
-      Backend.create(backend_type, opts)
     end
   end
 end

data/lib/rundock/version.rb

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

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

@@ -48,7 +48,7 @@ fi
 
 cp ${RUNDOCK_SCENARIO_DIR}/* ${RUNDOCK_SCENARIO_CACHE_DIR}
 
-find ${RUNDOCK_SCENARIO_CACHE_DIR} -type f -name "*_scenario.yml" | \
+find ${RUNDOCK_SCENARIO_CACHE_DIR} -type f -name "*_scenario.yml" -or -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; }

data/spec/integration/scenarios/simple_host_group.yml

@@ -0,0 +1,11 @@
+- node: localhost
+  command:
+    - "echo 'Should this message does not appear';cat /notexist"
+- node: anyhost-01
+---
+anyhost-01:
+  host: 127.0.0.1
+  ssh_opts:
+    port: 22222
+    user: tester
+    key: "<replaced_by_platforms>"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,6 +152,10 @@ files:
 - exe/rundock
 - lib/rundock.rb
 - lib/rundock/backend.rb
+- lib/rundock/builder/backend_builder.rb
+- lib/rundock/builder/base.rb
+- lib/rundock/builder/default_ssh_builder.rb
+- lib/rundock/builder/scenario_builder.rb
 - lib/rundock/cli.rb
 - lib/rundock/ext/hash.rb
 - lib/rundock/ext/object/blank.rb
@@ -173,6 +177,7 @@ files:
 - 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