itamae 1.9.13 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d31a078719d6c81a81538a9018dd038502f5b70b05918927bc3a97e6afdf8ebb
-  data.tar.gz: 23e7489bd095e53a783be646ba54c9d88dad035eb00248528126fb35f03a50ac
+  metadata.gz: 3c8a12f995297dabd31b3252f40b6dd38f0cc9238ca9653a7884d4d0e821824d
+  data.tar.gz: caf697caf3d0f628b6dc1beffe697c6b97b247cfbb1a711674e44f14c8830dab
 SHA512:
-  metadata.gz: a00853cae59ed87678e3351a3888d352c372c03d8cd6ebbe1491df525648440efb69ed8c67611dce68a41681ea8782d263feec21b87c229df5d646bfb16997c8
-  data.tar.gz: c5315707855dce49e9470a6c9723ecb537fd1b117cc29ea755bf023c320fe5aedb2d1d1882e173509cf68ed1e502c9728451471bb810ea4bbdf520ccb2f2e63b
+  metadata.gz: 34c6c6d4b83792d9fbe733c8d0ba82ca770d9b194340800ad9afcd9cd33682313458c814f80c80bac3f25389e3dce60132f23da21b8b66032ee08ab850b6dd9e
+  data.tar.gz: 69bce9ffc7feb0528027d3af15a9127799dffd775a4f9c07dc72a0a98ed6d04fbbd8a8eb13d9fb0d4fbc6b55d4f032d7be51fee365ddb70cfb71de459010f1fc

data/CHANGELOG.md

@@ -1,8 +1,15 @@
 ## Unreleased
-[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.9.12...master)
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.10.0...master)
+
+## v1.10.0
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.9.13...v1.10.0)
+
+Features
+
+- [Support `only_if` and `not_if` inside a `define`](https://github.com/itamae-kitchen/itamae/pull/271)
 
 ## v1.9.13
-[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.9.11...v1.9.12)
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.9.12...v1.9.13)
 
 Bugfixes
 

data/lib/itamae/recipe.rb

@@ -161,6 +161,18 @@ module Itamae
         context.instance_eval(&@definition.class.definition_block)
       end
 
+      def run
+        if @definition.do_not_run_because_of_only_if?
+          Itamae.logger.debug "#{@definition.resource_type}[#{@definition.resource_name}] Execution skipped because of only_if attribute"
+          return
+        elsif @definition.do_not_run_because_of_not_if?
+          Itamae.logger.debug "#{@definition.resource_type}[#{@definition.resource_name}] Execution skipped because of not_if attribute"
+          return
+        end
+
+        super
+      end
+
       private
 
       def show_banner

data/lib/itamae/resource/base.rb

@@ -160,6 +160,16 @@ module Itamae
         self.class.name.split("::").last.scan(/[A-Z][^A-Z]+/).map(&:downcase).join('_')
       end
 
+      def do_not_run_because_of_only_if?
+        @only_if_command &&
+          run_command(@only_if_command, error: false).exit_status != 0
+      end
+
+      def do_not_run_because_of_not_if?
+        @not_if_command &&
+          run_command(@not_if_command, error: false).exit_status == 0
+      end
+
       private
 
       alias_method :current, :current_attributes
@@ -270,16 +280,6 @@ module Itamae
         end
       end
 
-      def do_not_run_because_of_only_if?
-        @only_if_command &&
-          run_command(@only_if_command, error: false).exit_status != 0
-      end
-
-      def do_not_run_because_of_not_if?
-        @not_if_command &&
-          run_command(@not_if_command, error: false).exit_status == 0
-      end
-
       def backend
         runner.backend
       end

data/lib/itamae/version.rb

@@ -1,3 +1,3 @@
 module Itamae
-  VERSION = "1.9.13"
+  VERSION = "1.10.0"
 end

data/spec/integration/default_spec.rb

@@ -227,6 +227,42 @@ describe file('/tmp/remote_file_in_definition') do
   its(:content) { should eq("definition_example\n") }
 end
 
+describe file('/tmp/created_by_definition_2_created') do
+  it { should be_file }
+  its(:content) { should eq("name:created,key:value2,message:Hello, Itamae\n") }
+end
+
+describe file('/tmp/remote_file_in_definition_2_created') do
+  it { should be_file }
+  its(:content) { should eq("definition_example_2\n") }
+end
+
+describe file('/tmp/created_by_definition_2_not_created') do
+  it { should_not exist }
+end
+
+describe file('/tmp/remote_file_in_definition_2_not_created') do
+  it { should_not exist }
+end
+
+describe file('/tmp/created_by_definition_3_created') do
+  it { should be_file }
+  its(:content) { should eq("name:created,key:value3,message:Hello, Itamae\n") }
+end
+
+describe file('/tmp/remote_file_in_definition_3_created') do
+  it { should be_file }
+  its(:content) { should eq("definition_example_3\n") }
+end
+
+describe file('/tmp/created_by_definition_3_not_created') do
+  it { should_not exist }
+end
+
+describe file('/tmp/remote_file_in_definition_3_not_created') do
+  it { should_not exist }
+end
+
 describe file('/tmp/multi_delayed_notifies') do
   it { should be_file }
   its(:content) { should eq("1\n2\n3\n4\n") }

data/spec/integration/recipes/default.rb

@@ -342,6 +342,28 @@ definition_example "name" do
   key 'value'
 end
 
+execute "touch /tmp/trigger_for_definition_example_2"
+
+definition_example_2 "created" do
+  key     "value2"
+  only_if "test -f /tmp/trigger_for_definition_example_2"
+end
+
+definition_example_2 "not_created" do
+  key    "value2"
+  not_if "test -f /tmp/trigger_for_definition_example_2"
+end
+
+definition_example_3 "created" do
+  key    "value3"
+  not_if "test -f /tmp/this_file_is_not_exists"
+end
+
+definition_example_3 "not_created" do
+  key     "value3"
+  only_if "test -f /tmp/this_file_is_not_exists"
+end
+
 #####
 
 file "/tmp/never_exist4" do

data/spec/integration/recipes/define/default.rb

@@ -4,3 +4,18 @@ define :definition_example, key: 'default' do
   remote_file "/tmp/remote_file_in_definition"
 end
 
+define :definition_example_2, key: 'default' do
+  execute "echo 'name:#{params[:name]},key:#{params[:key]},message:#{node[:message]}' > /tmp/created_by_definition_2_#{params[:name]}"
+
+  remote_file "/tmp/remote_file_in_definition_2_#{params[:name]}" do
+    source "files/remote_file_in_definition_2"
+  end
+end
+
+define :definition_example_3, key: 'default' do
+  execute "echo 'name:#{params[:name]},key:#{params[:key]},message:#{node[:message]}' > /tmp/created_by_definition_3_#{params[:name]}"
+
+  remote_file "/tmp/remote_file_in_definition_3_#{params[:name]}" do
+    source "files/remote_file_in_definition_3"
+  end
+end

data/spec/integration/recipes/define/files/remote_file_in_definition_2

@@ -0,0 +1 @@
+definition_example_2

data/spec/integration/recipes/define/files/remote_file_in_definition_3

@@ -0,0 +1 @@
+definition_example_3

data/spec/integration/spec_helper.rb

@@ -14,3 +14,10 @@ set :docker_container, ENV["DOCKER_CONTAINER"]
 
 # Set PATH
 # set :path, '/sbin:/usr/local/sbin:$PATH'
+
+RSpec.configure do |config|
+  unless ENV["CI"]
+    # focus is enabled only local (Run all specs at CI)
+    config.filter_run_when_matching :focus
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.9.13
+  version: 1.10.0
 platform: ruby
 authors:
 - Ryota Arai
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -274,6 +274,8 @@ files:
 - spec/integration/recipes/default2.rb
 - spec/integration/recipes/define/default.rb
 - spec/integration/recipes/define/files/remote_file_in_definition
+- spec/integration/recipes/define/files/remote_file_in_definition_2
+- spec/integration/recipes/define/files/remote_file_in_definition_3
 - spec/integration/recipes/dry_run.rb
 - spec/integration/recipes/files/empty_file
 - spec/integration/recipes/files/remote_file_auto
@@ -330,6 +332,8 @@ test_files:
 - spec/integration/recipes/default2.rb
 - spec/integration/recipes/define/default.rb
 - spec/integration/recipes/define/files/remote_file_in_definition
+- spec/integration/recipes/define/files/remote_file_in_definition_2
+- spec/integration/recipes/define/files/remote_file_in_definition_3
 - spec/integration/recipes/dry_run.rb
 - spec/integration/recipes/files/empty_file
 - spec/integration/recipes/files/remote_file_auto