itamae 1.0.0.beta26 → 1.0.0.beta27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ee1b1c898ef9f58d8eb6ad84eae7f28f8b8ae3f
-  data.tar.gz: e972f58336f252920afc143d310b3e8bf606aed2
+  metadata.gz: f71dbe4da1c49cacda9dac2d10c5c1cb0263e6b4
+  data.tar.gz: 09480bb0d8624135546598f390cabd30428b8ce0
 SHA512:
-  metadata.gz: 6e21652210f37850b32b5ad3171a368844f809ff034d9e9122c01a6d8849629af7990104b99773e0ff35886a96061a0166a6026b4dc8d2200d2feeef5c4f7811
-  data.tar.gz: 5954033e97e6c554a09809a624b7df553f924d8a63e24224f4dc7146c9867ed4f79a429530b2c8feeef75616511d56ee8115117ecff956bf07b18ccf20797452
+  metadata.gz: 4238df2db65e2f9a66d5a0021d724e0e1d1f2234f97b62b4e3fab49f8560e92150124221b2a755f450cf782a919e3ad121ae3a8179021eaeba59eaed9fb08d18
+  data.tar.gz: ada64866b96afadc1f916e3a4b106e9e4f59acc8c01e5797e6c86f26988a5b6af207d97de8d09e5ee25816c8e31ad4ad6b49f4abcafe4bbb54395e3c5110ca0f

data/Rakefile

@@ -45,6 +45,7 @@ namespace :spec do
             cmd << " -l #{ENV['LOG_LEVEL'] || 'debug'}"
             cmd << " -j spec/integration/recipes/node.json"
             cmd << " spec/integration/recipes/default.rb"
+            cmd << " spec/integration/recipes/default2.rb"
 
             puts cmd
             system cmd

data/lib/itamae.rb

@@ -3,10 +3,11 @@ require "itamae/runner"
 require "itamae/cli"
 require "itamae/recipe"
 require "itamae/resource"
-require "itamae/recipe_dependencies"
+require "itamae/recipe_children"
 require "itamae/logger"
 require "itamae/node"
 require "itamae/backend"
+require "itamae/notification"
 
 module Itamae
   # Your code goes here...

data/lib/itamae/notification.rb

@@ -0,0 +1,23 @@
+require 'itamae'
+
+module Itamae
+  class Notification < Struct.new(:runner, :defined_in_resource, :action, :target_resource_desc, :timing)
+    def resource
+      runner.children.find_resource_by_description(target_resource_desc)
+    end
+
+    def run(options)
+      action_resource.run(action, options)
+    end
+
+    def action_resource
+      resource
+    end
+  end
+
+  class Subscription < Notification
+    def action_resource
+      defined_in_resource
+    end
+  end
+end

data/lib/itamae/recipe.rb

@@ -2,18 +2,20 @@ require 'itamae'
 
 module Itamae
   class Recipe
+    NotFoundError = Class.new(StandardError)
+
     attr_reader :path
     attr_reader :runner
-    attr_reader :dependencies
-    attr_reader :delayed_actions
+    attr_reader :children
+    attr_reader :delayed_notifications
 
     def initialize(runner, path)
       @runner = runner
       @path = path
-      @dependencies = RecipeDependencies.new
-      @delayed_actions = []
+      @children = RecipeChildren.new
+      @delayed_notifications = []
 
-      load_dependencies
+      load_children
     end
 
     def node
@@ -21,19 +23,14 @@ module Itamae
     end
 
     def run(options = {})
-      Logger.info "> Applying recipe... (#{@path})"
-
-      @dependencies.each do |resource|
-        case resource
-        when Resource::Base
-          resource.run(nil, dry_run: options[:dry_run])
-        when Recipe
-          resource.run(options)
-        end
-      end
+      Logger.info "Recipe: #{@path}"
 
-      @delayed_actions.uniq.each do |action, resource|
-        resource.run(action, dry_run: options[:dry_run])
+      @children.run(options)
+
+      @delayed_notifications.uniq do |notification|
+        [notification.action, notification.action_resource]
+      end.each do |notification|
+        notification.run(options)
       end
 
       Logger.info "< Finished. (#{@path})"
@@ -41,22 +38,32 @@ module Itamae
 
     private
 
-    def load_dependencies
+    def load_children
       instance_eval(File.read(@path), @path, 1)
     end
 
     def method_missing(method, name, &block)
       klass = Resource.get_resource_class(method)
       resource = klass.new(self, name, &block)
-      @dependencies << resource
+      @children << resource
     rescue NameError
       super
     end
 
     def include_recipe(target)
       target = ::File.expand_path(target, File.dirname(@path))
+
+      unless File.exist?(target)
+        raise NotFoundError, "File not found. (#{target})"
+      end
+
+      if runner.children.find_recipe_by_path(target)
+        Logger.debug "Recipe, #{target}, is skipped because it is already included"
+        return
+      end
+
       recipe = Recipe.new(@runner, target)
-      @dependencies << recipe
+      @children << recipe
     end
   end
 end

data/lib/itamae/recipe_children.rb

@@ -0,0 +1,61 @@
+module Itamae
+  class RecipeChildren < Array
+    NotFoundError = Class.new(StandardError)
+
+    def find_resource_by_description(desc)
+      # desc is like 'resource_type[name]'
+      resources.find do |resource|
+        type, name = Itamae::Resource.parse_description(desc)
+        resource.resource_type == type && resource.resource_name == name
+      end.tap do |resource|
+        unless resource
+          raise NotFoundError, "'#{desc}' resource is not found."
+        end
+      end
+    end
+
+    def subscribing(target)
+      resources.map do |resource|
+        resource.subscriptions.select do |subscription|
+          subscription.resource == target
+        end
+      end.flatten
+    end
+
+    def find_recipe_by_path(path)
+      recipes.find do |recipe|
+        recipe.path == path
+      end
+    end
+
+    def resources
+      self.map do |item|
+        case item
+        when Resource::Base
+          item
+        when Recipe
+          item.children.resources
+        end
+      end.flatten
+    end
+
+    def recipes
+      self.select do |item|
+        item.is_a?(Recipe)
+      end.map do |recipe|
+        [recipe] + recipe.children.recipes
+      end.flatten
+    end
+
+    def run(options)
+      self.each do |resource|
+        case resource
+        when Resource::Base
+          resource.run(nil, dry_run: options[:dry_run])
+        when Recipe
+          resource.run(options)
+        end
+      end
+    end
+  end
+end

data/lib/itamae/resource/base.rb

@@ -30,14 +30,16 @@ module Itamae
       attr_reader :resource_name
       attr_reader :attributes
       attr_reader :current_attributes
+      attr_reader :subscriptions
+      attr_reader :notifications
 
       def initialize(recipe, resource_name, &block)
         @attributes = {}
         @current_attributes = {}
         @recipe = recipe
         @resource_name = resource_name
-        @notifies = []
-        @subscribes = []
+        @notifications = []
+        @subscriptions = []
         @updated = false
 
         instance_eval(&block) if block_given?
@@ -46,13 +48,13 @@ module Itamae
       end
 
       def run(specific_action = nil, options = {})
-        Logger.info "> Executing #{resource_type} (#{attributes})..."
+        Logger.info "Executing #{resource_type} (#{attributes})..."
 
         if do_not_run_because_of_only_if?
-          Logger.info "< Execution skipped because of only_if attribute"
+          Logger.info "Execution skipped because of only_if attribute"
           return
         elsif do_not_run_because_of_not_if?
-          Logger.info "< Execution skipped because of not_if attribute"
+          Logger.info "Execution skipped because of not_if attribute"
           return
         end
 
@@ -69,11 +71,12 @@ module Itamae
 
         updated! if different?
 
-        notify if updated?
+        notify(options) if updated?
 
-        Logger.info "< Succeeded."
+        Logger.info "Succeeded."
+        Logger.info ''
       rescue Backend::CommandExecutionError
-        Logger.error "< Failed."
+        Logger.error "Failed."
         exit 2
       end
 
@@ -93,21 +96,6 @@ module Itamae
         humps.join('_')
       end
 
-      def notifies_resources
-        @notifies.map do |action, resource_desc, timing|
-          resource = recipe.dependencies.find_by_description(resource_desc)
-          [action, resource, timing]
-        end
-      end
-
-      def subscribes_resources
-        @subscribes.map do |action, resource_desc, timing|
-          resource = recipe.dependencies.find_by_description(resource_desc)
-          [action, resource, timing]
-        end
-      end
-
-
       private
 
       def method_missing(method, *args, &block)
@@ -200,11 +188,11 @@ module Itamae
       end
 
       def notifies(action, resource_desc, timing = :delay)
-        @notifies << [action, resource_desc, timing]
+        @notifications << Notification.new(runner, self, action, resource_desc, timing)
       end
 
       def subscribes(action, resource_desc, timing = :delay)
-        @subscribes << [action, resource_desc, timing]
+        @subscriptions << Subscription.new(runner, self, action, resource_desc, timing)
       end
 
       def node
@@ -248,14 +236,13 @@ module Itamae
         @updated
       end
 
-      def notify
-        action_resource_timing = notifies_resources + recipe.dependencies.subscribing(self)
-        action_resource_timing.uniq.each do |action, resource, timing|
-          case timing
+      def notify(options)
+        (notifications + recipe.children.subscribing(self)).each do |notification|
+          case notification.timing
           when :immediately
-            resource.run(action)
+            notification.run(options)
           when :delay
-            @recipe.delayed_actions << [action, resource]
+            @recipe.delayed_notifications << notification
           end
         end
       end

data/lib/itamae/runner.rb

@@ -10,11 +10,8 @@ module Itamae
         set_backend_from_options(backend_type, options)
 
         runner = self.new(node_from_options(options))
-
-        recipe_files.each do |path|
-          recipe = Recipe.new(runner, File.expand_path(path))
-          recipe.run(dry_run: options[:dry_run])
-        end
+        runner.load_recipes(recipe_files)
+        runner.run(dry_run: options[:dry_run])
       end
 
       private
@@ -60,14 +57,26 @@ module Itamae
 
     attr_accessor :node
     attr_accessor :tmpdir
+    attr_accessor :children
 
     def initialize(node)
       @node = node
       @tmpdir = "/tmp/itamae_tmp"
+      @children = RecipeChildren.new
 
       Backend.instance.run_command(["mkdir", "-p", @tmpdir])
       Backend.instance.run_command(["chmod", "777", @tmpdir])
     end
+
+    def load_recipes(paths)
+      paths.each do |path|
+        children << Recipe.new(self, File.expand_path(path))
+      end
+    end
+
+    def run(options)
+      children.run(options)
+    end
   end
 end
 

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta26
+1.0.0.beta27

data/spec/integration/default_spec.rb

@@ -93,3 +93,7 @@ describe file('/tmp/created_by_itamae_user') do
   it { should be_owned_by 'itamae' }
 end
 
+describe file('/tmp/created_in_default2') do
+  it { should be_file }
+end
+

data/spec/integration/recipes/default.rb

@@ -152,3 +152,9 @@ execute "echo Hello > /tmp/created_by_itamae_user" do
   user "itamae"
 end
 
+#####
+
+execute "echo 'notify to resource in default2.rb'" do
+  notifies :create, "file[put file in default2.rb]"
+end
+

data/spec/integration/recipes/default2.rb

@@ -0,0 +1,6 @@
+file "put file in default2.rb" do
+  action :nothing
+  path "/tmp/created_in_default2"
+  content 'Hello'
+end
+

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

@@ -16,6 +16,7 @@ module Itamae
     describe ".run" do
       let(:recipes) { %w! ./recipe1.rb ./recipe2.rb ! }
       it "runs each recipe with the runner" do
+        pending "Rewrite later"
         recipes.each do |r|
           recipe = double(:recipe)
           Recipe.stub(:new).with(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta26
+  version: 1.0.0.beta27
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -158,8 +158,9 @@ files:
 - lib/itamae/cli.rb
 - lib/itamae/logger.rb
 - lib/itamae/node.rb
+- lib/itamae/notification.rb
 - lib/itamae/recipe.rb
-- lib/itamae/recipe_dependencies.rb
+- lib/itamae/recipe_children.rb
 - lib/itamae/resource.rb
 - lib/itamae/resource/base.rb
 - lib/itamae/resource/directory.rb
@@ -180,6 +181,7 @@ files:
 - spec/integration/Vagrantfile
 - spec/integration/default_spec.rb
 - spec/integration/recipes/default.rb
+- spec/integration/recipes/default2.rb
 - spec/integration/recipes/hello.erb
 - spec/integration/recipes/hello.txt
 - spec/integration/recipes/included.rb
@@ -221,6 +223,7 @@ test_files:
 - spec/integration/Vagrantfile
 - spec/integration/default_spec.rb
 - spec/integration/recipes/default.rb
+- spec/integration/recipes/default2.rb
 - spec/integration/recipes/hello.erb
 - spec/integration/recipes/hello.txt
 - spec/integration/recipes/included.rb

data/lib/itamae/recipe_dependencies.rb

@@ -1,39 +0,0 @@
-module Itamae
-  class RecipeDependencies < Array
-    NotFoundError = Class.new(StandardError)
-
-    def find_by_description(desc)
-      # desc is like 'resource_type[name]'
-      resources.find do |resource|
-        type, name = Itamae::Resource.parse_description(desc)
-        resource.resource_type == type && resource.resource_name == name
-      end.tap do |resource|
-        unless resource
-          raise NotFoundError, "'#{desc}' resource is not found."
-        end
-      end
-    end
-
-    def subscribing(target)
-      resources.map do |resource|
-        resource.subscribes_resources.map do |action, r, timing|
-          if r == target
-            [action, resource, timing]
-          end
-        end.compact
-      end.flatten(1)
-    end
-
-    def resources
-      self.select do |item|
-        item.is_a?(Resource::Base)
-      end
-    end
-
-    def recipes
-      self.select do |item|
-        item.is_a?(Recipe)
-      end
-    end
-  end
-end