itamae 1.0.0.beta10 → 1.0.0.beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81a5923793f82c902667a2d8324149ec2ef160ac
-  data.tar.gz: dbaf21780d608bfa50de7141b6666fbe8e592656
+  metadata.gz: 1e79cccb302b213dead194d1fb5a47ee4421325d
+  data.tar.gz: 7ed4180528acd9fb5e0ae50834f85e44aeb91a7e
 SHA512:
-  metadata.gz: 92f837c2a09449dca10841e0de3e17f620f18bbbd82391f4b654c6e42737bc127878caec62df874aa7a0c9be94133b92919ec8108480adfd3baeb2485fe652b2
-  data.tar.gz: 23fdf6eeffcd642c16c2d1b52f774e777c6e9e08065ad57cad48e1b8cf10b64e1d1b675c43b9177c2ba3d448beceb3735bbb476c065a40e10beddcb4acfa5de3
+  metadata.gz: 8bf822b67930b8281bfae4eef594eec40c592f65b99086a566fc2c9ef0cfa6d9497ca9cbd34c6ef1827f8353785cd298502f5a4cc079c9b178a7cb437ee44267
+  data.tar.gz: 67b3ac8336ae73558e746595212b21301356d4184e2f33486ef3381b052b42698adf24a6051c27d515b1adf1d1e5ef2f872af9ef6c61156c491b0e0b84b6d79a

data/Rakefile

@@ -65,3 +65,23 @@ namespace :spec do
   end
 end
 
+namespace :release do
+  desc "Bump up version and commit"
+  task :version_up do
+    version_file = File.expand_path("lib/itamae/version.txt")
+    current_version = File.read(version_file).strip
+
+    if /\A(.+)(\d+)\z/ =~ current_version
+      next_version = "#{$1}#{$2.to_i + 1}"
+    else
+      raise "Invalid version"
+    end
+
+    open(version_file, "w") do |f|
+      f.write next_version
+    end
+    system "git add #{version_file}"
+    system "git commit -m 'Bump up version'"
+  end
+end
+

data/lib/itamae.rb

@@ -3,7 +3,7 @@ require "itamae/runner"
 require "itamae/cli"
 require "itamae/recipe"
 require "itamae/resource"
-require "itamae/resource_collection"
+require "itamae/recipe_dependencies"
 require "itamae/logger"
 require "itamae/node"
 require "itamae/backend"

data/lib/itamae/recipe.rb

@@ -4,16 +4,16 @@ module Itamae
   class Recipe
     attr_reader :path
     attr_reader :runner
-    attr_reader :resources
+    attr_reader :dependencies
     attr_reader :delayed_actions
 
     def initialize(runner, path)
       @runner = runner
       @path = path
-      @resources = ResourceCollection.new
+      @dependencies = RecipeDependencies.new
       @delayed_actions = []
 
-      load_resources
+      load_dependencies
     end
 
     def node
@@ -21,9 +21,13 @@ module Itamae
     end
 
     def run(options = {})
-      @resources.each do |resource|
-        # do action specified in the recipe
-        resource.run(nil, dry_run: options[:dry_run])
+      @dependencies.each do |resource|
+        case resource
+        when Resource::Base
+          resource.run(nil, dry_run: options[:dry_run])
+        when Recipe
+          resource.run(options)
+        end
       end
 
       @delayed_actions.uniq.each do |action, resource|
@@ -33,14 +37,20 @@ module Itamae
 
     private
 
-    def load_resources
+    def load_dependencies
       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)
-      @resources << resource
+      @dependencies << resource
+    end
+
+    def include_recipe(target)
+      target = ::File.expand_path(target, File.dirname(@path))
+      recipe = Recipe.new(@runner, target)
+      @dependencies << recipe
     end
   end
 end

data/lib/itamae/{resource_collection.rb → recipe_dependencies.rb}

@@ -1,10 +1,10 @@
 module Itamae
-  class ResourceCollection < Array
+  class RecipeDependencies < Array
     NotFoundError = Class.new(StandardError)
 
     def find_by_description(desc)
       # desc is like 'resource_type[name]'
-      self.find do |resource|
+      resources.find do |resource|
         type, name = Itamae::Resource.parse_description(desc)
         resource.resource_type == type && resource.resource_name == name
       end.tap do |resource|
@@ -15,7 +15,7 @@ module Itamae
     end
 
     def subscribing(target)
-      self.map do |resource|
+      resources.map do |resource|
         resource.subscribes_resources.map do |action, r, timing|
           if r == target
             [action, resource, timing]
@@ -23,5 +23,17 @@ module Itamae
         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

data/lib/itamae/resource/base.rb

@@ -25,6 +25,7 @@ module Itamae
 
       define_attribute :action, type: [Symbol, Array], required: true
 
+      attr_reader :recipe
       attr_reader :resource_name
       attr_reader :attributes
       attr_reader :current_attributes
@@ -93,14 +94,14 @@ module Itamae
 
       def notifies_resources
         @notifies.map do |action, resource_desc, timing|
-          resource = resources.find_by_description(resource_desc)
+          resource = recipe.dependencies.find_by_description(resource_desc)
           [action, resource, timing]
         end
       end
 
       def subscribes_resources
         @subscribes.map do |action, resource_desc, timing|
-          resource = resources.find_by_description(resource_desc)
+          resource = recipe.dependencies.find_by_description(resource_desc)
           [action, resource, timing]
         end
       end
@@ -219,10 +220,6 @@ module Itamae
         @recipe.runner
       end
 
-      def resources
-        @recipe.resources
-      end
-
       def run_command(*args)
         backend.run_command(*args)
       end
@@ -247,7 +244,7 @@ module Itamae
       end
 
       def notify
-        action_resource_timing = notifies_resources + resources.subscribing(self)
+        action_resource_timing = notifies_resources + recipe.dependencies.subscribing(self)
         action_resource_timing.uniq.each do |action, resource, timing|
           case timing
           when :immediately

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta10
+1.0.0.beta11

data/spec/integration/default_spec.rb

@@ -1,5 +1,9 @@
 require 'spec_helper'
 
+describe file('/tmp/included_recipe') do
+  it { should be_file }
+end
+
 describe package('dstat') do
   it { should be_installed }
 end

data/spec/integration/recipes/default.rb

@@ -1,3 +1,5 @@
+include_recipe "./included.rb"
+
 # TODO: replace with user resource
 execute 'id itamae || useradd itamae'
 

data/spec/integration/recipes/included.rb

@@ -0,0 +1 @@
+execute "touch /tmp/included_recipe"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta10
+  version: 1.0.0.beta11
 platform: ruby
 authors:
 - Ryota Arai
@@ -158,6 +158,7 @@ files:
 - lib/itamae/logger.rb
 - lib/itamae/node.rb
 - lib/itamae/recipe.rb
+- lib/itamae/recipe_dependencies.rb
 - lib/itamae/resource.rb
 - lib/itamae/resource/base.rb
 - lib/itamae/resource/directory.rb
@@ -170,7 +171,6 @@ files:
 - lib/itamae/resource/remote_file.rb
 - lib/itamae/resource/service.rb
 - lib/itamae/resource/template.rb
-- lib/itamae/resource_collection.rb
 - lib/itamae/runner.rb
 - lib/itamae/version.rb
 - lib/itamae/version.txt
@@ -179,6 +179,7 @@ files:
 - spec/integration/recipes/default.rb
 - spec/integration/recipes/hello.erb
 - spec/integration/recipes/hello.txt
+- spec/integration/recipes/included.rb
 - spec/integration/recipes/node.json
 - spec/integration/spec_helper.rb
 - spec/unit/lib/itamae/logger_spec.rb
@@ -222,6 +223,7 @@ test_files:
 - spec/integration/recipes/default.rb
 - spec/integration/recipes/hello.erb
 - spec/integration/recipes/hello.txt
+- spec/integration/recipes/included.rb
 - spec/integration/recipes/node.json
 - spec/integration/spec_helper.rb
 - spec/unit/lib/itamae/logger_spec.rb