itamae 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bee2953f7e53e6c977a24568b6f1ef50b2209f40
-  data.tar.gz: 2b8e4200cbcbf4f2106185355e240ba2c9798863
+  metadata.gz: f7fa94c40f407b231be9ce95914243185fc593d1
+  data.tar.gz: 9dc1fa0303e5300ebb4742ec6f0265764af39ac8
 SHA512:
-  metadata.gz: 73481813d9a2e6d6ed1033e787dc8e0392a6b47c1e68de5df4af6b43e76b6bd0a67e9095c826aa51b9cd74e62cbb08767f41210f55ddfa8e088996f58c339963
-  data.tar.gz: a1627a795d970cbfb2eba039bb13a5d33141c5209a1a75d967b549937e1db0bba7b03199e02f5758d0326be534d1758ee7673a4516e3f652c12a34742c2623a8
+  metadata.gz: 50781d5b380946cfe7647780a245e94929ae8c0c1af8cfa6435621b900af04cf5be62fc04fd2b0249343bceb97f26f026cd424afa509743c6da388bb2bb18e11
+  data.tar.gz: d1c88a9ec88b590af6c40dc4681b26ec09fd26e57c64cf20edb84fa9f01064a443911f9b799d8959eeb6c8dfe287c7ec96b9b9351d7c4448e397b8e630e120aa

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v1.2.2
+
+Improvements
+
+- Refactor Backend and Runner class for multi backends.
+
+## v1.2.1
+
+(yanked)
+
 ## v1.2.0
 
 Feature

data/itamae.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thor"
-  spec.add_runtime_dependency "specinfra", [">= 2.24.1", "< 3.0.0"]
+  spec.add_runtime_dependency "specinfra", [">= 2.24.2", "< 3.0.0"]
   spec.add_runtime_dependency "hashie"
   spec.add_runtime_dependency "ansi"
   spec.add_runtime_dependency "schash", "~> 0.1.0"

data/lib/itamae/backend.rb

@@ -2,6 +2,8 @@ require 'specinfra'
 require 'singleton'
 require 'io/console'
 
+Specinfra.configuration.error_on_missing_backend_type = true
+
 module Specinfra
   module Configuration
     def self.sudo_password
@@ -157,10 +159,9 @@ module Itamae
 
         if @options[:vagrant]
           config = Tempfile.new('', Dir.tmpdir)
-          hostname = opts[:host] || 'default'
+          hostname = opts[:host_name] || 'default'
           `vagrant ssh-config #{hostname} > #{config.path}`
           opts.merge!(Net::SSH::Config.for(hostname, [config.path]))
-          opts[:host] = opts.delete(:host_name)
         end
 
         if @options[:ask_password]

data/lib/itamae/node.rb

@@ -4,36 +4,34 @@ require 'json'
 require 'schash'
 
 module Itamae
-  class Node < Hashie::Mash
+  class Node
     ValidationError = Class.new(StandardError)
 
-    def initialize(initial_hash, backend = nil)
-      super(initial_hash)
+    attr_reader :mash
+
+    def initialize(hash, backend)
+      @mash = Hashie::Mash.new(hash)
       @backend = backend
     end
 
     def reverse_merge(other_hash)
-      Hashie::Mash.new(other_hash).merge(self)
+      self.class.new(_reverse_merge(other_hash), @backend)
     end
 
     def reverse_merge!(other_hash)
-      self.replace(reverse_merge(other_hash))
+      @mash.replace(_reverse_merge(other_hash))
     end
 
     def [](key)
-      val = super(key)
-      if val.nil?
-        begin
-          val = @backend.host_inventory[key]
-        rescue NotImplementedError, NameError
-          val = nil
-        end
+      if @mash.has_key?(key)
+        @mash[key]
+      else
+        fetch_inventory_value(key)
       end
-      val
     end
 
     def validate!(&block)
-      errors = Schash::Validator.new(&block).validate(self)
+      errors = Schash::Validator.new(&block).validate(@mash)
       unless errors.empty?
         errors.each do |error|
           Logger.error "'#{error.position.join('->')}' #{error.message}"
@@ -41,6 +39,31 @@ module Itamae
         raise ValidationError
       end
     end
+
+    private
+
+    def _reverse_merge(other_hash)
+      Hashie::Mash.new(other_hash).merge(@mash)
+    end
+
+    def method_missing(method, *args)
+      if @mash.respond_to?(method)
+        return @mash.public_send(method, *args)
+      elsif args.empty? && value = fetch_inventory_value(method)
+        return value
+      end
+
+      super
+    end
+
+    def respond_to?(method, priv = false)
+      @mash.respond_to?(method, priv) || super
+    end
+
+    def fetch_inventory_value(key)
+      @backend.host_inventory[key]
+    rescue NotImplementedError, NameError
+      nil
+    end
   end
 end
-

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.2.2
+1.2.3

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

@@ -7,7 +7,7 @@ module Itamae
       it "merges a hash but the method receiver's value will be preferred" do
         a = described_class.new({a: :b, c: :d}, backend)
         expected = described_class.new({a: :b, c: :d, e: :f}, backend)
-        expect(a.reverse_merge(a: :c, e: :f)).to eq(expected)
+        expect(a.reverse_merge(a: :c, e: :f).mash).to eq(expected.mash)
       end
     end
   end

data/spec/unit/spec_helper.rb

@@ -19,4 +19,5 @@ RSpec.configure do |config|
 end
 
 Itamae::Logger.log_device = StringIO.new
+Specinfra.configuration.error_on_missing_backend_type = false
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Ryota Arai
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.24.1
+        version: 2.24.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.24.1
+        version: 2.24.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0