cron_wrapper 0.0.11 → 0.0.12

data/Gemfile

@@ -0,0 +1,7 @@
+# A sample Gemfile
+source "http://rubygems.org"
+
+group :development, :test do
+  gem 'echoe'
+  gem "rspec"
+end

data/Gemfile.lock

@@ -0,0 +1,34 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    allison (2.0.3)
+    diff-lcs (1.1.3)
+    echoe (4.6.3)
+      allison (>= 2.0.3)
+      gemcutter (>= 0.7.0)
+      rake (>= 0.9.2)
+      rdoc (>= 3.6.1)
+      rubyforge (>= 2.0.4)
+    gemcutter (0.7.0)
+    json (1.6.1)
+    json_pure (1.6.1)
+    rake (0.9.2.2)
+    rdoc (3.11)
+      json (~> 1.4)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  echoe
+  rspec

data/Manifest

@@ -1,7 +1,9 @@
+Gemfile
+Gemfile.lock
 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

data/Rakefile

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

data/cron_wrapper.gemspec

@@ -2,28 +2,26 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cron_wrapper}
-  s.version = "0.0.11"
+  s.version = "0.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Bryan Taylor"]
-  s.cert_chain = ["/home/bryan/gem_private_key/gem-public_cert.pem"]
-  s.date = %q{2011-03-03}
-  s.default_executable = %q{cron_wrapper}
+  s.authors = [%q{Bryan Taylor}]
+  s.cert_chain = [%q{/Users/bryan/.gem_credentials/gem-public_cert.pem}]
+  s.date = %q{2012-03-26}
   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", "cron_wrapper.gemspec", "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.executables = [%q{cron_wrapper}]
+  s.extra_rdoc_files = [%q{bin/cron_wrapper}, %q{lib/cron/awesome_script.rb}, %q{lib/cron_wrapper.rb}]
+  s.files = [%q{Gemfile}, %q{Gemfile.lock}, %q{Manifest}, %q{Rakefile}, %q{bin/cron_wrapper}, %q{lib/cron/awesome_script.rb}, %q{lib/cron_wrapper.rb}, %q{spec/cron_wrapper_spec.rb}, %q{spec/spec_helper.rb}, %q{cron_wrapper.gemspec}]
+  s.homepage = %q{http://github.com/rubyisbeautiful}
+  s.rdoc_options = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{Cron_wrapper}]
+  s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{cron_wrapper}
-  s.rubygems_version = %q{1.3.7}
-  s.signing_key = %q{/home/bryan/gem_private_key/gem-private_key.pem}
+  s.rubygems_version = %q{1.8.6}
+  s.signing_key = %q{/Users/bryan/.gem_credentials/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
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/cron/awesome_script.rb

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

data/lib/cron_wrapper.rb

@@ -13,6 +13,7 @@ class CronWrapper
     @options[:root]       = '.'
     @options[:lock_dir]   = nil
     @options[:dry_run]    = false
+    @options[:name]       = nil
     @options[:silent]     = false
     @options[:verbose]    = false
     @options[:log]        = nil
@@ -35,6 +36,7 @@ class CronWrapper
       
       opts.on("--wrap FILE", "file to run") { |o| @options[:target] = o }
       opts.on("--wrap-dry-run", "dry run (default: off)") { |o| @options[:dry_run] = o }
+      opts.on("--wrap-name NAME", "use NAME for the lock file (default: same as wrap script)") { |o| @options[:name] = o }
       opts.on("--wrap-rails", "Try to load Rails (default: off)") { |o| @options[:rails] = o }
       opts.on("--wrap-root DIR", "Root or working directory (default: .)") { |o| @options[:root] = o }
       opts.on("--wrap-lock_dir DIR", "Lock dir (default: <root>/tmp/locks)") { |o| @options[:lock_dir] = o }
@@ -105,8 +107,13 @@ class CronWrapper
     
   def run
     base_name   = @options[:target]
-    target      = File.join(@options[:root], "lib/cron/#{base_name}.rb") 
-    lock_file   = File.join(@options[:lock_dir], "/#{base_name}.lock")
+    target      = File.join(@options[:root], "lib/cron/#{base_name}.rb")
+    if @options[:name]
+      lock_file   = File.join(@options[:lock_dir], "/#{@options[:name]}.lock")
+    else
+      lock_file   = File.join(@options[:lock_dir], "/#{base_name}.lock")
+    end
+
     
     if File.exists? lock_file
       stale     = false

data/spec/cron_wrapper_spec.rb

@@ -118,7 +118,22 @@ describe "cron_wrapper" do
       @pid = nil
       remove_lock
     end
-    
+
+
+    it "should create the lock file in lock_dir using the --wrap-name if provided" do
+      t = Thread.new { `#{cmd} --wrap awesome_script --wrap-name foobar_script --wrap-verbose --wrap-root #{root} --wrap-log log/awesome_script.log` }
+      Timeout::timeout(3) do
+        begin
+          @pid = File.read "#{root}/tmp/locks/foobar_script.lock"
+        rescue
+          retry
+        end
+      end.should_not raise_error TimeoutError
+
+      @pid.nil?.should_not == true
+      t.join
+    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` }
@@ -159,7 +174,7 @@ describe "cron_wrapper" do
     end
     
     
-    it "should not execute if the lock file is there and the pid is valid" do
+    it "should not execute if the default 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
@@ -173,7 +188,7 @@ describe "cron_wrapper" do
     end
     
     
-    it "should execute if the lock file is there but the pid is invalid" do
+    it "should execute if the default lock file is there but the pid is invalid" do
       File.open("#{root}/tmp/locks/awesome_script.lock", 'w') do |file|
         file << 'foo'
       end
@@ -185,6 +200,49 @@ describe "cron_wrapper" do
       
       ((end_time - start_time) > 2).should == true
     end
+
+
+    it "should execute if the lock file is there under a different name" 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-name foobar_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
+
+
+    it "should not execute if the custom lock file is there and the pid is valid" do
+      File.open("#{root}/tmp/locks/foobar_script.lock", 'w') do |file|
+        file << Process::pid
+      end
+
+      start_time  = Time.now
+      Process.fork { `#{cmd} --wrap awesome_script --wrap-name foobar_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 custom lock file is there but the pid is invalid" do
+      File.open("#{root}/tmp/locks/foobar_script.lock", 'w') do |file|
+        file << 'foo'
+      end
+
+      start_time  = Time.now
+      Process.fork { `#{cmd} --wrap awesome_script --wrap-name foobar_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
   
   

data/spec/spec_helper.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cron_wrapper
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Bryan Taylor
@@ -36,8 +36,7 @@ cert_chain:
   NK5lPw==
   -----END CERTIFICATE-----
 
-date: 2011-03-03 00:00:00 +00:00
-default_executable: 
+date: 2012-03-26 00:00:00 Z
 dependencies: []
 
 description: A gem that provides useful features for running ruby or Rails scripts with cron
@@ -48,17 +47,20 @@ extensions: []
 
 extra_rdoc_files: 
 - bin/cron_wrapper
+- lib/cron/awesome_script.rb
 - lib/cron_wrapper.rb
 files: 
+- Gemfile
+- Gemfile.lock
 - 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
-has_rdoc: true
-homepage: http://rubyisbeautiful.com
+- cron_wrapper.gemspec
+homepage: http://github.com/rubyisbeautiful
 licenses: []
 
 post_install_message: 
@@ -91,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cron_wrapper
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: "features: locking to prevent resource contention, standard logging, optional rails integration"