itamae 1.0.0.beta29 → 1.0.0.beta30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e6c40f7ec418f602cc9c3656ab52e2911ef569a
-  data.tar.gz: ae5a65e894d475f4001ba6e81ceee410eee7a2a2
+  metadata.gz: a8f874dbe2bbea23c2b737a85b36c81a215f2ff2
+  data.tar.gz: 236c5f921b47fde0c43d55d8e5c2050cfad3c71d
 SHA512:
-  metadata.gz: 8bb64b1eeb4a24e68384acb26cbac4f3bf71f152b7df88c9daeb13a271db796b9162d945d31871ea500cd5309db4ba627f2346dedaf709b9147fb8f08cf6fb4b
-  data.tar.gz: c806857b5bc48e363d19320926e21db59833b38da307a9db0615591edf2c232495d13a030bbd3a22f81601e0ac3ead9b09a9bb7be938768701250a01de3ef968
+  metadata.gz: a37f3e87c9441cb271b64b6840ed2938fe0ee3bde462f3eec5395514619017743912bf6e257f54493a1a09442316a032b3eec264e4ed6c0ba035424f734b1884
+  data.tar.gz: 97972599e06ad215501ac16f90f9f52fff8e6427766ad24861bf911bdbb9c1c65c0dfa15992504fb44c6796bf1a1fe43fcd360317f079dc8f520323dd0d9d96d

data/itamae.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thor"
-  spec.add_runtime_dependency "specinfra", "2.0.0.beta39"
+  spec.add_runtime_dependency "specinfra", "2.0.0.beta41"
   spec.add_runtime_dependency "hashie"
   spec.add_runtime_dependency "ansi"
 

data/lib/itamae.rb

@@ -8,6 +8,7 @@ require "itamae/logger"
 require "itamae/node"
 require "itamae/backend"
 require "itamae/notification"
+require "itamae/definition"
 
 module Itamae
   # Your code goes here...

data/lib/itamae/cli.rb

@@ -18,6 +18,10 @@ module Itamae
     option :dry_run, type: :boolean, aliases: ['-n']
     option :ohai, type: :boolean, default: false
     def local(*recipe_files)
+      if recipe_files.empty?
+        raise "Please specify recipe files."
+      end
+
       Runner.run(recipe_files, :local, options)
     end
 
@@ -30,6 +34,10 @@ module Itamae
     option :port, type: :numeric, aliases: ['-p']
     option :ohai, type: :boolean, default: false
     def ssh(*recipe_files)
+      if recipe_files.empty?
+        raise "Please specify recipe files."
+      end
+
       Runner.run(recipe_files, :ssh, options)
     end
 

data/lib/itamae/definition.rb

@@ -0,0 +1,63 @@
+require 'itamae'
+
+module Itamae
+  class Definition < Resource::Base
+    class << self
+      def create_class(name, params, &block)
+        Class.new(self).tap do |klass|
+          klass.definition_block = block
+
+          klass.define_attribute :action, default: :run
+          params.each_pair do |key, value|
+            klass.define_attribute key.to_sym, type: Object, default: value
+          end
+        end
+      end
+
+      def definition_block=(block)
+        @definition_block = block
+      end
+
+      def definition_block
+        @definition_block
+      end
+    end
+
+    def initialize(*args)
+      super
+
+      construct_resources
+    end
+    
+    def run_action(options)
+      @children.run(options)
+    end
+
+    private
+
+    def construct_resources
+      block = self.class.definition_block
+
+      context = Context.new(@attributes.merge(name: resource_name))
+      context.instance_exec(&block)
+      @children = context.children
+    end
+
+    class Context
+      attr_reader :params
+      attr_reader :children
+
+      def initialize(params, &block)
+        @params = params
+        @children = RecipeChildren.new
+      end
+
+      def method_missing(method, name, &block)
+        klass = Resource.get_resource_class(method)
+        resource = klass.new(self, name, &block)
+        @children << resource
+      end
+    end
+  end
+end
+

data/lib/itamae/recipe.rb

@@ -46,14 +46,16 @@ module Itamae
       klass = Resource.get_resource_class(method)
       resource = klass.new(self, name, &block)
       @children << resource
-    rescue NameError
-      super
     end
 
-    def include_recipe(target)
-      target = ::File.expand_path(target, File.dirname(@path))
+    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) }
 
-      unless File.exist?(target)
+      unless target
         raise NotFoundError, "File not found. (#{target})"
       end
 
@@ -65,6 +67,24 @@ module Itamae
       recipe = Recipe.new(@runner, target)
       @children << recipe
     end
+
+    def find_recipe_from_load_path(recipe)
+      target = recipe.gsub(/::/, '/')
+      target += '.rb' if target !~ /\.rb$/
+      plugin_name = recipe.split('::')[0]
+
+      $LOAD_PATH.find do |path|
+        if path =~ %r{/itamae-plugin-recipe-#{plugin_name}/}
+          File.join(path, 'itamae', 'plugin', 'recipe', target)
+        end
+      end
+    end
+
+    def define(name, params = {}, &block)
+      Resource.const_set(
+        Resource.get_resource_class_name(name),
+        Definition.create_class(name, params, &block)
+      )
+    end
   end
 end
-

data/lib/itamae/resource/base.rb

@@ -65,7 +65,7 @@ module Itamae
 
         unless options[:dry_run]
           [action].flatten.each do |action|
-            public_send("#{specific_action || action}_action".to_sym)
+            public_send("#{specific_action || action}_action".to_sym, options)
           end
         end
 
@@ -80,7 +80,7 @@ module Itamae
         exit 2
       end
 
-      def nothing_action
+      def nothing_action(options)
         # do nothing
       end
 

data/lib/itamae/resource/directory.rb

@@ -28,7 +28,7 @@ module Itamae
         end
       end
 
-      def create_action
+      def create_action(options)
         if !run_specinfra(:check_file_is_directory, path)
           run_specinfra(:create_file_as_directory, path)
         end

data/lib/itamae/resource/execute.rb

@@ -6,7 +6,7 @@ module Itamae
       define_attribute :action, default: :run
       define_attribute :command, type: String, default_name: true
 
-      def run_action
+      def run_action(options)
         run_command(command)
         updated!
       end

data/lib/itamae/resource/file.rb

@@ -61,7 +61,7 @@ module Itamae
         end
       end
 
-      def create_action
+      def create_action(options)
         if mode
           run_specinfra(:change_file_mode, @temppath, mode)
         end
@@ -76,7 +76,7 @@ module Itamae
         run_specinfra(:move_file, @temppath, path)
       end
 
-      def delete_action
+      def delete_action(options)
         if run_specinfra(:check_file_is_file, path)
           # TODO: delegate to Specinfra
           run_command(["rm", path])

data/lib/itamae/resource/git.rb

@@ -22,7 +22,7 @@ module Itamae
         @current_attributes[:exist?] = exist
       end
 
-      def sync_action
+      def sync_action(options)
         ensure_git_available
 
         new_repository = false

data/lib/itamae/resource/link.rb

@@ -22,7 +22,7 @@ module Itamae
         end
       end
 
-      def create_action
+      def create_action(options)
         unless run_specinfra(:check_file_is_linked_to, link, to)
           run_specinfra(:link_file_to, link, to)
         end

data/lib/itamae/resource/local_ruby_block.rb

@@ -6,7 +6,7 @@ module Itamae
       define_attribute :action, default: :run
       define_attribute :block, type: Proc
 
-      def run_action
+      def run_action(options)
         block.call
       end
     end

data/lib/itamae/resource/mail_alias.rb

@@ -7,7 +7,7 @@ module Itamae
       define_attribute :mail_alias, type: String, default_name: true
       define_attribute :recipient, type: String, required: true
 
-      def create_action
+      def create_action(options)
         if !run_specinfra(:check_mail_alias_is_aliased_to, mail_alias, recipient)
           run_specinfra(:add_mail_alias, mail_alias, recipient)
         end

data/lib/itamae/resource/package.rb

@@ -21,18 +21,10 @@ module Itamae
         end
       end
 
-      def install_action
+      def install_action(action_options)
         unless run_specinfra(:check_package_is_installed, name, version)
-          if %w!ubuntu debian!.include?(backend.os[:family])
-            # TODO: delegate to Specinfra
-            package_name = name
-            package_name += "=#{version}" if version
-            run_command("DEBIAN_FRONTEND='noninteractive' apt-get -y #{options} install #{shell_escape(package_name)}")
-            updated!
-          else
-            run_specinfra(:install_package, name, version)
-            updated!
-          end
+          run_specinfra(:install_package, name, version, options)
+          updated!
         end
       end
     end

data/lib/itamae/resource/service.rb

@@ -24,27 +24,27 @@ module Itamae
         end
       end
 
-      def start_action
+      def start_action(options)
         run_specinfra(:start_service, name)
       end
 
-      def stop_action
+      def stop_action(options)
         run_specinfra(:stop_service, name)
       end
 
-      def restart_action
+      def restart_action(options)
         run_specinfra(:restart_service, name)
       end
 
-      def reload_action
+      def reload_action(options)
         run_specinfra(:reload_service, name)
       end
 
-      def enable_action
+      def enable_action(options)
         run_specinfra(:enable_service, name)
       end
 
-      def disable_action
+      def disable_action(options)
         run_specinfra(:disable_service, name)
       end
     end

data/lib/itamae/resource/user.rb

@@ -23,7 +23,7 @@ module Itamae
         end
       end
 
-      def create_action
+      def create_action(options)
         if run_specinfra(:check_user_exists, username)
           if uid && uid.to_s != @current_attributes[:uid]
             # TODO: delegate to Specinfra

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta29
+1.0.0.beta30

data/spec/integration/recipes/default.rb

@@ -170,3 +170,13 @@ file "/tmp/should_not_exist" do
   action :delete
 end
 
+#####
+
+define :definition_example, key: 'default' do
+  execute "echo 'name:#{params[:name]},key:#{params[:key]}' > /tmp/created_by_definition"
+end
+
+definition_example "name" do
+  key 'value'
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta29
+  version: 1.0.0.beta30
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta39
+        version: 2.0.0.beta41
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta39
+        version: 2.0.0.beta41
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +156,7 @@ files:
 - lib/itamae.rb
 - lib/itamae/backend.rb
 - lib/itamae/cli.rb
+- lib/itamae/definition.rb
 - lib/itamae/logger.rb
 - lib/itamae/node.rb
 - lib/itamae/notification.rb