itamae 1.0.0.beta49 → 1.0.0.beta50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b37f53d2a4a61e4cd6c8dd6a2693f288ce8da97
-  data.tar.gz: 110468b24b81c63dc09d2106d4da354db4ab9d8f
+  metadata.gz: 613d6fd0d20ee53c9d137d2262accac8a00782d5
+  data.tar.gz: 95900b2da4cee352834a7fc7f012a47f8b4eb62b
 SHA512:
-  metadata.gz: 8ad905062073bbab497a56175390a6222853977fad875c23c045739222d4b2b70bfd8283be962e050172e0e661eaa01a1ce7e91b1bbb9f83fd34f43f6c033ac0
-  data.tar.gz: 3bf7eb7d3e69ad208bb98ccc1f21338da49c52d1dab5fba7741826300a4e44ffa4b9f0e61ff6e45bce22fe37a17838916f5bd1355d26e473d69060d3d812e345
+  metadata.gz: 723341847d55096272ab9520b52f9982f1131fc95d470c2a6a033b5b511936673ce43842cc1593dd6cb9f6916dad9167622fdb47b28c7df6d863c4af72b8d828
+  data.tar.gz: cb9115ddb3f54c1a8c89cd6dec2771a993b606b4fc164dcab4250e17a525625bca8b2609c5adfcc955fef36f12a74af21979707207c1677effcfa6069ec890fc

data/lib/itamae/recipe.rb

@@ -9,17 +9,29 @@ module Itamae
     attr_reader :children
     attr_reader :delayed_notifications
 
+    class << self
+      def find_recipe_in_gem(recipe)
+        target = recipe.gsub('::', '/')
+        target += '.rb' if target !~ /\.rb$/
+        plugin_name = recipe.split('::')[0]
+
+        spec = Gem.loaded_specs.values.find do |spec|
+          spec.name == "itamae-plugin-recipe-#{plugin_name}"
+        end
+
+        return nil unless spec
+
+        File.join(spec.lib_dirs_glob, 'itamae', 'plugin', 'recipe', target)
+      end
+    end
+
     def initialize(runner, path)
       @runner = runner
       @path = path
-      @children = RecipeChildren.new
       @delayed_notifications = []
 
-      load_children
-    end
-
-    def node
-      @runner.node
+      context = EvalContext.new(self)
+      @children = context.children
     end
 
     def run(options = {})
@@ -36,72 +48,71 @@ module Itamae
       end
     end
 
-    private
+    class EvalContext
+      attr_reader :children
 
-    def load_children
-      instance_eval(File.read(@path), @path, 1)
-    end
-
-    def respond_to_missing?(method, include_private = false)
-      Resource.get_resource_class(method)
-      true
-    rescue NameError
-      false
-    end
+      def initialize(recipe)
+        @recipe = recipe
+        @children = RecipeChildren.new
 
-    def method_missing(*args, &block)
-      super unless args.size == 2
+        instance_eval(File.read(@recipe.path), @recipe.path, 1)
+      end
 
-      method, name = args
-      begin
-        klass = Resource.get_resource_class(method)
+      def respond_to_missing?(method, include_private = false)
+        Resource.get_resource_class(method)
+        true
       rescue NameError
-        super
+        false
       end
 
-      resource = klass.new(self, name, &block)
-      @children << resource
-    end
+      def method_missing(*args, &block)
+        super unless args.size == 2
 
-    def include_recipe(recipe)
-      candidate_paths = [
-        ::File.expand_path(recipe, File.dirname(@path)),
-        find_recipe_from_load_path(recipe),
-      ].compact
-      target = candidate_paths.find {|path| File.exist?(path) }
+        method, name = args
+        begin
+          klass = Resource.get_resource_class(method)
+        rescue NameError
+          super
+        end
 
-      unless target
-        raise NotFoundError, "Recipe not found. (#{recipe})"
+        resource = klass.new(@recipe, name, &block)
+        @children << resource
       end
 
-      if runner.children.find_recipe_by_path(target)
-        Logger.debug "Recipe, #{target}, is skipped because it is already included"
-        return
+      def define(name, params = {}, &block)
+        Resource.const_set(
+          Resource.get_resource_class_name(name),
+          Definition.create_class(name, params, &block)
+        )
       end
 
-      recipe = Recipe.new(@runner, target)
-      @children << recipe
-    end
+      def include_recipe(target)
+        candidate_paths = [
+          ::File.expand_path(target, File.dirname(@recipe.path)),
+          Recipe.find_recipe_in_gem(target),
+        ].compact
+        path = candidate_paths.find {|path| File.exist?(path) }
 
-    def find_recipe_from_load_path(recipe)
-      target = recipe.gsub('::', '/')
-      target += '.rb' if target !~ /\.rb$/
-      plugin_name = recipe.split('::')[0]
+        unless path
+          raise NotFoundError, "Recipe not found. (#{target})"
+        end
 
-      spec = Gem.loaded_specs.values.find do |spec|
-        spec.name == "itamae-plugin-recipe-#{plugin_name}"
-      end
+        if runner.children.find_recipe_by_path(path)
+          Logger.debug "Recipe, #{target}, is skipped because it is already included"
+          return
+        end
 
-      return nil unless spec
+        recipe = Recipe.new(runner, path)
+        @children << recipe
+      end
 
-      File.join(spec.lib_dirs_glob, 'itamae', 'plugin', 'recipe', target)
-    end
+      def node
+        runner.node
+      end
 
-    def define(name, params = {}, &block)
-      Resource.const_set(
-        Resource.get_resource_class_name(name),
-        Definition.create_class(name, params, &block)
-      )
+      def runner
+        @recipe.runner
+      end
     end
   end
 end

data/lib/itamae/runner.rb

@@ -21,8 +21,13 @@ module Itamae
         if options[:ohai]
           unless Backend.instance.run_command("which ohai", error: false).exit_status == 0
             # install Ohai
-            Logger.info "Installing ohai gem..."
-            Backend.instance.run_command("gem install ohai --no-ri --no-rdoc")
+            Logger.info "Installing ohai package..."
+            begin
+              Backend.instance.run_specinfra(:install_package, "ohai")
+            rescue Itamae::Backend::CommandExecutionError
+              Logger.info "Installing Chef package... (because installing ohai package failed)"
+              Backend.instance.run_command("curl -L https://www.opscode.com/chef/install.sh | bash")
+            end
           end
 
           Logger.info "Loading node data via ohai..."

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta49
+1.0.0.beta50

data/wercker.yml

@@ -9,6 +9,10 @@ build:
     - rvm-use:
         version: 2.1.1
 
+    - script:
+        name: update bundler
+        code: gem update bundler
+
     # A step that executes `bundle install` command
     - bundle-install
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta49
+  version: 1.0.0.beta50
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor