cron_wrapper 0.0.8 → 0.0.9

data/Manifest

@@ -2,7 +2,7 @@ Manifest
 Rakefile
 bin/cron_wrapper
 cron_wrapper.gemspec
-lib/cron/foo.rb
+lib/cron/awesome_script.rb
 lib/cron_wrapper.rb
 spec/cron_wrapper_spec.rb
 spec/spec_helper.rb

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('cron_wrapper', '0.0.8') do |p|
+Echoe.new('cron_wrapper', '0.0.9') do |p|
 	p.description    = "A gem that provides useful features for running ruby or Rails scripts with cron"
   p.url            = "http://rubyisbeautiful.com"
 	p.author         = "Bryan Taylor"

data/cron_wrapper.gemspec

@@ -2,24 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cron_wrapper}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Taylor"]
-  s.cert_chain = ["/Users/bryan/.gem/gem-public_cert.pem"]
-  s.date = %q{2011-02-22}
+  s.date = %q{2011-03-02}
   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/foo.rb", "lib/cron_wrapper.rb"]
-  s.files = ["Manifest", "Rakefile", "bin/cron_wrapper", "cron_wrapper.gemspec", "lib/cron/foo.rb", "lib/cron_wrapper.rb", "spec/cron_wrapper_spec.rb", "spec/spec_helper.rb"]
+  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/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 @@
+sleep(2); puts "awesome"

data/lib/cron_wrapper.rb

@@ -17,6 +17,7 @@ class CronWrapper
     @options[:verbose]    = false
     @options[:log]        = nil
     @options[:target]     = nil
+    @options[:extra]      = nil
     
     @others = []
     
@@ -47,11 +48,7 @@ class CronWrapper
       end
     end
     
-    begin
-      foo.order!
-    rescue OptionParser::InvalidOption => e
-      @others << e.args
-    end
+    @others = foo.order!
     
     # if they did not enter a script name, then give them usage
     if @options[:target].nil? or @options[:target] == ''
@@ -111,18 +108,50 @@ class CronWrapper
     lock_file   = File.join(@options[:lock_dir], "/#{base_name}.lock")
     
     if File.exists? lock_file
+      stale     = false
       lock_pid  = File.read(lock_file)
-      ps_output = `ps -p #{lock_pid}`
-      if ps_output.split("\n").length > 1
+      ps_output = nil
+      
+      unless lock_pid =~ /\d+/
+        stale = true
+      end
+      
+      unless stale
+        begin
+          ps_output = `ps -p #{lock_pid}` 
+        rescue 
+          logger.debug "ps failed, assuming stale"
+          stale = true
+        end
+        
+        if ps_output.split("\n").length < 1
+          logger.debug "no ps output for pid #{lock_pid}, assuming stale"
+          stale = true
+        end
+      end
+      
+      if stale
+        logger.debug "cleaning stale pid #{lock_pid} from #{lock_file}"
+        FileUtils.rm_f lock_file
+      else
         logger.debug "#{base_name} is already running, skipping"
         exit
-      else
-        logger.debug "cleaning stale pid #{lock_pid} from #{lock_file}"
       end
+    else
+      logger.debug "there was no lock file"
     end
 
-    File.open(lock_file, 'w') do |file|
-      file << Process::pid
+    begin
+      pid = Process::pid
+      File.open(lock_file, 'w') do |file|
+        file << pid
+      end
+      logger.debug "wrote new pid #{pid} to lock file"
+    rescue => e
+      logger.debug "got an error writing to lock file"
+      logger.info e.message
+      logger.debug e.backtrace
+      exit
     end
     
     

data/spec/cron_wrapper_spec.rb

@@ -7,6 +7,10 @@ def remove_lock
   FileUtils.rm_f "tmp/locks/awesome_script.lock" rescue nil
 end
 
+def remove_log
+  FileUtils.rm_f "log/awesome_script.log" rescue nil
+end
+
 
 describe "cron_wrapper" do
   
@@ -15,56 +19,174 @@ describe "cron_wrapper" do
     FileUtils.mkdir_p "#{root}/log"
     FileUtils.mkdir_p "#{root}/lib/cron"
     File.open("#{root}/lib/cron/awesome_script.rb", 'w') do |file|
-      file. << 'sleep(1); puts "awesome"'
+      file. << 'sleep(2); puts "awesome"'
     end
   end
     
   before(:each) do
     @pid = nil
-    remove_lock
+    remove_log
   end
   
-  after(:all) do
-    FileUtils.rm_rf "#{root}/tmp"
-    FileUtils.rm_rf "#{root}/log"
-    FileUtils.rm_rf "#{root}/lib/cron"
+  describe "rails" do
+    
+    before(:all) do
+      FileUtils.mkdir_p "config"
+      
+      File.open("#{root}/config/environment.rb", 'w') do |file|
+        file << "class Rails; def self.root; return '#{root}'; end; end;"
+      end
+      
+      File.open("#{root}/lib/cron/rails_script.rb", 'w') do |file|
+        file << "str = Rails.root rescue 'no';  File.open('#{root}/tmp/result', 'w'){ |file| file << str }"
+      end
+    end
+    
+    after(:each) do
+      FileUtils.rm_rf("tmp/result") rescue nil
+    end
+    
+    after(:all) do
+      FileUtils.rm_rf("#{root}/lib/cron/rails_script.rb")
+      FileUtils.rm_rf("#{root}/config/environment.rb")
+    end
+    
+    
+    it "should not load rails if not passed on the commandline" do
+      t = Thread.new { `#{cmd} --wrap rails_script --wrap-verbose --wrap-root #{root} --wrap-log log/rails_script.log` }
+      t.join
+      File.read("tmp/result").should == "no"
+    end
+    
+    it "should load rails if passed on the commandline" do
+      t = Thread.new { `#{cmd} --wrap-rails --wrap rails_script --wrap-verbose --wrap-root #{root} --wrap-log log/rails_script.log` }
+      t.join
+      File.read("tmp/result").should == root
+    end
   end
   
   
-  it "should create a lock file in lock_dir if no lock file exists" do
-    t = Thread.new { `#{cmd} --wrap 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
+  
+  describe "with optparse" do
+    
+    before(:all) do
+      File.open("#{root}/lib/cron/uses_optparse.rb", 'w') do |file|
+        file << 'File.open("tmp/result", "w") { |file| file << ARGV.join(", ") }'
       end
-    end.should_not raise_error TimeoutError
+    end
+    
+    after(:each) do
+      FileUtils.rm_rf("tmp/result") rescue nil
+    end
     
-    @pid.nil?.should_not == true
-    t.join
+    after(:all) do
+      FileUtils.rm_rf("#{root}/lib/cron/uses_optparse.rb")
+    end
+    
+    it "should pass options after -- to the subcommand" do
+      t = Thread.new { `#{cmd} --wrap uses_optparse --wrap-verbose --wrap-root #{root} --wrap-log log/uses_optparse.log -- --foo bar` }
+      t.join
+      File.read("tmp/result").should == "--foo, bar"
+    end
   end
   
   
-  it "should remove the lock file in lock_dir after execution" do
-    `#{cmd} --wrap awesome_script --wrap-skip-rails --wrap-root #{root} --wrap-log log/awesome_script.log`
-    File.exists?("tmp/locks/awesome_script.lock").should == false
+  
+  describe "logging" do
+    it "should create log/awesome_script.log when passed on the commandline" do
+      t = Thread.new { `#{cmd} --wrap awesome_script --wrap-verbose --wrap-root #{root} --wrap-log log/awesome_script.log` }
+      t.join
+      puts "#{Dir.entries(File.join(root,'log')).join(',')}"
+      File.exists?("#{root}/log/awesome_script.log").should == true
+    end
   end
   
   
-  it "should have the pid of the currently executing thread in the lock file" do
-    read_pid = nil
-    @pid = Process.fork { `#{cmd} --wrap awesome_script --wrap-verbose --wrap-skip-rails --wrap-root #{root} --wrap-log log/awesome_script.log` }
+  
+  describe "locking" do
+    
+    before(:all) do
+      FileUtils.mkdir_p "#{root}/tmp/locks"
+      FileUtils.mkdir_p "#{root}/log"
+      FileUtils.mkdir_p "#{root}/lib/cron"
+      File.open("#{root}/lib/cron/awesome_script.rb", 'w') do |file|
+        file. << 'sleep(2); puts "awesome"'
+      end
+    end
+      
+    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} --wrap awesome_script --wrap-verbose --wrap-root #{root} --wrap-log log/awesome_script.log` }
+      Timeout::timeout(3) 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} --wrap awesome_script --wrap-root #{root} --wrap-log log/awesome_script.log`
+      File.exists?("tmp/locks/awesome_script.lock").should == false
+    end
     
-    begin
-      read_pid = File.read "#{root}/tmp/locks/awesome_script.lock"
-    rescue
-      retry
+    
+    it "should have the pid of the currently executing thread in the lock file" do
+      read_pid = nil
+      @pid = Process.fork { `#{cmd} --wrap awesome_script --wrap-verbose --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
+      @pid.nil?.should == false
+      read_pid.nil?.should == false
+      read_pid.should_not == ''
+      read_pid.should == (@pid + 1).to_s
     end
     
-    Process.wait
-    read_pid.should == (@pid + 1).to_s
+    
+    it "should not execute if the lock file is there and the pid is valid" do
+      File.open("#{root}/tmp/locks/awesome_script.lock", 'w') do |file|
+        file << Process::pid
+      end
+      
+      start_time  = Time.now
+      Process.fork { `#{cmd} --wrap awesome_script --wrap-verbose --wrap-root #{root} --wrap-log log/awesome_script.log` }
+      Process.wait
+      end_time    = Time.now
+      
+      ((end_time - start_time) < 1).should == true
+    end
+    
+    
+    it "should execute if the lock file is there but the pid is invalid" do
+      File.open("#{root}/tmp/locks/awesome_script.lock", 'w') do |file|
+        file << 'foo'
+      end
+      
+      start_time  = Time.now
+      Process.fork { `#{cmd} --wrap awesome_script --wrap-verbose --wrap-root #{root} --wrap-log log/awesome_script.log` }
+      Process.wait
+      end_time    = Time.now
+      
+      ((end_time - start_time) > 2).should == true
+    end
   end
   
   
+  
 end

metadata

@@ -1,42 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: cron_wrapper
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Bryan Taylor
 autorequire: 
 bindir: bin
-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-----
+cert_chain: []
 
-date: 2011-02-22 00:00:00 -05:00
+date: 2011-03-02 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -48,14 +27,14 @@ extensions: []
 
 extra_rdoc_files: 
 - bin/cron_wrapper
-- lib/cron/foo.rb
+- lib/cron/awesome_script.rb
 - lib/cron_wrapper.rb
 files: 
 - Manifest
 - Rakefile
 - bin/cron_wrapper
 - cron_wrapper.gemspec
-- lib/cron/foo.rb
+- lib/cron/awesome_script.rb
 - lib/cron_wrapper.rb
 - spec/cron_wrapper_spec.rb
 - spec/spec_helper.rb

data/lib/cron/foo.rb

@@ -1 +0,0 @@
-puts "foo: #{ARGV}"