syncwrap 1.1.0 → 1.2.0

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 1.2.0 (2012-9-25)
+* Touch jobs.rb if not otherwise modified by iyyov_install_jobs. This
+  notifies iyyov to restart a daemon when the jobs.rb is otherwise
+  unchanged (and using a daemon version range.)
+* Upgrade to JRuby 1.6.8 (default)
+* Upgrade to Iyyov 1.1.4 (default, in init.d/iyyov)
+* Upgrade to java 1.7.0_07
+
 === 1.1.0 (2012-9-13)
 * Add (boxed-)geminabox provisions and deploy task
 * Upgrade to (default) jdk-ora-1.7.0_05-x64

data/Rakefile

@@ -14,6 +14,7 @@ require 'syncwrap/iyyov'
 require 'syncwrap/rhel'
 require 'syncwrap/postgresql'
 require 'syncwrap/remote_task'
+require 'syncwrap/geminabox'
 
 class SyncWrapper
   include SyncWrap::Java
@@ -22,6 +23,7 @@ class SyncWrapper
   include SyncWrap::Iyyov
   include SyncWrap::RHEL
   include SyncWrap::PostgreSQL
+  include SyncWrap::Geminabox
 
   include SyncWrap::RemoteTask
 

data/etc/init.d/iyyov

@@ -14,7 +14,7 @@
 gem_home="/usr/local/lib/jruby/gems"
 
 # (Exact) Gem version of iyyov to run
-version="1.1.3"
+version="1.1.4"
 
 # User to run the daemon as (should own rundir)
 user="runr"

data/lib/syncwrap/base.rb

@@ -15,5 +15,5 @@
 #++
 
 module SyncWrap
-  VERSION='1.1.0'
+  VERSION='1.2.0'
 end

data/lib/syncwrap/iyyov.rb

@@ -30,7 +30,7 @@ module SyncWrap::Iyyov
   def initialize
     super
 
-    @iyyov_version = '1.1.3'
+    @iyyov_version = '1.1.4'
   end
 
   # Install then (re-)start Iyyov if needed, yield to block if given
@@ -49,17 +49,29 @@ module SyncWrap::Iyyov
       sleep 15
     end
 
+    # Any Iyyov restart completes *before* job changes
+
     # FIXME: Need a better solution to wait on Iyyov than an arbitrary
     # sleep.
 
-    # Any Iyyov restart completes *before* job changes
+    tfile = '/tmp/iyyov_jobs_deploy'
+    sudo <<-SH
+      rm -f #{tfile}
+      touch #{tfile}
+    SH
 
     yield if block_given?
 
     user_run_rput( 'var/iyyov/jobs.rb', iyyov_run_dir )
 
-    # FIXME: If no jobs.rb change, still touch file to ensure
-    # check, but avoid both an update and a touch...
+    # Touch jobs.rb if not changed by above, so iyyov can check if
+    # daemons need restart.
+    sudo( <<-SH, :user => user_run )
+      if [ #{iyyov_run_dir}/jobs.rb -ot #{tfile} ]; then
+        touch #{iyyov_run_dir}/jobs.rb
+        echo "touch #{iyyov_run_dir}/jobs.rb"
+      fi
+    SH
 
   end
 

data/lib/syncwrap/java.rb

@@ -35,7 +35,7 @@ module SyncWrap::Java
     super
 
     @java_repo_base_url = 'http://localhost/repo'
-    @java_jdk_name = 'jdk-ora-1.7.0_05-x64'
+    @java_jdk_name = 'jdk-ora-1.7.0_07-x64'
   end
 
   def java_jdk_url

data/lib/syncwrap/jruby.rb

@@ -21,7 +21,7 @@ require 'syncwrap/common'
 module SyncWrap::JRuby
   include SyncWrap::Common
 
-  # JRuby version to install (default: 1.6.7)
+  # JRuby version to install (default: 1.6.8)
   attr_accessor :jruby_version
 
   # The name of the gem command to be installed/used (default: jgem)
@@ -33,7 +33,7 @@ module SyncWrap::JRuby
   def initialize
     super
 
-    @jruby_version = '1.6.7'
+    @jruby_version = '1.6.8'
     @jruby_gem_command = 'jgem'
     @jruby_gem_install_args = %w[ --no-rdoc --no-ri ]
   end

data/test/test_syncwrap.rb

@@ -57,7 +57,7 @@ class TestSyncWrap < MiniTest::Unit::TestCase
                   'Common#initialize should run for defaults' )
     assert_equal( 'runr', w.user_run,
                   'UserRun#initialize should run for defaults' )
-    assert_equal( '1.1.3', w.iyyov_version,
+    assert_equal( '1.1.4', w.iyyov_version,
                   'Iyyov#initialize should run for defaults' )
   end
 

metadata

@@ -2,14 +2,14 @@
 name: syncwrap
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - David Kellum
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest