cron_wrapper 0.0.2 → 0.0.3

data/Manifest

@@ -1,4 +1,9 @@
 Manifest
 Rakefile
 bin/cron_wrapper
+cron_wrapper.gemspec
+lib/cron/awesome_script.rb
 lib/cron_wrapper.rb
+spec/cron_wrapper_spec.rb
+spec/ruby_forker.rb
+spec/spec_helper.rb

data/Rakefile

@@ -2,9 +2,9 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('cron_wrapper', '0.0.2') do |p|
+Echoe.new('cron_wrapper', '0.0.3') do |p|
 	p.description    = "A gem that provides useful features for running ruby or Rails scripts with cron"
-	p.url            = "http://bugzilla.visaops.net/project_automate_groups/trunk/projects/cron_wrapper"
+  p.url            = "http://rubyisbeautiful.com"
 	p.author         = "Bryan Taylor"
 	p.summary        = 'features: locking to prevent resource contention, standard logging, optional rails integration'
 	p.email          = "btaylor39 @nospam@ csc.com"

data/bin/cron_wrapper

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'cron_wrapper'
+begin
+  require 'cron_wrapper'
+rescue LoadError
+  require 'lib/cron_wrapper.rb'
+end
 CronWrapper.new(ARGV).run

data/cron_wrapper.gemspec

@@ -2,22 +2,24 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cron_wrapper}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Taylor"]
-  s.date = %q{2011-02-18}
+  s.cert_chain = ["/Users/bryan/.gem/gem-public_cert.pem"]
+  s.date = %q{2011-02-22}
   s.default_executable = %q{cron_wrapper}
   s.description = %q{A gem that provides useful features for running ruby or Rails scripts with cron}
   s.email = %q{btaylor39 @nospam@ csc.com}
   s.executables = ["cron_wrapper"]
-  s.extra_rdoc_files = ["bin/cron_wrapper", "lib/cron_wrapper.rb"]
-  s.files = ["Manifest", "Rakefile", "bin/cron_wrapper", "lib/cron_wrapper.rb", "cron_wrapper.gemspec"]
-  s.homepage = %q{http://bugzilla.visaops.net/project_automate_groups/trunk/projects/cron_wrapper}
+  s.extra_rdoc_files = ["bin/cron_wrapper", "lib/cron/awesome_script.rb", "lib/cron_wrapper.rb"]
+  s.files = ["Manifest", "Rakefile", "bin/cron_wrapper", "cron_wrapper.gemspec", "lib/cron/awesome_script.rb", "lib/cron_wrapper.rb", "spec/cron_wrapper_spec.rb", "spec/ruby_forker.rb", "spec/spec_helper.rb"]
+  s.homepage = %q{http://rubyisbeautiful.com}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cron_wrapper"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{cron_wrapper}
   s.rubygems_version = %q{1.3.7}
+  s.signing_key = %q{/Users/bryan/.gem/gem-private_key.pem}
   s.summary = %q{features: locking to prevent resource contention, standard logging, optional rails integration}
 
   if s.respond_to? :specification_version then

data/lib/cron/awesome_script.rb

@@ -0,0 +1,2 @@
+sleep(1)
+puts "awesome"

data/lib/cron_wrapper.rb

@@ -1,5 +1,6 @@
 require 'optparse'
 require 'logger'
+require 'fileutils'
 
 class CronWrapper
   
@@ -100,7 +101,7 @@ class CronWrapper
     
     
     
-  def run  
+  def run
     base_name   = ARGV[0]
     target      = File.join(@options[:root], "lib/cron/#{base_name}.rb") 
     lock_file   = File.join(@options[:lock_dir], "/#{base_name}.lock")
@@ -115,7 +116,7 @@ class CronWrapper
         logger.debug "cleaning stale pid #{lock_pid} from #{lock_file}"
       end
     end
-    
+
     File.open(lock_file, 'w') do |file|
       file << Process::pid
     end
@@ -134,7 +135,13 @@ class CronWrapper
       logger.debug e.backtrace
     end
     
-    FileUtils.rm_f lock_file rescue nil
+    begin
+      FileUtils.rm_f lock_file
+    rescue => e
+      logger.fatal "couldn't remove lock file: #{lock_file}"
+      logger.info e.message
+      logger.debug e.backtrace
+    end
     
   end
   

data/spec/cron_wrapper_spec.rb

@@ -0,0 +1,55 @@
+require 'fileutils'
+require 'timeout'
+root  = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+cmd   = File.join root, 'bin/cron_wrapper'
+
+def remove_lock
+  FileUtils.rm_f "tmp/locks/awesome_script.lock" rescue nil
+end
+
+
+describe "cron_wrapper" do
+  
+  before(:each) do
+    @pid = nil
+    remove_lock
+  end
+  
+  
+  it "should create a lock file in lock_dir if no lock file exists" do
+    t = Thread.new { `#{cmd} awesome_script --wrap-verbose --wrap-skip-rails --wrap-root #{root} --wrap-log log/awesome_script.log` }
+    Timeout::timeout(2) do
+      begin
+        @pid = File.read "#{root}/tmp/locks/awesome_script.lock"
+      rescue
+        retry
+      end
+    end.should_not raise_error TimeoutError
+    
+    @pid.nil?.should_not == true
+    t.join
+  end
+  
+  
+  it "should remove the lock file in lock_dir after execution" do
+    `#{cmd} awesome_script --wrap-skip-rails --wrap-root #{root} --wrap-log log/awesome_script.log`
+    File.exists?("tmp/locks/awesome_script.lock").should == false
+  end
+  
+  
+  it "should have the pid of the currently executing thread in the lock file" do
+    read_pid = nil
+    @pid = Process.fork { `#{cmd} awesome_script --wrap-verbose --wrap-skip-rails --wrap-root #{root} --wrap-log log/awesome_script.log` }
+    
+    begin
+      read_pid = File.read "#{root}/tmp/locks/awesome_script.lock"
+    rescue
+      retry
+    end
+    
+    Process.wait
+    read_pid.should == (@pid + 1).to_s
+  end
+  
+  
+end

data/spec/ruby_forker.rb

@@ -0,0 +1,13 @@
+require 'rbconfig'
+
+module RubyForker
+  # Forks a ruby interpreter with same type as ourself.
+  # jruby will fork jruby, ruby will fork ruby etc.
+  def ruby(args, stderr=nil)
+    config       = ::RbConfig::CONFIG
+    interpreter  = File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
+    cmd = "#{interpreter} #{args}"
+    cmd << " 2> #{stderr}" unless stderr.nil?
+    `#{cmd}`
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require 'rspec/core'
+require 'autotest/rspec2'

metadata

@@ -1,21 +1,42 @@
 --- !ruby/object:Gem::Specification 
 name: cron_wrapper
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Bryan Taylor
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDMDCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADA+MRIwEAYDVQQDDAlidGF5
+  bG9yMzkxEzARBgoJkiaJk/IsZAEZFgNjc2MxEzARBgoJkiaJk/IsZAEZFgNjb20w
+  HhcNMTEwMjE2MTI1MzQzWhcNMTIwMjE2MTI1MzQzWjA+MRIwEAYDVQQDDAlidGF5
+  bG9yMzkxEzARBgoJkiaJk/IsZAEZFgNjc2MxEzARBgoJkiaJk/IsZAEZFgNjb20w
+  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDid0W3CiAzCKP+H70D/FFq
+  RnwfMdTqsIGK6pKZVHIqqcZxntJw1r3zHwvDwwjh67/iysB0mum6Palizm0xtBqZ
+  wTHO+GXNsTz/+zfihkJMSVhSY8Y58SNuV5m1CmzdVSyVrTyOlkc6+IpHTlpaCpf4
+  r3mGtZbsuEpLvU/A3iC778k8Bm9hoKhI/3CoMWQjSTHYfrMDWetuGhu8NbdGK3BN
+  E1dgEBdQLAjf8yeY3pmmUE88cr9EvrFVdx7mnI5lzOwZMuFSgEBw5AsB6+vvlTW3
+  i75Q4pJwjeM41i2B1u7T4kskmOogfZl3YAulPXrEaTCKHDEQb/Jp4WtTy2v8m+79
+  AgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBS36r/0
+  ouuKO1EVrbluXYEBlANxODANBgkqhkiG9w0BAQUFAAOCAQEAgNN7J2bWCZDSQQm8
+  7PfoCViUKWIcWEZB+C05R0JDpFue0lL5s6aAt61rPXL6k5UiLtj8QkGSe0vasC9G
+  f8eBWU5l3g/HDvsFZ5cIBWk0saF7xlIZC3E98LF8Vcfl9WFibHCuwApxzzcAQvdU
+  ocHFXaTM2tz8iRO5pW+Do3GC7Mjbo2mvAGN0H5f4tZkZ+Ttm25bAPpnHfXaWPxKq
+  RL48Oo1H6iw8nmjm8YrQC6UdtW8ogetCkJwwFmK/U5YQQsE0NnUSG5Ii5R32ZdaY
+  eMvMROg/ZYJZzMayO+XXWYgXhy2UDEP/hNhNzM3E+XJUilcA4dZ/fdX57vL0Qpvn
+  NK5lPw==
+  -----END CERTIFICATE-----
 
-date: 2011-02-18 00:00:00 +00:00
+date: 2011-02-22 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -27,15 +48,20 @@ extensions: []
 
 extra_rdoc_files: 
 - bin/cron_wrapper
+- lib/cron/awesome_script.rb
 - lib/cron_wrapper.rb
 files: 
 - Manifest
 - Rakefile
 - bin/cron_wrapper
-- lib/cron_wrapper.rb
 - cron_wrapper.gemspec
+- lib/cron/awesome_script.rb
+- lib/cron_wrapper.rb
+- spec/cron_wrapper_spec.rb
+- spec/ruby_forker.rb
+- spec/spec_helper.rb
 has_rdoc: true
-homepage: http://bugzilla.visaops.net/project_automate_groups/trunk/projects/cron_wrapper
+homepage: http://rubyisbeautiful.com
 licenses: []
 
 post_install_message: