rundock 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0a18e2fe745300ae9f65c19888268983681a74b
-  data.tar.gz: f9683ce81d50dad93028198bd475608078fefdab
+  metadata.gz: a21e949e779d9e65286baadba3983ec954463992
+  data.tar.gz: 9e788a4da896088984770a5daeebefe2783b9b35
 SHA512:
-  metadata.gz: e7f65308868d53438a140fe859ee387f5f8578215a3cedd554bd9d9183514eb3403438da8280bf7baf6b65c09a62ea975a03f80079b3f8be7305535d66b4838e
-  data.tar.gz: 4aba11b47b26ed6bbfd819cc91d72aa61873c7fbbdc5b0e0eae50806ab4a3502ca7f1cf1b36c5070db6e59219230a18630927f391eea900fe0bb42a36f3cfd1a
+  metadata.gz: b2083be399656f5743561b1d0702d7338cc4b1b297e5bee8fed77cf26a4743ef2a6753d29c1dcc8b59e381b0e4d732a40b8ec3b3081b9e0d2211c8238f776abf
+  data.tar.gz: 8ea83dc8f122369924fa3bc8500274ecf9a1d570f19d3e71c329166895f8da45ac638ea3088f6ca62f218f1982501ca6fecc8a05fdd915028148890b46b25115

data/Rakefile

@@ -126,9 +126,9 @@ namespace :spec do
         desc "Run rundock and serverspec tests for #{target}"
 
         if target != 'localhost'
-          task :all => [:docker, :rundock, :serverspec]
+          task :all => %i[docker rundock serverspec]
         else
-          task :all => [:rundock, :serverspec]
+          task :all => %i[rundock serverspec]
         end
 
         unless target == 'localhost'

data/circle.yml

@@ -1,13 +1,19 @@
 machine:
+  environment:
+    RUBY_VERSIONS: 2.1.10,2.4.1
   services:
     - docker
-  ruby:
-    version: 2.1.1
 
 dependencies:
   cache_directories:
     - "~/docker"
+  override:
+    - rvm get head
+    - rvm install $RUBY_VERSIONS
+    - rvm $RUBY_VERSIONS --verbose do gem install bundler
+    - rvm $RUBY_VERSIONS --verbose do bundle install
 
 test:
   override:
-    - bundle exec rake spec
+    - rvm $RUBY_VERSIONS --verbose do bundle exec rake spec:
+        parallel: true

data/lib/rundock/attribute/node_attribute.rb

@@ -10,16 +10,16 @@ module Rundock
       attr_accessor :dry_run
       attr_accessor :hooks
 
-      AVAIL_TAKE_OVERS = [
-        :task_info,
-        :errexit,
-        :cwd,
-        :sudo,
-        :dry_run
+      AVAIL_TAKE_OVERS = %i[
+        task_info
+        errexit
+        cwd
+        sudo
+        dry_run
       ]
 
       def init_except_take_over_state
-        list.each do |k, _v|
+        list.each_key do |k|
           define_attr(k, nil) unless AVAIL_TAKE_OVERS.include?(k)
         end
       end

data/lib/rundock/builder/backend_builder.rb

@@ -48,7 +48,7 @@ module Rundock
         end
 
         # replace cli ssh options if exists
-        %w(:user :key :port :ssh_config :ask_password :sudo).each { |o| @node_info[@nodename.to_sym][:ssh_opts][o] = @options[o] if @options[o] }
+        %i[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
@@ -62,6 +62,7 @@ module Rundock
                          :local
                        else
                          :ssh
+
                        end
 
         backend_type

data/lib/rundock/builder/scenario_builder.rb

@@ -37,7 +37,7 @@ module Rundock
       def build_scenario_with_file
         if @scenario_file
 
-          type = [:main, :target_info, :tasks, :hooks]
+          type = %i[main target_info tasks hooks]
           scenario_data = {}
 
           YAML.load_documents(@scenario_file).each_with_index do |data, idx|

data/lib/rundock/logger.rb

@@ -69,7 +69,7 @@ module Rundock
         @indent_depth -= 1 if @indent_depth > 0
       end
 
-      def color(code)
+      def new_color(code)
         prev_color = @color
         @color = code
         yield

data/lib/rundock/node.rb

@@ -15,7 +15,7 @@ module Rundock
     end
 
     def add_operation(ope)
-      @operations = [] unless @operations
+      @operations ||= []
       @operations << ope
     end
 

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

@@ -95,7 +95,7 @@ module Rundock
           ERB.new(srcfile, nil, trim_mode).tap do |erb|
             erb.filename = src
           end.result(OpenStruct.new(mapping).instance_eval { binding })
-        rescue => ex
+        rescue StandardError => ex
           Logger.error("ERB Error: #{ex.message}")
         end
       end

data/lib/rundock/runner.rb

@@ -4,7 +4,7 @@ require 'open-uri'
 module Rundock
   class Runner
     ScenarioNotFoundError = Class.new(StandardError)
-    RUNDOCK_PLUGINS = %w(operation hook)
+    RUNDOCK_PLUGINS = %w[operation hook]
 
     class << self
       def run(options)
@@ -61,7 +61,7 @@ module Rundock
       end
 
       # load from local project
-      Dir.glob("#{File.expand_path(File.dirname(__FILE__))}/plugin/**/*.rb").each do |f|
+      Dir.glob("#{__dir__}/plugin/**/*.rb").each do |f|
         require f.gsub(/.rb$/, '')
       end
 

data/lib/rundock/version.rb

@@ -1,3 +1,3 @@
 module Rundock
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

data/rundock.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rundock/version'
@@ -20,11 +19,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'serverspec', '~> 2.1'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'serverspec', '~> 2.1'
 
-  spec.add_runtime_dependency 'specinfra', ['>= 2.31.0', '< 3.0.0']
   spec.add_runtime_dependency 'ansi'
-  spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'net-ssh'
+  spec.add_runtime_dependency 'specinfra', ['>= 2.31.0', '< 3.0.0']
+  spec.add_runtime_dependency 'thor'
 end

data/spec/integration/groups/simple_host_group.yml

@@ -1,7 +1,6 @@
-- target: localhost
+- target: anyhost-01
   command:
     - "echo 'Should this message does not appear';cat /notexist"
-- target: anyhost-01
 ---
 anyhost-01:
   target_type: host

data/spec/integration/platforms/centos6/Dockerfile

@@ -1,5 +1,7 @@
 FROM centos:6
 
+RUN rm -f /var/run/yum.pid
+RUN yum clean all
 RUN yum install -y yum install openssh openssh-server openssh-clients sudo passwd
 RUN useradd tester
 RUN echo "tester" | passwd --stdin tester

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,55 +39,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: serverspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: serverspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: specinfra
+  name: ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.31.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '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
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ansi
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,21 +95,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: specinfra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        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: '0'
+        version: 2.31.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: net-ssh
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="