itamae 1.2.19 → 1.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a63438ba5d5a7df745b43c27d982046e5a00f12
-  data.tar.gz: 5cf2cd03190449e6dd7a9b8b2bd8dbd9d664fe6e
+  metadata.gz: ebe55a32ee69f26e86a9b90f98d09c2962eaae96
+  data.tar.gz: 12681aa3d8e0883562ef20f025f745bc1a00df71
 SHA512:
-  metadata.gz: c5a195641261be7d1f1c6626c7b36f4aaa457034ae856d894ad0a7df4dc9ad6a5445e0aadd2f98da8dcfeca18c4aba67127124617b50d1fcace00412274d17fb
-  data.tar.gz: 8ae0da5d2367aa6ea25e54cc497a52c4da35c42a64421f8889c12773f85b45b48447c82a50b8f25a6bd9928d17f99d5dddd899db235de17caa5fcac51fe900df
+  metadata.gz: a825854a1ab504152f6052ddafa9774bdb3a465924202d4025116757723e929b5c9cdde536c8eee3e3241da302905d71ba135d4f0c4ce000c5baec04fdcc8041
+  data.tar.gz: f6afc1d44a0606695bd373d586194d7e9fe64bba44a7cc8f8a594ad27cf7ff8c7e5117d6bc62853a9ead300c1888e8829a83000fb210439768e43ce7a1768006

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## v1.2.21
+
+Improvements
+
+- [Show error message when specified action is unavailable in dry_run mode (by @eagletmt)](https://github.com/itamae-kitchen/itamae/pull/137)
+- [Fix deprecation warnings in unit tests (by @eagletmt)](https://github.com/itamae-kitchen/itamae/pull/138)
+
+## v1.2.20
+
+Improvements
+
+- [Wrap host inventory value with Hashie::Mash to access it by a method call](https://github.com/itamae-kitchen/itamae/pull/135)
+
 ## v1.2.19
 
 Features

data/lib/itamae/node.rb

@@ -61,7 +61,12 @@ module Itamae
     end
 
     def fetch_inventory_value(key)
-      @backend.host_inventory[key]
+      value = @backend.host_inventory[key]
+      if value.is_a?(Hash)
+        value = Hashie::Mash.new(value)
+      end
+
+      value
     rescue NotImplementedError, NameError
       nil
     end

data/lib/itamae/resource/base.rb

@@ -184,8 +184,13 @@ module Itamae
           Logger.debug "(in show_differences)"
           show_differences
 
-          unless options[:dry_run]
-            public_send("action_#{action}".to_sym, options)
+          method_name = "action_#{action}"
+          if options[:dry_run]
+            unless respond_to?(method_name)
+              Logger.error "action #{action.inspect} is unavailable"
+            end
+          else
+            public_send(method_name, options)
           end
 
           updated! if different?

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.2.19
+1.2.21

data/spec/integration/recipes/default.rb

@@ -335,3 +335,13 @@ local_ruby_block 'execute run_command' do
     end
   end
 end
+
+###
+
+v1 = node.memory.total
+v2 = node[:memory][:total]
+v3 = node['memory']['total']
+
+unless v1 == v2 && v2 == v3 && v1 =~ /\A\d+kB\z/
+  raise "failed to fetch host inventory value (#{v1}, #{v2}, #{v3})"
+end

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

@@ -7,47 +7,48 @@ module Itamae
       include FakeFS::SpecHelpers
 
       class Klass < Itamae::Backend::Base
-        def initialize(_)
-          @backend = Object.new
-          @backend.stub(:send_file)
-          @backend.stub(:send_directory)
+        def initialize(_, backend)
+          @backend = backend
         end
       end
 
+      let(:backend) { double('backend', send_file: nil, send_directory: nil) }
+      let(:itamae_backend) { Klass.new('dummy', backend) }
+
       describe ".send_file" do
         context "the source file doesn't exist" do
-          subject { -> { Klass.new("dummy").send_file("src", "dst") } }
+          subject { -> { itamae_backend.send_file("src", "dst") } }
           it { expect(subject).to raise_error(Itamae::Backend::SourceNotExistError, "The file 'src' doesn't exist.") }
         end
 
         context "the source file exist, but it is not a regular file" do
           before { Dir.mkdir("src")  }
-          subject { -> { Klass.new("dummy").send_file("src", "dst") } }
+          subject { -> { itamae_backend.send_file("src", "dst") } }
           it { expect(subject).to raise_error(Itamae::Backend::SourceNotExistError, "'src' is not a file.") }
         end
 
         context "the source file is a regular file" do
           before { FileUtils.touch("src")  }
-          subject { -> { Klass.new("dummy").send_file("src", "dst") } }
+          subject { -> { itamae_backend.send_file("src", "dst") } }
           it { expect { subject }.not_to raise_error }
         end
       end
 
       describe ".send_directory" do
         context "the source directory doesn't exist" do
-          subject { -> { Klass.new("dummy").send_directory("src", "dst") } }
+          subject { -> { itamae_backend.send_directory("src", "dst") } }
           it { expect(subject).to raise_error(Itamae::Backend::SourceNotExistError, "The directory 'src' doesn't exist.") }
         end
 
         context "the source directory exist, but it is not a directory" do
           before { FileUtils.touch("src")  }
-          subject { -> { Klass.new("dummy").send_directory("src", "dst") } }
+          subject { -> { itamae_backend.send_directory("src", "dst") } }
           it { expect(subject).to raise_error(Itamae::Backend::SourceNotExistError, "'src' is not a directory.") }
         end
 
         context "the source directory is a directory" do
           before { Dir.mkdir("src")  }
-          subject { -> { Klass.new("dummy").send_directory("src", "dst") } }
+          subject { -> { itamae_backend.send_directory("src", "dst") } }
           it { expect { subject }.not_to raise_error }
         end
       end

data/spec/unit/lib/itamae/resource/base_spec.rb

@@ -106,17 +106,28 @@ describe TestResource do
   end
   let(:recipe) do
     double(:recipe).tap do |r|
-      r.stub(:runner).and_return(runner)
+      allow(r).to receive(:runner).and_return(runner)
     end
   end
 
   describe "#run" do
     before do
       subject.attributes.action = :name
+      allow(Itamae::Logger).to receive(:debug)  # suppress logger output
     end
+
     it "executes <ACTION_NAME>_action method" do
       expect(subject).to receive(:action_name)
       subject.run
     end
+
+    context 'with dry_run' do
+      context 'when specified action is unavailable' do
+        it 'logs error' do
+          expect(Itamae::Logger).to receive(:error).with(/action :name is unavailable/)
+          subject.run(nil, dry_run: true)
+        end
+      end
+    end
   end
 end

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

@@ -19,7 +19,7 @@ module Itamae
         pending "Rewrite later"
         recipes.each do |r|
           recipe = double(:recipe)
-          Recipe.stub(:new).with(
+          allow(Recipe).to receive(:new).with(
             an_instance_of(Itamae::Runner),
             File.expand_path(r)
           ).and_return(recipe)

data/spec/unit/spec_helper.rb

@@ -7,7 +7,6 @@ require 'itamae'
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
@@ -16,6 +15,8 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
+
+  config.raise_errors_for_deprecations!
 end
 
 Itamae::Logger.log_device = StringIO.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.2.19
+  version: 1.2.21
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor