cronicle 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e33a76397600f6b7c1dc022459638a2fa110e8fb
-  data.tar.gz: be4c62e61702f516a1c0fa1092d4db59d63eb9e5
+  metadata.gz: 7cdae0546bbdc1bd3e6a5bafd16d9b1f90f67d17
+  data.tar.gz: 61b267dfbc54560acdd815389696bda3ec5d8fdb
 SHA512:
-  metadata.gz: db4e5c51f3742cbb08a974fb9beac13aa9507a6a05d72827891dfa22b277968602a7ea48d8c4a684df2f44b3e391be3789a2cc3077bdf4f32badc6f4091a693e
-  data.tar.gz: 897f0d4f90395b938e06be90bed3cc8cd5df90cfaf5e1fe57dcf057d7818503c5ef2c19c56706bc21f72a0708de99039d4f55610bb37557e43944a8d10810f80
+  metadata.gz: 6fa6f2ff6eefa7bc123f0f6af444d566c6db47e8786439cb23b53aee310b8e3378c40385d5a3c2764c3658072d220fb64c36924fe94b51697e5f51d88232ff9f
+  data.tar.gz: ed515c832462b40bf65b737a9c963ac12db5a194cfc9e97bdf5acd504204ab0a3932aa716050190b841b2b9db6968103c841017e39bca06de21556722537de8c

data/README.md

@@ -133,7 +133,7 @@ server2
 
 Hosts definition file is not required.
 
-If you pass `--hosts` options, can be defined as follows in Jobfile:
+If you pass `--hosts` option, can be defined as follows in Jobfile:
 
 ```ruby
 on servers: /any_host/ do # use regexp

data/cronicle.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['sgwr_dts@yahoo.co.jp']
   spec.summary       = %q{It is a tool for execute script, and define cron on remote hosts.}
   spec.description   = %q{It is a tool for execute script, and define cron on remote hosts.}
-  spec.homepage      = 'https://github.com/winebarrel/cronicle'
+  spec.homepage      = 'http://cronicle.codenize.tools/'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/cronicle/ext/net-ssh_ext.rb

@@ -1,11 +1,13 @@
 class Net::SSH::Connection::Channel
+  PROMPT_REGEXP = Regexp.compile('^' + Regexp.escape(SSHKit::Backend::Netssh::SUDO_PROMPT) + '\b')
+
   alias on_data_orig on_data
 
   def on_data(&block)
     on_data_orig do |ch, data|
       sudo_password = Thread.current[SSHKit::Backend::Netssh::SUDO_PASSWORD_KEY]
 
-      if sudo_password and data == SSHKit::Backend::Netssh::SUDO_PROMPT
+      if sudo_password and data =~ PROMPT_REGEXP
         ch.send_data(sudo_password + "\n")
       else
         block.call(ch, data) if block

data/lib/cronicle/ext/sshkit_ext.rb

@@ -9,7 +9,7 @@ class SSHKit::Backend::Netssh
 
     retval = with_sudo_password(host.options[:sudo_password] || '') do
       with_sudo = [:sudo, '-p', SUDO_PROMPT, '-S']
-      with_sudo << '-u' << opts[:user] if opts[:user]
+      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)

data/lib/cronicle/version.rb

@@ -1,3 +1,3 @@
 module Cronicle
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/cronicle.rb

@@ -15,8 +15,8 @@ require 'unindent'
 
 module Cronicle; end
 require 'cronicle/ext/hash_ext'
-require 'cronicle/ext/net-ssh_ext'
 require 'cronicle/ext/sshkit_ext'
+require 'cronicle/ext/net-ssh_ext'
 require 'cronicle/logger'
 require 'cronicle/utils'
 require 'cronicle/client'

data/spec/cronicle_exec_spec.rb

@@ -128,6 +128,7 @@ describe 'Cronicle::Client#exec' do
     it do
       expect(amzn_out).to eq <<-EOS.unindent
         foo on amazon_linux/ec2-user> Execute job
+        foo on amazon_linux/ec2-user>\s
         foo on amazon_linux/ec2-user> Linux
         foo on amazon_linux/ec2-user> ec2-user
       EOS
@@ -136,6 +137,7 @@ describe 'Cronicle::Client#exec' do
     it do
       expect(ubuntu_out).to eq <<-EOS.unindent
         foo on ubuntu/ubuntu> Execute job
+        foo on ubuntu/ubuntu>\s
         foo on ubuntu/ubuntu> Linux
         foo on ubuntu/ubuntu> ubuntu
       EOS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cronicle
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Genki Sugawara
@@ -218,7 +218,7 @@ files:
 - spec/cronicle_update_spec.rb
 - spec/host_list_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/winebarrel/cronicle
+homepage: http://cronicle.codenize.tools/
 licenses:
 - MIT
 metadata: {}