itamae 1.12.4 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd2755f33211c89faf48c7aaa7156c90dc8f2a6228eea1531914c24e8c23242d
-  data.tar.gz: 38c011974e040f00ce5818f3bf490bae833dc6560146e093a0f0655495c923c8
+  metadata.gz: adefcb08fb8611f035cf3f70d3d76ab4c2b1d012aef3f4489f33c4fb445a88fd
+  data.tar.gz: d4e7126f52fb0da4906a289025d9c73a2143b90a1297c570b81e3490985cd83e
 SHA512:
-  metadata.gz: f3faba704d1dec3f3bfc21428a4574b2c72a6e2804b8f91a8274881325c6b61f9ca30de5b0fadfa3a81726c543d7bcdbe43408022fbcae952c6ba170fa8f0f53
-  data.tar.gz: 9f3e1aa52bc4d1cbc9b4a4c1687856746738efdec9f43b8988dee73eb43ffa1362501ae0008e1938fb367e763925e292a9930a5d634d4071c54796964549369a
+  metadata.gz: 2a5206774cb5c387b79030ed32e9d12c096189a78725294d9516a1abf18199d9ca5d0339b75ae5815d0778f6372b29fef38c3c65b992deea7412729873995578
+  data.tar.gz: a8c13d073d29418c523a95501bc42c2864c1250def6a13936f744981eba9ddc4eb9b7ae59a7d66ba367c7799331ea0577fb81815ae7fb0fdc7d1b9825f530a05

data/.github/workflows/test.yml

@@ -27,9 +27,11 @@ jobs:
           - "2.6"
           - "2.7"
           - "3.0"
+          - "3.1"
         rubyopt:
           - ""
           - "--jit"
+          - "--yjit"
         exclude:
           # --jit is available since MRI 2.6
           - ruby:    "2.3"
@@ -38,7 +40,19 @@ jobs:
             rubyopt: "--jit"
           - ruby:    "2.5"
             rubyopt: "--jit"
-
+          # --yjit is available since MRI 3.1
+          - ruby:    "2.3"
+            rubyopt: "--yjit"
+          - ruby:    "2.4"
+            rubyopt: "--yjit"
+          - ruby:    "2.5"
+            rubyopt: "--yjit"
+          - ruby:    "2.6"
+            rubyopt: "--yjit"
+          - ruby:    "2.7"
+            rubyopt: "--yjit"
+          - ruby:    "3.0"
+            rubyopt: "--yjit"
     env:
       RUBYOPT: ${{ matrix.rubyopt }}
 
@@ -79,9 +93,11 @@ jobs:
           - "2.6"
           - "2.7"
           - "3.0"
+          - "3.1"
         rubyopt:
           - ""
           - "--jit"
+          - "--yjit"
         image:
           - ubuntu:trusty
         exclude:
@@ -92,6 +108,19 @@ jobs:
             rubyopt: "--jit"
           - ruby:    "2.5"
             rubyopt: "--jit"
+          # --yjit is available since MRI 3.1
+          - ruby:    "2.3"
+            rubyopt: "--yjit"
+          - ruby:    "2.4"
+            rubyopt: "--yjit"
+          - ruby:    "2.5"
+            rubyopt: "--yjit"
+          - ruby:    "2.6"
+            rubyopt: "--yjit"
+          - ruby:    "2.7"
+            rubyopt: "--yjit"
+          - ruby:    "3.0"
+            rubyopt: "--yjit"
 
     env:
       RUBYOPT: ${{ matrix.rubyopt }}
@@ -142,9 +171,11 @@ jobs:
           - "2.6"
           - "2.7"
           - "3.0"
+          - "3.1"
         rubyopt:
           - ""
           - "--jit"
+          - "--yjit"
         exclude:
           # --jit is available since MRI 2.6
           - ruby:    "2.3"
@@ -153,6 +184,19 @@ jobs:
             rubyopt: "--jit"
           - ruby:    "2.5"
             rubyopt: "--jit"
+          # --yjit is available since MRI 3.1
+          - ruby:    "2.3"
+            rubyopt: "--yjit"
+          - ruby:    "2.4"
+            rubyopt: "--yjit"
+          - ruby:    "2.5"
+            rubyopt: "--yjit"
+          - ruby:    "2.6"
+            rubyopt: "--yjit"
+          - ruby:    "2.7"
+            rubyopt: "--yjit"
+          - ruby:    "3.0"
+            rubyopt: "--yjit"
 
     env:
       RUBYOPT: ${{ matrix.rubyopt }}

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 ## Unreleased
-[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.12.4...master)
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.13.0...master)
+
+## v1.13.0
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.12.6...v1.13.0)
+
+Improvements
+
+- [Support repeatable "node_json" and "node_yaml" options](https://github.com/itamae-kitchen/itamae/pull/351)
+
+## v1.12.6
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.12.5...v1.12.6)
+
+Bugfixes
+
+- [Support Psych4.x](https://github.com/itamae-kitchen/itamae/pull/347)
+
+## v1.12.5
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.12.4...v1.12.5)
+
+Bugfixes
+
+- [Define exit_on_failure? to suppress thor's warning](https://github.com/itamae-kitchen/itamae/pull/344)
 
 ## v1.12.4
 [full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.12.3...v1.12.4)

data/Rakefile

@@ -21,7 +21,7 @@ namespace :spec do
   namespace :integration do
     container_name = 'itamae'
 
-    task :all => ['spec:integration:docker' 'spec:integration:local']
+    task :all => ['spec:integration:docker', 'spec:integration:local']
 
     desc "Run provision and specs"
     task :docker => ["docker:boot", "docker:provision", "docker:serverspec", 'docker:clean_docker_container']

data/bin/itamae

@@ -2,4 +2,3 @@
 
 require 'itamae/cli'
 Itamae::CLI.start
-

data/itamae.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "thor"
+  spec.add_runtime_dependency "thor", ">= 1.0.0"
   spec.add_runtime_dependency "specinfra", [">= 2.64.0", "< 3.0.0"]
   spec.add_runtime_dependency "hashie"
   spec.add_runtime_dependency "ansi"

data/lib/itamae/cli.rb

@@ -14,8 +14,8 @@ module Itamae
 
     def self.define_exec_options
       option :recipe_graph, type: :string, desc: "[EXPERIMENTAL] Write recipe dependency graph in DOT", banner: "PATH"
-      option :node_json, type: :string, aliases: ['-j']
-      option :node_yaml, type: :string, aliases: ['-y']
+      option :node_json, type: :string, aliases: ['-j'], repeatable: true
+      option :node_yaml, type: :string, aliases: ['-y'], repeatable: true
       option :dry_run, type: :boolean, aliases: ['-n']
       option :shell, type: :string, default: "/bin/sh"
       option :login_shell, type: :boolean, default: false
@@ -31,11 +31,15 @@ module Itamae
     def self.options
       @itamae_options ||= super.dup.tap do |options|
         if config = options[:config]
-          options.merge!(YAML.load_file(config))
+          options.merge!(YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(config) : YAML.load(config))
         end
       end
     end
 
+    def self.exit_on_failure?
+      true
+    end
+
     desc "local RECIPE [RECIPE...]", "Run Itamae locally"
     define_exec_options
     def local(*recipe_files)

data/lib/itamae/runner.rb

@@ -91,8 +91,10 @@ module Itamae
     end
 
     private
+
     def create_node
       hash = {}
+      hash.extend(Hashie::Extensions::DeepMerge)
 
       if @options[:ohai]
         unless @backend.run_command("which ohai", error: false).exit_status == 0
@@ -105,19 +107,23 @@ module Itamae
         hash.merge!(JSON.parse(@backend.run_command("ohai 2>/dev/null").stdout))
       end
 
-      if @options[:node_json]
-        path = File.expand_path(@options[:node_json])
+      @options.fetch(:node_json, []).each do |name|
+        path = File.expand_path(name)
         Itamae.logger.info "Loading node data from #{path}..."
-        hash.merge!(JSON.load(open(path)))
+
+        hash.deep_merge!(JSON.parse(File.read(path)))
       end
 
-      if @options[:node_yaml]
-        path = File.expand_path(@options[:node_yaml])
+      @options.fetch(:node_yaml, []).each do |name|
+        path = File.expand_path(name)
         Itamae.logger.info "Loading node data from #{path}..."
-        hash.merge!(YAML.load(open(path)) || {})
+
+        yaml = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(File.read(path)) : YAML.load(File.read(path))
+        hash.deep_merge!(yaml || {})
       end
 
-      Node.new(hash, @backend)
+      # 'hash.dup' ensures that we pass a pristine Hash object without Hashie extensions
+      Node.new(hash.dup, @backend)
     end
 
     def prepare_handler

data/lib/itamae/version.rb

@@ -1,3 +1,3 @@
 module Itamae
-  VERSION = "1.12.4"
+  VERSION = "1.13.0"
 end

data/spec/unit/lib/itamae/runner_spec.rb

@@ -28,5 +28,49 @@ module Itamae
         described_class.run(recipes, :local, {})
       end
     end
+
+    describe "#initialize" do
+      context "with multiple node_json and node_yaml files" do
+        def build_temp_file(data)
+          file = Tempfile.new
+          file.write data
+          file.close
+          file
+        end
+
+        it "merges hashes and overwrites arrays" do
+          json_one = build_temp_file %({ "vars_from_json": { "one": 1 }, "shared": { "foo": true } })
+          json_two = build_temp_file %({ "vars_from_json": { "two": 2 } })
+          yaml_one = build_temp_file %(
+            vars_from_yaml:
+              three: 3
+            array:
+              - 123
+            shared:
+              bar: false
+          )
+          yaml_two = build_temp_file %(
+            vars_from_yaml:
+              four: 4
+            array:
+              - 456
+          )
+
+          runner = described_class.new(
+            spy,
+            node_json: [json_one.path, json_two.path],
+            node_yaml: [yaml_one.path, yaml_two.path]
+          )
+
+          expect(runner.node[:vars_from_json][:one]).to eq 1
+          expect(runner.node[:vars_from_json][:two]).to eq 2
+          expect(runner.node[:vars_from_yaml][:three]).to eq 3
+          expect(runner.node[:vars_from_yaml][:four]).to eq 4
+          expect(runner.node[:array]).to eq [456]
+          expect(runner.node[:shared][:foo]).to eq true
+          expect(runner.node[:shared][:bar]).to eq false
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.12.4
+  version: 1.13.0
 platform: ruby
 authors:
 - Ryota Arai
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: specinfra
   requirement: !ruby/object:Gem::Requirement
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Simple Configuration Management Tool