cronicle 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9671c2408dcd1e81c18c453cfb0337b37853b444
-  data.tar.gz: b0a075f4eb57c43edff84d9d68d08fe6a8af41f2
+  metadata.gz: 55990d68d863dd005a1f29102d53d908e20fab99
+  data.tar.gz: 8b01d9445e7e8c8d35ef5214efd14e129db06352
 SHA512:
-  metadata.gz: 5f4caf9b0bb52999418ff28be419c0a541635048bf606b878ac1f4f6177cafd5accefbd41d262ca4423e7ec40b79a7f6931d11a869d4e954b7de4d30789d318e
-  data.tar.gz: 9526f40169d7852ee7fa2de6cfbb2d2ddf3ebb7339dc4e5dfa4d5fc8144f49f0296a984c9278e1edd7458c644b2bdc7208d3b19052e05ee184e52cca4a280ce8
+  metadata.gz: 7d1e3492bb2986148c5c29e41954da0bb0825000af875d8abbe898c7a81d87345c18cd2909a7a2e0fae9e9d16c64343f51fe1fed6a9af18c9147a0bde8064d89
+  data.tar.gz: 45de3981f26f42a144d12c55fe60e9e7e1b2c05fb30fad3adc6d3d52d339145fa8ffefe371d9fc17cffa6ebafab425e4feb59741b96e66c9eacda6da84b3c38a

data/README.md

@@ -86,6 +86,7 @@ puts "hello"
 * CRONICLE_SSH_USER
 * CRONICLE_SSH_OPTIONS
 * CRONICLE_SSH_CONFIG
+* CRONICLE_SUDO_PASSWORD
 
 ## Jobfile example
 

data/lib/cronicle.rb

@@ -18,6 +18,7 @@ require 'cronicle/ext/hash_ext'
 require 'cronicle/ext/sshkit_ext'
 require 'cronicle/ext/net-ssh_ext'
 require 'cronicle/logger'
+require 'cronicle/log_sniffer'
 require 'cronicle/utils'
 require 'cronicle/client'
 require 'cronicle/cli'

data/lib/cronicle/cli.rb

@@ -4,7 +4,7 @@ class Cronicle::CLI < Thor
   class_option 'file',               :aliases => '-f', :desc => 'Job definition file',        :default => 'Jobfile'
   class_option 'hosts',              :aliases => '-h', :desc => 'Hosts definition file'
   class_option 'target-roles',       :aliases => '-r', :desc => 'Target host role list',      :type => :array
-  class_option 'sudo-password',      :aliases => '-p', :desc => 'Sudo password'
+  class_option 'sudo-password',      :aliases => '-p', :desc => 'Sudo password',              :default => ENV['CRONICLE_SUDO_PASSWORD']
   class_option 'ssh-user',                             :desc => 'SSH login user',             :default => ENV['CRONICLE_SSH_USER']
   class_option 'ask-pass',                             :desc => 'Ask sudo password',          :type => :boolean, :default => false
   class_option 'dry-run',                              :desc => 'Do not actually change',     :type => :boolean, :default => false

data/lib/cronicle/driver.rb

@@ -54,36 +54,27 @@ class Cronicle::Driver
           end
 
           upload_script(temp_dir, name, job[:content]) do |temp_script|
-            exec_opts = {:user => user, :raise_on_non_zero_exit => false}
-            command = nil
+            host_user_job = {:host => host.hostname, :user => user, :job => name}
 
-            if job[:bundle]
-              mkgemfile(user, name, job[:bundle], temp_dir)
-              bundle(user, name, temp_dir)
+            sniffer = proc do |obj|
+              out = obj.kind_of?(SSHKit::Command) ? obj.stdout : obj.to_s
 
-              with_bundle(user, name, temp_dir) do
-                command = sudo(:_execute, bundler_path, :exec, temp_script, exec_opts)
+              out.each_line do |line|
+                log_for_cronicle(:info, line, host_user_job)
               end
-            else
-              command = sudo(:_execute, temp_script, exec_opts)
             end
 
-            out = command.full_stdout
-            Cronicle::Utils.remove_prompt!(out)
-            host_user_job = {:host => host.hostname, :user => user, :job => name}
+            exec_opts = {:user => user, :raise_on_non_zero_exit => false, :sniffer => sniffer}
 
-            put_log = proc do |level, opts|
-              opts ||= {}
+            if job[:bundle]
+              mkgemfile(user, name, job[:bundle], temp_dir)
+              bundle(user, name, temp_dir)
 
-              out.each_line do |line|
-                log_for_cronicle(:info, line.strip, opts.merge(host_user_job))
+              with_bundle(user, name, temp_dir) do
+                sudo(:_execute, bundler_path, :exec, temp_script, exec_opts)
               end
-            end
-
-            if command.exit_status.zero?
-              put_log.call(:info)
             else
-              put_log.call(:error, :color => :red)
+              sudo(:_execute, temp_script, exec_opts)
             end
           end
         end

data/lib/cronicle/ext/sshkit_ext.rb

@@ -6,12 +6,27 @@ class SSHKit::Backend::Netssh
 
   alias _execute_orig _execute
 
+  def output
+    @output ||= SSHKit.config.output
+  end
+
   def _execute(*args)
+    options = args.last.kind_of?(Hash) ? args.last : {}
+    orig_output = output
+
     begin
+      if options[:sniffer]
+        @output = Cronicle::LogSniffer.new(orig_output) do |obj|
+          options[:sniffer].call(obj)
+        end
+      end
+
       _execute_orig(*args)
     rescue => e
       log_for_cronicle(:error, args.join(' '), :color => :red)
       raise e
+    ensure
+      @output = orig_output
     end
   end
 
@@ -22,9 +37,7 @@ class SSHKit::Backend::Netssh
       with_sudo = [:sudo, '-p', SUDO_PROMPT, '-S']
       with_sudo << :sudo << '-u' << opts[:user] if opts[:user]
       with_sudo.concat(args)
-
-      raise_on_non_zero_exit = opts.fetch(:raise_on_non_zero_exit, true)
-      send(command, *with_sudo, :raise_on_non_zero_exit => raise_on_non_zero_exit)
+      send(command, *with_sudo, opts)
     end
 
     Cronicle::Utils.remove_prompt!(retval) if retval.kind_of?(String)

data/lib/cronicle/log_sniffer.rb

@@ -0,0 +1,12 @@
+class Cronicle::LogSniffer
+  def initialize(original_output, &block)
+    @original_output = original_output
+    @block = block
+  end
+
+  def write(obj)
+    @block.call(obj)
+    @original_output << obj
+  end
+  alias :<< :write
+end

data/lib/cronicle/logger.rb

@@ -63,31 +63,6 @@ class Cronicle::Logger < ::Logger
       Cronicle::Logger.log(level, message, opts)
     end
   end
-
-  class SSHKitIO
-    def initialize(io = $stdout)
-      @io = io
-    end
-
-    def <<(obj)
-      @io << mask_password(obj)
-    end
-
-    private
-
-    MASK_REGEXP = /\becho\s+([^|]+)\s+\|\s+sudo\s+-S\s+/
-    MASK = 'XXXXXXXX'
-
-    def mask_password(obj)
-      if obj.kind_of?(String) and obj =~ MASK_REGEXP
-        password = $1
-        obj.sub(password, MASK)
-      else
-        obj
-      end
-    end
-  end
 end
 
-SSHKit.config.output = SSHKit::Formatter::Pretty.new(Cronicle::Logger::SSHKitIO.new)
 SSHKit.config.output_verbosity = :warn

data/lib/cronicle/version.rb

@@ -1,3 +1,3 @@
 module Cronicle
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/cronicle_exec_spec.rb

@@ -55,10 +55,13 @@ describe 'Cronicle::Client#exec' do
         foo on ubuntu/root> Execute job
         foo on ubuntu/root>\s
         foo on ubuntu/root> Linux
+        foo on ubuntu/root>\s
         foo on ubuntu/root> root
+        foo on ubuntu/root>\s
         bar on ubuntu/root> Execute job
         bar on ubuntu/root>\s
         bar on ubuntu/root> hello
+        bar on ubuntu/root>\s
       EOS
     end
   end
@@ -139,7 +142,9 @@ describe 'Cronicle::Client#exec' do
         foo on ubuntu/ubuntu> Execute job
         foo on ubuntu/ubuntu>\s
         foo on ubuntu/ubuntu> Linux
+        foo on ubuntu/ubuntu>\s
         foo on ubuntu/ubuntu> ubuntu
+        foo on ubuntu/ubuntu>\s
       EOS
     end
   end
@@ -206,7 +211,9 @@ describe 'Cronicle::Client#exec' do
         foo on ubuntu/ubuntu> Execute job
         foo on ubuntu/ubuntu>\s
         foo on ubuntu/ubuntu> "My Mash on ubuntu"
+        foo on ubuntu/ubuntu>\s
         foo on ubuntu/ubuntu> true
+        foo on ubuntu/ubuntu>\s
       EOS
     end
   end
@@ -238,6 +245,7 @@ describe 'Cronicle::Client#exec' do
         foo on amazon_linux/ec2-user> Execute job
         foo on amazon_linux/ec2-user>\s
         foo on amazon_linux/ec2-user> BAR
+        foo on amazon_linux/ec2-user>\s
       EOS
     end
 
@@ -246,6 +254,7 @@ describe 'Cronicle::Client#exec' do
         foo on ubuntu/ubuntu> Execute job
         foo on ubuntu/ubuntu>\s
         foo on ubuntu/ubuntu> 100
+        foo on ubuntu/ubuntu>\s
       EOS
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cronicle
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sourcify
@@ -223,6 +223,7 @@ files:
 - lib/cronicle/ext/net-ssh_ext.rb
 - lib/cronicle/ext/sshkit_ext.rb
 - lib/cronicle/host_list.rb
+- lib/cronicle/log_sniffer.rb
 - lib/cronicle/logger.rb
 - lib/cronicle/utils.rb
 - lib/cronicle/version.rb