syncwrap 1.0.0 → 1.1.0

data/History.rdoc

@@ -1,2 +1,10 @@
+=== 1.1.0 (2012-9-13)
+* Add (boxed-)geminabox provisions and deploy task
+* Upgrade to (default) jdk-ora-1.7.0_05-x64
+* RHEL version of test Rakefile, init.d/iyyov
+* Fix RHEL yum args
+* Silence user_exist? id command output
+* iyyov_install_rundir as user_run
+
 === 1.0.0 (2012-7-15)
 * Initial release.

data/Manifest.txt

@@ -15,6 +15,7 @@ lib/syncwrap.rb
 lib/syncwrap/common.rb
 lib/syncwrap/distro.rb
 lib/syncwrap/ec2.rb
+lib/syncwrap/geminabox.rb
 lib/syncwrap/hashdot.rb
 lib/syncwrap/iyyov.rb
 lib/syncwrap/java.rb
@@ -26,3 +27,4 @@ lib/syncwrap/ubuntu.rb
 lib/syncwrap/user_run.rb
 test/test_syncwrap.rb
 usr/local/bin/jgem
+var/iyyov/jobs.rb

data/Rakefile

@@ -11,7 +11,7 @@ require 'syncwrap/java'
 require 'syncwrap/hashdot'
 require 'syncwrap/jruby'
 require 'syncwrap/iyyov'
-require 'syncwrap/ubuntu'
+require 'syncwrap/rhel'
 require 'syncwrap/postgresql'
 require 'syncwrap/remote_task'
 
@@ -20,8 +20,8 @@ class SyncWrapper
   include SyncWrap::Hashdot
   include SyncWrap::JRuby
   include SyncWrap::Iyyov
-  include SyncWrap::Ubuntu
-  include SyncWrap::PostgreSQL::Ubuntu
+  include SyncWrap::RHEL
+  include SyncWrap::PostgreSQL
 
   include SyncWrap::RemoteTask
 
@@ -48,6 +48,13 @@ class SyncWrapper
       iyyov_install
     end
 
+    desc "Deploy Geminabox Daemon"
+    remote_task :geminabox_deploy do
+      iyyov_install_jobs do
+        geminabox_install
+      end
+    end
+
     desc "Deploy PostgreSQL"
     remote_task :pg_deploy do
       pg_install

data/etc/init.d/iyyov

@@ -1,19 +1,13 @@
-#!/bin/sh
+#!/bin/bash
+#
+# iyyov    Startup script for Iyyov monitoring daemon
+#
+# chkconfig: 2345 88 12
+# description: Iyyov monitoring daemon
+# processname: iyyov
+# config: /opt/var/iyyov/jobs.rb
 
-### BEGIN INIT INFO
-# Provides:          iyyov
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Should-Start:      $named
-# Default-Start:     2 3 4 5
-# Default-Stop:
-# Short-Description: Iyyov jruby monitor
-# Description:       Iyyov jruby monitoring and job control daemon
-### END INIT INFO
-
-set -e
-
-. /lib/lsb/init-functions
+. /etc/rc.d/init.d/functions
 
 # Gem home directory
 # Set to match system "jgem environment path"
@@ -28,6 +22,9 @@ user="runr"
 # Running directory (for jobs.rb config, log, and pid file)
 rundir="/var/local/runr/iyyov"
 
+# Add PATH to jruby if non-standard
+export PATH=$PATH:/usr/local/bin
+
 prog="iyyov"
 daemon="${gem_home}/gems/iyyov-${version}-java/init/${prog}"
 config="${rundir}/jobs.rb"
@@ -40,16 +37,16 @@ start() {
     [ -f "$config" ] || exit 6
     [ -d "$rundir" ] || exit 7
 
-    log_daemon_msg "Starting Iyyov Daemon" "iyyov"
-    start-stop-daemon --start -d $rundir -c $user --exec $daemon -- $config
+    echo -n $"Starting $prog: "
+    runuser -c "cd $rundir && $daemon $config" $user
     RETVAL=$?
-    log_end_msg $RETVAL
+    [ $RETVAL -eq 0 ] && success $"$prog startup" || failure $"$prog startup"
+    echo
 }
 
 status() {
     if [ -f "$pidfile" ]; then
-        pid=`cat $pidfile`
-        echo "Status $prog: running pid $pid"
+        echo "Status $prog: running pid $(<$pidfile)"
     else
         echo "Status $prog: not running"
     fi
@@ -62,10 +59,12 @@ reload() {
 }
 
 stop() {
-    log_daemon_msg "Stopping iyyov daemon" "iyyov"
-    start-stop-daemon --stop --quiet --oknodo --pidfile $pidfile
+    echo -n $"Shutting down $prog: "
+    killproc -p $pidfile $prog
     RETVAL=$?
-    log_end_msg $RETVAL
+    [ $RETVAL -eq 0 ] && success || failure
+    echo
+    return $RETVAL
 }
 
 case "$1" in

data/lib/syncwrap/base.rb

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

data/lib/syncwrap/geminabox.rb

@@ -0,0 +1,39 @@
+#--
+# Copyright (c) 2011-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 may
+# obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.  See the License for the specific language governing
+# permissions and limitations under the License.
+#++
+
+require 'syncwrap/user_run'
+require 'syncwrap/jruby'
+
+# Provisions the
+# {boxed-geminabox}[https://github.com/dekellum/boxed-geminabox/]
+# gem server.
+module SyncWrap::Geminabox
+  include SyncWrap::UserRun
+  include SyncWrap::JRuby
+
+  attr_accessor :geminabox_version
+
+  def initialize
+    super
+    @geminabox_version = '1.0.0'
+  end
+
+  def geminabox_install
+    jruby_install_gem( 'boxed-geminabox', :version => "=#{geminabox_version}" )
+    user_run_service_dir_setup( 'boxed-geminabox' )
+  end
+
+end

data/lib/syncwrap/iyyov.rb

@@ -85,7 +85,7 @@ module SyncWrap::Iyyov
   # Create iyyov rundir and make sure there is at minimum an empty
   # jobs file. Avoid touching it if already present
   def iyyov_install_rundir
-    run <<-SH
+    sudo( <<-"SH", :user => user_run )
       mkdir -p #{iyyov_run_dir}
       if [ ! -e #{iyyov_run_dir}/jobs.rb ]; then
         touch #{iyyov_run_dir}/jobs.rb

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_04-x64'
+    @java_jdk_name = 'jdk-ora-1.7.0_05-x64'
   end
 
   def java_jdk_url

data/lib/syncwrap/rhel.rb

@@ -36,12 +36,12 @@ module SyncWrap::RHEL
 
   def dist_install( *pkgs )
     pkgs = dist_map_packages( pkgs )
-    sudo "yum install -qy #{pkgs.join( ' ' )}"
+    sudo "yum install -q -y #{pkgs.join( ' ' )}"
   end
 
   def dist_uninstall( *pkgs )
     pkgs = dist_map_packages( pkgs )
-    sudo "yum remove -qy #{pkgs.join( ' ' )}"
+    sudo "yum remove -q -y #{pkgs.join( ' ' )}"
   end
 
   def dist_install_init_service( name )

data/lib/syncwrap/user_run.rb

@@ -81,7 +81,7 @@ module SyncWrap::UserRun
   end
 
   def user_exist?
-    exec_conditional { run "id #{user_run}" } == 0
+    exec_conditional { run "id #{user_run} >/dev/null" } == 0
   end
 
   def user_create

data/test/test_syncwrap.rb

@@ -27,6 +27,7 @@ require 'syncwrap/java'
 require 'syncwrap/hashdot'
 require 'syncwrap/jruby'
 require 'syncwrap/iyyov'
+require 'syncwrap/geminabox'
 require 'syncwrap/ec2'
 require 'syncwrap/ubuntu'
 require 'syncwrap/rhel'
@@ -40,6 +41,7 @@ class TestSyncWrap < MiniTest::Unit::TestCase
     include SyncWrap::Hashdot
     include SyncWrap::JRuby
     include SyncWrap::Iyyov
+    include SyncWrap::Geminabox
 
     include SyncWrap::RHEL
     include SyncWrap::Ubuntu # Not a recomendated combo

data/var/iyyov/jobs.rb

@@ -0,0 +1,11 @@
+Iyyov.context do |c|
+
+  c.base_dir = '/var/local/runr'
+
+  c.define_daemon do |d|
+    d.name     = "boxed-geminabox"
+    d.version  = "~> 1.0.0"
+    d.log_rotate
+  end
+
+end

metadata

@@ -1,111 +1,118 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: syncwrap
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 1.1.0
 platform: ruby
-authors: 
-  - David Kellum
-autorequire: 
+authors:
+- David Kellum
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-07-16 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: minitest
-    version_requirements: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 3.2.0
-    requirement: *id001
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rjack-tarpit
-    version_requirements: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "2.0"
-    requirement: *id002
-    prerelease: false
-    type: :development
+date: 2012-09-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rjack-tarpit
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    none: false
+  prerelease: false
+  type: :development
 description: A generalized and modular set of provisioning and deployment routines. The Rake-centric Vlad and not-actually-Rake Capistrano both suffer from lack of objects, e.g. the ability to customize and mix-in behavior. SyncWrap offers an Object/Module system that can be used with either. Known to work with Vlad/rake-remote_task but could also be integrated with Capistrano, or others.
-email: 
-  - dek-oss@gravitext.com
+email:
+- dek-oss@gravitext.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-  - History.rdoc
-  - README.rdoc
-files: 
-  - History.rdoc
-  - Manifest.txt
-  - README.rdoc
-  - Rakefile
-  - etc/init.d/iyyov
-  - etc/postgresql/9.1/main/environment
-  - etc/postgresql/9.1/main/pg_ctl.conf
-  - etc/postgresql/9.1/main/pg_hba.conf
-  - etc/postgresql/9.1/main/pg_ident.conf
-  - etc/postgresql/9.1/main/postgresql.conf
-  - etc/postgresql/9.1/main/start.conf
-  - etc/sysctl.d/61-postgresql-shm.conf
-  - lib/syncwrap/base.rb
-  - lib/syncwrap.rb
-  - lib/syncwrap/common.rb
-  - lib/syncwrap/distro.rb
-  - lib/syncwrap/ec2.rb
-  - lib/syncwrap/hashdot.rb
-  - lib/syncwrap/iyyov.rb
-  - lib/syncwrap/java.rb
-  - lib/syncwrap/jruby.rb
-  - lib/syncwrap/postgresql.rb
-  - lib/syncwrap/remote_task.rb
-  - lib/syncwrap/rhel.rb
-  - lib/syncwrap/ubuntu.rb
-  - lib/syncwrap/user_run.rb
-  - test/test_syncwrap.rb
-  - usr/local/bin/jgem
+extra_rdoc_files:
+- History.rdoc
+- README.rdoc
+files:
+- History.rdoc
+- Manifest.txt
+- README.rdoc
+- Rakefile
+- etc/init.d/iyyov
+- etc/postgresql/9.1/main/environment
+- etc/postgresql/9.1/main/pg_ctl.conf
+- etc/postgresql/9.1/main/pg_hba.conf
+- etc/postgresql/9.1/main/pg_ident.conf
+- etc/postgresql/9.1/main/postgresql.conf
+- etc/postgresql/9.1/main/start.conf
+- etc/sysctl.d/61-postgresql-shm.conf
+- lib/syncwrap/base.rb
+- lib/syncwrap.rb
+- lib/syncwrap/common.rb
+- lib/syncwrap/distro.rb
+- lib/syncwrap/ec2.rb
+- lib/syncwrap/geminabox.rb
+- lib/syncwrap/hashdot.rb
+- lib/syncwrap/iyyov.rb
+- lib/syncwrap/java.rb
+- lib/syncwrap/jruby.rb
+- lib/syncwrap/postgresql.rb
+- lib/syncwrap/remote_task.rb
+- lib/syncwrap/rhel.rb
+- lib/syncwrap/ubuntu.rb
+- lib/syncwrap/user_run.rb
+- test/test_syncwrap.rb
+- usr/local/bin/jgem
+- var/iyyov/jobs.rb
 homepage: http://github.com/dekellum/syncwrap
 licenses: []
-
-post_install_message: 
-rdoc_options: 
-  - --main
-  - README.rdoc
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+post_install_message:
+rdoc_options:
+- --main
+- README.rdoc
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 2
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 2
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.15
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: A generalized and modular set of provisioning and deployment routines. The Rake-centric Vlad and not-actually-Rake Capistrano both suffer from lack of objects, e.g. the ability to customize and mix-in behavior. SyncWrap offers an Object/Module system that can be used with either.
 test_files: []
-
+...