itamae 1.2.11 → 1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abc46228492e8429a26e851015522f897ded712f
-  data.tar.gz: ad1644cef5cfe63cd651ebfcd1a41607c63fe1f6
+  metadata.gz: 47fe6f419701b8d6ea5e8e83de69f6ec2a613b84
+  data.tar.gz: 4575a36969617f23fa01d53f058b2061bef21b2f
 SHA512:
-  metadata.gz: c035e7f0e949cadbb6f6338668501bbff39e8892e7662e8570f333f6ede71e2b7f323e6a78041795d18816deacadffe00ac0f0fe4e2830048d7a3a02ccddb338
-  data.tar.gz: 4f7e22d682411a50334b4d18b318e611fd3ff40160f3d6d27cb882b4ef426ee19294adf552c792a3dd6de06bbcacbd3dff86faaee427e1b95d25bd8236366708
+  metadata.gz: 4903252764a33d19b67966d9b8b3243ae886b1b1e0e8dc61610afd35b93aa77f3cf62d8f72a270ec327344564bdf56b489efc3708d8975701ca50e8355057423
+  data.tar.gz: a4977c7fd756974df71c798a7d4034f76026239f1a9baf5291c3d70ff2df0859b6be4133236ba8d0029dfb5088ad83d8827bec5c1ae36af126be9644f2f352e1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.2.12
+
+Bugfixes
+
+- Run delayed notifications created by a delayed notification.
+- Set updated false after executing resources.
+
 ## v1.2.11
 
 Bugfixes

data/lib/itamae/recipe.rb

@@ -46,17 +46,22 @@ module Itamae
 
       Logger.formatter.with_indent do
         @children.run(options)
-
-        @delayed_notifications.uniq do |notification|
-          [notification.action, notification.action_resource]
-        end.each do |notification|
-          notification.run(options)
-        end
+        run_delayed_notifications(options)
       end
     end
 
     private
 
+    def run_delayed_notifications(options)
+      @delayed_notifications.uniq! do |notification|
+        [notification.action, notification.action_resource]
+      end
+
+      while notification = @delayed_notifications.shift
+        notification.run(options)
+      end
+    end
+
     def show_banner
       Logger.info "Recipe: #{@path}"
     end

data/lib/itamae/resource/base.rb

@@ -134,6 +134,8 @@ module Itamae
           verify unless options[:dry_run]
           notify(options) if updated?
         end
+
+        @updated = false
       rescue Backend::CommandExecutionError
         Logger.error "#{resource_type}[#{resource_name}] Failed."
         exit 2

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.2.11
+1.2.12

data/spec/integration/default_spec.rb

@@ -135,3 +135,13 @@ describe file('/tmp/remote_file_in_definition') do
   it { should be_file }
   its(:content) { should eq("definition_example\n") }
 end
+
+describe file('/tmp/multi_delayed_notifies') do
+  it { should be_file }
+  its(:content) { should eq("1\n2\n3\n4\n") }
+end
+
+describe file('/tmp/multi_immediately_notifies') do
+  it { should be_file }
+  its(:content) { should eq("1\n2\n3\n4\n") }
+end

data/spec/integration/recipes/default.rb

@@ -236,3 +236,42 @@ execute 'true' do
   verify 'true'
 end
 
+#####
+
+execute 'echo 1 > /tmp/multi_delayed_notifies' do
+  notifies :run, "execute[echo 2 >> /tmp/multi_delayed_notifies]"
+end
+
+execute 'echo 2 >> /tmp/multi_delayed_notifies' do
+  action :nothing
+  notifies :run, "execute[echo 3 >> /tmp/multi_delayed_notifies]"
+end
+
+execute 'echo 3 >> /tmp/multi_delayed_notifies' do
+  action :nothing
+  notifies :run, "execute[echo 4 >> /tmp/multi_delayed_notifies]"
+end
+
+execute 'echo 4 >> /tmp/multi_delayed_notifies' do
+  action :nothing
+end
+
+#####
+
+execute 'echo 1 > /tmp/multi_immediately_notifies' do
+  notifies :run, "execute[echo 2 >> /tmp/multi_immediately_notifies]", :immediately
+end
+
+execute 'echo 2 >> /tmp/multi_immediately_notifies' do
+  action :nothing
+  notifies :run, "execute[echo 3 >> /tmp/multi_immediately_notifies]", :immediately
+end
+
+execute 'echo 3 >> /tmp/multi_immediately_notifies' do
+  action :nothing
+  notifies :run, "execute[echo 4 >> /tmp/multi_immediately_notifies]", :immediately
+end
+
+execute 'echo 4 >> /tmp/multi_immediately_notifies' do
+  action :nothing
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.2.12
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -262,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple Configuration Management Tool