itamae 1.0.0.beta41 → 1.0.0.beta42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31f55ef380f7a57cf16dbd7218cac9a1ad714268
-  data.tar.gz: 7b72a1e4e195d37d30ded16e59be70d37351bee2
+  metadata.gz: 34cf3ba583fc7e11e18f615f1d4d299806e1e555
+  data.tar.gz: 4a96e5ab9eee853a7938c91154f3f1d213d7b565
 SHA512:
-  metadata.gz: 6818dada3e0fbce7f0e567fcd4142003ef700faa575511b8cf5717777420155bbbb83fa9ad965b53642f6134be8cfa3b164acbd099c4e1ccb592d49f7f3034e0
-  data.tar.gz: e55e7e6604ceeaf2ffd60ca3ad594b022786e1db6ecc0110100fa8c1017d2d74f5906d16dae159ac123e593df04a54cc7eb2f87dab236f884523099b89bd59c8
+  metadata.gz: 2def3d8aed7a2d2d1326f1cb5465df7389630723f365fec1527b127a4d185946ebd9506a5bbd5bee2411ef3c7e60c35077a4506a521e0e5607c20c0c5ce4d0fa
+  data.tar.gz: 0a52f599858557e16deccd6389e778131b1761bf1a97a27e9425d0ce099cd3f91ab63db5b216054e7eea88bc77e61da73f1878804dd6df4f481062d72be76196

data/lib/itamae/notification.rb

@@ -1,7 +1,7 @@
 require 'itamae'
 
 module Itamae
-  class Notification < Struct.new(:runner, :defined_in_resource, :action, :target_resource_desc, :timing)
+  class Notification < Struct.new(:defined_in_resource, :action, :target_resource_desc, :timing)
     def resource
       runner.children.find_resource_by_description(target_resource_desc)
     end
@@ -13,6 +13,10 @@ module Itamae
     def action_resource
       resource
     end
+
+    def runner
+      defined_in_resource.recipe.runner
+    end
   end
 
   class Subscription < Notification

data/lib/itamae/resource/base.rb

@@ -1,9 +1,64 @@
 require 'itamae'
 require 'shellwords'
+require 'hashie'
 
 module Itamae
   module Resource
     class Base
+      class EvalContext
+        attr_reader :attributes
+        attr_reader :notifications
+        attr_reader :subscriptions
+        attr_reader :only_if_command
+        attr_reader :not_if_command
+
+        def initialize(resource)
+          @resource = resource
+
+          @attributes = Hashie::Mash.new
+          @notifications = []
+          @subscriptions = []
+        end
+
+        def respond_to_missing?(method, include_private = false)
+          @resource.class.defined_attributes.has_key?(method) || super
+        end
+
+        def method_missing(method, *args, &block)
+          if @resource.class.defined_attributes[method]
+            if args.size == 1
+              return @attributes[method] = args.first
+            elsif args.size == 0 && block_given?
+              return @attributes[method] = block
+            elsif args.size == 0
+              return @attributes[method]
+            end
+          end
+
+          super
+        end
+
+        def notifies(action, resource_desc, timing = :delay)
+          @notifications << Notification.new(@resource, action, resource_desc, timing)
+        end
+
+        def subscribes(action, resource_desc, timing = :delay)
+          @subscriptions << Subscription.new(@resource, action, resource_desc, timing)
+        end
+
+        def only_if(command)
+          @only_if_command = command
+        end
+
+        def not_if(command)
+          @not_if_command = command
+        end
+
+        def node
+          @resource.runner.node
+        end
+      end
+
       @defined_attributes ||= {}
 
       class << self
@@ -32,17 +87,22 @@ module Itamae
       attr_reader :current_attributes
       attr_reader :subscriptions
       attr_reader :notifications
+      attr_reader :updated
 
       def initialize(recipe, resource_name, &block)
-        @attributes = {}
-        @current_attributes = {}
+        @current_attributes = Hashie::Mash.new
         @recipe = recipe
         @resource_name = resource_name
-        @notifications = []
-        @subscriptions = []
         @updated = false
 
-        instance_eval(&block) if block_given?
+        EvalContext.new(self).tap do |context|
+          context.instance_eval(&block) if block
+          @attributes = context.attributes
+          @notifications = context.notifications
+          @subscriptions = context.subscriptions
+          @only_if_command = context.only_if_command
+          @not_if_command = context.not_if_command
+        end
 
         process_attributes
       end
@@ -60,7 +120,7 @@ module Itamae
             return
           end
 
-          [specific_action || action].flatten.each do |action|
+          [specific_action || attributes.action].flatten.each do |action|
             run_action(action, options)
           end
 
@@ -91,6 +151,8 @@ module Itamae
 
       private
 
+      alias_method :current, :current_attributes
+
       def run_action(action, options)
         @current_action = action
 
@@ -116,24 +178,6 @@ module Itamae
         @current_action = nil
       end
 
-      def respond_to_missing?(method, include_private = false)
-        self.class.defined_attributes.has_key?(method) || super
-      end
-
-      def method_missing(method, *args, &block)
-        if self.class.defined_attributes[method]
-          if args.size == 1
-            return @attributes[method] = args.first
-          elsif args.size == 0 && block_given?
-            return @attributes[method] = block
-          elsif args.size == 0
-            return @attributes[method]
-          end
-        end
-
-        super
-      end
-
       def pre_action
         # do nothing
       end
@@ -193,14 +237,6 @@ module Itamae
         backend.send_file(src, dst)
       end
 
-      def only_if(command)
-        @only_if_command = command
-      end
-
-      def not_if(command)
-        @not_if_command = command
-      end
-
       def do_not_run_because_of_only_if?
         @only_if_command &&
           run_command(@only_if_command, error: false).exit_status != 0
@@ -211,32 +247,24 @@ module Itamae
           run_command(@not_if_command, error: false).exit_status == 0
       end
 
-      def notifies(action, resource_desc, timing = :delay)
-        @notifications << Notification.new(runner, self, action, resource_desc, timing)
+      def backend
+        Backend.instance
       end
 
-      def subscribes(action, resource_desc, timing = :delay)
-        @subscriptions << Subscription.new(runner, self, action, resource_desc, timing)
+      def runner
+        recipe.runner
       end
 
       def node
         runner.node
       end
 
-      def backend
-        Backend.instance
-      end
-
-      def runner
-        @recipe.runner
-      end
-
       def run_command(*args)
         unless args.last.is_a?(Hash)
           args << {}
         end
 
-        args.last[:user] ||= user
+        args.last[:user] ||= attributes.user
 
         backend.run_command(*args)
       end

data/lib/itamae/resource/directory.rb

@@ -12,34 +12,34 @@ module Itamae
       def pre_action
         case @current_action
         when :create
-          @attributes[:exist?] = true
+          attributes.exist = true
         end
       end
 
       def set_current_attributes
-        exist = run_specinfra(:check_file_is_directory, path)
-        @current_attributes[:exist?] = exist
+        exist = run_specinfra(:check_file_is_directory, attributes.path)
+        current.exist = exist
 
         if exist
-          @current_attributes[:mode] = run_specinfra(:get_file_mode, path).stdout.chomp
-          @current_attributes[:owner] = run_specinfra(:get_file_owner_user, path).stdout.chomp
-          @current_attributes[:group] = run_specinfra(:get_file_owner_group, path).stdout.chomp
+          current.mode = run_specinfra(:get_file_mode, attributes.path).stdout.chomp
+          current.owner = run_specinfra(:get_file_owner_user, attributes.path).stdout.chomp
+          current.group = run_specinfra(:get_file_owner_group, attributes.path).stdout.chomp
         else
-          @current_attributes[:mode] = nil
-          @current_attributes[:owner] = nil
-          @current_attributes[:group] = nil
+          current.mode = nil
+          current.owner = nil
+          current.group = nil
         end
       end
 
       def action_create(options)
-        if !run_specinfra(:check_file_is_directory, path)
-          run_specinfra(:create_file_as_directory, path)
+        if !run_specinfra(:check_file_is_directory, attributes.path)
+          run_specinfra(:create_file_as_directory, attributes.path)
         end
-        if attributes[:mode]
-          run_specinfra(:change_file_mode, path, attributes[:mode])
+        if attributes.mode
+          run_specinfra(:change_file_mode, attributes.path, attributes.mode)
         end
-        if attributes[:owner] || attributes[:group]
-          run_specinfra(:change_file_owner, path, attributes[:owner], attributes[:group])
+        if attributes.owner || attributes.group
+          run_specinfra(:change_file_owner, attributes.path, attributes.owner, attributes.group)
         end
       end
     end

data/lib/itamae/resource/execute.rb

@@ -7,7 +7,7 @@ module Itamae
       define_attribute :command, type: String, default_name: true
 
       def action_run(options)
-        run_command(command)
+        run_command(attributes.command)
         updated!
       end
     end

data/lib/itamae/resource/file.rb

@@ -13,11 +13,11 @@ module Itamae
 
       def pre_action
         begin
-          src = if content_file
-                  ::File.expand_path(content_file, ::File.dirname(@recipe.path))
+          src = if attributes.content_file
+                  ::File.expand_path(attributes.content_file, ::File.dirname(@recipe.path))
                 else
                   f = Tempfile.open('itamae')
-                  f.write(content)
+                  f.write(attributes.content)
                   f.close
                   f.path
                 end
@@ -30,30 +30,29 @@ module Itamae
 
         case @current_action
         when :create
-          @attributes[:exist?] = true
+          attributes.exist = true
         end
       end
 
       def set_current_attributes
-        exist = run_specinfra(:check_file_is_file, path)
-        @current_attributes[:exist?] = exist
+        current.exist = run_specinfra(:check_file_is_file, attributes.path)
 
-        if exist
-          @current_attributes[:mode] = run_specinfra(:get_file_mode, path).stdout.chomp
-          @current_attributes[:owner] = run_specinfra(:get_file_owner_user, path).stdout.chomp
-          @current_attributes[:group] = run_specinfra(:get_file_owner_group, path).stdout.chomp
+        if current.exist
+          current.mode = run_specinfra(:get_file_mode, attributes.path).stdout.chomp
+          current.owner = run_specinfra(:get_file_owner_user, attributes.path).stdout.chomp
+          current.group = run_specinfra(:get_file_owner_group, attributes.path).stdout.chomp
         else
-          @current_attributes[:mode] = nil
-          @current_attributes[:owner] = nil
-          @current_attributes[:group] = nil
+          current.mode = nil
+          current.owner = nil
+          current.group = nil
         end
       end
 
       def show_differences
         super
 
-        if @current_attributes[:exist?]
-          diff = run_command(["diff", "-u", path, @temppath], error: false)
+        if current.exist
+          diff = run_command(["diff", "-u", attributes.path, @temppath], error: false)
           if diff.exit_status == 0
             # no change
             Logger.debug "file content will not change"
@@ -67,17 +66,17 @@ module Itamae
       end
 
       def action_create(options)
-        if mode
-          run_specinfra(:change_file_mode, @temppath, mode)
+        if attributes.mode
+          run_specinfra(:change_file_mode, @temppath, attributes.mode)
         end
-        if owner || group
-          run_specinfra(:change_file_owner, @temppath, owner, group)
+        if attributes.owner || attributes.group
+          run_specinfra(:change_file_owner, @temppath, attributes.owner, attributes.group)
         end
 
-        if run_specinfra(:check_file_is_file, path)
-          run_specinfra(:copy_file, path, "#{path}.bak")
+        if run_specinfra(:check_file_is_file, attributes.path)
+          run_specinfra(:copy_file, attributes.path, "#{attributes.path}.bak")
 
-          unless check_command(["diff", "-q", @temppath, path])
+          unless check_command(["diff", "-q", @temppath, attributes.path])
             # the file is modified
             updated!
           end
@@ -86,12 +85,12 @@ module Itamae
           updated!
         end
 
-        run_specinfra(:move_file, @temppath, path)
+        run_specinfra(:move_file, @temppath, attributes.path)
       end
 
       def action_delete(options)
-        if run_specinfra(:check_file_is_file, path)
-          run_specinfra(:remove_file, path)
+        if run_specinfra(:check_file_is_file, attributes.path)
+          run_specinfra(:remove_file, attributes.path)
         end
       end
     end

data/lib/itamae/resource/git.rb

@@ -13,13 +13,12 @@ module Itamae
       def pre_action
         case @current_action
         when :sync
-          @attributes[:exist?] = true
+          attributes.exist = true
         end
       end
 
       def set_current_attributes
-        exist = run_specinfra(:check_file_is_directory, destination)
-        @current_attributes[:exist?] = exist
+        current.exist = run_specinfra(:check_file_is_directory, attributes.destination)
       end
 
       def action_sync(options)
@@ -27,15 +26,15 @@ module Itamae
 
         new_repository = false
 
-        if run_specinfra(:check_file_is_directory, destination)
+        if run_specinfra(:check_file_is_directory, attributes.destination)
           run_command_in_repo(['git', 'fetch', 'origin'])
         else
-          run_command(['git', 'clone', repository, destination])
+          run_command(['git', 'clone', attributes.repository, attributes.destination])
           new_repository = true
         end
 
-        target = if revision
-                   get_revision(revision)
+        target = if attributes.revision
+                   get_revision(attributes.revision)
                  else
                    run_command_in_repo("git ls-remote origin HEAD | cut -f1").stdout.strip
                  end
@@ -65,7 +64,7 @@ module Itamae
       end
 
       def run_command_in_repo(*args)
-        run_command(*args, cwd: destination)
+        run_command(*args, cwd: attributes.destination)
       end
 
       def current_branch

data/lib/itamae/resource/link.rb

@@ -10,21 +10,21 @@ module Itamae
       def pre_action
         case @current_action
         when :create
-          @attributes[:exist?] = true
+          attributes.exist = true
         end
       end
 
       def set_current_attributes
-        @current_attributes[:exist?] = run_specinfra(:check_file_is_link, link)
+        current.exist = run_specinfra(:check_file_is_link, attributes.link)
 
-        if @current_attributes[:exist?]
-          @current_attributes[:to] = run_specinfra(:get_file_link_target, link).stdout.strip
+        if current.exist
+          current.to = run_specinfra(:get_file_link_target, attributes.link).stdout.strip
         end
       end
 
       def action_create(options)
-        unless run_specinfra(:check_file_is_linked_to, link, to)
-          run_specinfra(:link_file_to, link, to)
+        unless run_specinfra(:check_file_is_linked_to, attributes.link, attributes.to)
+          run_specinfra(:link_file_to, attributes.link, attributes.to)
         end
       end
     end

data/lib/itamae/resource/local_ruby_block.rb

@@ -7,7 +7,7 @@ module Itamae
       define_attribute :block, type: Proc
 
       def action_run(options)
-        block.call
+        attributes.block.call
       end
     end
   end

data/lib/itamae/resource/package.rb

@@ -11,22 +11,21 @@ module Itamae
       def pre_action
         case @current_action
         when :install
-          @attributes[:installed?] = true
+          attributes.installed = true
         end
       end
 
       def set_current_attributes
-        installed = run_specinfra(:check_package_is_installed, name)
-        @current_attributes[:installed?] = installed
+        current.installed = run_specinfra(:check_package_is_installed, attributes.name)
 
-        if installed
-          @current_attributes[:version] = run_specinfra(:get_package_version, name).stdout.strip
+        if current.installed
+          current.version = run_specinfra(:get_package_version, attributes.name).stdout.strip
         end
       end
 
       def action_install(action_options)
-        unless run_specinfra(:check_package_is_installed, name, version)
-          run_specinfra(:install_package, name, version, options)
+        unless run_specinfra(:check_package_is_installed, attributes.name, attributes.version)
+          run_specinfra(:install_package, attributes.name, attributes.version, attributes.options)
           updated!
         end
       end

data/lib/itamae/resource/remote_file.rb

@@ -6,7 +6,8 @@ module Itamae
       define_attribute :source, type: String, required: true
 
       def pre_action
-        content_file(::File.expand_path(source, ::File.dirname(@recipe.path)))
+        attributes.content_file =
+          ::File.expand_path(attributes.source, ::File.dirname(@recipe.path))
 
         super
       end

data/lib/itamae/resource/service.rb

@@ -9,43 +9,43 @@ module Itamae
       def pre_action
         case @current_action
         when :start, :restart
-          @attributes[:running?] = true
+          attributes.running = true
         when :stop
-          @attributes[:running?] = false
+          attributes.running = false
         when :enable
-          @attributes[:enabled?] = true
+          attributes.enabled = true
         when :disable
-          @attributes[:enabled?] = false
+          attributes.enabled = false
         end
       end
 
       def set_current_attributes
-        @current_attributes[:running?] = run_specinfra(:check_service_is_running, name)
-        @current_attributes[:enabled?] = run_specinfra(:check_service_is_enabled, name)
+        current.running = run_specinfra(:check_service_is_running, attributes.name)
+        current.enabled = run_specinfra(:check_service_is_enabled, attributes.name)
       end
 
       def action_start(options)
-        run_specinfra(:start_service, name)
+        run_specinfra(:start_service, attributes.name)
       end
 
       def action_stop(options)
-        run_specinfra(:stop_service, name)
+        run_specinfra(:stop_service, attributes.name)
       end
 
       def action_restart(options)
-        run_specinfra(:restart_service, name)
+        run_specinfra(:restart_service, attributes.name)
       end
 
       def action_reload(options)
-        run_specinfra(:reload_service, name)
+        run_specinfra(:reload_service, attributes.name)
       end
 
       def action_enable(options)
-        run_specinfra(:enable_service, name)
+        run_specinfra(:enable_service, attributes.name)
       end
 
       def action_disable(options)
-        run_specinfra(:disable_service, name)
+        run_specinfra(:disable_service, attributes.name)
       end
     end
   end

data/lib/itamae/resource/template.rb

@@ -8,8 +8,8 @@ module Itamae
       define_attribute :source, type: String, required: true
 
       def pre_action
-        src = ::File.expand_path(source, ::File.dirname(@recipe.path))
-        content(ERB.new(::File.read(src), nil, '-').result(binding))
+        src = ::File.expand_path(attributes.source, ::File.dirname(@recipe.path))
+        attributes.content = ERB.new(::File.read(src), nil, '-').result(binding)
 
         super
       end

data/lib/itamae/resource/user.rb

@@ -12,42 +12,42 @@ module Itamae
       define_attribute :uid, type: [String, Integer]
 
       def set_current_attributes
-        @current_attributes[:exist?] = exist?
+        current.exist = exist?
 
-        if @current_attributes[:exist?]
-          @current_attributes[:uid] = run_specinfra(:get_user_uid, username).stdout.strip
-          @current_attributes[:gid] = run_specinfra(:get_user_gid, username).stdout.strip
-          @current_attributes[:home] = run_specinfra(:get_user_home_directory, username).stdout.strip
-          @current_attributes[:password] = current_password
+        if current.exist
+          current.uid = run_specinfra(:get_user_uid, attributes.username).stdout.strip
+          current.gid = run_specinfra(:get_user_gid, attributes.username).stdout.strip
+          current.home = run_specinfra(:get_user_home_directory, attributes.username).stdout.strip
+          current.password = current_password
         end
       end
 
       def action_create(options)
-        if run_specinfra(:check_user_exists, username)
-          if uid && uid.to_s != @current_attributes[:uid]
-            run_specinfra(:update_user_uid, username, uid)
+        if run_specinfra(:check_user_exists, attributes.username)
+          if attributes.uid && attributes.uid.to_s != current.uid
+            run_specinfra(:update_user_uid, attributes.username, attributes.uid)
             updated!
           end
 
-          if gid && gid.to_s != @current_attributes[:gid]
-            run_specinfra(:update_user_gid, username, gid)
+          if attributes.gid && attributes.gid.to_s != current.gid
+            run_specinfra(:update_user_gid, attributes.username, attributes.gid)
             updated!
           end
 
-          if password && password != current_password
-            run_specinfra(:update_user_encrypted_password, username, password)
+          if attributes.password && attributes.password != current_password
+            run_specinfra(:update_user_encrypted_password, attributes.username, attributes.password)
             updated!
           end
         else
           options = {
-            gid:            gid,
-            home_directory: home,
-            password:       password,
-            system_user:    system_user,
-            uid:            uid,
+            gid:            attributes.gid,
+            home_directory: attributes.home,
+            password:       attributes.password,
+            system_user:    attributes.system_user,
+            uid:            attributes.uid,
           }
 
-          run_specinfra(:add_user, username, options)
+          run_specinfra(:add_user, attributes.username, options)
 
           updated!
         end
@@ -55,11 +55,11 @@ module Itamae
 
       private
       def exist?
-        run_specinfra(:check_user_exists, username)
+        run_specinfra(:check_user_exists, attributes.username)
       end
 
       def current_password
-        result = run_specinfra(:get_user_encrypted_password, username)
+        result = run_specinfra(:get_user_encrypted_password, attributes.username)
         if result.success?
           result.stdout.strip
         else

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta41
+1.0.0.beta42

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

@@ -109,7 +109,7 @@ describe TestResource do
 
   describe "#run" do
     before do
-      subject.action :name
+      subject.attributes.action = :name
     end
     it "executes <ACTION_NAME>_action method" do
       expect(subject).to receive(:action_name)

metadata

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