itamae 1.0.0.beta33 → 1.0.0.beta34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7789de3e2192706f3fbc070c21b4c8655ee069e
-  data.tar.gz: 53c079ad48be16240db72583dbd259789f13f18f
+  metadata.gz: 35649d044a624b2d15b00968214ab5a9bbdec57d
+  data.tar.gz: 5f221d3341a367ba33934195034f2b146f04d992
 SHA512:
-  metadata.gz: ebe47750eca4115b24f816d646305df6b61eb370bb0955db711fc0fe522c20f6f72cdfb953d5029d67a8eda8ff367b20e027b39e7d94b9d81f71bab3bf156a97
-  data.tar.gz: fe8db93b2450cbd67a3038f482f3773cd8e6a77fd5d20fe2f3bfc983311cae8b612186645cd1b9203ef3642990e4c5ecc9eddfd593e18be33c85b0754bf1f7c7
+  metadata.gz: a19fe887f749d27ca6f9b9c4eef51a974711f8a79257d2ec6cb8e41e177bd8ed37144a42ba652845a88465d7740a1e8d5641d1e508fcff09a13251152c5282be
+  data.tar.gz: e9fb236ceda5b1901c940053369a75cd37da70e1030a546e2f6a18d92ec49f72eadac7223d9b4221e990657f7f7e200768353a633c63ca9407f2e957db577e29

data/lib/itamae/logger.rb

@@ -74,14 +74,6 @@ module Itamae
       def method_missing(method, *args, &block)
         logger.public_send(method, *args, &block)
       end
-
-      def depth
-        @depth || 0
-      end
-
-      def depth=(value)
-        @depth = value
-      end
     end
   end
 end

data/lib/itamae/resource/base.rb

@@ -60,18 +60,27 @@ module Itamae
             return
           end
 
-          pre_action
+          [action].flatten.each do |action|
+            @current_action = action
 
-          set_current_attributes
-          show_differences
+            Logger.info "action: #{action}"
 
-          unless options[:dry_run]
-            [action].flatten.each do |action|
-              Logger.info "action: #{action}"
+            unless options[:dry_run]
               Logger.formatter.indent do
+                Logger.debug "(in pre_action)"
+                pre_action
+
+                Logger.debug "(in set_current_attributes)"
+                set_current_attributes
+
+                Logger.debug "(in show_differences)"
+                show_differences
+
                 public_send("#{specific_action || action}_action".to_sym, options)
               end
             end
+
+            @current_action = nil
           end
 
           updated! if different?

data/lib/itamae/resource/directory.rb

@@ -9,6 +9,13 @@ module Itamae
       define_attribute :owner, type: String
       define_attribute :group, type: String
 
+      def pre_action
+        case @current_action
+        when :create
+          @attributes[:exist?] = true
+        end
+      end
+
       def set_current_attributes
         exist = run_specinfra(:check_file_is_directory, path)
         @current_attributes[:exist?] = exist
@@ -22,10 +29,6 @@ module Itamae
           @current_attributes[:owner] = nil
           @current_attributes[:group] = nil
         end
-
-        if action == :create
-          @attributes[:exist?] = true
-        end
       end
 
       def create_action(options)

data/lib/itamae/resource/file.rb

@@ -23,6 +23,11 @@ module Itamae
 
         @temppath = ::File.join(runner.tmpdir, Time.now.to_f.to_s)
         send_file(src, @temppath)
+
+        case @current_action
+        when :create
+          @attributes[:exist?] = true
+        end
       end
 
       def set_current_attributes
@@ -38,10 +43,6 @@ module Itamae
           @current_attributes[:owner] = nil
           @current_attributes[:group] = nil
         end
-
-        if action == :create
-          @attributes[:exist?] = true
-        end
       end
 
       def show_differences

data/lib/itamae/resource/git.rb

@@ -11,7 +11,7 @@ module Itamae
       define_attribute :revision, type: String
 
       def pre_action
-        case action
+        case @current_action
         when :sync
           @attributes[:exist?] = true
         end

data/lib/itamae/resource/link.rb

@@ -8,7 +8,7 @@ module Itamae
       define_attribute :to, type: String, required: true
 
       def pre_action
-        case action
+        case @current_action
         when :create
           @attributes[:exist?] = true
         end

data/lib/itamae/resource/package.rb

@@ -8,6 +8,13 @@ module Itamae
       define_attribute :version, type: String
       define_attribute :options, type: String
 
+      def pre_action
+        case @current_action
+        when :install
+          @attributes[:installed?] = true
+        end
+      end
+
       def set_current_attributes
         installed = run_specinfra(:check_package_is_installed, name)
         @current_attributes[:installed?] = installed
@@ -15,10 +22,6 @@ module Itamae
         if installed
           @current_attributes[:version] = run_specinfra(:get_package_version, name).stdout.strip
         end
-
-        if action == :install
-          @attributes[:installed?] = true
-        end
       end
 
       def install_action(action_options)

data/lib/itamae/resource/service.rb

@@ -6,24 +6,24 @@ module Itamae
       define_attribute :action, default: :nothing
       define_attribute :name, type: String, default_name: true
 
-      def set_current_attributes
-        @current_attributes[:running?] = run_specinfra(:check_service_is_running, name)
-        @current_attributes[:enabled?] = run_specinfra(:check_service_is_enabled, name)
-
-        actions = [action].flatten
-        if actions.include?(:start) || actions.include?(:restart)
+      def pre_action
+        case @current_action
+        when :start, :restart
           @attributes[:running?] = true
-        elsif actions.include?(:stop)
+        when :stop
           @attributes[:running?] = false
-        end
-
-        if actions.include?(:enable)
+        when :enable
           @attributes[:enabled?] = true
-        elsif actions.include?(:disable)
+        when :disable
           @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)
+      end
+
       def start_action(options)
         run_specinfra(:start_service, name)
       end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta33
+1.0.0.beta34

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta33
+  version: 1.0.0.beta34
 platform: ruby
 authors:
 - Ryota Arai