iyyov 1.0.2-java → 1.1.0-java

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 1.1.0 (2010-12-7)
+* Fix LogRotator.max_size initialized default. (issues/1)
+* Change name of daemon to plain 'iyyov' (in keeping with standard
+  daemon naming.)
+* Upgrade to slf4j ~> 1.6.1, logback ~> 1.0.0
+* Upgrade (dev dependencies) minitest < 2.1, hashdot-test-daemon ~> 1.2
+
 === 1.0.2 (2010-3-14)
 * Include a host-based.rb selection config example.
 * Futher README.rdoc improvements.

data/Manifest.txt

@@ -1,9 +1,15 @@
-Manifest.txt
 History.rdoc
+Manifest.txt
 README.rdoc
 Rakefile
 bin/iyyov-fg
-init/iyyov-daemon
+config/async.rb
+config/crontab
+config/host-based.rb
+config/jobs.rb
+config/load-all.rb
+config/init.d/iyyov
+init/iyyov
 lib/iyyov/base.rb
 lib/iyyov.rb
 lib/iyyov/context.rb
@@ -13,12 +19,6 @@ lib/iyyov/log_rotator.rb
 lib/iyyov/scheduler.rb
 lib/iyyov/shutdown_handler.rb
 lib/iyyov/task.rb
-config/async.rb
-config/crontab
-config/jobs.rb
-config/load-all.rb
-config/host-based.rb
-config/init.d/iyyov
 test/jobs-bad.rb
 test/jobs-dupe.rb
 test/setup.rb

data/README.rdoc

@@ -55,8 +55,8 @@ configurations. Sample jobs.rb configuration:
 The simple form of the define_daemon creates an Iyyov::Daemon
 based on the following conventions:
 
-* The required name by default is used as a gem name as well as init
-  script name.
+* The required name is used as the default gem name as well and
+  default init script name.
 * Most all set attributes may be lambda's.
 * If a version is specified, the default Daemon.exe_path will be an
   init script with the same name and provided by the same named gem
@@ -77,8 +77,8 @@ achieve this:
 * inittab or upstart (which also supports monitoring/restarting iyyov itself)
 * Crontab (an example is provided at gem or source config/crontab)
 
-Iyyov itself contains a Hashdot annotated init/iyyov-daemon script
-used by the above provided examples.
+Iyyov itself contains a Hashdot annotated init/iyyov script used by
+the above provided examples.
 
 == License
 

data/Rakefile

@@ -28,17 +28,17 @@ 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.5.11' ],
-                        [ 'rjack-logback',       '~> 0.9.18' ],
-                        [ 'logrotate',           '=  1.2.1'  ] ]
-  h.extra_dev_deps += [ [ 'minitest',            '~> 1.5.0'  ],
-                        [ 'hashdot-test-daemon', '~> 1.0'    ] ]
+  h.extra_deps     += [ [ 'rjack-slf4j',         '~> 1.6.1' ],
+                        [ 'rjack-logback',       '~> 1.0.0' ],
+                        [ 'logrotate',           '=  1.2.1' ] ]
+  h.extra_dev_deps += [ [ 'minitest',            '>= 1.5.0', '< 2.1' ],
+                        [ 'hashdot-test-daemon', '~> 1.2'   ] ]
 end
 
 # Version/date consistency checks:
 
 task :chk_init_v do
-  t.test_line_match( 'init/iyyov-daemon',
+  t.test_line_match( 'init/iyyov',
                       /^gem.+#{t.name}/, /= #{t.version}/ )
 end
 task :chk_rcd_v do

data/bin/iyyov-fg

@@ -4,7 +4,7 @@
 #. hashdot.vm.options += -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
 
 #--
-# Copyright (C) 2010 David Kellum
+# Copyright (c) 2010 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,8 +24,8 @@ $LOAD_PATH.unshift File.join( File.dirname(__FILE__), "..", "lib" )
 require 'rubygems'
 require 'rjack-logback'
 
-Logback.config_console( :thread => true, :lwidth => 35,
-                        :level => Logback::INFO )
+RJack::Logback.config_console( :thread => true, :lwidth => 35,
+                               :level => RJack::Logback::INFO )
 
 require 'optparse'
 require 'iyyov'
@@ -39,7 +39,7 @@ Options:
 END
 
   opts.on( "-d", "--debug", "Enable debug logging" ) do
-    Logback.root.level = Logback::DEBUG
+    RJack::Logback.root.level = Logback::DEBUG
   end
 
   opts.on( "-v", "--version", "Show version and exit" ) do

data/config/async.rb

@@ -1,7 +1,7 @@
 
 Iyyov.context do |c|
   count = 0
-  log = SLF4J["hello"]
+  log = RJack::SLF4J["hello"]
   c.schedule_at( :name => "hello", :mode => :async, :period => 1.5 ) do
     count += 1
     sleep count

data/config/crontab

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

data/config/host-based.rb

@@ -1,7 +1,7 @@
 Iyyov.context do |c|
 
   hostname = `hostname -s`.strip
-  SLF4J[ File.basename( __FILE__ ) ].info( "Setup services for [#{hostname}]." )
+  RJack::SLF4J[ File.basename( __FILE__ ) ].info( "Setup services for [#{hostname}]." )
 
   case hostname
 

data/config/init.d/iyyov

@@ -4,7 +4,7 @@
 #
 # chkconfig: 2345 88 12
 # description: Iyyov monitoring daemon
-# processname: iyyov-daemon
+# processname: iyyov
 # config: /opt/var/iyyov/jobs.rb
 
 . /etc/rc.d/init.d/functions
@@ -14,7 +14,7 @@
 gem_home="/opt/jruby/gems"
 
 # (Exact) Gem version of iyyov to run
-version="1.0.2"
+version="1.1.0"
 
 # User to run the daemon as (should own rundir)
 user="iyyov"
@@ -25,7 +25,7 @@ rundir="/opt/var/iyyov"
 # Add PATH to jruby if non-standard
 export PATH=/opt/bin:$PATH
 
-prog="iyyov-daemon"
+prog="iyyov"
 daemon="${gem_home}/gems/iyyov-${version}-java/init/${prog}"
 config="${rundir}/jobs.rb"
 pidfile="${rundir}/${prog}.pid"

data/init/{iyyov-daemon → iyyov}

@@ -1,13 +1,13 @@
 #!/usr/bin/env jruby
 #-*- ruby -*-
 #. hashdot.profile         += daemon
-#. hashdot.pid_file         = ./iyyov-daemon.pid
-#. hashdot.io_redirect.file = ./iyyov-daemon.log
+#. hashdot.pid_file         = ./iyyov.pid
+#. hashdot.io_redirect.file = ./iyyov.log
 #. hashdot.vm.options += -Xmx64m
 #. hashdot.vm.options += -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
 
 #--
-# Copyright (C) 2010 David Kellum
+# Copyright (c) 2010 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.0.2" )
+gem( "iyyov", "= 1.1.0" )
 
 require 'rjack-logback'
 RJack::Logback.config_console( :full => true, :thread => true )

data/lib/iyyov/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (C) 2010 David Kellum
+# Copyright (c) 2010 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.0.2'
+  VERSION = '1.1.0'
 end

data/lib/iyyov/context.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (C) 2010 David Kellum
+# Copyright (c) 2010 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 David Kellum
+# Copyright (c) 2010 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
@@ -20,10 +20,10 @@ require 'fileutils'
 require 'iyyov/log_rotator'
 
 module Iyyov
-  include RJack
 
   # A daemon instance to start and monitor
   class Daemon
+    include RJack
 
     # Name of this daemon. Must be unique in combination with any
     # specified instance.

data/lib/iyyov/errors.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (C) 2010 David Kellum
+# Copyright (c) 2010 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 David Kellum
+# Copyright (c) 2010 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
@@ -68,7 +68,7 @@ module Iyyov
 
     def initialize( log = nil )
       @log = log
-      max_size_mb = 256
+      self.max_size_mb = 256
       @count = 3
       @gzip = true
       @signal = "HUP"

data/lib/iyyov/scheduler.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (C) 2010 David Kellum
+# Copyright (c) 2010 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
@@ -30,7 +30,7 @@ module Iyyov
       @queue = Java::java.util.PriorityQueue.new( 67, TimeComp.new )
       @lock = Mutex.new
       @shutdown_handler = nil
-      @log = SLF4J[ self.class ]
+      @log = RJack::SLF4J[ self.class ]
     end
 
     def add( t, now = Time.now )

data/lib/iyyov/shutdown_handler.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (C) 2010 David Kellum
+# Copyright (c) 2010 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 David Kellum
+# Copyright (c) 2010 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
@@ -22,6 +22,7 @@ module Iyyov
 
   # A task to be scheduled and run.
   class Task
+    include RJack
 
     # Regular interval between subsequent executions in seconds.
     #

data/lib/iyyov.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (C) 2010 David Kellum
+# Copyright (c) 2010 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/setup.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (C) 2010 David Kellum
+# Copyright (c) 2010 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
@@ -33,7 +33,7 @@ end
 
 time_it( "logback" ) do
   require 'rjack-logback'
-  RJack::Logback.config_console( :level => Logback::INFO, :stderr => true )
+  RJack::Logback.config_console( :level => RJack::Logback::INFO, :stderr => true )
 end
 
 time_it( "test/unit" ) do

data/test/test_context.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 #.hashdot.profile += jruby-shortlived
 #--
-# Copyright (C) 2010 David Kellum
+# Copyright (c) 2010 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 David Kellum
+# Copyright (c) 2010 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 David Kellum
+# Copyright (c) 2010 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

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: iyyov
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  prerelease: false
+  segments: 
+    - 1
+    - 1
+    - 0
+  version: 1.1.0
 platform: java
 authors: 
   - David Kellum
@@ -9,69 +14,98 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-13 23:00:00 -08:00
+date: 2010-12-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rjack-slf4j
-    type: :runtime
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.5.11
-      version: 
+            segments: 
+              - 1
+              - 6
+              - 1
+            version: 1.6.1
+    type: :runtime
+    version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: rjack-logback
-    type: :runtime
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 0.9.18
-      version: 
+            segments: 
+              - 1
+              - 0
+              - 0
+            version: 1.0.0
+    type: :runtime
+    version_requirements: *id002
   - !ruby/object:Gem::Dependency 
     name: logrotate
-    type: :runtime
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 2
+              - 1
             version: 1.2.1
-      version: 
+    type: :runtime
+    version_requirements: *id003
   - !ruby/object:Gem::Dependency 
     name: minitest
-    type: :development
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
       requirements: 
-        - - ~>
+        - - ">="
           - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 5
+              - 0
             version: 1.5.0
-      version: 
+        - - <
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 2
+              - 1
+            version: "2.1"
+    type: :development
+    version_requirements: *id004
   - !ruby/object:Gem::Dependency 
     name: hashdot-test-daemon
-    type: :development
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: "1.0"
-      version: 
+            segments: 
+              - 1
+              - 2
+            version: "1.2"
+    type: :development
+    version_requirements: *id005
   - !ruby/object:Gem::Dependency 
     name: rjack-tarpit
-    type: :development
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.2.0
-      version: 
+            segments: 
+              - 1
+              - 2
+              - 2
+            version: 1.2.2
+    type: :development
+    version_requirements: *id006
 description: Down-to-earth job control and monitoring.
 email: 
   - dek-oss@gravitext.com
@@ -81,15 +115,21 @@ extensions: []
 
 extra_rdoc_files: 
   - Manifest.txt
-  - README.rdoc
   - History.rdoc
+  - README.rdoc
 files: 
-  - Manifest.txt
   - History.rdoc
+  - Manifest.txt
   - README.rdoc
   - Rakefile
   - bin/iyyov-fg
-  - init/iyyov-daemon
+  - config/async.rb
+  - config/crontab
+  - config/host-based.rb
+  - config/jobs.rb
+  - config/load-all.rb
+  - config/init.d/iyyov
+  - init/iyyov
   - lib/iyyov/base.rb
   - lib/iyyov.rb
   - lib/iyyov/context.rb
@@ -99,12 +139,6 @@ files:
   - lib/iyyov/scheduler.rb
   - lib/iyyov/shutdown_handler.rb
   - lib/iyyov/task.rb
-  - config/async.rb
-  - config/crontab
-  - config/jobs.rb
-  - config/load-all.rb
-  - config/host-based.rb
-  - config/init.d/iyyov
   - test/jobs-bad.rb
   - test/jobs-dupe.rb
   - test/setup.rb
@@ -125,22 +159,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+          - 0
         version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+          - 0
         version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: iyyov
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 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/test_daemon.rb