iyyov 1.1.1-java → 1.1.2-java

data/History.rdoc

@@ -1,3 +1,12 @@
+=== 1.1.2 (2011-9-11)
+* Add Task.log accessor.
+* Fixes for ruby 1.9 compatibility; to_a -> Array()
+* Use Gem::Specification.find_by_name when available, per Rubygems
+  1.8.x deprecations.
+* Broaden to rjack-logback ~> 1.1
+* Upgrade to tarpit ~> 1.3.3 (build)
+* Broaden to minitest ~> 2.2 (build)
+
 === 1.1.1 (2011-3-26)
 * Fix one more bare Logback reference for iyyov-fg -d
 * Expose Daemon.log, for extensions.

data/Rakefile

@@ -3,7 +3,7 @@
 $LOAD_PATH << './lib'
 
 require 'rubygems'
-gem     'rjack-tarpit', '~> 1.3.0'
+gem     'rjack-tarpit', '~> 1.3.3'
 require 'rjack-tarpit'
 
 require 'iyyov/base'
@@ -14,9 +14,9 @@ t.specify do |h|
   h.developer( 'David Kellum', 'dek-oss@gravitext.com' )
   h.testlib = :minitest
   h.extra_deps     += [ [ 'rjack-slf4j',         '~> 1.6.1' ],
-                        [ 'rjack-logback',       '~> 1.1.1' ],
+                        [ 'rjack-logback',       '~> 1.1'   ],
                         [ 'logrotate',           '=  1.2.1' ] ]
-  h.extra_dev_deps += [ [ 'minitest',            '>= 1.5.0', '< 2.1' ],
+  h.extra_dev_deps += [ [ 'minitest',            '~> 2.2'   ],
                         [ 'hashdot-test-daemon', '~> 1.2'   ] ]
 end
 

data/config/crontab

@@ -1,2 +1,2 @@
 # PATH=/opt/bin
-*/1 * * * * cd /opt/var/iyyov && /opt/jruby/gems/gems/iyyov-1.1.1-java/init/iyyov jobs.rb
+*/1 * * * * cd /opt/var/iyyov && /opt/jruby/gems/gems/iyyov-1.1.2-java/init/iyyov jobs.rb

data/config/init.d/iyyov

@@ -14,7 +14,7 @@
 gem_home="/opt/jruby/gems"
 
 # (Exact) Gem version of iyyov to run
-version="1.1.1"
+version="1.1.2"
 
 # User to run the daemon as (should own rundir)
 user="iyyov"

data/init/iyyov

@@ -24,7 +24,7 @@
 
 require 'rubygems'
 
-gem( "iyyov", "= 1.1.1" )
+gem( "iyyov", "= 1.1.2" )
 
 require 'rjack-logback'
 RJack::Logback.config_console( :full => true, :thread => true )

data/lib/iyyov/base.rb

@@ -16,5 +16,5 @@
 
 module Iyyov
   # Iyyov version
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/lib/iyyov/daemon.rb

@@ -227,7 +227,12 @@ module Iyyov
     end
 
     def find_gem_spec
-      @gem_spec ||= Gem.source_index.find_name( gem_name, version ).last
+      @gem_spec ||=
+        if Gem::Specification.respond_to?( :find_by_name )
+          Gem::Specification.find_by_name( gem_name, version )
+        else
+          Gem.source_index.find_name( gem_name, version ).last
+        end
       unless @gem_spec
         raise( Gem::GemNotFoundException, "Missing gem #{gem_name} (#{version})" )
       end
@@ -236,7 +241,7 @@ module Iyyov
 
     def start
       epath = File.expand_path( exe_path )
-      eargs = args.to_a.map { |a| a.to_s.strip }.compact
+      eargs = args.map { |a| a.to_s.strip }.compact
       aversion = @gem_spec && @gem_spec.version
       @log.info { ( [ "starting", aversion || epath ] + eargs ).join(' ') }
 
@@ -250,7 +255,7 @@ module Iyyov
 
       @state = :up
       true
-    rescue Gem::GemNotFoundException, DaemonFailed, Errno::ENOENT => e
+    rescue Gem::LoadError, Gem::GemNotFoundException, DaemonFailed, Errno::ENOENT => e
       @log.error( e.to_s )
       @state = :failed
       false
@@ -260,7 +265,7 @@ module Iyyov
     # running instance.
     def exec_key
       keys = [ run_dir, exe_path ].map { |p| File.expand_path( p ) }
-      keys += args.to_a.map { |a| a.to_s.strip }.compact
+      keys += args.map { |a| a.to_s.strip }.compact
       keys.compact
     end
 

data/lib/iyyov/task.rb

@@ -32,7 +32,7 @@ module Iyyov
     # One or more fixed time values in 24hour format, local
     # timezone, i.e: [ "11:30", "23:30" ]
     #
-    # ~to_a[String] (default: nil, use period)
+    # Array(String) (default: nil, use period)
     attr_accessor :fixed_times
 
     # Array or range for days of week in which fixed_times apply. Days
@@ -55,6 +55,9 @@ module Iyyov
     # Once schedule succeeds, the absolute next time to execute.
     attr_reader :next_time
 
+    # SLF4J logger
+    attr_reader   :log
+
     # New task given options matching accessors and block containing
     # work.
     def initialize( opts = {}, &block )
@@ -169,7 +172,7 @@ module Iyyov
       ntime = nil
       while ntime.nil? && day <= last
         if fixed_days.include?( day.wday )
-          fixed_times.to_a.each do |ft|
+          Array( fixed_times ).each do |ft|
             ft = time_on_date( day, Time.parse( ft, now ) )
             ntime = ft if ( ( ft > now ) && ( ntime.nil? || ft < ntime ) )
           end

metadata

@@ -2,7 +2,7 @@
 name: iyyov
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.1
+  version: 1.1.2
 platform: java
 authors: 
   - David Kellum
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 00:00:00 -07:00
-default_executable: 
+date: 2011-09-11 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rjack-slf4j
@@ -32,7 +31,7 @@ dependencies:
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.1.1
+            version: "1.1"
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -52,12 +51,9 @@ dependencies:
     requirement: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.5.0
-        - - <
+        - - ~>
           - !ruby/object:Gem::Version 
-            version: "2.1"
+            version: "2.2"
     type: :development
     version_requirements: *id004
   - !ruby/object:Gem::Dependency 
@@ -79,7 +75,7 @@ dependencies:
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.3.0
+            version: 1.3.3
     type: :development
     version_requirements: *id006
 description: Down-to-earth job control and monitoring.
@@ -121,7 +117,6 @@ files:
   - test/test_context.rb
   - test/test_daemon.rb
   - test/test_scheduler.rb
-has_rdoc: true
 homepage: http://github.com/dekellum/iyyov
 licenses: []
 
@@ -146,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: iyyov
-rubygems_version: 1.5.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Down-to-earth job control and monitoring.