cronicle 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11f5fe77a738b4c7a79a87b1251b64863fcad6ee
-  data.tar.gz: fcc9dab5e28efb956caa314d6fc7c4b1e2453c3d
+  metadata.gz: bf65d92585b97645e66f532927dd044179ac70af
+  data.tar.gz: 21b90e95b86676a64b466dff15d8de0046526c12
 SHA512:
-  metadata.gz: 72a43d752f2a204e52684c34be85229cb68f71df9c488870e089b2b29ab6f16ed2ff88bc0e9b31ab02062a61a3fc53c130d520c963fe679cb3f6939e1b90f35d
-  data.tar.gz: 981d289443e799428e4cc77f3aa3b6337ea05ae6a7e6bda0827b4327b6beab20d0f491e838137438ea2b6476149fa40142e2c42d08cf9bfd63bab0469ce5c7b4
+  metadata.gz: fea9c1f8368743375665fc9d98354d23ebdfa8e4627739b9e45f4d83ed537dd03a6f87e1c7eb4a9873bf0697ae47a173232d44b11a3b7b98c9a3055fa36e8b34
+  data.tar.gz: 8712bbf81eda4185caca38cfebef69db7ffc8959e8a07213d7aff9336c187fe96ea872508e9b77f998d383a72f5a2dcc09b28cc3b2660a5f6c30b997b88721ca

data/.gitignore

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

data/README.md

@@ -38,6 +38,7 @@ Options:
       [--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
+      [--ssh-options=SSH-OPTIONS]      # SSH options (JSON)
       [--connection-timeout=N]         # SSH connection timeout
       [--concurrency=N]                # SSH concurrency
                                        # Default: 10

data/cronicle.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'parallel'
   spec.add_dependency 'diffy'
   spec.add_dependency 'highline'
+  spec.add_dependency 'unindent'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0.0'

data/lib/cronicle/cli.rb

@@ -8,6 +8,7 @@ class Cronicle::CLI < Thor
   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 '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]
@@ -103,11 +104,19 @@ class Cronicle::CLI < Thor
 
   def set_ssh_options
     conn_timeout = options['connection-timeout']
-    ssh_config = options['ssh-config']
+    ssh_options = {}
+
+    if options['ssh-options']
+      JSON.parse(options['ssh-options']).each do |key, value|
+        ssh_options[key.to_sym] = value
+      end
+    end
+
+    ssh_options[:config] = options['ssh-config'] if options['ssh-config']
 
     SSHKit::Backend::Netssh.configure do |ssh|
       ssh.connection_timeout = conn_timeout if conn_timeout
-      ssh.ssh_options = {:config => ssh_config} if ssh_config
+      ssh.ssh_options = ssh_options unless ssh_options.empty?
     end
   end
 end

data/lib/cronicle/dsl/context/job.rb

@@ -45,14 +45,14 @@ class Cronicle::DSL::Context::Job
 
     if block
       source = block.to_raw_source(:strip_enclosure => true).each_line.to_a
-      source = source.shift + source.join.undent
+      source = source.shift + source.join.unindent
 
       job_hash[:content] = <<-RUBY
 #!/usr/bin/env ruby
 #{source}
       RUBY
     else
-      job_hash[:content] = opts[:content].to_s.undent
+      job_hash[:content] = opts[:content].to_s.unindent
     end
   end
 end

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

@@ -0,0 +1,15 @@
+class Net::SSH::Connection::Channel
+  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
+        ch.send_data(sudo_password + "\n")
+      else
+        block.call(ch, data) if block
+      end
+    end
+  end
+end

data/lib/cronicle/ext/sshkit_ext.rb

@@ -1,18 +1,21 @@
 SSHKit::Backend::Netssh.config.pty = true
 
 class SSHKit::Backend::Netssh
+  SUDO_PASSWORD_KEY = :'__cronicle_sudo_password__'
+  SUDO_PROMPT = '__cronicle_sudo_prompt__'
+
   def sudo(command, *args)
     opts = args.last.kind_of?(Hash) ? args.pop : {}
 
-    password = host.options[:sudo_password] || ''
-    password = Shellwords.shellescape(password)
+    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)
 
-    with_sudo = [:echo, password, '|', :sudo, '-S']
-    with_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)
+    end
 
-    raise_on_non_zero_exit = opts.fetch(:raise_on_non_zero_exit, true)
-    retval = send(command, *with_sudo, :raise_on_non_zero_exit => raise_on_non_zero_exit)
     Cronicle::Utils.remove_prompt!(retval) if retval.kind_of?(String)
     retval
   end
@@ -33,7 +36,8 @@ class SSHKit::Backend::Netssh
 
   def list_crontabs
     cron_dir = find_cron_dir
-    @crontab_list ||= sudo(:capture, :find, cron_dir, '-type', :f, '-maxdepth', 1, '2> /dev/null',
+    @crontab_list ||= sudo(:capture, :bash, '-c',
+                        Shellwords.shellescape("find #{cron_dir} -type f 2> /dev/null"),
                         :raise_on_non_zero_exit => false).each_line.map(&:strip)
   end
 
@@ -140,6 +144,15 @@ class SSHKit::Backend::Netssh
   def crlf_to_lf(str)
     str.gsub("\r\n", "\n")
   end
+
+  def with_sudo_password(password)
+    begin
+      Thread.current[SUDO_PASSWORD_KEY] = password
+      yield
+    ensure
+      Thread.current[SUDO_PASSWORD_KEY] = nil
+    end
+  end
 end
 
 class SSHKit::Host

data/lib/cronicle/version.rb

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

data/lib/cronicle.rb

@@ -11,10 +11,11 @@ require 'sshkit'
 require 'sshkit/dsl'
 require 'tempfile'
 require 'thor'
+require 'unindent'
 
 module Cronicle; end
 require 'cronicle/ext/hash_ext'
-require 'cronicle/ext/string_ext'
+require 'cronicle/ext/net-ssh_ext'
 require 'cronicle/ext/sshkit_ext'
 require 'cronicle/logger'
 require 'cronicle/utils'

data/spec/cronicle_create_spec.rb

@@ -1,7 +1,7 @@
 describe 'Cronicle::Client#apply (create)' do
   context 'when empty cron' do
     let(:jobfile) do
-      <<-RUBY.undent
+      <<-RUBY.unindent
         on servers: /.*/ do
           job :foo, user: :root, schedule: '1 2 * * *' do
             puts `uname`
@@ -10,7 +10,7 @@ describe 'Cronicle::Client#apply (create)' do
         end
 
         on servers: /.*/ do
-          job :bar, user: :root, schedule: :@hourly, content: <<-SH.undent
+          job :bar, user: :root, schedule: :@hourly, content: <<-SH.unindent
             #!/bin/sh
             echo hello
           SH
@@ -63,18 +63,18 @@ describe 'Cronicle::Client#apply (create)' do
         expect(get_uname).to match /amzn/
         expect(get_crontabs).to eq amzn_crontab
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           puts `whoami`
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
           #!/bin/sh
           echo hello
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts 100
         EOS
@@ -86,18 +86,18 @@ describe 'Cronicle::Client#apply (create)' do
         expect(get_uname).to match /Ubuntu/
         expect(get_crontabs).to eq ubuntu_crontab
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           puts `whoami`
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
           #!/bin/sh
           echo hello
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts 200
         EOS
@@ -110,13 +110,13 @@ describe 'Cronicle::Client#apply (create)' do
       on TARGET_HOSTS do |ssh_options|
         user = ssh_options[:user]
 
-        set_crontab user, <<-CRON.undent
+        set_crontab user, <<-CRON.unindent
           FOO=bar
           ZOO=baz
           1 1 1 1 1 echo #{user} > /dev/null
         CRON
 
-        set_crontab :root, <<-CRON.undent
+        set_crontab :root, <<-CRON.unindent
           FOO=bar
           ZOO=baz
           1 1 1 1 1 echo root > /dev/null
@@ -125,7 +125,7 @@ describe 'Cronicle::Client#apply (create)' do
     end
 
     let(:jobfile) do
-      <<-RUBY.undent
+      <<-RUBY.unindent
         on servers: /.*/ do
           job :foo, user: :root, schedule: '1 2 * * *' do
             puts `uname`
@@ -134,7 +134,7 @@ describe 'Cronicle::Client#apply (create)' do
         end
 
         on servers: /.*/ do
-          job :bar, user: :root, schedule: :@hourly, content: <<-SH.undent
+          job :bar, user: :root, schedule: :@hourly, content: <<-SH.unindent
             #!/bin/sh
             echo hello
           SH
@@ -200,18 +200,18 @@ ZOO=baz
           expect(get_uname).to match /amzn/
           expect(get_crontabs).to eq amzn_crontab
 
-          expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+          expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
             #!/usr/bin/env ruby
             puts `uname`
             puts `whoami`
           EOS
 
-          expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+          expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
             #!/bin/sh
             echo hello
           EOS
 
-          expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.undent
+          expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.unindent
             #!/usr/bin/env ruby
             puts 100
           EOS
@@ -223,18 +223,18 @@ ZOO=baz
           expect(get_uname).to match /Ubuntu/
           expect(get_crontabs).to eq ubuntu_crontab
 
-          expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+          expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
             #!/usr/bin/env ruby
             puts `uname`
             puts `whoami`
           EOS
 
-          expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+          expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
             #!/bin/sh
             echo hello
           EOS
 
-          expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo')).to eq <<-EOS.undent
+          expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo')).to eq <<-EOS.unindent
             #!/usr/bin/env ruby
             puts 200
           EOS

data/spec/cronicle_delete_spec.rb

@@ -3,20 +3,20 @@ describe 'Cronicle::Client#apply (update)' do
     on TARGET_HOSTS do |ssh_options|
       user = ssh_options[:user]
 
-      set_crontab user, <<-CRON.undent
+      set_crontab user, <<-CRON.unindent
         FOO=bar
         ZOO=baz
         1 1 1 1 1 echo #{user} > /dev/null
       CRON
 
-      set_crontab :root, <<-CRON.undent
+      set_crontab :root, <<-CRON.unindent
         FOO=bar
         ZOO=baz
         1 1 1 1 1 echo root > /dev/null
       CRON
     end
 
-    cronicle(:apply) { <<-RUBY.undent }
+    cronicle(:apply) { <<-RUBY.unindent }
       on servers: /.*/ do
         job :foo, user: :root, schedule: '1 2 * * *' do
           puts `uname`
@@ -25,7 +25,7 @@ describe 'Cronicle::Client#apply (update)' do
       end
 
       on servers: /.*/ do
-        job :bar, user: :root, schedule: :@hourly, content: <<-SH.undent
+        job :bar, user: :root, schedule: :@hourly, content: <<-SH.unindent
           #!/bin/sh
           echo hello
         SH
@@ -82,7 +82,7 @@ ZOO=baz
   end
 
   let(:jobfile) do
-    <<-RUBY.undent
+    <<-RUBY.unindent
       on servers: /.*/ do
         job :foo, user: :root, schedule: '1 2 * * *' do
           puts `uname`
@@ -137,18 +137,18 @@ ZOO=baz
         expect(get_uname).to match /amzn/
         expect(get_crontabs).to eq amzn_crontab_orig
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           puts `whoami`
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
           #!/bin/sh
           echo hello
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts 100
         EOS
@@ -158,18 +158,18 @@ ZOO=baz
         expect(get_uname).to match /Ubuntu/
         expect(get_crontabs).to eq ubuntu_crontab_orig
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           puts `whoami`
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
           #!/bin/sh
           echo hello
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts 200
         EOS
@@ -181,13 +181,13 @@ ZOO=baz
         expect(get_uname).to match /amzn/
         expect(get_crontabs).to eq amzn_crontab
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           puts `whoami`
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts 100
         EOS
@@ -197,7 +197,7 @@ ZOO=baz
         expect(get_uname).to match /Ubuntu/
         expect(get_crontabs).to eq ubuntu_crontab
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           puts `whoami`
@@ -248,18 +248,18 @@ ZOO=baz
         expect(get_uname).to match /amzn/
         expect(get_crontabs).to eq amzn_crontab_orig
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           puts `whoami`
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
           #!/bin/sh
           echo hello
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts 100
         EOS
@@ -269,18 +269,18 @@ ZOO=baz
         expect(get_uname).to match /Ubuntu/
         expect(get_crontabs).to eq ubuntu_crontab_orig
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           puts `whoami`
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
           #!/bin/sh
           echo hello
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts 200
         EOS
@@ -292,18 +292,18 @@ ZOO=baz
         expect(get_uname).to match /amzn/
         expect(get_crontabs).to eq amzn_crontab_orig
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           puts `whoami`
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
           #!/bin/sh
           echo hello
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts 100
         EOS
@@ -313,18 +313,18 @@ ZOO=baz
         expect(get_uname).to match /Ubuntu/
         expect(get_crontabs).to eq ubuntu_crontab_orig
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           puts `whoami`
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
           #!/bin/sh
           echo hello
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts 200
         EOS

data/spec/cronicle_exec_spec.rb

@@ -16,7 +16,7 @@ describe 'Cronicle::Client#exec' do
 
   context 'run as root' do
     let(:jobfile) do
-      <<-RUBY.undent
+      <<-RUBY.unindent
         on servers: /.*/ do
           job :foo, user: :root do
             puts `uname`
@@ -25,7 +25,7 @@ describe 'Cronicle::Client#exec' do
         end
 
         on servers: /.*/ do
-          job :bar, user: :root, content: <<-SH.undent
+          job :bar, user: :root, content: <<-SH.unindent
             #!/bin/sh
             echo hello
           SH
@@ -39,21 +39,25 @@ describe 'Cronicle::Client#exec' do
     end
 
     it do
-      expect(amzn_out).to eq <<-EOS.undent
+      expect(amzn_out).to eq <<-EOS.unindent
         foo on amazon_linux/root> Execute job
+        foo on amazon_linux/root>\s
         foo on amazon_linux/root> Linux
         foo on amazon_linux/root> root
         bar on amazon_linux/root> Execute job
+        bar on amazon_linux/root>\s
         bar on amazon_linux/root> hello
       EOS
     end
 
     it do
-      expect(ubuntu_out).to eq <<-EOS.undent
+      expect(ubuntu_out).to eq <<-EOS.unindent
         foo on ubuntu/root> Execute job
+        foo on ubuntu/root>\s
         foo on ubuntu/root> Linux
         foo on ubuntu/root> root
         bar on ubuntu/root> Execute job
+        bar on ubuntu/root>\s
         bar on ubuntu/root> hello
       EOS
     end
@@ -61,7 +65,7 @@ describe 'Cronicle::Client#exec' do
 
   context 'run as root (dry-run)' do
     let(:jobfile) do
-      <<-RUBY.undent
+      <<-RUBY.unindent
         on servers: /.*/ do
           job :foo, user: :root do
             puts `uname`
@@ -70,7 +74,7 @@ describe 'Cronicle::Client#exec' do
         end
 
         on servers: /.*/ do
-          job :bar, user: :root, content: <<-SH.undent
+          job :bar, user: :root, content: <<-SH.unindent
             #!/bin/sh
             echo hello
           SH
@@ -84,14 +88,14 @@ describe 'Cronicle::Client#exec' do
     end
 
     it do
-      expect(amzn_out).to eq <<-EOS.undent
+      expect(amzn_out).to eq <<-EOS.unindent
         foo on amazon_linux/root> Execute job (dry-run)
         bar on amazon_linux/root> Execute job (dry-run)
       EOS
     end
 
     it do
-      expect(ubuntu_out).to eq <<-EOS.undent
+      expect(ubuntu_out).to eq <<-EOS.unindent
         foo on ubuntu/root> Execute job (dry-run)
         bar on ubuntu/root> Execute job (dry-run)
       EOS
@@ -100,7 +104,7 @@ describe 'Cronicle::Client#exec' do
 
   context 'run as non-root user' do
     let(:jobfile) do
-      <<-RUBY.undent
+      <<-RUBY.unindent
         on servers: /amazon_linux/ do
           job :foo, user: 'ec2-user' do
             puts `uname`
@@ -122,7 +126,7 @@ describe 'Cronicle::Client#exec' do
     end
 
     it do
-      expect(amzn_out).to eq <<-EOS.undent
+      expect(amzn_out).to eq <<-EOS.unindent
         foo on amazon_linux/ec2-user> Execute job
         foo on amazon_linux/ec2-user> Linux
         foo on amazon_linux/ec2-user> ec2-user
@@ -130,7 +134,7 @@ describe 'Cronicle::Client#exec' do
     end
 
     it do
-      expect(ubuntu_out).to eq <<-EOS.undent
+      expect(ubuntu_out).to eq <<-EOS.unindent
         foo on ubuntu/ubuntu> Execute job
         foo on ubuntu/ubuntu> Linux
         foo on ubuntu/ubuntu> ubuntu
@@ -140,7 +144,7 @@ describe 'Cronicle::Client#exec' do
 
   context 'jon is not defined' do
     let(:jobfile) do
-      <<-RUBY.undent
+      <<-RUBY.unindent
         on servers: /.*/ do
           job :foo, user: :root do
             puts `uname`

data/spec/cronicle_update_spec.rb

@@ -3,20 +3,20 @@ describe 'Cronicle::Client#apply (update)' do
     on TARGET_HOSTS do |ssh_options|
       user = ssh_options[:user]
 
-      set_crontab user, <<-CRON.undent
+      set_crontab user, <<-CRON.unindent
         FOO=bar
         ZOO=baz
         1 1 1 1 1 echo #{user} > /dev/null
       CRON
 
-      set_crontab :root, <<-CRON.undent
+      set_crontab :root, <<-CRON.unindent
         FOO=bar
         ZOO=baz
         1 1 1 1 1 echo root > /dev/null
       CRON
     end
 
-    cronicle(:apply) { <<-RUBY.undent }
+    cronicle(:apply) { <<-RUBY.unindent }
       on servers: /.*/ do
         job :foo, user: :root, schedule: '1 2 * * *' do
           puts `uname`
@@ -25,7 +25,7 @@ describe 'Cronicle::Client#apply (update)' do
       end
 
       on servers: /.*/ do
-        job :bar, user: :root, schedule: :@hourly, content: <<-SH.undent
+        job :bar, user: :root, schedule: :@hourly, content: <<-SH.unindent
           #!/bin/sh
           echo hello
         SH
@@ -82,7 +82,7 @@ ZOO=baz
   end
 
   let(:jobfile) do
-    <<-RUBY.undent
+    <<-RUBY.unindent
       on servers: /.*/ do
         job :foo, user: :root, schedule: '1 2 * * *' do
           puts `uname`
@@ -91,7 +91,7 @@ ZOO=baz
       end
 
       on servers: /.*/ do
-        job :bar, user: :root, schedule: :@hourly, content: <<-SH.undent
+        job :bar, user: :root, schedule: :@hourly, content: <<-SH.unindent
           #!/bin/sh
           echo hello
         SH
@@ -153,18 +153,18 @@ ZOO=baz
         expect(get_uname).to match /amzn/
         expect(get_crontabs).to eq amzn_crontab_orig
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           puts `whoami`
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
           #!/bin/sh
           echo hello
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts 100
         EOS
@@ -174,18 +174,18 @@ ZOO=baz
         expect(get_uname).to match /Ubuntu/
         expect(get_crontabs).to eq ubuntu_crontab_orig
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           puts `whoami`
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
           #!/bin/sh
           echo hello
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts 200
         EOS
@@ -197,18 +197,18 @@ ZOO=baz
         expect(get_uname).to match /amzn/
         expect(get_crontabs).to eq amzn_crontab
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           #puts `whoami`
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
           #!/bin/sh
           echo hello
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts 100
         EOS
@@ -218,18 +218,18 @@ ZOO=baz
         expect(get_uname).to match /Ubuntu/
         expect(get_crontabs).to eq ubuntu_crontab
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           #puts `whoami`
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
           #!/bin/sh
           echo hello
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo2')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo2')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts 200
         EOS
@@ -279,18 +279,18 @@ ZOO=baz
         expect(get_uname).to match /amzn/
         expect(get_crontabs).to eq amzn_crontab_orig
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           puts `whoami`
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
           #!/bin/sh
           echo hello
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts 100
         EOS
@@ -300,18 +300,18 @@ ZOO=baz
         expect(get_uname).to match /Ubuntu/
         expect(get_crontabs).to eq ubuntu_crontab_orig
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           puts `whoami`
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
           #!/bin/sh
           echo hello
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts 200
         EOS
@@ -323,18 +323,18 @@ ZOO=baz
         expect(get_uname).to match /amzn/
         expect(get_crontabs).to eq amzn_crontab_orig
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           puts `whoami`
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
           #!/bin/sh
           echo hello
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/ec2-user/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts 100
         EOS
@@ -344,18 +344,18 @@ ZOO=baz
         expect(get_uname).to match /Ubuntu/
         expect(get_crontabs).to eq ubuntu_crontab_orig
 
-        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts `uname`
           puts `whoami`
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/root/bar')).to eq <<-EOS.unindent
           #!/bin/sh
           echo hello
         EOS
 
-        expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo')).to eq <<-EOS.undent
+        expect(get_file('/var/lib/cronicle/libexec/ubuntu/foo')).to eq <<-EOS.unindent
           #!/usr/bin/env ruby
           puts 200
         EOS

data/spec/host_list_spec.rb

@@ -19,7 +19,7 @@ describe Cronicle::HostList do
 
   context 'when list is passed' do
     let(:source) do
-      <<-EOS.undent
+      <<-EOS.unindent
         foo
         bar
       EOS
@@ -41,7 +41,7 @@ describe Cronicle::HostList do
   context 'when JSON(servers) is passed' do
     context 'when single server' do
       let(:source) do
-        <<-EOS.undent
+        <<-EOS.unindent
           {
             "servers": "foo"
           }
@@ -63,7 +63,7 @@ describe Cronicle::HostList do
 
     context 'when multiple servers' do
       let(:source) do
-        <<-EOS.undent
+        <<-EOS.unindent
           {
             "servers": ["foo", "bar"]
           }
@@ -85,7 +85,7 @@ describe Cronicle::HostList do
 
     context 'when multiple servers with role' do
       let(:source) do
-        <<-EOS.undent
+        <<-EOS.unindent
           {
             "servers": {
               "foo": "db",
@@ -112,7 +112,7 @@ describe Cronicle::HostList do
   context 'when JSON(roles) is passed' do
     context 'when single server' do
       let(:source) do
-        <<-EOS.undent
+        <<-EOS.unindent
           {
             "roles": {
               "web": "bar"
@@ -136,7 +136,7 @@ describe Cronicle::HostList do
 
     context 'when multiple servers' do
       let(:source) do
-        <<-EOS.undent
+        <<-EOS.unindent
           {
             "roles": {
               "db": ["foo", "bar"],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cronicle
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sourcify
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: unindent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -192,8 +206,8 @@ files:
 - lib/cronicle/dsl/context/job.rb
 - lib/cronicle/exporter.rb
 - lib/cronicle/ext/hash_ext.rb
+- lib/cronicle/ext/net-ssh_ext.rb
 - lib/cronicle/ext/sshkit_ext.rb
-- lib/cronicle/ext/string_ext.rb
 - lib/cronicle/host_list.rb
 - lib/cronicle/logger.rb
 - lib/cronicle/utils.rb

data/lib/cronicle/ext/string_ext.rb

@@ -1,11 +0,0 @@
-class String
-  def undent
-    min_space_num = self.split("\n").delete_if {|s| s =~ /^\s*$/ }.map {|s| (s[/^\s+/] || '').length }.min
-
-    if min_space_num and min_space_num > 0
-      gsub(/^[ \t]{,#{min_space_num}}/, '')
-    else
-      self
-    end
-  end
-end