itamae 1.0.0.beta32 → 1.0.0.beta33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e05142ebe2064c8ea35f6ca3f54fe9ce1df6383
-  data.tar.gz: 292bfe518cb67a305ee08891459ecb5b5f6c0f66
+  metadata.gz: c7789de3e2192706f3fbc070c21b4c8655ee069e
+  data.tar.gz: 53c079ad48be16240db72583dbd259789f13f18f
 SHA512:
-  metadata.gz: 935258ed1e922445a2f7a501739519d5df67177e1351fb897b0959946f65b2c354de75f9c0241ad91a686a649593a2df254de249b3a26a405bd961b5183894a3
-  data.tar.gz: 9360186a116aea90b32b9bc5d1627c93756a7981b15ca2fdb5031c9ca2d5cb87e4f06e93273edd2c8ba3576571f13e81e76700642b83a198a797d75146663844
+  metadata.gz: ebe47750eca4115b24f816d646305df6b61eb370bb0955db711fc0fe522c20f6f72cdfb953d5029d67a8eda8ff367b20e027b39e7d94b9d81f71bab3bf156a97
+  data.tar.gz: fe8db93b2450cbd67a3038f482f3773cd8e6a77fd5d20fe2f3bfc983311cae8b612186645cd1b9203ef3642990e4c5ecc9eddfd593e18be33c85b0754bf1f7c7

data/README.md

@@ -1,4 +1,4 @@
-# Itamae [![Gem Version](https://badge.fury.io/rb/itamae.svg)](http://badge.fury.io/rb/itamae) [![wercker status](https://app.wercker.com/status/d44df82d2f4529ff664f32fa54ce12f5/s/master "wercker status")](https://app.wercker.com/project/bykey/d44df82d2f4529ff664f32fa54ce12f5)
+# Itamae [![Gem Version](https://badge.fury.io/rb/itamae.svg)](http://badge.fury.io/rb/itamae) [![Code Climate](https://codeclimate.com/github/ryotarai/itamae/badges/gpa.svg)](https://codeclimate.com/github/ryotarai/itamae) [![wercker status](https://app.wercker.com/status/d44df82d2f4529ff664f32fa54ce12f5/s/master "wercker status")](https://app.wercker.com/project/bykey/d44df82d2f4529ff664f32fa54ce12f5)
 
 Simple and lightweight configuration management tool inspired by Chef.
 
@@ -54,6 +54,10 @@ end
 
 Further example is here: [spec/integration/recipes/default.rb](spec/integration/recipes/default.rb)
 
+## Doc
+
+https://github.com/ryotarai/itamae/wiki
+
 ## Run tests
 
 Requirements: Vagrant

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.beta41"
+  spec.add_runtime_dependency "specinfra", "2.0.0.beta43"
   spec.add_runtime_dependency "hashie"
   spec.add_runtime_dependency "ansi"
 

data/lib/itamae/backend.rb

@@ -60,37 +60,39 @@ module Itamae
         command = "sudo -u #{Shellwords.escape(user)} -- /bin/sh -c #{Shellwords.escape(command)}"
       end
 
-      Logger.debug "  Executing `#{command}`..."
+      Logger.debug "Executing `#{command}`..."
 
       result = Specinfra::Runner.run_command(command)
       exit_status = result.exit_status
 
-      if exit_status == 0 || !options[:error]
-        method = :debug
-        message = "    exited with #{exit_status}"
-      else
-        method = :error
-        message = "  Command `#{command}` failed. (exit status: #{exit_status})"
-      end
+      Logger.formatter.indent do
+        if exit_status == 0 || !options[:error]
+          method = :debug
+          message = "exited with #{exit_status}"
+        else
+          method = :error
+          message = "Command `#{command}` failed. (exit status: #{exit_status})"
+        end
 
-      Logger.public_send(method, message)
+        Logger.public_send(method, message)
 
-      {"stdout" => result.stdout, "stderr" => result.stderr}.each_pair do |name, value|
-        next unless value && value != ''
+        {"stdout" => result.stdout, "stderr" => result.stderr}.each_pair do |name, value|
+          next unless value && value != ''
 
-        if value.bytesize > 1024 * 1024
-          Logger.public_send(method, "    #{name} is suppressed because it's too large")
-          next
-        end
-
-        value.each_line do |line|
-          # remove control chars
-          case line.encoding
-          when Encoding::UTF_8
-            line = line.tr("\u0000-\u001f\u007f\u2028",'')
+          if value.bytesize > 1024 * 1024
+            Logger.public_send(method, "#{name} is suppressed because it's too large")
+            next
           end
 
-          Logger.public_send(method, "    #{name} | #{line}")
+          value.each_line do |line|
+            # remove control chars
+            case line.encoding
+            when Encoding::UTF_8
+              line = line.tr("\u0000-\u001f\u007f\u2028",'')
+            end
+
+            Logger.public_send(method, "#{name} | #{line}")
+          end
         end
       end
 

data/lib/itamae/logger.rb

@@ -6,23 +6,33 @@ module Itamae
   module Logger
     class Formatter
       attr_accessor :colored
+      attr_accessor :depth
 
-      def call(severity, datetime, progname, msg)
+      INDENT_LENGTH = 3
 
-        severity = if colored
-                     color("%5s" % severity, severity)
-                   else
-                     "%5s" % severity
-                   end
+      def initialize(*args)
+        super
 
-        "[%s] %s : %s\n" % [format_datetime(datetime), severity, msg2str(msg)]
+        @depth = 0
       end
 
-      private
-      def format_datetime(time)
-        time.strftime("%Y-%m-%dT%H:%M:%S%:z")
+      def call(severity, datetime, progname, msg)
+        log = "%s : %s%s\n" % ["%5s" % severity, ' ' * INDENT_LENGTH * depth , msg2str(msg)]
+        if colored
+          color(log, severity)
+        else
+          log
+        end
+      end
+
+      def indent
+        @depth += 1
+        yield
+      ensure
+        @depth -= 1
       end
 
+      private
       def msg2str(msg)
         case msg
         when ::String
@@ -64,6 +74,14 @@ 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/recipe.rb

@@ -25,15 +25,15 @@ module Itamae
     def run(options = {})
       Logger.info "Recipe: #{@path}"
 
-      @children.run(options)
-
-      @delayed_notifications.uniq do |notification|
-        [notification.action, notification.action_resource]
-      end.each do |notification|
-        notification.run(options)
+      Logger.formatter.indent do
+        @children.run(options)
+
+        @delayed_notifications.uniq do |notification|
+          [notification.action, notification.action_resource]
+        end.each do |notification|
+          notification.run(options)
+        end
       end
-
-      Logger.info "< Finished. (#{@path})"
     end
 
     private
@@ -56,7 +56,7 @@ module Itamae
       target = candidate_paths.find {|path| File.exist?(path) }
 
       unless target
-        raise NotFoundError, "File not found. (#{target})"
+        raise NotFoundError, "Recipe not found. (#{recipe})"
       end
 
       if runner.children.find_recipe_by_path(target)

data/lib/itamae/resource/base.rb

@@ -48,33 +48,36 @@ module Itamae
       end
 
       def run(specific_action = nil, options = {})
-        Logger.info "Executing #{resource_type} (#{attributes})..."
-
-        if do_not_run_because_of_only_if?
-          Logger.info "Execution skipped because of only_if attribute"
-          return
-        elsif do_not_run_because_of_not_if?
-          Logger.info "Execution skipped because of not_if attribute"
-          return
-        end
+        attributes_without_action = attributes.dup.tap {|attr| attr.delete(:action) }
+        Logger.info "#{resource_type} (#{attributes_without_action})..."
+
+        Logger.formatter.indent do
+          if do_not_run_because_of_only_if?
+            Logger.info "Execution skipped because of only_if attribute"
+            return
+          elsif do_not_run_because_of_not_if?
+            Logger.info "Execution skipped because of not_if attribute"
+            return
+          end
 
-        pre_action
+          pre_action
 
-        set_current_attributes
-        show_differences
+          set_current_attributes
+          show_differences
 
-        unless options[:dry_run]
-          [action].flatten.each do |action|
-            public_send("#{specific_action || action}_action".to_sym, options)
+          unless options[:dry_run]
+            [action].flatten.each do |action|
+              Logger.info "action: #{action}"
+              Logger.formatter.indent do
+                public_send("#{specific_action || action}_action".to_sym, options)
+              end
+            end
           end
-        end
-
-        updated! if different?
 
-        notify(options) if updated?
+          updated! if different?
 
-        Logger.info "Succeeded."
-        Logger.info ''
+          notify(options) if updated?
+        end
       rescue Backend::CommandExecutionError
         Logger.error "Failed."
         exit 2
@@ -132,11 +135,11 @@ module Itamae
           if current_value.nil? && value.nil?
             # ignore
           elsif current_value.nil? && !value.nil?
-            Logger.info "  #{key} will be '#{value}'"
+            Logger.info "#{key} will be '#{value}'"
           elsif current_value == value || value.nil?
-            Logger.info "  #{key} will not change (current value is '#{current_value}')"
+            Logger.debug "#{key} will not change (current value is '#{current_value}')"
           else
-            Logger.info "  #{key} will change from '#{current_value}' to '#{value}'"
+            Logger.info "#{key} will change from '#{current_value}' to '#{value}'"
           end
         end
       end
@@ -162,7 +165,7 @@ module Itamae
       end
 
       def send_file(src, dst)
-        Logger.debug "  Sending a file from '#{src}' to '#{dst}'..."
+        Logger.debug "Sending a file from '#{src}' to '#{dst}'..."
         unless ::File.exist?(src)
           raise Error, "The file '#{src}' doesn't exist."
         end
@@ -227,7 +230,7 @@ module Itamae
 
       def updated!
         unless @updated
-          Logger.debug "  This resource is updated."
+          Logger.debug "This resource is updated."
         end
         @updated = true
       end

data/lib/itamae/resource/file.rb

@@ -51,11 +51,11 @@ module Itamae
           diff = run_command(["diff", "-u", path, @temppath], error: false)
           if diff.exit_status == 0
             # no change
-            Logger.info "  file content will not change"
+            Logger.debug "file content will not change"
           else
-            Logger.info "  diff:"
+            Logger.info "diff:"
             diff.stdout.each_line do |line|
-              Logger.info "    #{line.strip}"
+              Logger.info "#{line.strip}"
             end
           end
         end
@@ -78,8 +78,7 @@ module Itamae
 
       def delete_action(options)
         if run_specinfra(:check_file_is_file, path)
-          # TODO: delegate to Specinfra
-          run_command(["rm", path])
+          run_specinfra(:remove_file, path)
         end
       end
     end

data/lib/itamae/resource/link.rb

@@ -15,10 +15,10 @@ module Itamae
       end
 
       def set_current_attributes
-        @current_attributes[:exist?] = (run_command(["test", "-L", link], error: false).exit_status == 0)
+        @current_attributes[:exist?] = run_specinfra(:check_file_is_link, link)
 
         if @current_attributes[:exist?]
-          @current_attributes[:to] = run_command(["readlink", "-f", link]).stdout.strip
+          @current_attributes[:to] = run_specinfra(:get_file_link_target, link).stdout.strip
         end
       end
 

data/lib/itamae/resource/user.rb

@@ -15,10 +15,9 @@ module Itamae
         @current_attributes[:exist?] = exist?
 
         if @current_attributes[:exist?]
-          # TODO: delegate to Specinfra
-          @current_attributes[:uid] = run_command(["id", "-u", username]).stdout.strip
-          @current_attributes[:gid] = run_command(["id", "-g", username]).stdout.strip
-          @current_attributes[:home] = run_command("echo ~#{shell_escape(username)}").stdout.strip
+          @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
         end
       end
@@ -26,32 +25,29 @@ module Itamae
       def create_action(options)
         if run_specinfra(:check_user_exists, username)
           if uid && uid.to_s != @current_attributes[:uid]
-            # TODO: delegate to Specinfra
-            run_command(["usermod", "-u", uid, username]) 
+            run_specinfra(:update_user_uid, username, uid)
             updated!
           end
 
           if gid && gid.to_s != @current_attributes[:gid]
-            # TODO: delegate to Specinfra
-            run_command(["usermod", "-g", gid, username])
+            run_specinfra(:update_user_gid, username, gid)
             updated!
           end
 
           if password && password != current_password
-            # TODO: delegate to Specinfra
-            run_command("echo #{shell_escape("#{username}:#{password}")} | chpasswd -e")
+            run_specinfra(:update_user_encrypted_password, username, password)
             updated!
           end
         else
-          # TODO: delegate to Specinfra
-          args = ["useradd"]
-          args << "-g" << gid if gid
-          args << "-d" << home if home
-          args << "-p" << password if password
-          args << "-r" if system_user
-          args << "-u" << uid.to_s if uid
-          args << username
-          run_command(args)
+          options = {
+            gid:            gid,
+            home_directory: home,
+            password:       password,
+            system_user:    system_user,
+            uid:            uid,
+          }
+
+          run_specinfra(:add_user, username, options)
 
           updated!
         end
@@ -63,11 +59,9 @@ module Itamae
       end
 
       def current_password
-        # TODO: delegate to Specinfra
-        result = run_command("cat /etc/shadow | grep -E ^#{shell_escape(username)}:", error: false)
-
-        if result.exit_status == 0
-          result.stdout.split(":")[1]
+        result = run_specinfra(:get_user_encrypted_password, username)
+        if result.success?
+          result.stdout.strip
         else
           nil
         end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta32
+1.0.0.beta33

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta32
+  version: 1.0.0.beta33
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-27 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.beta41
+        version: 2.0.0.beta43
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta41
+        version: 2.0.0.beta43
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement