cronicle 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 397f41f3a15c86c5307a304e878fdf755ee47474
-  data.tar.gz: 57a0933ff281f922f79bcef23304d570e563d56a
+  metadata.gz: 90a9b9808f5544209161321c06c465715a6f07dd
+  data.tar.gz: 3a63c1278482a6a6af9dc9e57c3a873ac81989ed
 SHA512:
-  metadata.gz: aba44a6c955bfc541ddf83d010031656935800cfca10b7c4dc88194201bddb8149762b5a7d93754363c691ff12a22da71950ba6b959326464bd6a8c2992fc538
-  data.tar.gz: 5772cd0031968bc5e026dc773190baffdff5d98c376ea4b8c7e119e19143d4a29f765519c4938f484027fec583d5b11684d70c4f3ec6b11c4fda57dc22d90683
+  metadata.gz: f85ee6ee7e0e12e391282895c63400bf627ad6f7f8b30b541b2a56badcbdca2627d5d57408fb502e421246243154d174983da49877601a179257f96a69d1fc29
+  data.tar.gz: ffe7a07a5c8f8bbd1faa49e06495f4027ba59eb32229c9e92b0ef8546340a2eab330518e799abffb00f41bda340d599b56ba15f6751264f3c98ea1f22115f43c

data/README.md

@@ -88,6 +88,21 @@ puts "hello"
 
 ## Jobfile example
 
+```ruby
+on servers: :your_hostname do
+  job :my_job, user: "ec2-user", schedule: "* * * * *" do
+    puts "hello"
+  end
+
+  job :my_job2, user: "ec2-user", schedule: "* * * * *", content: <<-EOS
+    #!/bin/sh
+    echo hello
+  EOS
+end
+```
+
+### User bundler
+
 ```ruby
 on servers: :your_hostname do
   job :my_job, user: "ec2-user", schedule: "* * * * *", bundle: 'ruby-mysql' do
@@ -97,11 +112,6 @@ on servers: :your_hostname do
       p col1, col2
     end
   end
-
-  job :my_job2, user: "ec2-user", schedule: "* * * * *", content: <<-EOS
-    #!/bin/sh
-    echo hello
-  EOS
 end
 ```
 

data/Vagrantfile

@@ -2,6 +2,19 @@
 # vi: set ft=ruby :
 VAGRANTFILE_API_VERSION = "2"
 
+def set_aws_config(aws, override)
+  aws.access_key_id = ENV["AWS_ACCESS_KEY_ID"]
+  aws.secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]
+  aws.keypair_name = ENV["EC2_KEYPAIR_NAME"]
+  aws.instance_type = "t1.micro"
+  aws.region = ENV["AWS_REGION"] || 'us-east-1'
+  aws.terminate_on_shutdown = true
+
+  override.ssh.private_key_path = ENV["EC2_PRIVATE_KEY_PATH"] || ENV["EC2_KEYPAIR_NAME"] + ".pem"
+  override.ssh.pty = true
+  override.vm.boot_timeout = 180
+end
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "dummy"
   config.vm.box_url = "https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box"
@@ -10,47 +23,29 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.define :amazon_linux do |machine|
     machine.vm.provider :aws do |aws, override|
-      aws.access_key_id = ENV["AWS_ACCESS_KEY_ID"]
-      aws.secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]
-      aws.keypair_name = ENV["EC2_KEYPAIR_NAME"]
-      aws.instance_type = "m1.large"
-      aws.region = ENV["AWS_REGION"] || 'us-east-1'
-      aws.terminate_on_shutdown = true
-      aws.ami = ENV["AMAZON_LINUX_AMI"] || "ami-8e682ce6"
+      set_aws_config(aws, override)
 
+      aws.ami = ENV["AMAZON_LINUX_AMI"] || "ami-8e682ce6"
       override.ssh.username = "ec2-user"
-      override.ssh.private_key_path = ENV["EC2_PRIVATE_KEY_PATH"] || ENV["EC2_KEYPAIR_NAME"] + ".pem"
-      override.ssh.pty = true
 
       override.vm.provision "shell", inline: <<-SH
 echo cronicle | passwd --stdin ec2-user
 echo 'ec2-user ALL=(ALL) ALL' > /etc/sudoers.d/cloud-init
       SH
-
-      override.vm.boot_timeout = 180
     end
   end
 
   config.vm.define :ubuntu do |machine|
     machine.vm.provider :aws do |aws, override|
-      aws.access_key_id = ENV["AWS_ACCESS_KEY_ID"]
-      aws.secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]
-      aws.keypair_name = ENV["EC2_KEYPAIR_NAME"]
-      aws.instance_type = "m1.large"
-      aws.region = ENV["AWS_REGION"] || 'us-east-1'
-      aws.terminate_on_shutdown = true
-      aws.ami = ENV['UBUNTU_AMI'] || "ami-84562dec"
+      set_aws_config(aws, override)
 
+      aws.ami = ENV['UBUNTU_AMI'] || "ami-84562dec"
       override.ssh.username = "ubuntu"
-      override.ssh.private_key_path = ENV["EC2_PRIVATE_KEY_PATH"] || ENV["EC2_KEYPAIR_NAME"] + ".pem"
-      override.ssh.pty = true
 
       override.vm.provision "shell", inline: <<-SH
 echo ubuntu:cronicle | chpasswd
 echo 'ubuntu ALL=(ALL) ALL' > /etc/sudoers.d/90-cloud-init-users
       SH
-
-      override.vm.boot_timeout = 180
     end
   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, :bundle)
+    opts.assert_valid_keys(:schedule, :user, :content, :bundle, :locals, :header)
 
     if opts[:content] and block
       raise ArgumentError, 'Can not pass :content and block to `job` method'
@@ -38,6 +38,10 @@ class Cronicle::DSL::Context::Job
       raise ArgumentError, "Job `#{name}`: :context or block is required"
     end
 
+    unless opts[:locals].nil? or opts[:locals].kind_of?(Hash)
+      raise TypeError, "Job `#{name}`: :locals is wrong argument type (expected Hash)"
+    end
+
     job_hash = @result[name][:job]
     job_hash[:name] = name
     job_hash[:user] = opts.fetch(:user).to_s
@@ -52,12 +56,20 @@ class Cronicle::DSL::Context::Job
       source = block.to_raw_source(:strip_enclosure => true).each_line.to_a
       source = source.shift + source.join.unindent
 
-      job_hash[:content] = <<-RUBY
-#!/usr/bin/env ruby
-#{source}
-      RUBY
+      job_hash[:content] = "#!/usr/bin/env ruby\n"
+
+      opts.fetch(:locals, {}).each do |name, value|
+        job_hash[:content] << "#{name} = #{value.inspect}\n"
+      end
+
+      job_hash[:content] << "#{source}\n"
     else
       job_hash[:content] = opts[:content].to_s.unindent
     end
+
+    if opts[:header]
+      index = (job_hash[:content] =~ /^[^#]/) || 0
+      job_hash[:content].insert(index, "#{opts[:header]}\n")
+    end
   end
 end

data/lib/cronicle/version.rb

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

data/spec/cronicle_exec_spec.rb

@@ -210,4 +210,43 @@ describe 'Cronicle::Client#exec' do
       EOS
     end
   end
+
+  context 'with locals/header' do
+    let(:jobfile) do
+      <<-RUBY.unindent
+        on servers: /amazon_linux/ do
+          job :foo, user: 'ec2-user', locals: {foo: 'BAR'} do
+            puts foo
+          end
+        end
+
+        on servers: /ubuntu/ do
+          job :foo, user: :ubuntu, header: 'FOO=100', content: <<-SH
+            #!/bin/sh
+            echo $FOO
+          SH
+        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> BAR
+      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> 100
+      EOS
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -120,7 +120,7 @@ def cronicle(*args)
   command = args.shift
   options = args.last.kind_of?(Hash) ? args.pop : {}
 
-  tempfile(`vagrant ssh-config`) do |ssh_config|
+  tempfile(vagrant_ssh_config) do |ssh_config|
     SSHKit::Backend::Netssh.configure do |ssh|
       ssh.ssh_options = {:config => ssh_config.path}
     end
@@ -134,6 +134,10 @@ def cronicle(*args)
   end
 end
 
+def vagrant_ssh_config
+  @vagrant_ssh_config ||= `vagrant ssh-config`
+end
+
 def cronicle_client(options = {})
   options = {
     :sudo_password => 'cronicle'

metadata

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