cronicle 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cdae0546bbdc1bd3e6a5bafd16d9b1f90f67d17
-  data.tar.gz: 61b267dfbc54560acdd815389696bda3ec5d8fdb
+  metadata.gz: 397f41f3a15c86c5307a304e878fdf755ee47474
+  data.tar.gz: 57a0933ff281f922f79bcef23304d570e563d56a
 SHA512:
-  metadata.gz: 6fa6f2ff6eefa7bc123f0f6af444d566c6db47e8786439cb23b53aee310b8e3378c40385d5a3c2764c3658072d220fb64c36924fe94b51697e5f51d88232ff9f
-  data.tar.gz: ed515c832462b40bf65b737a9c963ac12db5a194cfc9e97bdf5acd504204ab0a3932aa716050190b841b2b9db6968103c841017e39bca06de21556722537de8c
+  metadata.gz: aba44a6c955bfc541ddf83d010031656935800cfca10b7c4dc88194201bddb8149762b5a7d93754363c691ff12a22da71950ba6b959326464bd6a8c2992fc538
+  data.tar.gz: 5772cd0031968bc5e026dc773190baffdff5d98c376ea4b8c7e119e19143d4a29f765519c4938f484027fec583d5b11684d70c4f3ec6b11c4fda57dc22d90683

data/.gitignore

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

data/.rspec

@@ -1,2 +1,4 @@
 --colour
 --require spec_helper
+--require rspec/instafail
+--format RSpec::Instafail

data/README.md

@@ -39,13 +39,13 @@ 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
-                                       # Default: ~/.ssh/config
+                                       # Default: ssh_config
       [--ssh-options=SSH-OPTIONS]      # SSH options (JSON)
       [--connection-timeout=N]         # SSH connection timeout
       [--concurrency=N]                # SSH concurrency
                                        # Default: 10
-      [--libexec=LIBEXEC]              # Cronicle libexec path
-                                       # Default: /var/lib/cronicle/libexec
+      [--var-dir=VAR-DIR]              # Cronicle var dir path
+                                       # Default: /var/lib/cronicle
   -v, [--verbose], [--no-verbose]      # Verbose mode
       [--debug], [--no-debug]          # Debug mode
       [--color], [--no-color]          # Colorize log
@@ -90,8 +90,12 @@ puts "hello"
 
 ```ruby
 on servers: :your_hostname do
-  job :my_job, user: "ec2-user", schedule: "* * * * *" do
-    puts "hello"
+  job :my_job, user: "ec2-user", schedule: "* * * * *", bundle: 'ruby-mysql' do
+    require 'mysql'
+    my = Mysql.connect('hostname', 'username', 'password', 'dbname')
+    my.query("select col1, col2 from tblname").each do |col1, col2|
+      p col1, col2
+    end
   end
 
   job :my_job2, user: "ec2-user", schedule: "* * * * *", content: <<-EOS

data/cronicle.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0.0'
   spec.add_development_dependency 'serverspec'
+  spec.add_development_dependency 'rspec-instafail'
 end

data/lib/cronicle/cli.rb

@@ -12,7 +12,7 @@ class Cronicle::CLI < Thor
   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]
+  class_option 'var-dir',                              :desc => 'Cronicle var dir path',      :default => Cronicle::Client::DEFAULTS[:var_dir]
   class_option 'verbose',            :aliases => '-v', :desc => 'Verbose mode',               :type => :boolean, :default => false
   class_option 'debug',                                :desc => 'Debug mode',                 :type => :boolean, :default => false
   class_option 'color',                                :desc => 'Colorize log',               :type => :boolean, :default => true
@@ -85,7 +85,7 @@ class Cronicle::CLI < Thor
       :sudo_password => options['sudo-password'],
       :ssh_user => options['ssh-user'],
       :concurrency => options['concurrency'],
-      :libexec => options['libexec'],
+      :var_dir => options['var-dir'],
       :dry_run => options['dry-run'],
       :verbose => options['verbose']
     }

data/lib/cronicle/client.rb

@@ -3,7 +3,7 @@ class Cronicle::Client
 
   DEFAULTS = {
     :concurrency => 10,
-    :libexec => '/var/lib/cronicle/libexec'
+    :var_dir => '/var/lib/cronicle'
   }
 
   def initialize(host_list, options = {})
@@ -138,6 +138,8 @@ class Cronicle::Client
       (selected_hots + dsl_hosts).uniq.each do |h|
         if hosts[h][job_user][job_name]
           log(:warn, "Job is duplicated", :color => :yellow, :host => h, :user => job_user, :job => job_name)
+        elsif job_name.nil?
+          hosts[h] ||= {}
         else
           hosts[h][job_user][job_name] = job_hash
         end

data/lib/cronicle/driver.rb

@@ -54,7 +54,20 @@ class Cronicle::Driver
           end
 
           upload_script(temp_dir, name, job[:content]) do |temp_script|
-            command = sudo(:_execute, temp_script, :user => user, :raise_on_non_zero_exit => false)
+            exec_opts = {:user => user, :raise_on_non_zero_exit => false}
+            command = nil
+
+            if job[:bundle]
+              mkgemfile(user, name, job[:bundle], temp_dir)
+              bundle(user, name, temp_dir)
+
+              with_bundle(user, name, temp_dir) do
+                command = sudo(:_execute, bundler_path, :exec, temp_script, exec_opts)
+              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}
@@ -79,6 +92,13 @@ class Cronicle::Driver
   end
 
   def create_job(user, name, job)
+    execute do
+      if job[:bundle]
+        mkgemfile(user, name, job[:bundle])
+        bundle(user, name)
+      end
+    end
+
     create_or_update_job(user, name, job)
   end
 
@@ -86,6 +106,13 @@ class Cronicle::Driver
     job_content = job[:content].chomp
     script_content = script[:content].chomp
 
+    execute do
+      if job[:bundle]
+        mkgemfile(user, name, job[:bundle])
+        bundle(user, name)
+      end
+    end
+
     if [:schedule, :content].any? {|k| job[k].chomp != script[k].chomp }
       create_or_update_job(user, name, job, script)
     end
@@ -114,7 +141,7 @@ class Cronicle::Driver
             sudo(:execute, :cp, temp_script, libexec_script)
             sudo(:execute, :touch, user_crontab(user))
             delete_cron_entry(user, name)
-            add_cron_entry(user, name, job[:schedule], user_temp_dir)
+            add_cron_entry(user, name, job[:schedule], user_temp_dir, job[:bundle])
           end
         end
       end
@@ -135,6 +162,7 @@ class Cronicle::Driver
           unless host.options[:dry_run]
             delete_cron_entry(user, name)
             sudo(:execute, :rm, '-f', script[:path], :raise_on_non_zero_exit => false)
+            sudo(:execute, :rm, '-rf', gemfile_dir(user, name), :raise_on_non_zero_exit => false)
           end
         end
       end

data/lib/cronicle/dsl/context.rb

@@ -42,7 +42,12 @@ class Cronicle::DSL::Context
     end
 
     target.assert_valid_keys(:servers, :roles)
+    values = Cronicle::DSL::Context::Job.new(target, &block).result.values
 
-    @result.concat(Cronicle::DSL::Context::Job.new(target, &block).result.values)
+    @result.concat(values.empty? ? [{
+      :servers => Array(target[:servers]),
+      :roles => Array(target[:roles]),
+      :job => {}
+    }] : values)
   end
 end

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

@@ -30,7 +30,7 @@ class Cronicle::DSL::Context::Job
       raise ArgumentError, "Job `#{name}`: :user is required"
     end
 
-    opts.assert_valid_keys(:schedule, :user, :content)
+    opts.assert_valid_keys(:schedule, :user, :content, :bundle)
 
     if opts[:content] and block
       raise ArgumentError, 'Can not pass :content and block to `job` method'
@@ -42,6 +42,11 @@ class Cronicle::DSL::Context::Job
     job_hash[:name] = name
     job_hash[:user] = opts.fetch(:user).to_s
     job_hash[:schedule] = opts[:schedule].to_s if opts[:schedule]
+    bundle = opts[:bundle]
+
+    if bundle
+      job_hash[:bundle] = bundle.kind_of?(Hash) ? bundle : Array(bundle).map(&:to_s)
+    end
 
     if block
       source = block.to_raw_source(:strip_enclosure => true).each_line.to_a

data/lib/cronicle/exporter.rb

@@ -32,12 +32,12 @@ class Cronicle::Exporter
 
   def parse_crontab(crontab, libexec_contents)
     scripts = {}
-    libexec_dir = @options.fetch(:libexec)
+    libexec_dir = @options.fetch(:var_dir) + '/libexec'
 
     crontab.each_line.map(&:strip).each do |line|
       next if line =~ /\A#/
 
-      md = line.match(/\A(@\w+|\S+(?:\s+\S+){4})\s+(.\S+)(.*)\z/)
+      md = line.match(/\A(@\w+|\S+(?:\s+\S+){4})\s+(?:cd\s+\S+\s+&&\s+\S*bundle\s+exec\s+)?(.\S+)(.*)\z/)
       schedule, path, extra = md.captures if md
 
       if %r|\A#{Regexp.escape(libexec_dir)}/(?:[^/]+)/(.+)| =~ path

data/lib/cronicle/ext/hash_ext.rb

@@ -2,7 +2,7 @@ class Hash
   def assert_valid_keys(*valid_keys)
     each_key do |k|
       next if valid_keys.include?(k)
-      raise ArgumentError, "Unknown key: #{k.inspect}. Valid keys are: #{valid_keys.map(&:inspect).join(', ')}"
+      raise ArgumentError, "unknown key: #{k.inspect}. valid keys are: #{valid_keys.map(&:inspect).join(', ')}"
     end
   end
 end

data/lib/cronicle/ext/sshkit_ext.rb

@@ -77,11 +77,17 @@ class SSHKit::Backend::Netssh
     sudo(:execute, :sed, '-i', sed_cmd, user_crontab(user), :raise_on_non_zero_exit => false)
   end
 
-  def add_cron_entry(user, name, schedule, temp_dir)
+  def add_cron_entry(user, name, schedule, temp_dir, bundle_gems = nil)
     script = script_path(user, name)
     temp_entry = [temp_dir, name + '.entry'].join('/')
 
-    cron_entry = "#{schedule}\\t#{script} 2>&1 | logger -t cronicle/#{user}/#{name}"
+    cron_entry = "#{schedule}\\t"
+
+    if bundle_gems
+      cron_entry << "cd #{gemfile_dir(user, name)} && #{bundler_path} exec "
+    end
+
+    cron_entry << "#{script} 2>&1 | logger -t cronicle/#{user}/#{name}"
     cron_entry = Shellwords.shellescape(cron_entry)
     sudo(:execute, :echo, '-e', cron_entry, '>', temp_entry)
 
@@ -91,7 +97,7 @@ class SSHKit::Backend::Netssh
   end
 
   def upload_script(temp_dir, name, content)
-    temp_script = [temp_dir, name].join
+    temp_script = [temp_dir, name].join('/')
     upload!(StringIO.new(content), temp_script)
     execute(:chmod, 755, temp_script)
     yield(temp_script)
@@ -113,18 +119,87 @@ class SSHKit::Backend::Netssh
 
       yield(*block_args)
     ensure
-      execute(:rm, '-rf', temp_dir, :raise_on_non_zero_exit => false) rescue nil
+      sudo(:execute, :rm, '-rf', temp_dir, :raise_on_non_zero_exit => false) rescue nil
+    end
+  end
+
+  def mkgemfile(user, name, bundle_gems, temp_dir = nil)
+    sudo(:execute, :mkdir, '-p', gemfile_dir(user, name, temp_dir))
+    sudo(:execute, :bash, '-c',
+      Shellwords.shellescape(
+        [:echo, Shellwords.shellescape("source 'https://rubygems.org'"), '>', gemfile(user, name, temp_dir)].join(' ')
+      )
+    )
+
+    bundle_gems.each do |gem_name, version|
+      line = "gem '#{gem_name}'"
+      line << ", '#{version}'" if version
+      sudo(:execute, :bash, '-c',
+        Shellwords.shellescape(
+          [:echo, Shellwords.shellescape(line), '>>', gemfile(user, name, temp_dir)].join(' ')
+        )
+      )
+    end
+  end
+
+  def bundle(user, name, temp_dir = nil)
+    with_bundle(user, name, temp_dir) do |bundler_opts|
+      unless sudo(:execute, bundler_path, :check, *bundler_opts, :raise_on_non_zero_exit => false)
+        sudo(:execute, bundler_path, :install, *bundler_opts)
+      end
+    end
+  end
+
+  def with_bundle(user, name, temp_dir = nil)
+    within gemfile_dir(user, name, temp_dir) do
+      bundler_opts = ['--no-color', '--gemfile', gemfile(user, name, temp_dir), '--path', bundle_dir]
+      yield(bundler_opts)
     end
   end
 
   def libexec_dir
-    host.options.fetch(:libexec)
+    host.options.fetch(:var_dir) + '/libexec'
+  end
+
+  def run_dir
+    host.options.fetch(:var_dir) + '/run'
+  end
+
+  def bundle_dir
+    host.options.fetch(:var_dir) + '/bundle'
+  end
+
+  BUNDLER_PATHS = %w(
+    /usr/local/bin/bundle
+    /usr/bin/bundle
+  )
+
+  def bundler_path
+    @bundler_path ||= (BUNDLER_PATHS.find {|path|
+      execute(:test, '-f', path, :raise_on_non_zero_exit => false)
+    } || :bundle)
   end
 
   def user_libexec_dir(user)
     [libexec_dir, user].join('/')
   end
 
+  def user_run_dir(user)
+    [run_dir, user].join('/')
+  end
+
+  def gemfile_dir(user, name, temp_dir = nil)
+    if temp_dir
+      [temp_dir, user, name].join('/')
+    else
+      [user_run_dir(user), name].join('/')
+    end
+  end
+
+  def gemfile(user, name, temp_dir = nil)
+    [gemfile_dir(user, name, temp_dir), 'Gemfile'].join('/')
+  end
+
   def user_crontab(user)
     cron_dir = find_cron_dir
     [cron_dir, user].join('/')

data/lib/cronicle/version.rb

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

data/spec/cronicle_create_spec.rb

@@ -242,6 +242,103 @@ ZOO=baz
       end
     end
 
+    context 'when apply with bundle' do
+      let(:jobfile) do
+        <<-RUBY.unindent
+          on servers: /.*/ do
+            job :foo, user: :root, schedule: '1 2 * * *', bundle: 'ruby-mysql' do
+              require 'mysql'
+              p Mysql
+            end
+          end
+        RUBY
+      end
+
+      let(:amzn_crontab) do
+        {
+          "/var/spool/cron/ec2-user" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo ec2-user > /dev/null
+",
+          "/var/spool/cron/root" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo root > /dev/null
+1 2 * * *\tcd /var/lib/cronicle/run/root/foo && /usr/local/bin/bundle exec /var/lib/cronicle/libexec/root/foo 2>&1 | logger -t cronicle/root/foo
+"
+        }
+      end
+
+      let(:amzn_gemfile) do
+        {
+          "/var/lib/cronicle/run/root/foo/Gemfile" =>
+"source 'https://rubygems.org'
+gem 'ruby-mysql'
+"
+        }
+      end
+
+      let(:ubuntu_crontab) do
+        {
+          "/var/spool/cron/crontabs/root" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo root > /dev/null
+1 2 * * *\tcd /var/lib/cronicle/run/root/foo && /usr/local/bin/bundle exec /var/lib/cronicle/libexec/root/foo 2>&1 | logger -t cronicle/root/foo
+",
+          "/var/spool/cron/crontabs/ubuntu" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo ubuntu > /dev/null
+"
+        }
+      end
+
+      let(:ubuntu_gemfile) do
+        {
+          "/var/lib/cronicle/run/root/foo/Gemfile" =>
+"source 'https://rubygems.org'
+gem 'ruby-mysql'
+"
+        }
+      end
+
+      before do
+        cronicle(:apply) { jobfile }
+      end
+
+      it do
+        on :amazon_linux 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.unindent
+            #!/usr/bin/env ruby
+            require 'mysql'
+            p Mysql
+          EOS
+
+          expect(get_gemfiles).to eq amzn_gemfile
+        end
+      end
+
+      it do
+        on :ubuntu 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.unindent
+            #!/usr/bin/env ruby
+            require 'mysql'
+            p Mysql
+          EOS
+
+          expect(get_gemfiles).to eq ubuntu_gemfile
+        end
+      end
+    end
+
     context 'when apply (dry-run)' do
       let(:amzn_crontab) do
         {

data/spec/cronicle_delete_spec.rb

@@ -206,6 +206,165 @@ ZOO=baz
     end
   end
 
+  context 'when cron is deleted with bundle' do
+    let(:jobfile) do
+      <<-RUBY.unindent
+        on servers: /.*/ do
+          job :foo, user: :root, schedule: '1 2 * * *', bundle: 'ruby-mysql' do
+            require 'mysql'
+            p Mysql
+          end
+        end
+      RUBY
+    end
+
+    let(:amzn_crontab_orig) do
+      {
+        "/var/spool/cron/ec2-user" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo ec2-user > /dev/null
+",
+        "/var/spool/cron/root" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo root > /dev/null
+1 2 * * *\tcd /var/lib/cronicle/run/root/foo && /usr/local/bin/bundle exec /var/lib/cronicle/libexec/root/foo 2>&1 | logger -t cronicle/root/foo
+"
+      }
+    end
+
+    let(:amzn_gemfile_orig) do
+      {
+        "/var/lib/cronicle/run/root/foo/Gemfile" =>
+"source 'https://rubygems.org'
+gem 'ruby-mysql'
+"
+      }
+    end
+
+    let(:ubuntu_crontab_orig) do
+      {
+        "/var/spool/cron/crontabs/root" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo root > /dev/null
+1 2 * * *\tcd /var/lib/cronicle/run/root/foo && /usr/local/bin/bundle exec /var/lib/cronicle/libexec/root/foo 2>&1 | logger -t cronicle/root/foo
+",
+        "/var/spool/cron/crontabs/ubuntu" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo ubuntu > /dev/null
+"
+      }
+    end
+
+    let(:ubuntu_gemfile_orig) do
+      {
+        "/var/lib/cronicle/run/root/foo/Gemfile" =>
+"source 'https://rubygems.org'
+gem 'ruby-mysql'
+"
+      }
+    end
+
+    let(:amzn_crontab) do
+      {
+        "/var/spool/cron/ec2-user" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo ec2-user > /dev/null
+",
+        "/var/spool/cron/root" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo root > /dev/null
+1 2 * * *\tcd /var/lib/cronicle/run/root/foo && /usr/local/bin/bundle exec /var/lib/cronicle/libexec/root/foo 2>&1 | logger -t cronicle/root/foo
+"
+      }
+    end
+
+    let(:amzn_gemfile) do
+      {
+        "/var/lib/cronicle/run/root/foo/Gemfile" =>
+"source 'https://rubygems.org'
+gem 'ruby-mysql'
+"
+      }
+    end
+
+    let(:ubuntu_crontab) do
+      {
+        "/var/spool/cron/crontabs/root" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo root > /dev/null
+1 2 * * *\tcd /var/lib/cronicle/run/root/foo && /usr/local/bin/bundle exec /var/lib/cronicle/libexec/root/foo 2>&1 | logger -t cronicle/root/foo
+",
+        "/var/spool/cron/crontabs/ubuntu" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo ubuntu > /dev/null
+"
+      }
+    end
+
+    let(:ubuntu_gemfile) do
+      {
+        "/var/lib/cronicle/run/root/foo/Gemfile" =>
+"source 'https://rubygems.org'
+gem 'ruby-mysql'
+"
+      }
+    end
+
+    before do
+      cronicle(:apply) { jobfile }
+    end
+
+    it do
+      on :amazon_linux do
+        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.unindent
+          #!/usr/bin/env ruby
+          require 'mysql'
+          p Mysql
+        EOS
+
+        expect(get_gemfiles).to eq amzn_gemfile_orig
+      end
+
+      on :ubuntu do
+        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.unindent
+          #!/usr/bin/env ruby
+          require 'mysql'
+          p Mysql
+        EOS
+
+        expect(get_gemfiles).to eq ubuntu_gemfile_orig
+      end
+
+      cronicle(:apply) { '' }
+
+      on :amazon_linux do
+        expect(get_uname).to match /amzn/
+        expect(get_crontabs).to eq amzn_crontab
+        expect(get_gemfiles).to eq amzn_gemfile
+      end
+
+      on :ubuntu do
+        expect(get_uname).to match /Ubuntu/
+        expect(get_crontabs).to eq ubuntu_crontab
+        expect(get_gemfiles).to eq ubuntu_gemfile
+      end
+    end
+  end
+
   context 'when cron is deleted (dry-run)' do
     let(:amzn_crontab) do
       {

data/spec/cronicle_exec_spec.rb

@@ -162,4 +162,52 @@ describe 'Cronicle::Client#exec' do
       }.to raise_error('Definition cannot be found: Job `bar`')
     end
   end
+
+  context 'with bundle' do
+    let(:jobfile) do
+      <<-RUBY.unindent
+        on servers: /amazon_linux/ do
+          job :foo, user: 'ec2-user', bundle: 'hashie' do
+            require 'hashie'
+            mash = Hashie::Mash.new
+            mash.name = "My Mash on amazon_linux"
+            p mash.name
+            p mash.name?
+          end
+        end
+
+        on servers: /ubuntu/ do
+          job :foo, user: :ubuntu, bundle: 'hashie' do
+            require 'hashie'
+            mash = Hashie::Mash.new
+            mash.name = "My Mash on ubuntu"
+            p mash.name
+            p mash.name?
+          end
+        end
+      RUBY
+    end
+
+    before do
+      cronicle(:exec, :foo, logger: logger) { jobfile }
+    end
+
+    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> "My Mash on amazon_linux"
+        foo on amazon_linux/ec2-user> true
+      EOS
+    end
+
+    it do
+      expect(ubuntu_out).to eq <<-EOS.unindent
+        foo on ubuntu/ubuntu> Execute job
+        foo on ubuntu/ubuntu>\s
+        foo on ubuntu/ubuntu> "My Mash on ubuntu"
+        foo on ubuntu/ubuntu> true
+      EOS
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -50,6 +50,15 @@ def get_crontabs
   }.flatten]
 end
 
+def get_gemfiles
+  gemfiles = Specinfra.backend.run_command("ls /var/lib/cronicle/run/*/*/Gemfile 2> /dev/null").stdout.strip.split(/\s+/)
+
+  Hash[*gemfiles.map {|gemfile|
+    content = Specinfra.backend.run_command("cat #{gemfile}").stdout
+    [gemfile, content]
+  }.flatten]
+end
+
 def get_file(path)
   Specinfra.backend.run_command("cat #{path}").stdout
 end
@@ -87,9 +96,14 @@ def on(*hosts)
 end
 
 RSpec.configure do |config|
-  config.before(:each) do
+  config.before(:all) do
     on :ubuntu do
       Specinfra.backend.run_command("apt-get -y install ruby")
+      Specinfra.backend.run_command("gem install bundler")
+    end
+
+    on :amazon_linux do
+      Specinfra.backend.run_command("gem install bundler")
     end
   end
 
@@ -97,6 +111,7 @@ RSpec.configure do |config|
     on TARGET_HOSTS do
       cron_dir = get_cron_dir
       Specinfra.backend.run_command("rm -f #{cron_dir}/*")
+      Specinfra.backend.run_command("rm -rf /var/lib/cronicle/run")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cronicle
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Genki Sugawara
@@ -178,6 +178,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-instafail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: It is a tool for execute script, and define cron on remote hosts.
 email:
 - sgwr_dts@yahoo.co.jp