iyyov 1.1.2-java → 1.1.3-java

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 1.1.3 (2012-1-15)
+* Add task on call to block for log access, etc.
+* Fix handling of Gem::LoadError on reload of jobs.rb extended with a
+  daemon who's gem is not currently installed. Previously this was
+  fatal error.
+* Upgrade to tarpit ~> 2.0, bundler Gemfile, gemspec (build)
+
 === 1.1.2 (2011-9-11)
 * Add Task.log accessor.
 * Fixes for ruby 1.9 compatibility; to_a -> Array()

data/README.rdoc

@@ -82,7 +82,7 @@ the above provided examples.
 
 == License
 
-Copyright (c) 2010-2011 David Kellum
+Copyright (c) 2010-2012 David Kellum
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License.  You

data/Rakefile

@@ -1,50 +1,7 @@
 # -*- ruby -*-
 
-$LOAD_PATH << './lib'
-
 require 'rubygems'
-gem     'rjack-tarpit', '~> 1.3.3'
+require 'bundler/setup'
 require 'rjack-tarpit'
 
-require 'iyyov/base'
-
-t = RJack::TarPit.new( 'iyyov', Iyyov::VERSION, :java_platform )
-
-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'   ],
-                        [ 'logrotate',           '=  1.2.1' ] ]
-  h.extra_dev_deps += [ [ 'minitest',            '~> 2.2'   ],
-                        [ 'hashdot-test-daemon', '~> 1.2'   ] ]
-end
-
-# Version/date consistency checks:
-
-task :chk_init_v do
-  t.test_line_match( 'init/iyyov',
-                      /^gem.+#{t.name}/, /= #{t.version}/ )
-end
-task :chk_rcd_v do
-  t.test_line_match( 'config/init.d/iyyov', /^version=".+"/, /"#{t.version}"/ )
-end
-task :chk_cron_v do
-  t.test_line_match( 'config/crontab', /gems\/iyyov/,
-                     /iyyov-#{t.version}-java/ )
-end
-task :chk_hist_v do
-  t.test_line_match( 'History.rdoc', /^==/, / #{t.version} / )
-end
-
-gem_tests = [ :chk_init_v, :chk_rcd_v, :chk_cron_v, :chk_hist_v  ]
-
-task :chk_hist_date do
-  t.test_line_match( 'History.rdoc', /^==/, /\([0-9\-]+\)$/ )
-end
-
-task :gem  => gem_tests
-task :tag  => gem_tests + [ :chk_hist_date ]
-task :push => [ :chk_hist_date ]
-
-t.define_tasks
+RJack::TarPit.new( 'iyyov' ).define_tasks

data/bin/iyyov-fg

@@ -4,7 +4,7 @@
 #. hashdot.vm.options += -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
 
 #--
-# Copyright (c) 2010-2011 David Kellum
+# Copyright (c) 2010-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/config/crontab

@@ -1,2 +1,2 @@
 # PATH=/opt/bin
-*/1 * * * * cd /opt/var/iyyov && /opt/jruby/gems/gems/iyyov-1.1.2-java/init/iyyov jobs.rb
+*/1 * * * * cd /opt/var/iyyov && /opt/jruby/gems/gems/iyyov-1.1.3-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.2"
+version="1.1.3"
 
 # User to run the daemon as (should own rundir)
 user="iyyov"

data/init/iyyov

@@ -7,7 +7,7 @@
 #. hashdot.vm.options += -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
 
 #--
-# Copyright (c) 2010-2011 David Kellum
+# Copyright (c) 2010-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -24,7 +24,7 @@
 
 require 'rubygems'
 
-gem( "iyyov", "= 1.1.2" )
+gem( "iyyov", "= 1.1.3" )
 
 require 'rjack-logback'
 RJack::Logback.config_console( :full => true, :thread => true )

data/lib/iyyov.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 David Kellum
+# Copyright (c) 2010-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/lib/iyyov/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 David Kellum
+# Copyright (c) 2010-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -16,5 +16,5 @@
 
 module Iyyov
   # Iyyov version
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/lib/iyyov/context.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 David Kellum
+# Copyright (c) 2010-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/lib/iyyov/daemon.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 David Kellum
+# Copyright (c) 2010-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -264,8 +264,16 @@ module Iyyov
     # Return array suitable for comparing this daemon with prior
     # running instance.
     def exec_key
-      keys = [ run_dir, exe_path ].map { |p| File.expand_path( p ) }
-      keys += args.map { |a| a.to_s.strip }.compact
+      epath = begin
+                exe_path
+              rescue Gem::LoadError, Gem::GemNotFoundException => e
+                @log.warn( e.to_s )
+                # Use a bogus, unique path instead
+                "/tmp/gem-not-found/#{ Time.now.usec }/#{ rand( 2**31 ) }"
+              end
+
+      keys = [ run_dir, epath ].map { |p| File.expand_path( p ) }
+      keys += args.map { |a| a.to_s.strip }
       keys.compact
     end
 

data/lib/iyyov/errors.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 David Kellum
+# Copyright (c) 2010-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/lib/iyyov/log_rotator.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 David Kellum
+# Copyright (c) 2010-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/lib/iyyov/scheduler.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 David Kellum
+# Copyright (c) 2010-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/lib/iyyov/shutdown_handler.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 David Kellum
+# Copyright (c) 2010-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/lib/iyyov/task.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 David Kellum
+# Copyright (c) 2010-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -133,7 +133,7 @@ module Iyyov
     def run_direct
       @log.debug "Running."
       begin
-        rc = ( @block.call if @block )
+        rc = ( @block.call( self ) if @block )
         filter( rc )
       rescue StandardError => e
         @log.error( "Handled and stopped with: ", e )

data/test/setup.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 David Kellum
+# Copyright (c) 2010-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -14,37 +14,20 @@
 # permissions and limitations under the License.
 #++
 
-#### General test setup: LOAD_PATH, logging, console output ####
+#### General test setup, logging, console output ####
 
-ldir = File.join( File.dirname( __FILE__ ), "..", "lib" )
-$LOAD_PATH.unshift( ldir ) unless $LOAD_PATH.include?( ldir )
+require 'rubygems'
+require 'bundler/setup'
 
-def time_it( name )
-  start = Time.now
-  output = ARGV.include?( '-v' )
-  $stdout.write( "Loading %10s..." % name ) if output
-  yield
-  puts "%6.3fs" % (Time.now - start) if output
-end
-
-time_it( "rubygems" ) do
-  require 'rubygems'
-end
-
-time_it( "logback" ) do
-  require 'rjack-logback'
-  RJack::Logback.config_console( :level => RJack::Logback::INFO, :stderr => true )
-end
-
-time_it( "test/unit" ) do
-  require 'minitest/unit'
-  require 'minitest/autorun'
+require 'rjack-logback'
+RJack::Logback.config_console( :level => RJack::Logback::INFO, :stderr => true )
 
-  # Make test output logging compatible: no partial lines.
-  class TestOut
-    def print( *a ); $stdout.puts( *a ); end
-    def puts( *a );  $stdout.puts( *a ); end
-  end
-  MiniTest::Unit.output = TestOut.new
+require 'minitest/unit'
+require 'minitest/autorun'
 
+# Make test output logging compatible: no partial lines.
+class TestOut
+  def print( *a ); $stdout.puts( *a ); end
+  def puts( *a );  $stdout.puts( *a ); end
 end
+MiniTest::Unit.output = TestOut.new

data/test/test_context.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 #.hashdot.profile += jruby-shortlived
 #--
-# Copyright (c) 2010-2011 David Kellum
+# Copyright (c) 2010-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/test/test_daemon.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 #.hashdot.profile += jruby-shortlived
 #--
-# Copyright (c) 2010-2011 David Kellum
+# Copyright (c) 2010-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/test/test_scheduler.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 #.hashdot.profile += jruby-shortlived
 #--
-# Copyright (c) 2010-2011 David Kellum
+# Copyright (c) 2010-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -58,10 +58,13 @@ class TestScheduler < MiniTest::Unit::TestCase
     s = Scheduler.new
     s.on_exit { flunk "Shouldn't make it here" }
     counter = 0
-    tk = Task.new( :name => "test_shutdown", :period => 0.001 ) do
+    tk = Task.new( :name => "test_shutdown", :period => 0.001 ) do |t|
       counter += 1
       assert( counter <= 2 )
-      :shutdown unless counter < 2
+      unless counter < 2
+        t.log.info "Shutting it down now"
+        :shutdown
+      end
     end
     s.add( tk )
     s.add( Task.new( :period => 5.0 ) { flunk "nor here" } )

metadata

@@ -2,7 +2,7 @@
 name: iyyov
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.2
+  version: 1.1.3
 platform: java
 authors: 
   - David Kellum
@@ -10,75 +10,75 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-11 00:00:00 Z
+date: 2012-01-15 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rjack-slf4j
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: 1.6.1
+    requirement: *id001
+    prerelease: false
     type: :runtime
-    version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: rjack-logback
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "1.1"
+    requirement: *id002
+    prerelease: false
     type: :runtime
-    version_requirements: *id002
   - !ruby/object:Gem::Dependency 
     name: logrotate
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
             version: 1.2.1
+    requirement: *id003
+    prerelease: false
     type: :runtime
-    version_requirements: *id003
   - !ruby/object:Gem::Dependency 
     name: minitest
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "2.2"
+    requirement: *id004
+    prerelease: false
     type: :development
-    version_requirements: *id004
   - !ruby/object:Gem::Dependency 
     name: hashdot-test-daemon
-    prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
+    version_requirements: &id005 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "1.2"
+    requirement: *id005
+    prerelease: false
     type: :development
-    version_requirements: *id005
   - !ruby/object:Gem::Dependency 
     name: rjack-tarpit
-    prerelease: false
-    requirement: &id006 !ruby/object:Gem::Requirement 
+    version_requirements: &id006 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.3.3
+            version: "2.0"
+    requirement: *id006
+    prerelease: false
     type: :development
-    version_requirements: *id006
-description: Down-to-earth job control and monitoring.
+description: 
 email: 
   - dek-oss@gravitext.com
 executables: 
@@ -86,7 +86,6 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-  - Manifest.txt
   - History.rdoc
   - README.rdoc
 files: 
@@ -131,21 +130,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
         version: "0"
 requirements: []
 
-rubyforge_project: iyyov
-rubygems_version: 1.8.10
+rubyforge_project: 
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Down-to-earth job control and monitoring.
-test_files: 
-  - test/test_daemon.rb
-  - test/test_context.rb
-  - test/test_scheduler.rb
+test_files: []
+