clockwork 0.4.1 → 0.5.0

data/Gemfile

@@ -1,9 +1,10 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gem 'tzinfo'
+gem 'tzinfo', "~> 0.3.35"
 
-group :development, :test do
+group :development do
   gem 'jeweler'
   gem 'contest'
+  gem 'daemons'
   gem 'mocha'
 end

data/Gemfile.lock

@@ -1,23 +1,29 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     contest (0.1.3)
+    daemons (1.1.9)
     git (1.2.5)
-    jeweler (1.6.4)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+      rdoc
+    json (1.7.7)
     metaclass (0.0.1)
-    mocha (0.10.0)
+    mocha (0.13.2)
       metaclass (~> 0.0.1)
-    rake (0.9.2)
-    tzinfo (0.3.32)
+    rake (10.0.3)
+    rdoc (4.0.0)
+      json (~> 1.4)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   contest
+  daemons
   jeweler
   mocha
-  tzinfo
+  tzinfo (~> 0.3.35)

data/README.md

@@ -52,6 +52,13 @@ it as the module (thanks to [hoverlover](https://github.com/hoverlover/clockwork
       every(1.day, 'midnight.job', :at => '00:00')
     end
 
+If you need to load your entire environment for your jobs, simply add:
+
+    require './config/boot'
+		require './config/environment'
+
+under the `require 'clockwork'` declaration.
+
 Quickstart for Heroku
 ---------------------
 
@@ -69,8 +76,9 @@ makes it impossible to parallelize.  For doing the work, you should be using a
 job queueing system, such as
 [Delayed Job](http://www.therailsway.com/2009/7/22/do-it-later-with-delayed-job),
 [Beanstalk/Stalker](http://adam.heroku.com/past/2010/4/24/beanstalk_a_simple_and_fast_queueing_backend/),
-[RabbitMQ/Minion](http://adamblog.heroku.com/past/2009/9/28/background_jobs_with_rabbitmq_and_minion/), or
-[Resque](http://github.com/blog/542-introducing-resque).  This design allows a
+[RabbitMQ/Minion](http://adamblog.heroku.com/past/2009/9/28/background_jobs_with_rabbitmq_and_minion/),
+[Resque](http://github.com/blog/542-introducing-resque), or
+[Sidekiq](https://github.com/mperham/sidekiq).  This design allows a
 simple clock process with no locks, but also offers near infinite horizontal
 scalability.
 
@@ -225,6 +233,19 @@ topography:
 You should use Monit, God, Upstart, or Inittab to keep your clock process
 running the same way you keep your web and workers running.
 
+Daemonization
+-------------
+
+Thanks to @fddayan, `clockworkd` executes clockwork script in as a daemon.
+
+You need `daemons` gem to use `clockworkd`.  It is not automatically installed, please install by yourself.
+
+Then,
+
+    clockworkd -c YOUR_CLOCK.rb start
+
+For more details, see help shown by `clockworkd`.
+
 Meta
 ----
 
@@ -239,4 +260,3 @@ Patches contributed by Mark McGranaghan and Lukáš Konarovský
 Released under the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 http://github.com/tomykaira/clockwork
-

data/Rakefile

@@ -7,7 +7,6 @@ Jeweler::Tasks.new do |s|
   s.author = "Adam Wiggins"
   s.email = "adam@heroku.com"
   s.homepage = "http://github.com/tomykaira/clockwork"
-  s.executables = [ "clockwork" ]
   s.rubyforge_project = "clockwork"
 
   s.files = FileList["[A-Z]*", "{bin,lib}/**/*"]

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/bin/clockworkd

@@ -0,0 +1,85 @@
+#!/usr/bin/env ruby
+
+STDERR.sync = STDOUT.sync = true
+
+require File.expand_path('../../lib/clockwork', __FILE__)
+require 'optparse'
+
+begin
+  require 'daemons'
+rescue LoadError
+  raise "You need to add gem 'daemons' to your Gemfile or Rubygems if you wish to use it."
+end
+
+@options = {
+  :quiet => false,
+  :pid_dir => File.expand_path("./tmp"),
+  :log_output => false,
+  :monitor => false,
+  :file => File.expand_path("./clock.rb")
+}
+
+bin_basename = File.basename($0)
+
+opts = OptionParser.new do |opts|
+  opts.banner = "Usage: #{bin_basename} -c FILE [options] start|stop|restart|run"
+  opts.separator ''
+  opts.on_tail('-h', '--help', 'Show this message') do
+    puts opts
+    exit 1
+  end
+  opts.on("--pid-dir=DIR", "Alternate directory in which to store the process ids. Default is #{@options[:pid_dir]}.") do |dir|
+    @options[:pid_dir] = dir
+  end
+  opts.on('-i', '--identifier=STR', 'An identifier for the process. Default is clock file name.') do |n|
+    @options[:identifier] = n
+  end
+  opts.on('-l', '--log', "Redirect both STDOUT and STDERR to a logfile named #{bin_basename}[.<identifier>].output in the pid-file directory.") do
+    @options[:log_output] = true
+  end
+  opts.on('--log-dir=DIR', 'A specific directory to put the log files into (default location is pid directory).') do | log_dir|
+    @options[:log_dir] = File.expand_path(log_dir)
+  end
+  opts.on('-m', '--monitor', 'Start monitor process.') do
+    @options[:monitor] = true
+  end
+  opts.on('-c', '--clock=FILE',"Clock .rb file. Default is #{@options[:file]}.") do |clock_file|
+    @options[:file] = clock_file
+    @options[:file] = "./#{@options[:file]}" unless @options[:file].match(/^[\/.]/)
+    @options[:file] = File.expand_path(@options[:file])
+  end
+end
+
+@args = opts.parse!(ARGV)
+
+def optparser_abort(opts,message)
+  $stderr.puts message
+  puts opts
+  exit 1
+end
+
+optparser_abort opts, "ERROR: --clock=FILE is required." unless @options[:file]
+optparser_abort opts, "ERROR: clock file #{@options[:file]} does not exist." unless File.exists?(@options[:file])
+optparser_abort opts, "ERROR: File extension specified in --clock must be '.rb'" unless File.extname(@options[:file]) == ".rb"
+
+@options[:identifier]  ||= "#{File.basename(@options[:file],'.*')}"
+process_name = "#{bin_basename}.#{@options[:identifier]}"
+
+@options[:log_dir] ||= @options[:pid_dir]
+
+Dir.mkdir(@options[:pid_dir]) unless File.exists?(@options[:pid_dir])
+Dir.mkdir(@options[:log_dir]) unless File.exists?(@options[:log_dir])
+
+puts "#{process_name}: pid file: #{File.expand_path(File.join(@options[:pid_dir],process_name + '.pid'))}"
+
+if @options[:log_output]
+  puts "#{process_name}: output log file: #{File.expand_path(File.join(@options[:log_dir],process_name + '.output'))}"
+else
+  puts "#{process_name}: No output will be printed out (run with --log if needed)"
+end
+
+Daemons.run_proc(process_name, :dir => @options[:pid_dir], :dir_mode => :normal, :monitor => @options[:monitor], :log_dir => @options[:log_dir], :log_output => @options[:log_output], :ARGV => @args) do |*args|
+  require @options[:file]
+
+  Clockwork::run
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clockwork
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,17 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.35
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.35
+- !ruby/object:Gem::Dependency
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -28,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: contest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: contest
+  name: daemons
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -80,6 +96,7 @@ description: A scheduler process to replace cron, using a more flexible Ruby syn
 email: adam@heroku.com
 executables:
 - clockwork
+- clockworkd
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -90,6 +107,7 @@ files:
 - Rakefile
 - VERSION
 - bin/clockwork
+- bin/clockworkd
 - lib/clockwork.rb
 - test/clockwork_test.rb
 homepage: http://github.com/tomykaira/clockwork
@@ -106,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -324134193
+      hash: -352792223
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: clockwork
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A scheduler process to replace cron.