taskmaster 0.1.1 → 0.2.0

data/Gemfile

@@ -9,8 +9,9 @@ gem 'activesupport'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", "~> 1"
   gem "jeweler", "~> 1.6.2"
   gem "rcov", ">= 0"
   gem "rake", "0.8.7"
+  gem "mocha", "~> 0.9"
 end

data/README.rdoc

@@ -33,7 +33,7 @@ Check the documentation on `Taskmaster::Henchman.every` for details on all the a
 
 == TODO
 
-* add a Rake task to output and save crontab for all Taskmaster-including classes (fall back to whenever)
+* add a binary script to fall back to whenever (for writing/updating crontab)
 
 == Contributing to taskmaster
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/taskmaster.rb

@@ -4,12 +4,47 @@ require 'taskmaster/henchman'
 require 'taskmaster/railtie'
 
 module Taskmaster
+  def self.aggregate
+    load_rails_models
+    hash = Henchman.included_in.inject({}) do |hash, klass|
+      hash[klass.name] = klass.cron_output.strip
+      hash
+    end
+    hash
+  end
+
+  def self.aggregate_whenever
+    load_rails_models
+    array = Henchman.included_in.inject([]) do |arr, klass|
+      arr << klass.scheduled_jobs
+      arr
+    end
+    array.flatten.join("\n")
+  end
+
+  def self.section(key, cron)
+    buffer = []
+    buffer << "#-- begin Taskmaster cron for #{application} - #{key}"
+    buffer << cron
+    buffer << "#-- end Taskmaster cron for #{application} - #{key}\n"
+    buffer
+  end
+
   def self.cron_output
-    # make sure all the models that could include Henchman are loaded
+    raw_output = aggregate
+    raw_output.keys.map { |key| section(key, raw_output[key]) }.join("\n")
+  end
+
+  def self.application
+    Rails.root.basename.to_s
+  rescue
+    "application"
+  end
+
+  private
+  def self.load_rails_models
     if defined?(Rails)
       Dir[Rails.root.join('app', 'models', '**', '*.rb')].each { |file| require file }
     end
-
-    Henchman.included_in.map { |klass| klass.cron_output.strip }.join("\n")
   end
 end

data/lib/taskmaster/henchman.rb

@@ -30,6 +30,10 @@ end"
       def cron_output
         Whenever::JobList.new(@scheduled_jobs.join("\n")).generate_cron_output
       end
+
+      def scheduled_jobs
+        @scheduled_jobs
+      end
     end
   end
 end

data/lib/tasks/taskmaster.rake

@@ -1,8 +1,20 @@
-namespace :taskmaster do
+require 'fileutils'
 
-  desc "Generate crontab"
-  task :generate do
+namespace :taskmaster do
+  desc "Preview the generated crontab"
+  task :preview do
     output = Taskmaster.cron_output
     puts output
   end
+
+  desc "Write the generated crontab to config/schedule.rb -- suitable for whenever to write it to the system"
+  task :write do
+    output = Taskmaster.aggregate_whenever
+    FileUtils.mkdir_p 'config'
+    FileUtils.touch   'config/schedule.rb'
+    File.open('config/schedule.rb', File::WRONLY) do |file|
+      file << output
+    end
+    puts "Your crontab has been written to config/schedule.rb. Please use the whenever script to write it to your system crontab."
+  end
 end

data/taskmaster.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{taskmaster}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Scofield"]
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/bscofield/taskmaster}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.3.9.2}
   s.summary = %q{Make your Ruby classes cron-aware}
 
   if s.respond_to? :specification_version then
@@ -46,25 +46,28 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<whenever>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rake>, ["= 0.8.7"])
+      s.add_development_dependency(%q<mocha>, ["~> 0.9"])
     else
       s.add_dependency(%q<whenever>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, ["~> 1"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rake>, ["= 0.8.7"])
+      s.add_dependency(%q<mocha>, ["~> 0.9"])
     end
   else
     s.add_dependency(%q<whenever>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, ["~> 1"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rake>, ["= 0.8.7"])
+    s.add_dependency(%q<mocha>, ["~> 0.9"])
   end
 end
 

data/test/helper.rb

@@ -8,6 +8,7 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'test/unit'
+require 'mocha'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

data/test/test_taskmaster.rb

@@ -1,5 +1,11 @@
 require 'helper'
 
+module Rails
+  def self.root
+    Pathname.new('/root/hydra')
+  end
+end
+
 class TestTaskmaster < Test::Unit::TestCase
   def test_constants_should_exist
     assert_nothing_raised do
@@ -8,11 +14,80 @@ class TestTaskmaster < Test::Unit::TestCase
     end
   end
 
+  def test_taskmaster_should_know_generated_whenever_syntax
+    expected = <<-WHENEVERSYNTAX
+every 600, {} do
+  runner 'FootSoldier.run'
+end
+every 3600, {} do
+  runner 'SpecialSoldier.specialty'
+end
+every 60, {} do
+  runner 'MultiSoldier.run'
+end
+every 3600, {} do
+  runner 'MultiSoldier.specialty'
+end
+every 3600, {:at=>20} do
+  runner 'SpecificSoldier.run'
+end
+every 3600, {} do
+  command 'CommandSoldier.run'
+end
+every 3600, {} do
+  command 'FrequencySoldier.run'
+end
+WHENEVERSYNTAX
+    assert_equal expected.strip, Taskmaster.aggregate_whenever.strip
+  end
+
   def test_taskmaster_should_know_all_output
-    output = Taskmaster.cron_output.split(/\n+/)
-    assert_equal "0,10,20,30,40,50 * * * * /bin/bash -l -c 'cd /Users/benscofield/personal/util/taskmaster && script/runner -e production '\\''FootSoldier.run'\\'''", output[0]
-    assert_equal "0 * * * * /bin/bash -l -c 'cd /Users/benscofield/personal/util/taskmaster && script/runner -e production '\\''SpecialSoldier.specialty'\\'''", output[1]
-    assert_equal "* * * * * /bin/bash -l -c 'cd /Users/benscofield/personal/util/taskmaster && script/runner -e production '\\''MultiSoldier.run'\\'''", output[2]
-    assert_equal "0 * * * * /bin/bash -l -c 'cd /Users/benscofield/personal/util/taskmaster && script/runner -e production '\\''MultiSoldier.specialty'\\'''", output[3]
+    output = Taskmaster.aggregate
+
+    assert_equal "0,10,20,30,40,50 * * * * /bin/bash -l -c 'cd /Users/benscofield/personal/util/taskmaster && script/runner -e production '\\''FootSoldier.run'\\'''", output['FootSoldier']
+    assert_equal "0 * * * * /bin/bash -l -c 'cd /Users/benscofield/personal/util/taskmaster && script/runner -e production '\\''SpecialSoldier.specialty'\\'''", output['SpecialSoldier']
+    assert_equal "* * * * * /bin/bash -l -c 'cd /Users/benscofield/personal/util/taskmaster && script/runner -e production '\\''MultiSoldier.run'\\'''", output['MultiSoldier'].split(/\n+/)[0]
+    assert_equal "0 * * * * /bin/bash -l -c 'cd /Users/benscofield/personal/util/taskmaster && script/runner -e production '\\''MultiSoldier.specialty'\\'''", output['MultiSoldier'].split(/\n+/)[1]
   end
+
+  def test_taskmaster_should_not_know_an_app_name_when_not_in_rails
+    Rails.expects(:root).raises(StandardError)
+    assert_equal "application", Taskmaster.application
+  end
+
+  def test_taskmaster_should_know_a_rails_app_name
+    assert_equal "hydra", Taskmaster.application
+  end
+
+    def test_taskmaster_should_generate_sectioned_crontab_format
+      expected = <<-OUTOUTDAMNEDSPOT
+#-- begin Taskmaster cron for hydra - FootSoldier
+0,10,20,30,40,50 * * * * /bin/bash -l -c 'cd /Users/benscofield/personal/util/taskmaster && script/runner -e production '\\''FootSoldier.run'\\'''
+#-- end Taskmaster cron for hydra - FootSoldier
+
+#-- begin Taskmaster cron for hydra - SpecialSoldier
+0 * * * * /bin/bash -l -c 'cd /Users/benscofield/personal/util/taskmaster && script/runner -e production '\\''SpecialSoldier.specialty'\\'''
+#-- end Taskmaster cron for hydra - SpecialSoldier
+
+#-- begin Taskmaster cron for hydra - MultiSoldier
+* * * * * /bin/bash -l -c 'cd /Users/benscofield/personal/util/taskmaster && script/runner -e production '\\''MultiSoldier.run'\\'''
+
+0 * * * * /bin/bash -l -c 'cd /Users/benscofield/personal/util/taskmaster && script/runner -e production '\\''MultiSoldier.specialty'\\'''
+#-- end Taskmaster cron for hydra - MultiSoldier
+
+#-- begin Taskmaster cron for hydra - SpecificSoldier
+20 * * * * /bin/bash -l -c 'cd /Users/benscofield/personal/util/taskmaster && script/runner -e production '\\''SpecificSoldier.run'\\'''
+#-- end Taskmaster cron for hydra - SpecificSoldier
+
+#-- begin Taskmaster cron for hydra - CommandSoldier
+0 * * * * /bin/bash -l -c 'CommandSoldier.run'
+#-- end Taskmaster cron for hydra - CommandSoldier
+
+#-- begin Taskmaster cron for hydra - FrequencySoldier
+0 * * * * /bin/bash -l -c 'FrequencySoldier.run'
+#-- end Taskmaster cron for hydra - FrequencySoldier
+OUTOUTDAMNEDSPOT
+
+      assert_equal expected, Taskmaster.cron_output
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taskmaster
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: whenever
-  requirement: &2152144960 !ruby/object:Gem::Requirement
+  requirement: &2152243520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152144960
+  version_requirements: *2152243520
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152143680 !ruby/object:Gem::Requirement
+  requirement: &2152243040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,21 +33,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152143680
+  version_requirements: *2152243040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152142280 !ruby/object:Gem::Requirement
+  requirement: &2152242560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1'
   type: :development
   prerelease: false
-  version_requirements: *2152142280
+  version_requirements: *2152242560
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152140880 !ruby/object:Gem::Requirement
+  requirement: &2152242080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *2152140880
+  version_requirements: *2152242080
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152139660 !ruby/object:Gem::Requirement
+  requirement: &2152241600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152139660
+  version_requirements: *2152241600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152138620 !ruby/object:Gem::Requirement
+  requirement: &2152241120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -77,7 +77,18 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2152138620
+  version_requirements: *2152241120
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2152240640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: *2152240640
 description: Taskmaster allows you to easily make your Ruby classes aware of cron.
 email: git@turrean.com
 executables: []
@@ -118,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4405291791740595885
+      hash: 3484259382040423965
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -127,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.9.2
 signing_key: 
 specification_version: 3
 summary: Make your Ruby classes cron-aware