itamae-mitsurin 0.46 → 0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d1f6d29ae9b227945bb222e0eb972c819039c5b
-  data.tar.gz: 9acdc555933504a72946673268da92c337ee7647
+  metadata.gz: 4b2e51e59486a4d9e4012683da2438208ae1ff71
+  data.tar.gz: e940d9d0f5426b12c422809299bc5c4c031f0897
 SHA512:
-  metadata.gz: 618c953d6cac86794aa74fcc8637e48b9a079848a44fba14dfa17f644fedac7ed78e576637b0aa3995d6e4cf55f654547fe1ea47be0bea2c69e435b690b32581
-  data.tar.gz: f20681d4563b280058249ae489677edaf94534fd587bd85d50f424ff719d6cb43eeb6da342d7a625bf36d1b760fac044a7524625c8c96dd406238edbda02dc39
+  metadata.gz: 6d0cfb95644d5f397e8c65a3d4412449fab7e3f9d1f22935fa16a151ec5ebc06f509af45c2d2aa85e9f1359ed2766ded7b6473aa068bb9f60d2ef005caffe668
+  data.tar.gz: f896bfdf02712c6c37e5d825ae300d367137c13732cc154ba62394a64c1d2af30cc43164bf73c07ea87fd790a46834b18ca283bb8ececd903c86b5916fe8e4ea

data/lib/itamae-mitsurin/cli.rb

@@ -12,7 +12,9 @@ module ItamaeMitsurin
       super
 
       ItamaeMitsurin.logger.level = ::Logger.const_get(options[:log_level].upcase)
+      ItamaeMitsurin.file_logger.level = ::Logger.const_get(options[:log_level].upcase)
       ItamaeMitsurin.logger.formatter.colored = options[:color]
+      ItamaeMitsurin.file_logger.formatter.colored = options[:color]
     end
 
     def self.define_exec_options

data/lib/itamae-mitsurin/logger.rb

@@ -120,10 +120,24 @@ module ItamaeMitsurin
     end
   end
 
+ # @logger = ::Logger.new($stdout).tap do |l|
+ #   l.formatter = ItamaeMitsurin::Logger::Formatter.new
+ # end.extend(ItamaeMitsurin::Logger::Helper)
+
   @logger = ::Logger.new($stdout).tap do |l|
     l.formatter = ItamaeMitsurin::Logger::Formatter.new
   end.extend(ItamaeMitsurin::Logger::Helper)
 
+  class ItamaeMitsurin::Logger::FileFormatter < ItamaeMitsurin::Logger::Formatter
+    def colorize(str, severity)
+      Time.now.strftime('%Y %m %d %H:%M:%S %z').to_s + str
+    end
+  end
+
+  @file_logger = ::Logger.new('logs/itamae.log', 5, 100 * 1024 * 1024).tap do |l|
+    l.formatter = ItamaeMitsurin::Logger::FileFormatter.new
+  end.extend(ItamaeMitsurin::Logger::Helper)
+
   class << self
     def logger
       @logger
@@ -132,5 +146,13 @@ module ItamaeMitsurin
     def logger=(l)
       @logger = l.extend(ItamaeMitsurin::Logger::Helper)
     end
+
+    def file_logger
+      @file_logger
+    end
+
+    def file_logger=(l)
+      @file_logger = l.extend(ItamaeMitsurin::Logger::Helper)
+    end
   end
 end

data/lib/itamae-mitsurin/mitsurin/itamae_with_target_task.rb

@@ -9,17 +9,18 @@ module ItamaeMitsurin
         all = []
         if (ARGV[0] == '-T' || ARGV[0] == '--tasks') && ARGV[1] != nil
           if File.exists?("nodes/#{ARGV[1]}")
-          project_h = {:project => ARGV[1]}
-          File.open "Project.json", 'w' do |f|
-            f.flock File::LOCK_EX
-            f.puts project_h.to_json
-            f.flock File::LOCK_UN
-          end
-          puts TaskBase.hl.color "Changed target mode '#{ARGV[1]}'", :green
+            project_h = {:project => ARGV[1]}
+            File.open "Project.json", 'w' do |f|
+              f.flock File::LOCK_EX
+              f.puts project_h.to_json
+              f.flock File::LOCK_UN
+            end
+            puts TaskBase.hl.color "Changed target mode '#{ARGV[1]}'", :green
           else
             raise "Change mode error '#{ARGV[1]}' is not exists"
           end
         end
+
         ret = JSON.parse(File.read("Project.json"))
         target = ret["project"] << '/**'
 
@@ -31,6 +32,7 @@ module ItamaeMitsurin
           rescue JSON::ParserError => e
             puts e.class.to_s + ", " + e.backtrace[0].to_s
             puts "Node error, nodefile:#{node_file}, reason:#{e.message}"
+            TaskBase.file_logger.fatal "Node error, nodefile:#{node_file}, reason:#{e.message}"
           end
 
           node_short = node_h[:environments][:hostname].split(".")[0]
@@ -51,6 +53,7 @@ module ItamaeMitsurin
             rescue Exception => e
               puts e.class.to_s + ", " + e.backtrace[0].to_s
               puts "Node or role error, nodefile:#{node_file}, reason:#{e.message}"
+              TaskBase.file_logger.fatal "Node or role error, nodefile:#{node_file}, reason:#{e.message}"
             else
               recipes.flatten!
             end
@@ -63,6 +66,7 @@ module ItamaeMitsurin
             rescue Exception => e
               puts e.class.to_s + ", " + e.backtrace[0].to_s
               puts "Node or environment error, nodefile:#{node_file}, reason:#{e.message}"
+              TaskBase.file_logger.fatal "Node or environment error, nodefile:#{node_file}, reason:#{e.message}"
             end
 
             # get recipes attr
@@ -132,7 +136,7 @@ module ItamaeMitsurin
             command << " --ask-password" unless ssh_password.nil?
             command << " --dry-run" if ENV['dry-run'] == "true"
             command << " -l debug" if ENV['debug'] == "true"
-            command << " -c logs/config/itamae_with_target_task.config"
+            # command << " -c logs/config/itamae_with_target_task.config"
 
             # Pass to read the recipe command
             command_recipe = []
@@ -155,6 +159,7 @@ module ItamaeMitsurin
             command << command_recipe.join
 
             puts TaskBase.hl.color(%!Run Itamae to "#{bname}"!, :red)
+            TaskBase.file_logger.info(%!Run Itamae to "#{bname}"!)
             run_list_noti = []
             command_recipe.each { |c_recipe|
               unless c_recipe.split("/")[4].split(".")[0] == 'default'
@@ -165,9 +170,12 @@ module ItamaeMitsurin
             }
 
             puts TaskBase.hl.color(%!Run List to \"#{run_list_noti.uniq.join(", ")}\"!, :green)
+            TaskBase.file_logger.info(%!Run List to \"#{run_list_noti.uniq.join(", ")}\"!)
             puts TaskBase.hl.color(%!#{command}!, :white)
+            TaskBase.file_logger.debug(%!#{command}!)
             st = system command
             exit 1 unless st
+            TaskBase.file_logger.info "itamae_with_target_task end."
           end
         end
       end

data/lib/itamae-mitsurin/mitsurin/task_base.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'highline'
-require "tmpdir"
+require 'tmpdir'
+require 'logger'
 
 module ItamaeMitsurin
   module Mitsurin
@@ -82,6 +83,16 @@ module ItamaeMitsurin
         def handler_logger
           default = {"handlers"=>[{"type"=>"json", "path"=>"itamae-log.json"}]}
         end
+
+        def file_logger
+          file_logger = ::Logger.new('logs/itamae.log', 5, 100 * 1024 * 1024).tap do |l|
+            l.formatter = proc do |serverity, datetime, progname, msg|
+              "#{datetime.strftime('%Y %m %d %H:%M:%S %z')} #{serverity} : #{msg}\n"
+            end
+          end
+
+          file_logger
+        end
       end
 
     end

data/lib/itamae-mitsurin/node.rb

@@ -35,6 +35,7 @@ module ItamaeMitsurin
       unless errors.empty?
         errors.each do |error|
           ItamaeMitsurin.logger.error "'#{error.position.join('->')}' #{error.message}"
+          ItamaeMitsurin.file_logger.error "'#{error.position.join('->')}' #{error.message}"
         end
         raise ValidationError
       end

data/lib/itamae-mitsurin/notification.rb

@@ -33,6 +33,7 @@ module ItamaeMitsurin
     def validate!
       unless [:delay, :delayed, :immediately].include?(timing)
         ItamaeMitsurin.logger.error "'#{timing}' is not valid notification timing. (Valid option is delayed or immediately)"
+        ItamaeMitsurin.file_logger.error "'#{timing}' is not valid notification timing. (Valid option is delayed or immediately)"
         abort
       end
     end

data/lib/itamae-mitsurin/recipe.rb

@@ -66,6 +66,11 @@ module ItamaeMitsurin
           @children.run
           run_delayed_notifications
         end
+
+        ItamaeMitsurin.file_logger.with_indent do
+          @children.run
+          run_delayed_notifications
+        end
       end
     end
 
@@ -83,6 +88,7 @@ module ItamaeMitsurin
 
     def show_banner
       ItamaeMitsurin.logger.info "Recipe: #{@path}"
+      ItamaeMitsurin.file_logger.info "Recipe: #{@path}"
     end
 
     class EvalContext

data/lib/itamae-mitsurin/resource.rb

@@ -58,6 +58,7 @@ module ItamaeMitsurin
         class_name = to_camel_case(name.to_s)
         if Resource.const_defined?(class_name)
           ItamaeMitsurin.logger.warn "Redefine class. (#{class_name})"
+          ItamaeMitsurin.file_logger.warn "Redefine class. (#{class_name})"
           return
         end
 

data/lib/itamae-mitsurin/resource/base.rb

@@ -149,6 +149,7 @@ module ItamaeMitsurin
         end
       rescue Backend::CommandExecutionError
         ItamaeMitsurin.logger.error "#{resource_type}[#{resource_name}] Failed."
+        ItamaeMitsurin.file_logger.error "#{resource_type}[#{resource_name}] Failed."
         exit 2
       end
 
@@ -189,6 +190,7 @@ module ItamaeMitsurin
             if runner.dry_run?
               unless respond_to?(method_name)
                 ItamaeMitsurin.logger.error "action #{action.inspect} is unavailable"
+                ItamaeMitsurin.file_logger.error "action #{action.inspect} is unavailable"
               end
             else
               args = [method_name]
@@ -239,12 +241,14 @@ module ItamaeMitsurin
           elsif current_value.nil? && !value.nil?
             ItamaeMitsurin.logger.color :green do
               ItamaeMitsurin.logger.info "#{resource_type}[#{resource_name}] #{key} will be '#{value}'"
+              ItamaeMitsurin.file_logger.info "#{resource_type}[#{resource_name}] #{key} will be '#{value}'"
             end
           elsif current_value == value || value.nil?
             ItamaeMitsurin.logger.debug "#{resource_type}[#{resource_name}] #{key} will not change (current value is '#{current_value}')"
           else
             ItamaeMitsurin.logger.color :green do
               ItamaeMitsurin.logger.info "#{resource_type}[#{resource_name}] #{key} will change from '#{current_value}' to '#{value}'"
+              ItamaeMitsurin.file_logger.info "#{resource_type}[#{resource_name}] #{key} will change from '#{current_value}' to '#{value}'"
             end
           end
         end
@@ -347,9 +351,11 @@ module ItamaeMitsurin
           end
 
           ItamaeMitsurin.logger.info message
+          ItamaeMitsurin.file_logger.info message
 
           if notification.instance_of?(Subscription)
             ItamaeMitsurin.logger.info "(because it subscribes this resource)"
+            ItamaeMitsurin.file_logger.info "(because it subscribes this resource)"
           end
 
           if notification.delayed?
@@ -364,11 +370,17 @@ module ItamaeMitsurin
         return if @verify_commands.empty?
 
         ItamaeMitsurin.logger.info "Verifying..."
+        ItamaeMitsurin.file_logger.info "Verifying..."
         ItamaeMitsurin.logger.with_indent do
           @verify_commands.each do |command|
             run_command(command)
           end
         end
+        ItamaeMitsurin.file_logger.with_indent do
+          @verify_commands.each do |command|
+            run_command(command)
+          end
+        end
       end
     end
   end

data/lib/itamae-mitsurin/runner.rb

@@ -7,6 +7,7 @@ module ItamaeMitsurin
     class << self
       def run(recipe_files, backend_type, options)
         ItamaeMitsurin.logger.info "Starting Itamae..."
+        ItamaeMitsurin.file_logger.info "Starting Itamae..."
 
         backend = Backend.create(backend_type, options)
         runner = self.new(backend, options)
@@ -99,22 +100,26 @@ module ItamaeMitsurin
         unless @backend.run_command("which ohai", error: false).exit_status == 0
           # install Ohai
           ItamaeMitsurin.logger.info "Installing Chef package... (to use Ohai)"
+          ItamaeMitsurin.file_logger.info "Installing Chef package... (to use Ohai)"
           @backend.run_command("curl -L https://www.opscode.com/chef/install.sh | bash")
         end
 
         ItamaeMitsurin.logger.info "Loading node data via ohai..."
+        ItamaeMitsurin.file_logger.info "Loading node data via ohai..."
         hash.merge!(JSON.parse(@backend.run_command("ohai").stdout))
       end
 
       if @options[:node_json]
         path = File.expand_path(@options[:node_json])
         ItamaeMitsurin.logger.info "Loading node data from #{path}..."
+        ItamaeMitsurin.file_logger.info "Loading node data from #{path}..."
         hash.merge!(JSON.load(open(path)))
       end
 
       if @options[:node_yaml]
         path = File.expand_path(@options[:node_yaml])
         ItamaeMitsurin.logger.info "Loading node data from #{path}..."
+        ItamaeMitsurin.file_logger.info "Loading node data from #{path}..."
         hash.merge!(YAML.load(open(path)) || {})
       end
 

data/lib/itamae-mitsurin/version.txt

@@ -1 +1 @@
-0.46
+0.47

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-mitsurin
 version: !ruby/object:Gem::Version
-  version: '0.46'
+  version: '0.47'
 platform: ruby
 authors:
 - Akihiro Kamiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor