itamae 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1638b5d146f89a94ea442567a8d7f54b5e770055
-  data.tar.gz: 88b9dbfc9d74db2008e89c3dd31ca4da5fe05640
+  metadata.gz: be707f952f0626bb44b015cee0d20e52458d732e
+  data.tar.gz: 1c12830f1a14ce7dacc5c10bf90f33e1cae17398
 SHA512:
-  metadata.gz: 98f3995c772b038282d7afc6f4741ae1360000bbe3ac022e8bf159f26819c87c4bfbabf7dcaa9384dd62a2adae6b96de324553952ae45ae2a07911a671ea6e45
-  data.tar.gz: 655e435f1a1e0976efb9f722dfa9b9b22179374721ef8b4730d9e0306b2cdaef5ae7950aaf85bc660e83463a83ac3838a2f28058e9e30d2ee37d8dc83b36ca90
+  metadata.gz: 052278ea06cccc8065d3452fec345eead2ff9ca5dd0a77bc447d9bb699f5c4de8efb20ca5648a36ef73a70e96eec3788895d1ef12053f920e92b046819905bef
+  data.tar.gz: d52c51210ae9ae7b6a99ee1c14be97a2f0fea28ceb596fc8bb66eee2b7668d21bcdb183100a597ba39852bb75fd283aa17ecd59c77e39c9bed28cd3e0c1124a3

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## v1.9.0
+
+Features
+
+- [New resource: `http_request` resource (by @hico-horiuchi)](https://github.com/itamae-kitchen/itamae/pull/180)
+- [Introduce Handler which handles events from Itamae (by @ryotarai)](https://github.com/itamae-kitchen/itamae/pull/181)
+  - Compatibility can be broken because this is experimental feature
+
+Improvements
+
+- [Optimize `git` resource for fixed revision (by @k0kubun)](https://github.com/itamae-kitchen/itamae/pull/182)
+- Rename `--dot` option to `--recipe-graph` option. (by @ryotarai)
+  - Compatibility can be broken because this is experimental feature
+
 ## v1.8.0
 
 Features
@@ -16,12 +30,13 @@ No change
 
 Features
 
-- `--profile` option (experimental)
+- `--profile` option (by @ryotarai)
   - `--profile PATH` saves executed commands to `PATH` in JSON format
+  - Compatibility can be broken because this is experimental feature
 
 Bugfixes
 
-- [Suppress errors of `edit` action of `file` resource when the target file doesn't exist in `dry-run` mode](https://github.com/itamae-kitchen/itamae/pull/144)
+- [Suppress errors of `edit` action of `file` resource when the target file doesn't exist in `dry-run` mode (by @ryotarai)](https://github.com/itamae-kitchen/itamae/pull/144)
 
 ## v1.6.3
 
@@ -54,19 +69,19 @@ Improvements
 
 Improvements
 
-- [`include_recipe 'plugin_name'` loads `itamae/plugin/recipe/plugin_name/default.rb` too](https://github.com/itamae-kitchen/itamae/pull/162)
+- [`include_recipe 'plugin_name'` loads `itamae/plugin/recipe/plugin_name/default.rb` too (by @ryotarai)](https://github.com/itamae-kitchen/itamae/pull/162)
 
 ## v1.5.1
 
 Improvements
 
-- [Logger can be injected one which doesn't have `color` method.](https://github.com/itamae-kitchen/itamae/commit/7c50f376f69029836047f26ab0a46b41b928c0d3)
+- [Logger can be injected one which doesn't have `color` method. (by @ryotarai)](https://github.com/itamae-kitchen/itamae/commit/7c50f376f69029836047f26ab0a46b41b928c0d3)
 
 ## v1.5.0
 
 Improvements
 
-- [Make a logger injectable from outside of Itamae.](https://github.com/itamae-kitchen/itamae/pull/160)
+- [Make a logger injectable from outside of Itamae. (by @ryotarai)](https://github.com/itamae-kitchen/itamae/pull/160)
 
 ## v1.4.5
 
@@ -78,13 +93,13 @@ Improvements
 
 Features
 
-- `--shell` option for `local`, `ssh` and `docker` subcommands. If it is set, it will be used instead of /bin/sh
+- `--shell` option for `local`, `ssh` and `docker` subcommands. If it is set, it will be used instead of /bin/sh (by @ryotarai)
 
 ## v1.4.3
 
 Bugfixes
 
-- [Restore original attributes of a resource after each action.](https://github.com/itamae-kitchen/itamae/commit/28d33da3cb67c6a7635e47845b0055cb17df53a8)
+- [Restore original attributes of a resource after each action. (by @ryotarai)](https://github.com/itamae-kitchen/itamae/commit/28d33da3cb67c6a7635e47845b0055cb17df53a8)
 
 ## v1.4.2
 
@@ -113,13 +128,13 @@ Improvements
 
 Bugfixes
 
-- `create` action of `file` resource without `content` attribute changes mode and owner without touching the content of the file
+- `create` action of `file` resource without `content` attribute changes mode and owner without touching the content of the file (by @ryotarai)
 
 ## v1.3.5
 
 Improvements
 
-- [`create` action of `file` resource without `content` attribute changes mode and owner without touching the content of the file](https://github.com/itamae-kitchen/itamae/compare/itamae-kitchen:d4a0abc...itamae-kitchen:3eae144)
+- [`create` action of `file` resource without `content` attribute changes mode and owner without touching the content of the file (by @ryotarai)](https://github.com/itamae-kitchen/itamae/compare/itamae-kitchen:d4a0abc...itamae-kitchen:3eae144)
 
 Bugfixes
 
@@ -129,7 +144,7 @@ Bugfixes
 
 Improvements
 
-- [Output stdout/err logs during command execution](https://github.com/itamae-kitchen/itamae/commit/24f140dd9744f30c645422959a6a72b6e31eacc4)
+- [Output stdout/err logs during command execution (by @ryotarai)](https://github.com/itamae-kitchen/itamae/commit/24f140dd9744f30c645422959a6a72b6e31eacc4)
 
 ## v1.3.3
 
@@ -153,7 +168,7 @@ Features
 
 Improvements
 
-- Update `HOME` environment variable when `user` attribute is specified. (incompatible change)
+- Update `HOME` environment variable when `user` attribute is specified. (incompatible change) (by @ryotarai)
 
 ## v1.2.21
 
@@ -166,7 +181,7 @@ Improvements
 
 Improvements
 
-- [Wrap host inventory value with Hashie::Mash to access it by a method call](https://github.com/itamae-kitchen/itamae/pull/135)
+- [Wrap host inventory value with Hashie::Mash to access it by a method call (by @ryotarai)](https://github.com/itamae-kitchen/itamae/pull/135)
 
 ## v1.2.19
 
@@ -178,7 +193,7 @@ Features
 
 Features
 
-- `run_command` method in a recipe, definition and resource
+- `run_command` method in a recipe, definition and resource (by @ryotarai)
 
 ## v1.2.17
 
@@ -203,7 +218,7 @@ Bugfixes
 
 Features
 
-- "edit" action of "file" resource
+- "edit" action of "file" resource (by @ryotarai)
 
 ## v1.2.13
 
@@ -215,8 +230,8 @@ Features
 
 Bugfixes
 
-- Run delayed notifications created by a delayed notification.
-- Set updated false after executing resources.
+- Run delayed notifications created by a delayed notification. (by @ryotarai)
+- Set updated false after executing resources. (by @ryotarai)
 
 ## v1.2.11
 
@@ -234,7 +249,7 @@ Bugfixes
 
 Bugfixes
 
-- Do not use local variable named `variables`.
+- Do not use local variable named `variables`. (by @ryotarai)
 
 If `variables` is used as local variable's name, the following causes a syntax error.
 
@@ -261,31 +276,31 @@ Bugfixes
 
 ## v1.2.6
 
-- Remove code for debugging...
+- Remove code for debugging... (by @ryotarai)
 
 ## v1.2.5
 
 Bugfixes
 
-- Bugs in definition feature.
+- Bugs in definition feature. (by @ryotarai)
 
 ## v1.2.4
 
 Improvements
 
-- Use specinfra/core instead of specinfra.
+- Use specinfra/core instead of specinfra. (by @ryotarai)
 
 ## v1.2.3
 
 Bugfixes
 
-- Bugs in Node class
+- Bugs in Node class (by @ryotarai)
 
 ## v1.2.2
 
 Improvements
 
-- Refactor Backend and Runner class for multi backends.
+- Refactor Backend and Runner class for multi backends. (by @ryotarai)
 
 ## v1.2.1
 
@@ -295,41 +310,42 @@ Improvements
 
 Feature
 
-- Docker backend
+- Docker backend (by @ryotarai)
   - This backend builds a Docker image.
   - Usage: `itamae docker --image baseimage recipe.rb`
   - NOTE: This feature is experimental.
+  - Compatibility can be broken because this is experimental feature
 
 ## v1.1.26
 
 Bugfix
 
-- Always outdent.
+- Always outdent. (by @ryotarai)
 
 ## v1.1.25
 
 Improvements
 
 - Make logging less verbose by default. (by @eagletmt)
-- Change indent width from 3 to 2.
+- Change indent width from 3 to 2. (by @ryotarai)
 
 ## v1.1.24
 
 Bugfixes
 
-- Make `node` accessible from define block.
+- Make `node` accessible from define block. (by @ryotarai)
 
 ## v1.1.23
 
 Feature
 
-- Validate node attributes by `Node#validate!`
+- Validate node attributes by `Node#validate!` (by @ryotarai)
 
 ## v1.1.22
 
 Improvements
 
-- `source :auto` accepts a template without .erb extention.
+- `source :auto` accepts a template without .erb extention. (by @ryotarai)
 
 ## v1.1.21
 
@@ -342,7 +358,7 @@ Bugfixes
 
 Features
 
-- `source :auto` of remote_file and template resources.
+- `source :auto` of remote_file and template resources. (by @ryotarai)
   - details: https://github.com/itamae-kitchen/itamae/issues/94
 
 ## v1.1.19
@@ -350,22 +366,22 @@ Features
 Features
 
 - `verify` attribute
-  - command will be executed after running resource action.
+  - command will be executed after running resource action. (by @ryotarai)
   - 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.
+- `delayed` is a valid notification timing. (by @ryotarai)
   - same as Chef
-- If invalid notification timing is provided, an error will be raised.
+- If invalid notification timing is provided, an error will be raised. (by @ryotarai)
 
 ## v1.1.18
 
 Improvements
 
 - [Add remove action to package resource (by @eagletmt)](https://github.com/itamae-kitchen/itamae/pull/92)
-- Colorize diff output of file resource
+- Colorize diff output of file resource (by @ryotarai)
   - removed lines in red
   - inserted lines in green
 
@@ -373,58 +389,59 @@ Improvements
 
 Bugfixes
 
-- Do not remove space char in output of diff.
+- Do not remove space char in output of diff. (by @ryotarai)
 
 ## v1.1.16
 
 Features
 
-- `source` attribute of `gem_package` resource.
+- `source` attribute of `gem_package` resource. (by @ryotarai)
 
 ## v1.1.15
 
 Features
 
-- Implement `gem_package` resource.
+- Implement `gem_package` resource. (by @ryotarai)
 
 ## v1.1.14
 
 Improvements
 
-- Start a service only if the service is not running.
-- Stop a service only if the service is running.
+- Start a service only if the service is not running. (by @ryotarai)
+- Stop a service only if the service is running. (by @ryotarai)
 
 ## v1.1.13
 
 Improvements
 
-- [Set executed attr of execute resource for logging purpose.](https://github.com/itamae-kitchen/itamae/pull/86)
-- [Colorize diff output of file resource green.](https://github.com/itamae-kitchen/itamae/pull/87)
+- [Set executed attr of execute resource for logging purpose. (by @ryotarai)](https://github.com/itamae-kitchen/itamae/pull/86)
+- [Colorize diff output of file resource green. (by @ryotarai)](https://github.com/itamae-kitchen/itamae/pull/87)
 
 ## v1.1.12
 
 Bugfixes
 
-- [Update home directory of user resource if changed.](https://github.com/itamae-kitchen/itamae/commit/0b5ad5245af8a7849d36d0598f06b7adb9ac025a)
+- [Update home directory of user resource if changed. (by @ryotarai)](https://github.com/itamae-kitchen/itamae/commit/0b5ad5245af8a7849d36d0598f06b7adb9ac025a)
 
 ## v1.1.11
 
 Bugfixes
 
-- [Do not include recipes which are already included.](https://github.com/itamae-kitchen/itamae/pull/85)
+- [Do not include recipes which are already included. (by @ryotarai)](https://github.com/itamae-kitchen/itamae/pull/85)
     - This may break backward compatibility.
 
 ## v1.1.10
 
 Feature
 
-- `--dot` option to write dependency graph of recipes (Experimental)
+- `--dot` option to write dependency graph of recipes
+  - Compatibility can be broken because this is experimental feature
 
 ## v1.1.9
 
 Improvements
 
-- Show template file path when rendering the template fails.
+- Show template file path when rendering the template fails. (by @ryotarai)
 
 ## v1.1.8
 
@@ -436,7 +453,7 @@ Improvements
 
 Bugfixes
 
-- Fix a typo bug
+- Fix a typo bug (by @ryotarai)
 
 ## v1.1.6 (yanked)
 
@@ -452,8 +469,8 @@ Bugfixes
 
 Bugfixes
 
-- Clear current attributes before each action.
-- Turn on updated-flag after each action.
+- Clear current attributes before each action. (by @ryotarai)
+- Turn on updated-flag after each action. (by @ryotarai)
 
 ## v1.1.4
 
@@ -473,17 +490,17 @@ Features
 
 Features
 
-- `user` resource accepts group name (String) as its `gid`.
+- `user` resource accepts group name (String) as its `gid`. (by @ryotarai)
 
 ## v1.1.1
 
 Features
 
-- New resource `remote_directory` which transfers a directory from local to remote like `remote_file` resource. (Thanks to @k0kubun)
+- New resource `remote_directory` which transfers a directory from local to remote like `remote_file` resource. (by @k0kubun)
   - https://github.com/ryotarai/itamae/pull/66
 
 ## v1.1.0
 
 Incompatible changes
 
-- `uid` and `gid` attributes of `user` resource accept only Integer. (https://github.com/ryotarai/itamae/pull/65)
+- [`uid` and `gid` attributes of `user` resource accept only Integer. (by @ryotarai)](https://github.com/ryotarai/itamae/pull/65)

data/itamae.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "docker-api", "~> 1.20"
   spec.add_development_dependency "fakefs"
+  spec.add_development_dependency "fluent-logger"
 end

data/lib/itamae.rb

@@ -3,6 +3,8 @@ require "itamae/runner"
 require "itamae/cli"
 require "itamae/recipe"
 require "itamae/resource"
+require "itamae/handler"
+require "itamae/handler_proxy"
 require "itamae/recipe_children"
 require "itamae/logger"
 require "itamae/node"

data/lib/itamae/cli.rb

@@ -17,7 +17,7 @@ module Itamae
     end
 
     def self.define_exec_options
-      option :dot, type: :string, default: nil, desc: "[EXPERIMENTAL] Only write dependency graph in DOT", banner: "PATH"
+      option :recipe_graph, type: :string, desc: "[EXPERIMENTAL] Write recipe dependency graph in DOT", banner: "PATH"
       option :node_json, type: :string, aliases: ['-j']
       option :node_yaml, type: :string, aliases: ['-y']
       option :dry_run, type: :boolean, aliases: ['-n']

data/lib/itamae/handler.rb

@@ -0,0 +1,21 @@
+require 'itamae/handler/base'
+
+module Itamae
+  module Handler
+    def self.from_type(type)
+      first_time = true
+
+      class_name = type.split('_').map(&:capitalize).join
+      self.const_get(class_name)
+    rescue NameError
+      require "itamae/handler/#{type}"
+
+      if first_time
+        first_time = false
+        retry
+      else
+        raise
+      end
+    end
+  end
+end

data/lib/itamae/handler/base.rb

@@ -0,0 +1,40 @@
+require 'socket'
+
+module Itamae
+  module Handler
+    class Base
+      attr_reader :recipes, :resources, :actions
+
+      def initialize(options)
+        @options = options
+
+        @recipes = []
+        @resources = []
+        @actions = []
+      end
+
+      def event(type, payload = {})
+        case type
+        when :recipe_started
+          @recipes << payload
+        when :recipe_completed, :recipe_failed
+          @recipes.pop
+        when :resource_started
+          @resources << payload
+        when :resource_completed, :resource_failed
+          @resources.pop
+        when :action_started
+          @actions << payload
+        when :action_completed, :action_failed
+          @actions.pop
+        end
+      end
+
+      private
+
+      def hostname
+        @hostname ||= @options['hostname'] || Socket.gethostname
+      end
+    end
+  end
+end

data/lib/itamae/handler/debug.rb

@@ -0,0 +1,10 @@
+module Itamae
+  module Handler
+    class Debug < Base
+      def event(type, payload = {})
+        super
+        Itamae.logger.info("EVENT:#{type} #{payload}")
+      end
+    end
+  end
+end

data/lib/itamae/handler/fluentd.rb

@@ -0,0 +1,44 @@
+module Itamae
+  module Handler
+    class Fluentd < Base
+      attr_accessor :fluent_logger # for test
+
+      def initialize(*)
+        super
+        load_fluent_logger
+      end
+
+      def event(type, payload = {})
+        super
+
+        unless @fluent_logger.post(type, payload.merge(hostname: hostname))
+          Itamae.logger.warn "Sending logs to Fluentd failed: #{@fluent_logger.last_error}"
+        end
+      end
+
+      private
+
+      def load_fluent_logger
+        begin
+          require 'fluent-logger'
+        rescue LoadError
+          raise "Loading fluent-logger gem failed. Please install 'fluent-logger' gem to use fluentd handler."
+        end
+
+        @fluent_logger = Fluent::Logger::FluentLogger.new(tag_prefix, host: fluentd_host, port: fluentd_port)
+      end
+
+      def tag_prefix
+        @options['tag_prefix'] || 'itamae_server'
+      end
+
+      def fluentd_host
+        @options['host'] || 'localhost'
+      end
+
+      def fluentd_port
+        (@options['port'] || 24224).to_i
+      end
+    end
+  end
+end

data/lib/itamae/handler/json.rb

@@ -0,0 +1,22 @@
+module Itamae
+  module Handler
+    class Json < Base
+      def initialize(*)
+        super
+        require 'time'
+        open_file
+      end
+
+      def event(type, payload = {})
+        super
+        @f.puts({'time' => Time.now.iso8601, 'event' => type, 'payload' => payload}.to_json)
+      end
+
+      private
+
+      def open_file
+        @f = open(@options.fetch('path'), 'a')
+      end
+    end
+  end
+end

data/lib/itamae/handler_proxy.rb

@@ -0,0 +1,38 @@
+module Itamae
+  class HandlerProxy
+    def initialize
+      @instances = []
+    end
+
+    def register_instance(instance)
+      @instances << instance
+    end
+
+    def event(*args, &block)
+      if block_given?
+        _event_with_block(*args, &block)
+      else
+        _event(*args)
+      end
+    end
+
+    private
+
+    def _event(*args)
+      @instances.each do |i|
+        i.event(*args)
+      end
+    end
+
+    def _event_with_block(event_name, *args, &block)
+      event("#{event_name}_started".to_sym, *args)
+      block.call
+    rescue
+      event("#{event_name}_failed".to_sym, *args)
+      raise
+    else
+      event("#{event_name}_completed".to_sym, *args)
+    end
+  end
+end
+

data/lib/itamae/recipe.rb

@@ -61,9 +61,11 @@ module Itamae
     def run
       show_banner
 
-      Itamae.logger.with_indent do
-        @children.run
-        run_delayed_notifications
+      @runner.handler.event(:recipe, path: @path) do
+        Itamae.logger.with_indent do
+          @children.run
+          run_delayed_notifications
+        end
       end
     end
 

data/lib/itamae/recipe_children.rb

@@ -60,24 +60,24 @@ module Itamae
     end
 
     # returns dependencies graph in DOT
-    def deps_in_dot
+    def dependency_in_dot
       result = ""
       result << "digraph recipes {\n"
       result << "  rankdir=LR;\n"
-      result << _deps_in_dot
+      result << _dependency_in_dot
       result << "}"
 
       result
     end
 
-    def _deps_in_dot
+    def _dependency_in_dot
       result = ""
 
       recipes(recursive: false).each do |recipe|
         recipe.children.recipes(recursive: false).each do |child_recipe|
           result << %{  "#{recipe.path}" -> "#{child_recipe.path}";\n}
         end
-        result << recipe.children._deps_in_dot
+        result << recipe.children._dependency_in_dot
       end
 
       result

data/lib/itamae/resource.rb

@@ -6,6 +6,7 @@ require 'itamae/resource/remote_directory'
 require 'itamae/resource/remote_file'
 require 'itamae/resource/directory'
 require 'itamae/resource/template'
+require 'itamae/resource/http_request'
 require 'itamae/resource/execute'
 require 'itamae/resource/service'
 require 'itamae/resource/link'

data/lib/itamae/resource/base.rb

@@ -121,26 +121,31 @@ module Itamae
       end
 
       def run(specific_action = nil)
-        Itamae.logger.debug "#{resource_type}[#{resource_name}]"
-
-        Itamae.logger.with_indent_if(Itamae.logger.debug?) do
-          if do_not_run_because_of_only_if?
-            Itamae.logger.debug "#{resource_type}[#{resource_name}] Execution skipped because of only_if attribute"
-            return
-          elsif do_not_run_because_of_not_if?
-            Itamae.logger.debug "#{resource_type}[#{resource_name}] Execution skipped because of not_if attribute"
-            return
-          end
+        runner.handler.event(:resource, resource_type: resource_type, resource_name: resource_name) do
+          Itamae.logger.debug "#{resource_type}[#{resource_name}]"
+
+          Itamae.logger.with_indent_if(Itamae.logger.debug?) do
+            if do_not_run_because_of_only_if?
+              Itamae.logger.debug "#{resource_type}[#{resource_name}] Execution skipped because of only_if attribute"
+              return
+            elsif do_not_run_because_of_not_if?
+              Itamae.logger.debug "#{resource_type}[#{resource_name}] Execution skipped because of not_if attribute"
+              return
+            end
+
+            [specific_action || attributes.action].flatten.each do |action|
+              run_action(action)
+            end
 
-          [specific_action || attributes.action].flatten.each do |action|
-            run_action(action)
+            verify unless runner.dry_run?
+            if updated?
+              notify
+              runner.handler.event(:resource_updated)
+            end
           end
 
-          verify unless runner.dry_run?
-          notify if updated?
+          @updated = false
         end
-
-        @updated = false
       rescue Backend::CommandExecutionError
         Itamae.logger.error "#{resource_type}[#{resource_name}] Failed."
         exit 2
@@ -151,15 +156,7 @@ module Itamae
       end
 
       def resource_type
-        humps = []
-        self.class.name.split("::").last.each_char do |c|
-          if "A" <= c && c <= "Z"
-            humps << c.downcase
-          else
-            humps.last << c
-          end
-        end
-        humps.join('_')
+        self.class.name.split("::").last.scan(/[A-Z][^A-Z]+/).map(&:downcase).join('_')
       end
 
       private
@@ -167,45 +164,50 @@ module Itamae
       alias_method :current, :current_attributes
 
       def run_action(action)
-        original_attributes = @attributes # preserve and restore later
-        @current_action = action
+        runner.handler.event(:action, action: action) do
+          original_attributes = @attributes # preserve and restore later
+          @current_action = action
 
-        clear_current_attributes
+          clear_current_attributes
 
-        Itamae.logger.debug "#{resource_type}[#{resource_name}] action: #{action}"
+          Itamae.logger.debug "#{resource_type}[#{resource_name}] action: #{action}"
 
-        return if action == :nothing
+          return if action == :nothing
 
-        Itamae.logger.with_indent_if(Itamae.logger.debug?) do
-          Itamae.logger.debug "(in pre_action)"
-          pre_action
+          Itamae.logger.with_indent_if(Itamae.logger.debug?) do
+            Itamae.logger.debug "(in pre_action)"
+            pre_action
 
-          Itamae.logger.debug "(in set_current_attributes)"
-          set_current_attributes
+            Itamae.logger.debug "(in set_current_attributes)"
+            set_current_attributes
 
-          Itamae.logger.debug "(in show_differences)"
-          show_differences
+            Itamae.logger.debug "(in show_differences)"
+            show_differences
 
-          method_name = "action_#{action}"
-          if runner.dry_run?
-            unless respond_to?(method_name)
-              Itamae.logger.error "action #{action.inspect} is unavailable"
-            end
-          else
-            args = [method_name]
-            if method(method_name).arity == 1
-              # for plugin compatibility
-              args << runner.options
+            method_name = "action_#{action}"
+            if runner.dry_run?
+              unless respond_to?(method_name)
+                Itamae.logger.error "action #{action.inspect} is unavailable"
+              end
+            else
+              args = [method_name]
+              if method(method_name).arity == 1
+                # for plugin compatibility
+                args << runner.options
+              end
+
+              public_send(*args)
             end
 
-            public_send(*args)
+            if different?
+              updated!
+              runner.handler.event(:attribute_changed, from: @current_attributes, to: @attributes)
+            end
           end
 
-          updated! if different?
+          @current_action = nil
+          @attributes = original_attributes
         end
-
-        @current_action = nil
-        @attributes = original_attributes
       end
 
       def clear_current_attributes

data/lib/itamae/resource/file.rb

@@ -50,8 +50,8 @@ module Itamae
 
         super
 
-        if current.exist && @temppath
-          show_file_diff
+        if @temppath
+          compare_file
         end
       end
 
@@ -113,8 +113,14 @@ module Itamae
 
       private
 
-      def show_file_diff
-        diff = run_command(["diff", "-u", attributes.path, @temppath], error: false)
+      def compare_file
+        compare_to = if current.exist
+                       attributes.path
+                     else
+                       '/dev/null'
+                     end
+
+        diff = run_command(["diff", "-u", compare_to, @temppath], error: false)
         if diff.exit_status == 0
           # no change
           Itamae.logger.debug "file content will not change"
@@ -132,6 +138,7 @@ module Itamae
               Itamae.logger.info line.chomp
             end
           end
+          runner.handler.event(:file_content_changed, diff: diff.stdout)
         end
       end
 

data/lib/itamae/resource/git.rb

@@ -33,13 +33,12 @@ module Itamae
           cmd << attributes.repository << attributes.destination
           run_command(cmd)
           new_repository = true
-        else
-          run_command_in_repo(['git', 'fetch', 'origin'])
         end
 
         target = if attributes.revision
                    get_revision(attributes.revision)
                  else
+                   fetch_origin!
                    run_command_in_repo("git ls-remote origin HEAD | cut -f1").stdout.strip
                  end
 
@@ -52,6 +51,7 @@ module Itamae
             deploy_old_created = true
           end
 
+          fetch_origin!
           run_command_in_repo(["git", "checkout", target, "-b", DEPLOY_BRANCH])
 
           if deploy_old_created
@@ -82,6 +82,12 @@ module Itamae
       def get_revision(branch)
         run_command_in_repo("git rev-list #{shell_escape(branch)} | head -n1").stdout.strip
       end
+
+      def fetch_origin!
+        return if @origin_fetched
+        @origin_fetched = true
+        run_command_in_repo(['git', 'fetch', 'origin'])
+      end
     end
   end
 end

data/lib/itamae/resource/http_request.rb

@@ -0,0 +1,19 @@
+require 'itamae'
+require 'open-uri'
+
+module Itamae
+  module Resource
+    class HttpRequest < File
+      UrlNotFoundError = Class.new(StandardError)
+
+      define_attribute :headers, type: Hash, default: {}
+      define_attribute :url, type: String, required: true
+
+      def pre_action
+        attributes.content = open(attributes.url, attributes.headers).read
+
+        super
+      end
+    end
+  end
+end

data/lib/itamae/runner.rb

@@ -11,17 +11,7 @@ module Itamae
         backend = Backend.create(backend_type, options)
         runner = self.new(backend, options)
         runner.load_recipes(recipe_files)
-
-        if dot_file = options[:dot]
-          runner.save_dependency_graph(dot_file)
-          return
-        end
-
         runner.run
-
-        if profile = options[:profile]
-          runner.save_profile(profile)
-        end
       end
     end
 
@@ -30,11 +20,14 @@ module Itamae
     attr_reader :node
     attr_reader :tmpdir
     attr_reader :children
+    attr_reader :handler
 
     def initialize(backend, options)
       @backend = backend
       @options = options
 
+      prepare_handler
+
       @node = create_node
       @tmpdir = "/tmp/itamae_tmp"
       @children = RecipeChildren.new
@@ -58,8 +51,16 @@ module Itamae
     end
 
     def run
+      if recipe_graph_file = options[:recipe_graph]
+        save_dependency_graph(recipe_graph_file)
+      end
+
       children.run
       @backend.finalize
+
+      if profile = options[:profile]
+        save_profile(profile)
+      end
     end
 
     def dry_run?
@@ -67,9 +68,9 @@ module Itamae
     end
 
     def save_dependency_graph(path)
-      Itamae.logger.info "Writing dependency graph in DOT to #{path}..."
+      Itamae.logger.info "Writing recipe dependency graph to #{path}..."
       open(path, 'w') do |f|
-        f.write(runner.children.deps_in_dot)
+        f.write(children.dependency_in_dot)
       end
     end
 
@@ -108,5 +109,16 @@ module Itamae
 
       Node.new(hash, @backend)
     end
+
+    def prepare_handler
+      @handler = HandlerProxy.new
+      (@options[:handlers] || []).each do |handler|
+        type = handler.delete('type')
+        unless type
+          raise "#{type} field is not set"
+        end
+        @handler.register_instance(Handler.from_type(type).new(handler))
+      end
+    end
   end
 end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.8.0
+1.9.0

data/spec/integration/default_spec.rb

@@ -70,6 +70,16 @@ describe file('/tmp/never_exist2') do
   it { should_not be_file }
 end
 
+describe file('/tmp/http_request.html') do
+  it { should be_file }
+  its(:content) { should match(/"from": "itamae"/) }
+end
+
+describe file('/tmp/http_request_headers.html') do
+  it { should be_file }
+  its(:content) { should match(/"User-Agent": "Itamae"/) }
+end
+
 describe file('/tmp/notifies') do
   it { should be_file }
   its(:content) { should eq("2431") }

data/spec/integration/recipes/default.rb

@@ -156,6 +156,17 @@ end
 
 ######
 
+http_request "/tmp/http_request.html" do
+  url "https://httpbin.org/get?from=itamae"
+end
+
+http_request "/tmp/http_request_headers.html" do
+  headers "User-Agent" => "Itamae"
+  url "https://httpbin.org/get"
+end
+
+######
+
 service "cron" do
   action :stop
 end

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

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Itamae::Handler::Base do
+  subject(:handler) { described_class.new({}) }
+
+  context "when receiving recipe_started event" do
+    it "stores the payload" do
+      subject.event(:recipe_started, :payload)
+      expect(subject.recipes).to eq([:payload])
+    end
+  end
+
+  context "when receiving recipe_completed event" do
+    before do
+      subject.event(:recipe_started, :payload)
+    end
+
+    it "pops the payload" do
+      subject.event(:recipe_completed, :payload)
+      expect(subject.recipes).to eq([])
+    end
+  end
+
+  context "when receiving recipe_failed event" do
+    before do
+      subject.event(:recipe_started, :payload)
+    end
+
+    it "pops the payload" do
+      subject.event(:recipe_failed, :payload)
+      expect(subject.recipes).to eq([])
+    end
+  end
+end

data/spec/unit/lib/itamae/handler/fluentd_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+require 'itamae/handler/fluentd'
+
+describe Itamae::Handler::Fluentd do
+  subject(:handler) do
+    described_class.new(options).tap do |h|
+      h.fluent_logger = fluent_logger
+    end
+  end
+  let(:options) { {'hostname' => 'me'} }
+  let(:fluent_logger) { Fluent::Logger::TestLogger.new }
+
+  describe '#event' do
+    it 'posts a record to fluent logger' do
+      subject.event(:type, {arg: 'value'})
+      expect(fluent_logger.queue).to eq([{arg: 'value', hostname: 'me'}])
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+module Itamae
+  describe HandlerProxy do
+    let(:handler) { instance_double(Handler::Base) }
+    before { subject.register_instance(handler) }
+
+    describe "#event" do
+      context "with block" do
+        context "when the block completes" do
+          it "fires *_started and *_completed events" do
+            expect(handler).to receive(:event).with(:name_started, :arg)
+            expect(handler).to receive(:event).with(:name_completed, :arg)
+            subject.event(:name, :arg) { }
+          end
+        end
+
+        context "when the block fails" do
+          it "fires *_started and *_failed events" do
+            expect(handler).to receive(:event).with(:name_started, :arg)
+            expect(handler).to receive(:event).with(:name_failed, :arg)
+            expect {
+              subject.event(:name, :arg) { raise }
+            }.to raise_error
+          end
+        end
+      end
+
+      context "without block" do
+        it "fires the event" do
+          expect(handler).to receive(:event).with(:name, :arg)
+          subject.event(:name, :arg)
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+module Itamae
+  describe Handler do
+    describe ".from_type" do
+      it "returns handler class" do
+        expect(described_class.from_type('debug')).to eq(Handler::Debug)
+      end
+    end
+  end
+end

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

@@ -100,14 +100,15 @@ end
 describe TestResource do
   subject(:resource) { described_class.new(recipe, "name") }
 
-  let(:commands) { double(:commands) }
+  let(:handler) { Itamae::HandlerProxy.new }
   let(:runner) do
     instance_double(Itamae::Runner).tap do |r|
       allow(r).to receive(:dry_run?).and_return(false)
+      allow(r).to receive(:handler).and_return(handler)
     end
   end
   let(:recipe) do
-    double(:recipe).tap do |r|
+    instance_double(Itamae::Recipe).tap do |r|
       allow(r).to receive(:runner).and_return(runner)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -184,6 +184,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fluent-logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - ryota.arai@gmail.com
@@ -221,6 +235,12 @@ files:
 - lib/itamae/generators/templates/role/default.rb
 - lib/itamae/generators/templates/role/files/.keep
 - lib/itamae/generators/templates/role/templates/.keep
+- lib/itamae/handler.rb
+- lib/itamae/handler/base.rb
+- lib/itamae/handler/debug.rb
+- lib/itamae/handler/fluentd.rb
+- lib/itamae/handler/json.rb
+- lib/itamae/handler_proxy.rb
 - lib/itamae/logger.rb
 - lib/itamae/node.rb
 - lib/itamae/notification.rb
@@ -234,6 +254,7 @@ files:
 - lib/itamae/resource/gem_package.rb
 - lib/itamae/resource/git.rb
 - lib/itamae/resource/group.rb
+- lib/itamae/resource/http_request.rb
 - lib/itamae/resource/link.rb
 - lib/itamae/resource/local_ruby_block.rb
 - lib/itamae/resource/package.rb
@@ -261,6 +282,10 @@ files:
 - spec/integration/recipes/templates/template_auto.erb
 - spec/integration/spec_helper.rb
 - spec/unit/lib/itamae/backend_spec.rb
+- spec/unit/lib/itamae/handler/base_spec.rb
+- spec/unit/lib/itamae/handler/fluentd_spec.rb
+- spec/unit/lib/itamae/handler_proxy_spec.rb
+- spec/unit/lib/itamae/handler_spec.rb
 - spec/unit/lib/itamae/node_spec.rb
 - spec/unit/lib/itamae/recipe_spec.rb
 - spec/unit/lib/itamae/resource/base_spec.rb
@@ -309,6 +334,10 @@ test_files:
 - spec/integration/recipes/templates/template_auto.erb
 - spec/integration/spec_helper.rb
 - spec/unit/lib/itamae/backend_spec.rb
+- spec/unit/lib/itamae/handler/base_spec.rb
+- spec/unit/lib/itamae/handler/fluentd_spec.rb
+- spec/unit/lib/itamae/handler_proxy_spec.rb
+- spec/unit/lib/itamae/handler_spec.rb
 - spec/unit/lib/itamae/node_spec.rb
 - spec/unit/lib/itamae/recipe_spec.rb
 - spec/unit/lib/itamae/resource/base_spec.rb