itamae 1.1.18 → 1.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21d7a4d489e16899e9c5554fc59a8741ec2aa0cc
-  data.tar.gz: c188142a5e592f79df63523e0f193b266432d888
+  metadata.gz: 5bc2771249661bde6dc39318b631d963a7697ebc
+  data.tar.gz: e0daf9fcefe8de50700be1bd21a5e6d2713a514a
 SHA512:
-  metadata.gz: 8221d7deaa055b4091ccb439c8ca9411f8d91baa938d1dd12dba5ca661b991f755a30eb8ed1789c2cb8c78239f739a1a0e28ffb02e8cb8dcceb21490934701d1
-  data.tar.gz: deee523a22ae7d96c6d814580f67aed9afa8d5f120a9d131dc1d68ae594a6ba0d4da032070d63e625334a6dcb5fa03cc8a542c369076b8ad16a4ab976780d75c
+  metadata.gz: 554595b1b3c7a10964e2d087d3b1a8194f1baab016fd4e6408dea6ab920d671d64744b1a19f2ec488e835d9072eb980dca6b24677c3c99bae1a5c55162dd9d44
+  data.tar.gz: 7b245129c145755de0ff1751c9fe275be4bb30532540269be2c6e0300d376af02fc3b1ef063153b9a32b08f409ada0228a3c21705c4ceef13b6777e827745d5a

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## v1.1.19
+
+Features
+
+- `verify` attribute
+  - command will be executed after running resource action.
+  - If it fails, Itamae will abort (notifications will not be executed)
+
+Improvements
+
+- [`--vagrant` option without `--host` assumes the VM name `default` (by @muratayusuke)](https://github.com/itamae-kitchen/itamae/pull/91)
+- `delayed` is a valid notification timing.
+  - same as Chef
+- If invalid notification timing is provided, an error will be raised.
+
 ## v1.1.18
 
 Improvements

data/lib/itamae/cli.rb

@@ -33,7 +33,7 @@ module Itamae
     option :node_json, type: :string, aliases: ['-j']
     option :node_yaml, type: :string, aliases: ['-y']
     option :dry_run, type: :boolean, aliases: ['-n']
-    option :host, required: true, type: :string, aliases: ['-h']
+    option :host, type: :string, aliases: ['-h']
     option :user, type: :string, aliases: ['-u']
     option :key, type: :string, aliases: ['-i']
     option :port, type: :numeric, aliases: ['-p']
@@ -46,6 +46,10 @@ module Itamae
         raise "Please specify recipe files."
       end
 
+      unless options[:host] || options[:vagrant]
+        raise "Please set '-h <hostname>' or '--vagrant'"
+      end
+
       Runner.run(recipe_files, :ssh, options)
     end
 

data/lib/itamae/notification.rb

@@ -2,6 +2,10 @@ require 'itamae'
 
 module Itamae
   class Notification < Struct.new(:defined_in_resource, :action, :target_resource_desc, :timing)
+    def self.create(*args)
+      self.new(*args).tap(&:validate!)
+    end
+
     def resource
       runner.children.find_resource_by_description(target_resource_desc)
     end
@@ -17,6 +21,21 @@ module Itamae
     def runner
       defined_in_resource.recipe.runner
     end
+
+    def delayed?
+      [:delay, :delayed].include?(timing)
+    end
+
+    def immediately?
+      timing == :immediately
+    end
+
+    def validate!
+      unless [:delay, :delayed, :immediately].include?(timing)
+        Logger.error "'#{timing}' is not valid notification timing. (Valid option is delayed or immediately)"
+        abort
+      end
+    end
   end
 
   class Subscription < Notification

data/lib/itamae/resource/base.rb

@@ -9,6 +9,7 @@ module Itamae
         attr_reader :attributes
         attr_reader :notifications
         attr_reader :subscriptions
+        attr_reader :verify_commands
         attr_reader :only_if_command
         attr_reader :not_if_command
 
@@ -18,6 +19,7 @@ module Itamae
           @attributes = Hashie::Mash.new
           @notifications = []
           @subscriptions = []
+          @verify_commands = []
         end
 
         def respond_to_missing?(method, include_private = false)
@@ -39,11 +41,11 @@ module Itamae
         end
 
         def notifies(action, resource_desc, timing = :delay)
-          @notifications << Notification.new(@resource, action, resource_desc, timing)
+          @notifications << Notification.create(@resource, action, resource_desc, timing)
         end
 
         def subscribes(action, resource_desc, timing = :delay)
-          @subscriptions << Subscription.new(@resource, action, resource_desc, timing)
+          @subscriptions << Subscription.create(@resource, action, resource_desc, timing)
         end
 
         def only_if(command)
@@ -57,6 +59,11 @@ module Itamae
         def node
           @resource.recipe.runner.node
         end
+
+        # Experimental
+        def verify(command)
+          @verify_commands << command
+        end
       end
 
       @defined_attributes ||= {}
@@ -102,6 +109,7 @@ module Itamae
           @subscriptions = context.subscriptions
           @only_if_command = context.only_if_command
           @not_if_command = context.not_if_command
+          @verify_commands = context.verify_commands
         end
 
         process_attributes
@@ -123,6 +131,7 @@ module Itamae
             run_action(action, options)
           end
 
+          verify unless options[:dry_run]
           notify(options) if updated?
         end
       rescue Backend::CommandExecutionError
@@ -326,10 +335,9 @@ module Itamae
         (notifications + recipe.children.subscribing(self)).each do |notification|
           message = "Notifying #{notification.action} to #{notification.action_resource.resource_type} resource '#{notification.action_resource.resource_name}'"
 
-          case notification.timing
-          when :delay
+          if notification.delayed?
             message << " (delayed)"
-          when :immediately
+          elsif notification.immediately?
             message << " (immediately)"
           end
 
@@ -339,11 +347,21 @@ module Itamae
             Logger.info "(because it subscribes this resource)"
           end
 
-          case notification.timing
-          when :immediately
-            notification.run(options)
-          when :delay
+          if notification.delayed?
             @recipe.delayed_notifications << notification
+          elsif notification.immediately?
+            notification.run(options)
+          end
+        end
+      end
+
+      def verify
+        return if @verify_commands.empty?
+
+        Logger.info "Verifying..."
+        Logger.formatter.indent do
+          @verify_commands.each do |command|
+            run_command(command)
           end
         end
       end

data/lib/itamae/runner.rb

@@ -69,8 +69,9 @@ module Itamae
 
           if options[:vagrant]
             config = Tempfile.new('', Dir.tmpdir)
-            `vagrant ssh-config #{opts[:host]} > #{config.path}`
-            opts.merge!(Net::SSH::Config.for(opts[:host], [config.path]))
+            hostname = opts[:host] || 'default'
+            `vagrant ssh-config #{hostname} > #{config.path}`
+            opts.merge!(Net::SSH::Config.for(hostname, [config.path]))
             opts[:host] = opts.delete(:host_name)
           end
 

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.1.18
+1.1.19

data/spec/integration/recipes/default.rb

@@ -215,3 +215,9 @@ file "/tmp/file1" do
   notifies :create, "file[/tmp/never_exist4]"
 end
 
+#####
+
+execute 'true' do
+  verify 'true'
+end
+

metadata

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