cronicle 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf65d92585b97645e66f532927dd044179ac70af
-  data.tar.gz: 21b90e95b86676a64b466dff15d8de0046526c12
+  metadata.gz: e33a76397600f6b7c1dc022459638a2fa110e8fb
+  data.tar.gz: be4c62e61702f516a1c0fa1092d4db59d63eb9e5
 SHA512:
-  metadata.gz: fea9c1f8368743375665fc9d98354d23ebdfa8e4627739b9e45f4d83ed537dd03a6f87e1c7eb4a9873bf0697ae47a173232d44b11a3b7b98c9a3055fa36e8b34
-  data.tar.gz: 8712bbf81eda4185caca38cfebef69db7ffc8959e8a07213d7aff9336c187fe96ea872508e9b77f998d383a72f5a2dcc09b28cc3b2660a5f6c30b997b88721ca
+  metadata.gz: db4e5c51f3742cbb08a974fb9beac13aa9507a6a05d72827891dfa22b277968602a7ea48d8c4a684df2f44b3e391be3789a2cc3077bdf4f32badc6f4091a693e
+  data.tar.gz: 897f0d4f90395b938e06be90bed3cc8cd5df90cfaf5e1fe57dcf057d7818503c5ef2c19c56706bc21f72a0708de99039d4f55610bb37557e43944a8d10810f80

data/.gitignore

@@ -17,4 +17,3 @@ Jobfile
 /.vagrant
 *.pem
 *.bak
-/_site

data/README.md

@@ -35,9 +35,11 @@ Options:
   -h, [--hosts=HOSTS]                  # Hosts definition file
   -r, [--target-roles=one two three]   # Target host role list
   -p, [--sudo-password=SUDO-PASSWORD]  # Sudo password
+      [--ssh-user=SSH-USER]            # SSH login user
       [--ask-pass], [--no-ask-pass]    # Ask sudo password
       [--dry-run], [--no-dry-run]      # Do not actually change
   -c, [--ssh-config=SSH-CONFIG]        # OpenSSH configuration file
+                                       # Default: ~/.ssh/config
       [--ssh-options=SSH-OPTIONS]      # SSH options (JSON)
       [--connection-timeout=N]         # SSH connection timeout
       [--concurrency=N]                # SSH concurrency
@@ -78,6 +80,12 @@ $ ssh your_hostname 'cat /var/lib/cronicle/libexec/ec2-user/my_job'
 puts "hello"
 ```
 
+## Environment variables
+
+* CRONICLE_SSH_USER
+* CRONICLE_SSH_OPTIONS
+* CRONICLE_SSH_CONFIG
+
 ## Jobfile example
 
 ```ruby

data/lib/cronicle/cli.rb

@@ -5,10 +5,11 @@ class Cronicle::CLI < Thor
   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 '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
-  class_option 'ssh-config',         :aliases => '-c', :desc => 'OpenSSH configuration file', :default => nil
-  class_option 'ssh-options',                          :desc => 'SSH options (JSON)',         :default => nil
+  class_option 'ssh-config',         :aliases => '-c', :desc => 'OpenSSH configuration file', :default => (ENV['CRONICLE_SSH_CONFIG'] || '~/.ssh/config')
+  class_option 'ssh-options',                          :desc => 'SSH options (JSON)',         :default => ENV['CRONICLE_SSH_OPTIONS']
   class_option 'connection-timeout',                   :desc => 'SSH connection timeout',     :type => :numeric, :default => nil
   class_option 'concurrency',                          :desc => 'SSH concurrency',            :type => :numeric, :default => Cronicle::Client::DEFAULTS[:concurrency]
   class_option 'libexec',                              :desc => 'Cronicle libexec path',      :default => Cronicle::Client::DEFAULTS[:libexec]
@@ -82,6 +83,7 @@ class Cronicle::CLI < Thor
   def client_options
     client_opts = {
       :sudo_password => options['sudo-password'],
+      :ssh_user => options['ssh-user'],
       :concurrency => options['concurrency'],
       :libexec => options['libexec'],
       :dry_run => options['dry-run'],
@@ -112,7 +114,12 @@ class Cronicle::CLI < Thor
       end
     end
 
-    ssh_options[:config] = options['ssh-config'] if options['ssh-config']
+    ssh_config = options['ssh-config']
+
+    if ssh_config
+      ssh_config = File.expand_path(ssh_config)
+      ssh_options[:config] = ssh_config if File.exist?(ssh_config)
+    end
 
     SSHKit::Backend::Netssh.configure do |ssh|
       ssh.connection_timeout = conn_timeout if conn_timeout

data/lib/cronicle/client.rb

@@ -25,6 +25,10 @@ class Cronicle::Client
     end
 
     parallel_each(jobs_by_host) do |host, jobs_by_user|
+      if @options[:ssh_user] and host !~ /@/
+        host = @options[:ssh_user] + '@' + host
+      end
+
       run_driver(host) do |driver|
         jobs_by_user.each do |user, jobs|
           driver.execute_job(user, jobs)

data/lib/cronicle/ext/sshkit_ext.rb

@@ -7,7 +7,7 @@ class SSHKit::Backend::Netssh
   def sudo(command, *args)
     opts = args.last.kind_of?(Hash) ? args.pop : {}
 
-    retval = with_sudo_password(host.options[:sudo_password]) do
+    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.concat(args)

data/lib/cronicle/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cronicle
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sourcify