rundock 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6f82ec4374a46a20026e0417e0c7f66d7d057e8b
-  data.tar.gz: 8b580b3c626012b28be9fbc2613f97f87ee9f212
+SHA256:
+  metadata.gz: 9bb22b4416bfed20d9298fdef1b332a9d38d18f660bcbb5c9efb7b51f05774b2
+  data.tar.gz: 815af1356a3282d2840faa0a4b245461fc6c41017dcb677dea4868d391542e8f
 SHA512:
-  metadata.gz: 6be0922ed3c5b1da9b1af40872eff0f329ee40743a6f66c6cc55a68ca61e810971920dfe35522487e54a83051ca549e039361ed9fd1a23980fea9ad762896426
-  data.tar.gz: beab9f72f9ace44c0e65e9222f1df9489306565204fda69ff213c25f60317bd51838ae75db528d88cf4ef3b2f5771fcfb37601a462ac4c53f80489e76408016b
+  metadata.gz: 2e5f969a45ea55d61b00bb8a36a4e27b57dfbb8706d3cec497e9f4bf31293d4e6012e36d5975a8f47d374bca81b206540e4327b92ecff548c4a9a7b3baf92123
+  data.tar.gz: e8d6dffa5f76858e3909c934ff207aa4b195e4e13af443670f401f48346cfac4a4a617efe5afa98021dc8fc61b59a6c41e985bcf76967c6c15b83c36347b8942

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.2.1
+
+Update
+
+- Update support ruby version(2.4.1,2.6.0)
+- Support circleci 2.0
+
 ## v1.2.0
 
 Update

data/Rakefile

@@ -100,6 +100,7 @@ task :clean do
   execute('rm -fr /var/tmp/hello_rundock*', false, false)
   Dir.glob('./spec/integration/platforms/*').each do |platform|
     next if platform =~ /localhost$/
+
     execute("#{platform}/setup.sh --clean", false, true)
   end
 end

data/circle.yml

@@ -1,19 +1,95 @@
-machine:
-  environment:
-    RUBY_VERSIONS: 2.1.10,2.4.1
-  services:
-    - docker
-
-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:
-    - rvm $RUBY_VERSIONS --verbose do bundle exec rake spec:
-        parallel: true
+# This configuration was automatically generated from a CircleCI 1.0 config.
+# It should include any build commands you had along with commands that CircleCI
+# inferred from your project structure. We strongly recommend you read all the
+# comments in this file to understand the structure of CircleCI 2.0, as the idiom
+# for configuration has changed substantially in 2.0 to allow arbitrary jobs rather
+# than the prescribed lifecycle of 1.0. In general, we recommend using this generated
+# configuration as a reference rather than using it in production, though in most
+# cases it should duplicate the execution of your original 1.0 config.
+version: 2
+jobs:
+  build:
+    machine: true
+    working_directory: ~/hiracy/rundock
+    parallelism: 2
+    shell: /bin/bash --login
+    # CircleCI 2.0 does not support environment variables that refer to each other the same way as 1.0 did.
+    # If any of these refer to each other, rewrite them so that they don't or see https://circleci.com/docs/2.0/env-vars/#interpolating-environment-variables-to-set-other-environment-variables .
+    environment:
+      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
+      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
+      RUBY_VERSIONS: 2.4.1,2.6.0
+    # In CircleCI 1.0 we used a pre-configured image with a large number of languages and other packages.
+    # In CircleCI 2.0 you can now specify your own image, or use one of our pre-configured images.
+    # The following configuration line tells CircleCI to use the specified docker image as the runtime environment for you job.
+    # We have selected a pre-built image that mirrors the build environment we use on
+    # the 1.0 platform, but we recommend you choose an image more tailored to the needs
+    # of each job. For more information on choosing an image (or alternatively using a
+    # VM instead of a container) see https://circleci.com/docs/2.0/executor-types/
+    # To see the list of pre-built images that CircleCI provides for most common languages see
+    # https://circleci.com/docs/2.0/circleci-images/
+    #docker:
+    #- image: circleci/build-image:ubuntu-14.04-XXL-upstart-1189-5614f37
+    #  command: /sbin/init
+    steps:
+    # Machine Setup
+    #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
+    # The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out.
+    - checkout
+    # Prepare for artifact and test results  collection equivalent to how it was done on 1.0.
+    # In many cases you can simplify this from what is generated here.
+    # 'See docs on artifact collection here https://circleci.com/docs/2.0/artifactsG/'
+    - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
+    # This is based on your 1.0 configuration file or project settings
+    - run:
+        working_directory: ~/hiracy/rundock
+        command: 'sudo docker info >/dev/null 2>&1 || sudo service docker start; '
+    # Dependencies
+    #   This would typically go in either a build or a build-and-test job when using workflows
+    # Restore the dependency cache
+    - restore_cache:
+        keys:
+        # This branch if available
+        - v2-dep-{{ .Branch }}-
+        # Default branch if not
+        - v2-dep-master-
+        # Any branch if there are none on the default branch - this should be unnecessary if you have your default branch configured correctly
+        - v2-dep-
+    # This is based on your 1.0 configuration file or project settings
+    - run: sudo apt-get update
+    - run: sudo apt-get install gnupg2
+    - run: gpg2 --keyserver keyserver.ubuntu.com --recv-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+    - run: rvm get head
+    - run: rvm install $RUBY_VERSIONS
+    - run: rvm $RUBY_VERSIONS --verbose do gem install bundler
+    - run: rvm $RUBY_VERSIONS --verbose do bundle install
+    # Save dependency cache
+    - save_cache:
+        key: v2-dep-{{ .Branch }}-{{ epoch }}
+        paths:
+        # This is a broad list of cache paths to include many possible development environments
+        # You can probably delete some of these entries
+        - vendor/bundle
+        - ~/virtualenvs
+        - ~/.m2
+        - ~/.ivy2
+        - ~/.bundle
+        - ~/.go_workspace
+        - ~/.gradle
+        - ~/.cache/bower
+        # These cache paths were specified in the 1.0 config
+        - ~/docker
+    # Test
+    #   This would typically be a build job when using workflows, possibly combined with build
+    # This is based on your 1.0 configuration file or project settings
+    - run: rvm $RUBY_VERSIONS --verbose do bundle exec rake spec
+    # Teardown
+    #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
+    # Save test results
+    - store_test_results:
+        path: /tmp/circleci-test-results
+    # Save artifacts
+    - store_artifacts:
+        path: /tmp/circleci-artifacts
+    - store_artifacts:
+        path: /tmp/circleci-test-results

data/lib/rundock/backend.rb

@@ -64,6 +64,7 @@ module Rundock
         rescue StandardError => e
           Logger.error(e.to_s)
           raise CommandResultStatusError if exec_options[:errexit]
+
           return nil
         end
 

data/lib/rundock/builder/backend_builder.rb

@@ -41,6 +41,7 @@ module Rundock
           # no use default ssh options if local
           # set unless scenario file and cli options specified and not localhost
           next if localhost?
+
           opt = oo.to_s.gsub(/_ssh_default/, '').to_sym
           @node_info[@nodename.to_sym][:ssh_opts][opt] = @options[oo] if !@node_info[@nodename.to_sym][:ssh_opts][opt] && !@options[opt]
         end

data/lib/rundock/builder/default_ssh_builder.rb

@@ -24,7 +24,7 @@ module Rundock
                        end
 
         File.open(def_ssh_file) do |f|
-          YAML.load_documents(f) do |y|
+          YAML.load_stream(f) do |y|
             y.each do |k, v|
               opts["#{k}_ssh_default".to_sym] = v
             end

data/lib/rundock/builder/hook_builder.rb

@@ -60,6 +60,7 @@ module Rundock
         attributes.each do |k, v|
           raise HookStructureError unless v.is_a?(Hash)
           next if !allow_all && !enables.include?(k.to_s)
+
           @enable_hooks[k] = v
           hooks << Rundock::HookFactory.instance(v[:hook_type]).create(k.to_s, v)
         end

data/lib/rundock/builder/operation_builder.rb

@@ -107,7 +107,7 @@ module Rundock
         cli_options = {} if cli_options.nil?
 
         if cli_options[:command] &&
-           (ope_type == :command || ope_type == :task)
+           %i[command task].include?(ope_type)
           Logger.debug(%("--command or -c" option is specified and ignore scenario file.))
           return
         end

data/lib/rundock/builder/scenario_builder.rb

@@ -30,6 +30,7 @@ module Rundock
 
       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
@@ -40,7 +41,7 @@ module Rundock
           type = %i[main target_info tasks hooks]
           scenario_data = {}
 
-          YAML.load_documents(@scenario_file).each_with_index do |data, idx|
+          YAML.load_stream(@scenario_file).each_with_index do |data, idx|
             if idx == 0
               scenario_data[type[idx]] = data
             else

data/lib/rundock/logger.rb

@@ -80,6 +80,7 @@ module Rundock
 
       def flush
         return nil if @lock
+
         ret = @buffer.dup
         @buffer.clear
         ret

data/lib/rundock/operation/base.rb

@@ -24,6 +24,7 @@ module Rundock
 
       def assign_args(src, args)
         return src unless args
+
         src.gsub(/\$#/, args.length.to_s)
            .gsub(/\$@/, args.join(' '))
            .gsub(/\$[1-9]/) { |arg_n| args[arg_n.chars[1..-1].join.to_i - 1] }

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

@@ -108,6 +108,7 @@ module Rundock
         map = {}
         binding.each do |k, v|
           next unless v.key?(:value)
+
           bind_key  = assign_args(k.to_s, args)
           bind_type = assign_args(v[:type].to_s, args)
           bind_value = assign_args(v[:value].to_s, args)

data/lib/rundock/runner.rb

@@ -76,6 +76,7 @@ module Rundock
         RUNDOCK_PLUGINS.each do |plugin|
           next if g !~ /^(rundock-plugin-#{plugin})-/
           next if Gem::Specification.find_by_name(g).nil?
+
           Logger.debug("Loading rundock plugin: #{g}")
           libdir = "#{Gem::Specification.find_by_name(g).full_gem_path}/lib/#{Regexp.last_match(1).tr('-', '/')}"
           Dir.glob("#{libdir}/*.rb").each do |f|

data/lib/rundock/version.rb

@@ -1,3 +1,3 @@
 module Rundock
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/rundock.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.9'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'serverspec', '~> 2.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -153,7 +153,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -293,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Simple and extensible server orchestration framework

data/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-  - 2.0.0