cronicle 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf5e59d994c9053a7e7f684735bf31e36e0894bd
-  data.tar.gz: 23bbf254357c458e7381f510366a39c6bc52297f
+  metadata.gz: 55c08587227f16557d6a593632f4be80211529a6
+  data.tar.gz: fc493ac6139ef47144b822f450c87180b9282d28
 SHA512:
-  metadata.gz: 9da051ad79732fa58805cdff44209add4ece98e4f019c5869c123239a7e6e3a64c97367998fc0f289e69c72db745f61fbb50301044736a64957c00adc7321855
-  data.tar.gz: 8e5e860a68fd60386e402422f54c1d2fe290d891f5c413aa56a33a02439566342653827d6d383d8e832d20c6e4cd8cb5ccfbe46e67a86ac2c0b12f14fa28173d
+  metadata.gz: fc99682523adf3153934dd24bf7da7b9318a8e9ce5e139d7c55aaacfe022d55b6642368999452583809cd5a1e3cc23fdba72bcc3e2c9c0ce07d70933568eb074
+  data.tar.gz: ca24dc26a7a5ca099bd7b3360f13230cae62c3e8087cd0172910bc1aebad2d083e0badc69f4aedfbc586c54f266f6c45d12b1c4da85d6e34d6b4f990ffb3fe36

data/README.md

@@ -26,6 +26,7 @@ Or install it yourself as:
 ```
 Commands:
   cronicle apply           # Apply cron jobs to remote hosts
+  cronicle cleanup         # Clean up cron jobs on remote hosts
   cronicle exec JOB_NAME   # Execute a job on remote hosts
   cronicle help [COMMAND]  # Describe available commands or one specific command
 
@@ -146,7 +147,7 @@ server2
 ```javascript
 {
   "servers": {
-    "server1": ["web", "app"]
+    "server1": ["web", "app"],
     "server2": ["db"]
   }
 }

data/lib/cronicle/cli.rb

@@ -45,6 +45,14 @@ class Cronicle::CLI < Thor
     end
   end
 
+  desc 'cleanup', 'Clean up cron jobs on remote hosts'
+  def cleanup
+    with_logging do
+      set_ssh_options
+      client.cleanup
+    end
+  end
+
   private
 
   def with_logging

data/lib/cronicle/client.rb

@@ -15,6 +15,10 @@ class Cronicle::Client
     walk(file)
   end
 
+  def cleanup
+    walk(nil, :cleanup => true)
+  end
+
   def exec(file, name)
     name = name.to_s
     jobs = load_file(file)
@@ -39,9 +43,18 @@ class Cronicle::Client
 
   private
 
-  def walk(file)
-    jobs = load_file(file)
-    jobs_by_host = select_host(jobs)
+  def walk(file, opts = {})
+    if opts[:cleanup]
+      jobs_by_host = {}
+
+      @host_list.all.each do |host|
+        jobs_by_host[host] = {}
+      end
+    else
+      jobs = load_file(file)
+      jobs_by_host = select_host(jobs)
+    end
+
     exported = export_cron(jobs_by_host.keys)
     walk_hosts(jobs_by_host, exported)
   end

data/lib/cronicle/version.rb

@@ -1,3 +1,3 @@
 module Cronicle
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/cronicle_cleanup_spec.rb

@@ -0,0 +1,358 @@
+describe 'Cronicle::Client#cleanup' do
+  before do
+    on TARGET_HOSTS do |ssh_options|
+      user = ssh_options[:user]
+
+      set_crontab user, <<-CRON.unindent
+        FOO=bar
+        ZOO=baz
+        1 1 1 1 1 echo #{user} > /dev/null
+      CRON
+
+      set_crontab :root, <<-CRON.unindent
+        FOO=bar
+        ZOO=baz
+        1 1 1 1 1 echo root > /dev/null
+      CRON
+    end
+
+    cronicle(:apply) { <<-RUBY.unindent }
+      on servers: /.*/ do
+        job :foo, user: :root, schedule: '1 2 * * *' do
+          puts `uname`
+          puts `whoami`
+        end
+      end
+
+      on servers: /.*/ do
+        job :bar, user: :root, schedule: :@hourly, content: <<-SH.unindent
+          #!/bin/sh
+          echo hello
+        SH
+      end
+
+      on servers: /amazon_linux/ do
+        job :foo, user: 'ec2-user', schedule: '1 * * * *' do
+          puts 100
+        end
+      end
+
+      on servers: /ubuntu/ do
+        job :foo, user: :ubuntu, schedule: :@daily do
+          puts 200
+        end
+      end
+    RUBY
+  end
+
+  context 'when cron is cleaned up' 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
+"
+      }
+    end
+
+    let(:amzn_gemfile) do
+      {
+      }
+    end
+
+    let(:ubuntu_crontab) do
+      {
+        "/var/spool/cron/crontabs/root" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo root > /dev/null
+",
+        "/var/spool/cron/crontabs/ubuntu" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo ubuntu > /dev/null
+"
+      }
+    end
+
+    let(:ubuntu_gemfile) do
+      {
+      }
+    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(:cleanup)
+
+      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 cleaned up (dry-run)' do
+    let(:amzn_crontab_orig) do
+      {
+        "/var/spool/cron/ec2-user" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo ec2-user > /dev/null
+1 * * * *\t/var/lib/cronicle/libexec/ec2-user/foo 2>&1 | logger -t cronicle/ec2-user/foo
+",
+        "/var/spool/cron/root" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo root > /dev/null
+1 2 * * *\t/var/lib/cronicle/libexec/root/foo 2>&1 | logger -t cronicle/root/foo
+@hourly\t/var/lib/cronicle/libexec/root/bar 2>&1 | logger -t cronicle/root/bar
+"
+      }
+    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 * * *\t/var/lib/cronicle/libexec/root/foo 2>&1 | logger -t cronicle/root/foo
+@hourly\t/var/lib/cronicle/libexec/root/bar 2>&1 | logger -t cronicle/root/bar
+",
+        "/var/spool/cron/crontabs/ubuntu" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo ubuntu > /dev/null
+@daily\t/var/lib/cronicle/libexec/ubuntu/foo 2>&1 | logger -t cronicle/ubuntu/foo
+"
+      }
+    end
+
+    let(:amzn_crontab) do
+      {
+        "/var/spool/cron/ec2-user" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo ec2-user > /dev/null
+2 * * * *\t/var/lib/cronicle/libexec/ec2-user/foo 2>&1 | logger -t cronicle/ec2-user/foo
+",
+        "/var/spool/cron/root" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo root > /dev/null
+@hourly\t/var/lib/cronicle/libexec/root/bar 2>&1 | logger -t cronicle/root/bar
+1 2 * * *\t/var/lib/cronicle/libexec/root/foo 2>&1 | logger -t cronicle/root/foo
+"
+      }
+    end
+
+    let(:ubuntu_crontab) do
+      {
+        "/var/spool/cron/crontabs/root" =>
+"FOO=bar
+ZOO=baz
+1 1 1 1 1 echo root > /dev/null
+@hourly\t/var/lib/cronicle/libexec/root/bar 2>&1 | logger -t cronicle/root/bar
+1 2 * * *\t/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
+@daily\t/var/lib/cronicle/libexec/ubuntu/foo2 2>&1 | logger -t cronicle/ubuntu/foo2
+"
+      }
+    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
+          puts `uname`
+          puts `whoami`
+        EOS
+
+        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.unindent
+          #!/usr/bin/env ruby
+          puts 100
+        EOS
+      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
+          puts `uname`
+          puts `whoami`
+        EOS
+
+        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.unindent
+          #!/usr/bin/env ruby
+          puts 200
+        EOS
+      end
+
+      cronicle(:cleanup, dry_run: true)
+
+      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
+          puts `uname`
+          puts `whoami`
+        EOS
+
+        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.unindent
+          #!/usr/bin/env ruby
+          puts 100
+        EOS
+      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
+          puts `uname`
+          puts `whoami`
+        EOS
+
+        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.unindent
+          #!/usr/bin/env ruby
+          puts 200
+        EOS
+      end
+    end
+  end
+end

data/spec/cronicle_delete_spec.rb

@@ -1,4 +1,4 @@
-describe 'Cronicle::Client#apply (update)' do
+describe 'Cronicle::Client#apply (delete)' do
   before do
     on TARGET_HOSTS do |ssh_options|
       user = ssh_options[:user]
@@ -279,17 +279,12 @@ ZOO=baz
 "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
 
@@ -299,7 +294,6 @@ gem 'ruby-mysql'
 "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
@@ -311,10 +305,6 @@ ZOO=baz
 
     let(:ubuntu_gemfile) do
       {
-        "/var/lib/cronicle/run/root/foo/Gemfile" =>
-"source 'https://rubygems.org'
-gem 'ruby-mysql'
-"
       }
     end
 
@@ -349,7 +339,10 @@ gem 'ruby-mysql'
         expect(get_gemfiles).to eq ubuntu_gemfile_orig
       end
 
-      cronicle(:apply) { '' }
+      cronicle(:apply) { <<-EOS }
+        on servers: /.*/ do
+        end
+      EOS
 
       on :amazon_linux do
         expect(get_uname).to match /amzn/

data/spec/spec_helper.rb

@@ -126,9 +126,15 @@ def cronicle(*args)
     end
 
     client = cronicle_client(options)
-
-    tempfile(yield) do |f|
-      args = [command, f.path, args].flatten
+    content = block_given? ? yield : nil
+
+    if content
+      tempfile(yield) do |f|
+        args = [command, f.path, args].flatten
+        client.send(*args)
+      end
+    else
+      args = [command, args].flatten
       client.send(*args)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cronicle
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sourcify
@@ -226,6 +226,7 @@ files:
 - lib/cronicle/logger.rb
 - lib/cronicle/utils.rb
 - lib/cronicle/version.rb
+- spec/cronicle_cleanup_spec.rb
 - spec/cronicle_create_spec.rb
 - spec/cronicle_delete_spec.rb
 - spec/cronicle_exec_spec.rb
@@ -257,6 +258,7 @@ signing_key:
 specification_version: 4
 summary: It is a tool for execute script, and define cron on remote hosts.
 test_files:
+- spec/cronicle_cleanup_spec.rb
 - spec/cronicle_create_spec.rb
 - spec/cronicle_delete_spec.rb
 - spec/cronicle_exec_spec.rb