iyyov 1.2.0-java → 1.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7692b765081a521e88f4b83ef83c6eb77f5d40b9
-  data.tar.gz: 4bc956f7bb0ee66a43dcfdee726627fe8884a13f
+  metadata.gz: fb9a4d2984880e18916ce5a0e68cca50950a4932
+  data.tar.gz: 97b47e8ed075a1df2d439fa0579656fdbe3f55cd
 SHA512:
-  metadata.gz: eee70d3b7aaad4509f4cffe854839652da43bc95c3d05c3fb5625cbe484718a4368f65ef115f5f6e42f898b41e1c1f7f2f898884fc85d43ddf9da86613626655
-  data.tar.gz: 03ad99512a103d85de5e67eb6574b1f595da8142c28fb1863b1c5ae4e5046c6a5a59e249dc68f4fe3f7a50bedb8855eac2305b9c83cb367aab2b42441201e940
+  metadata.gz: 5a6cfbc1ce3601d6fa0a3e811e965802071e550772bf8bedcb2be6818a42da6ecd3dc3c442885d012d90ded4ea1082e677d451a2850d2dda59304cc0b3eba59e
+  data.tar.gz: e752e1fe1473db6330c188b37a259006f629b521ee91ac3cd848591f9c18a8fc25d7895398cbd5aac93e02f3e3ce9fe410b3aa6f724eb68200dec4f06a0e8664

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 1.3.0 (2014-2-24)
+* Add Context.load_directory to load the contents of a jobs.d
+  directory. Each contained executable *.rb file is loaded. This
+  allows deploying a file for each independent job and
+  enabling/disabling jobs with chmod +x/-x.  The directory itself and
+  all *.rb files are watched for mtime or ctime change.
+
 === 1.2.0 (2013-12-6)
 * Improve deamon log output
 * Add Travis CI test setup (build)

data/README.rdoc

@@ -83,7 +83,7 @@ the above provided examples.
 
 == License
 
-Copyright (c) 2010-2013 David Kellum
+Copyright (c) 2010-2014 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/bin/iyyov-fg

@@ -4,7 +4,7 @@
 #. hashdot.vm.options += -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
 
 #--
-# Copyright (c) 2010-2013 David Kellum
+# Copyright (c) 2010-2014 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/init.d/iyyov

@@ -14,7 +14,7 @@
 gem_home="/opt/jruby/gems"
 
 # (Exact) Gem version of iyyov to run
-version="1.2.0"
+version="1.3.0"
 
 # 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-2013 David Kellum
+# Copyright (c) 2010-2014 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.2.0" )
+gem( "iyyov", "= 1.3.0" )
 
 require 'rjack-logback'
 RJack::Logback.config_console( :full => true, :thread => true )

data/lib/iyyov.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2013 David Kellum
+# Copyright (c) 2010-2014 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-2013 David Kellum
+# Copyright (c) 2010-2014 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.2.0'
+  VERSION = '1.3.0'
 end

data/lib/iyyov/context.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2013 David Kellum
+# Copyright (c) 2010-2014 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
@@ -125,11 +125,32 @@ module Iyyov
       nil
     end
 
+    # Load all executable *.rb files in the specified
+    # directory. Non-executable *.rb files are assumed temporarily
+    # disabled and are still watched for a ctime change. The
+    # directory itself is also watched for an mtime change (as in
+    # adding a new file).
+    def load_directory( dir )
+      @files[ dir ] = [ File.stat( dir ).mtime, nil ]
+
+      Dir.glob( File.join( dir, '*.rb' ) ) do |file|
+        fstat = File.stat( file )
+        if fstat.executable?
+          load_file( file )
+        else
+          # Still watch ctime on this file, so if it changes to executable
+          # we reload.
+          @files[ file ] = [ nil, fstat.ctime ]
+        end
+      end
+    end
+
     def load_file( file, is_root = false )
       @log.info { "Loading #{file}" }
       begin
+        fstat = File.stat( file )
+        @files[ file ] = [ fstat.mtime, fstat.ctime ]
         load file
-        @files[ file ] = File.stat( file ).mtime
         @root_files << file if is_root
         true
       rescue SetupError, ScriptError, StandardError => e
@@ -155,14 +176,19 @@ module Iyyov
       return unless @watch_files && ! @files.empty?
       t = Task.new( :name => "watch-files", :period => 11.0 ) do
         reload = false
-        @files.each do |fname, last_time|
+        @files.each do |fname, (last_mtime, last_ctime)|
           begin
-            new_time = File.stat( fname ).mtime
-            if new_time != last_time
+            fstat = File.stat( fname )
+            if last_mtime && ( last_mtime != fstat.mtime )
               @log.info { "#{fname} has new modification time, reloading." }
               reload = true
               break
             end
+            if last_ctime && ( last_ctime != fstat.ctime )
+              @log.info { "#{fname} has new change time, reloading." }
+              reload = true
+              break
+            end
           rescue Errno::ENOENT, Errno::EACCES => e
             @log.error( e.to_s )
           end

data/lib/iyyov/daemon.rb

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

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2013 David Kellum
+# Copyright (c) 2010-2014 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-2013 David Kellum
+# Copyright (c) 2010-2014 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-2013 David Kellum
+# Copyright (c) 2010-2014 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-2013 David Kellum
+# Copyright (c) 2010-2014 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-2013 David Kellum
+# Copyright (c) 2010-2014 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-2013 David Kellum
+# Copyright (c) 2010-2014 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_context.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 #.hashdot.profile += jruby-shortlived
 #--
-# Copyright (c) 2010-2013 David Kellum
+# Copyright (c) 2010-2014 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-2013 David Kellum
+# Copyright (c) 2010-2014 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-2013 David Kellum
+# Copyright (c) 2010-2014 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iyyov
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: java
 authors:
 - David Kellum
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rjack-slf4j