rundock 0.5.4 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be69d1204087ff6b81446b6303ec46351a15324b
-  data.tar.gz: c8d4edf9535b4495e8c57f3b0186baabba97fcbb
+  metadata.gz: d8a23e3b42a6d06189c3ccedafbce905f5216e77
+  data.tar.gz: e8556f0984bb264a72ec144ff3995a4879f09d70
 SHA512:
-  metadata.gz: 4a11d81638882d166d039e394e2efd3db08d01d5d24fa3f5e5e397cdb2101091b7a1bd14f02b601d3a22c62075e7a0d3ae63bae44fe2bc59007b2e194992439f
-  data.tar.gz: 1d2bc6ac9a8d3a1545161138fa5d599dd2556fb10199370f4ad6685d798c0a39cf6f6c3f60663858fab5994abb6467140d5bbd74945c95d0ef49c3df7bb3344d
+  metadata.gz: d98ebcc2c7b3dcf7ba6fa71d0c512f3d103a0bb0c823f6149527ee5c95cbf1073fb51453427ce4550b7b4ff6f2ed82cf358f17b845f3e54452cf5bc80df82309
+  data.tar.gz: 59f74b1b9a5e75559f19879669aa628c60c1f764167f05569724e5b72c2cf78eb285d0f8262e5b11a763d6b50b60c629f229eb385c4f528603598ed9e72a66f6

data/.rubocop.yml

@@ -51,5 +51,11 @@ Style/FormatString:
 Style/RegexpLiteral:
   Enabled: false
 
+Style/Alias:
+  Enabled: false
+
+Style/MutableConstant:
+  Enabled: false
+
 Lint/UnusedMethodArgument:
   Enabled: false

data/Rakefile

@@ -67,11 +67,11 @@ def do_rundock_scenarios(platform)
   end
 
   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
+    default_ssh_opt = if scenario =~ /use_default_ssh/ && platform != 'localhost'
+                        " -d #{base_dir}/integration_default_ssh.yml"
+                      else
+                        ''
+                      end
 
     options = ''
     if scenario =~ %r{^*scenarios/(.*hooks_by_option)_scenario.yml$}

data/circle.yml

@@ -1,6 +1,8 @@
 machine:
   services:
     - docker
+  ruby:
+    version: 2.1.1
 
 dependencies:
   cache_directories:

data/lib/rundock/backend.rb

@@ -65,8 +65,8 @@ module Rundock
         Logger.formatter.indent do
           Logger.debug("cwd: #{exec_options[:cwd]}") if exec_options[:cwd]
           Logger.debug("sudo: #{exec_options[:sudo]}") if exec_options[:sudo]
-          Logger.error("#{result.stderr.strip}") unless result.stderr.strip.blank?
-          Logger.info("#{result.stdout.strip}") unless result.stdout.strip.blank?
+          Logger.error(result.stderr.strip) unless result.stderr.strip.blank?
+          Logger.info(result.stdout.strip) unless result.stdout.strip.blank?
           Logger.debug("errexit: #{exec_options[:errexit]}")
           Logger.debug("exit status: #{exit_status}")
         end
@@ -111,11 +111,11 @@ 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]])
-        else
-          ssh_opts = Net::SSH::Config.for(options[:host])
-        end
+        ssh_opts = if options[:ssh_config] && FileTest.exists?(options[:ssh_config])
+                     Net::SSH::Config.for(options[:host], [options[:ssh_config]])
+                   else
+                     Net::SSH::Config.for(options[:host])
+                   end
 
         # priority = node_attributes > cli options
         ssh_opts[:host_name] = options[:host]

data/lib/rundock/builder/backend_builder.rb

@@ -55,14 +55,14 @@ module Rundock
       end
 
       def parse_backend_type
-        if localhost? &&
-           !@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
-        end
+        backend_type = if localhost? &&
+                          !@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]
+                         :local
+                       else
+                         :ssh
+                       end
 
         backend_type
       end

data/lib/rundock/builder/default_ssh_builder.rb

@@ -3,7 +3,9 @@ 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"
+      RUNDOCK_PACKAGE_PATH = Gem::Specification.find_by_path('rundock')
+      PRESET_SSH_OPTIONS_DEFAULT_ROOT = RUNDOCK_PACKAGE_PATH.nil? ? '.' : RUNDOCK_PACKAGE_PATH.full_gem_path
+      PRESET_SSH_OPTIONS_DEFAULT_FILE_PATH = "#{PRESET_SSH_OPTIONS_DEFAULT_ROOT}/default_ssh.yml"
 
       def initialize(options)
         super(options)
@@ -12,11 +14,11 @@ module Rundock
       def build
         opts = {}
 
-        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
+        def_ssh_file = if @options[:default_ssh_opts] && FileTest.exist?(@options[:default_ssh_opts])
+                         @options[:default_ssh_opts]
+                       else
+                         PRESET_SSH_OPTIONS_DEFAULT_FILE_PATH
+                       end
 
         File.open(def_ssh_file) do |f|
           YAML.load_documents(f) do |y|

data/lib/rundock/builder/operation_builder.rb

@@ -116,11 +116,11 @@ module Rundock
 
         unless recursive
           # apply cli options
-          if !cli_options.key?(:run_anyway)
-            node_attributes.errexit = true
-          else
-            node_attributes.errexit = !cli_options[:run_anyway]
-          end
+          node_attributes.errexit = if !cli_options.key?(:run_anyway)
+                                      true
+                                    else
+                                      !cli_options[:run_anyway]
+                                    end
           node_attributes.dry_run = (cli_options && cli_options[:dry_run]) ? true : false
         end
 

data/lib/rundock/builder/target_group_builder.rb

@@ -8,18 +8,16 @@ module Rundock
       def build(scenario_targets)
         targets = {} unless scenario_targets
 
-        if @options[:targetgroup]
-          if FileTest.exist?(@options[:targetgroup])
-            targets.merge!(YAML.load_file(@options[:targetgroup]).deep_symbolize_keys)
-            Logger.info("merged target file #{@options[:targetgroup]}")
-          elsif FileTest.exist?(DEFAULT_TARGET_GROUP_FILE_PATH)
-            Logger.warn("targetgroup file is not found. use #{DEFAULT_TARGET_GROUP_FILE_PATH}")
-            targets.merge!(YAML.load_file(DEFAULT_TARGET_GROUP_FILE_PATH).deep_symbolize_keys)
-          else
-            Logger.warn("Targetgroup path is not available. (#{@options[:targetgroup]})")
-          end
+        return scenario_targets unless @options[:targetgroup]
+
+        if FileTest.exist?(@options[:targetgroup])
+          targets.merge!(YAML.load_file(@options[:targetgroup]).deep_symbolize_keys)
+          Logger.info("merged target file #{@options[:targetgroup]}")
+        elsif FileTest.exist?(DEFAULT_TARGET_GROUP_FILE_PATH)
+          Logger.warn("targetgroup file is not found. use #{DEFAULT_TARGET_GROUP_FILE_PATH}")
+          targets.merge!(YAML.load_file(DEFAULT_TARGET_GROUP_FILE_PATH).deep_symbolize_keys)
         else
-          return scenario_targets
+          Logger.warn("Targetgroup path is not available. (#{@options[:targetgroup]})")
         end
 
         targets

data/lib/rundock/builder/task_builder.rb

@@ -8,18 +8,15 @@ module Rundock
       def build(scenario_tasks)
         tasks = {} unless scenario_tasks
 
-        if @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]})")
-          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
-          return scenario_tasks
+          Logger.warn("Task path is not available. (#{@options[:tasks]})")
         end
 
         tasks

data/lib/rundock/cli.rb

@@ -25,7 +25,7 @@ module Rundock
 
     desc 'version', 'Print version'
     def version
-      puts "#{Rundock::VERSION}"
+      puts Rundock::VERSION.to_s
     end
 
     desc 'do [SCENARIO] [options]', 'Run rundock from scenario file'

data/lib/rundock/ext/hash.rb

@@ -1,6 +1,6 @@
 class Hash
   def depth
-    1 + (values.map { |v| v.is_a?(Hash) ? v.depth : 1 }.max)
+    1 + values.map { |v| v.is_a?(Hash) ? v.depth : 1 }.max
   end
 
   def deep_symbolize_keys

data/lib/rundock/gem/helper.rb

@@ -0,0 +1,26 @@
+require 'bundler/vendored_thor' unless defined?(Thor)
+require 'bundler'
+
+module Rundock
+  module Gem
+    class Helper < Bundler::GemHelper
+      def install
+        desc "Run rundock with default configuration"
+        task :rundock => 'rundock:do'
+
+        namespace :rundock do
+          desc 'Run rundock with scenariofile.(env:SCENARIO_FILE_PATH)'
+          task 'do' do
+            if ENV['SCENARIO_FILE_PATH']
+              system("rundock do #{ENV['SCENARIO_FILE_PATH']}")
+            else
+              system('rundock do')
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+

data/lib/rundock/gem/tasks.rb

@@ -0,0 +1,2 @@
+require 'rundock/gem/helper'
+Rundock::Gem::Helper.install_tasks

data/lib/rundock/hook_factory.rb

@@ -17,11 +17,11 @@ module Rundock
 
       obj = nil
       klass.split('::').map do |k|
-        if obj.nil?
-          obj = Kernel.const_get(k)
-        else
-          obj = obj.const_get(k)
-        end
+        obj = if obj.nil?
+                Kernel.const_get(k)
+              else
+                obj = obj.const_get(k)
+              end
       end
 
       hook = obj.new(name, attributes)

data/lib/rundock/logger.rb

@@ -101,22 +101,22 @@ module Rundock
       end
 
       def formatted_message(severity, datetime, progname, msg)
-        if !@show_header
-          out = "%s\n" % [msg2str(msg)]
-        elsif !@date_header
-          out = "%5s: %s%s\n" % [
-            severity,
-            ' ' * 2 * indent_depth,
-            msg2str(msg)]
-        elsif @short_header
-          out = "%s: %s%s\n" % [severity[0, 1], ' ' * 2 * indent_depth, msg2str(msg)]
-        else
-          out = "[%s] %5s: %s%s\n" % [
-            datetime.strftime('%Y-%m-%dT%H:%M:%S.%L'),
-            severity,
-            ' ' * 2 * indent_depth,
-            msg2str(msg)]
-        end
+        out = if !@show_header
+                "%s\n" % [msg2str(msg)]
+              elsif !@date_header
+                "%5s: %s%s\n" % [
+                  severity,
+                  ' ' * 2 * indent_depth,
+                  msg2str(msg)]
+              elsif @short_header
+                "%s: %s%s\n" % [severity[0, 1], ' ' * 2 * indent_depth, msg2str(msg)]
+              else
+                "[%s] %5s: %s%s\n" % [
+                  datetime.strftime('%Y-%m-%dT%H:%M:%S.%L'),
+                  severity,
+                  ' ' * 2 * indent_depth,
+                  msg2str(msg)]
+              end
 
         out
       end
@@ -135,10 +135,10 @@ module Rundock
       end
 
       def colorize(msg, severity)
-        if @color
-          col = @color
-        else
-          col = case severity
+        col = if @color
+                @color
+              else
+                case severity
                 when 'INFO'
                   :clear
                 when 'WARN'
@@ -148,7 +148,7 @@ module Rundock
                 else
                   :clear
                 end
-        end
+              end
 
         ANSI.public_send(col) { msg }
       end

data/lib/rundock/operation_factory.rb

@@ -17,11 +17,11 @@ module Rundock
 
       obj = nil
       klass.split('::').map do |k|
-        if obj.nil?
-          obj = Kernel.const_get(k)
-        else
-          obj = obj.const_get(k)
-        end
+        obj = if obj.nil?
+                Kernel.const_get(k)
+              else
+                obj.const_get(k)
+              end
       end
 
       operation = obj.new(instruction, attributes)

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

@@ -51,11 +51,11 @@ module Rundock
 
           is_erb = opt.key?(:erb) && opt[:erb]
 
-          if opt.key?(:trim_mode)
-            trim_mode = opt[:trim_mode]
-          else
-            trim_mode = DEFAULT_TRIM_MODE
-          end
+          trim_mode = if opt.key?(:trim_mode)
+                        opt[:trim_mode]
+                      else
+                        DEFAULT_TRIM_MODE
+                      end
 
           erb_options = ''
           erb_options = " erb: true trim_mode: #{trim_mode}" if is_erb
@@ -63,11 +63,11 @@ module Rundock
           Logger.info("deploy localhost: #{opt[:src]} remote:#{attributes[:nodeinfo][:host]}:#{opt[:dst]}#{erb_options}")
           Logger.debug("deploy erb binding: #{opt[:binding]}") if is_erb
 
-          if is_erb
-            val_binding = extract_map(backend, opt[:binding])
-          else
-            val_binding = {}
-          end
+          val_binding = if is_erb
+                          extract_map(backend, opt[:binding])
+                        else
+                          {}
+                        end
 
           if is_erb
             erb_content = conv_erb(opt[:src], trim_mode, val_binding)

data/lib/rundock/runner.rb

@@ -29,11 +29,13 @@ module Rundock
 
     def build(options)
       if options[:scenario] || options[:targetgroup]
-        if options[:scenario] && !FileTest.exist?(options[:scenario])
-          raise ScenarioNotFoundError, "'#{options[:scenario]}' scenario file is not found."
-        elsif options[:command] && options[:targetgroup] && !FileTest.exist?(options[:targetgroup])
-          raise ScenarioNotFoundError, "'#{options[:targetgroup]}' targetgroup file is not found."
-        end
+        raise ScenarioNotFoundError,
+              "'#{options[:scenario]}' scenario file is not found." if options[:scenario] &&
+                                                                       !FileTest.exist?(options[:scenario])
+        raise ScenarioNotFoundError,
+              "'#{options[:targetgroup]}' targetgroup file is not found." if options[:command] &&
+                                                                             options[:targetgroup] &&
+                                                                             !FileTest.exist?(options[:targetgroup])
 
         options[:scenario] = options[:targetgroup] if options[:command] && options[:targetgroup]
 

data/lib/rundock/version.rb

@@ -1,3 +1,3 @@
 module Rundock
-  VERSION = '0.5.4'
+  VERSION = '0.5.7'
 end

metadata

@@ -1,131 +1,131 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.7
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: serverspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: specinfra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.31.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.31.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -136,10 +136,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -167,6 +167,8 @@ files:
 - lib/rundock/cli.rb
 - lib/rundock/ext/hash.rb
 - lib/rundock/ext/object/blank.rb
+- lib/rundock/gem/helper.rb
+- lib/rundock/gem/tasks.rb
 - lib/rundock/hook/base.rb
 - lib/rundock/hook_factory.rb
 - lib/rundock/logger.rb
@@ -242,17 +244,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Simple and extensible server orchestration framework