syncwrap 2.2.0 → 2.3.0

data/lib/syncwrap.rb

@@ -357,8 +357,15 @@ module SyncWrap
   # risky in SyncWrap given that all of these should be loaded before
   # any threads are in play.
 
+  autoload :AmazonLinux,   'syncwrap/components/amazon_linux'
+  autoload :Bundle,        'syncwrap/components/bundle'
+  autoload :BundledIyyovDaemon, 'syncwrap/components/bundled_iyyov_daemon'
+  autoload :BundlerGem,    'syncwrap/components/bundler_gem'
+  autoload :Arch,          'syncwrap/components/arch'
+  autoload :CentOS,        'syncwrap/components/centos'
   autoload :CommercialJDK, 'syncwrap/components/commercial_jdk'
   autoload :CRubyVM,       'syncwrap/components/cruby_vm'
+  autoload :Debian,        'syncwrap/components/debian'
   autoload :EtcHosts,      'syncwrap/components/etc_hosts'
   autoload :Geminabox,     'syncwrap/components/geminabox'
   autoload :Hashdot,       'syncwrap/components/hashdot'
@@ -369,10 +376,14 @@ module SyncWrap
   autoload :Network,       'syncwrap/components/network'
   autoload :OpenJDK,       'syncwrap/components/open_jdk'
   autoload :PostgreSQL,    'syncwrap/components/postgresql'
+  autoload :Puma,          'syncwrap/components/puma'
   autoload :Qpid,          'syncwrap/components/qpid'
   autoload :QpidRepo,      'syncwrap/components/qpid'
+  autoload :RakeGem,       'syncwrap/components/rake_gem'
   autoload :RHEL,          'syncwrap/components/rhel'
   autoload :RunUser,       'syncwrap/components/run_user'
+  autoload :SourceTree,    'syncwrap/components/source_tree'
+  autoload :TarpitGem,     'syncwrap/components/tarpit_gem'
   autoload :Ubuntu,        'syncwrap/components/ubuntu'
   autoload :Users,         'syncwrap/components/users'
 

data/sync/postgresql/postgresql.conf.erb

@@ -38,18 +38,18 @@
 # option or PGDATA environment variable, represented here as ConfigDir.
 
 <% if pg_specify_etc_config %>
-data_directory = '/var/lib/postgresql/<%= version %>/main'
+data_directory = '/var/lib/postgresql/<%= pg_version %>/main'
                                         # use data in another directory
                                         # (change requires restart)
-hba_file = '/etc/postgresql/<%= version %>/main/pg_hba.conf'
+hba_file = '/etc/postgresql/<%= pg_version %>/main/pg_hba.conf'
                                         # host-based authentication file
                                         # (change requires restart)
-ident_file = '/etc/postgresql/<%= version %>/main/pg_ident.conf'
+ident_file = '/etc/postgresql/<%= pg_version %>/main/pg_ident.conf'
                                         # ident configuration file
                                         # (change requires restart)
 
 # If external_pid_file is not explicitly set, no extra PID file is written.
-external_pid_file = '/var/run/postgresql/<%= version %>-main.pid'
+external_pid_file = '/var/run/postgresql/<%= pg_version %>-main.pid'
                                         # write an extra PID file
                                         # (change requires restart)
 <% else %>

data/sync/var/iyyov/default/bundled_daemon.rb.erb

@@ -0,0 +1,31 @@
+Iyyov.context do |c|
+
+  c.define_daemon do |d|
+    d.name     = "<%= name %>"
+<% if instance %>
+    d.instance = "<%= instance %>"
+<% end %>
+    d.exe_path = "<%= exe_path %>"
+    d.log_rotate
+
+    def d.start
+      epath = File.expand_path( exe_path, run_dir )
+      eargs = args.map { |a| a.to_s.strip }.compact
+      @log.info { ( [ "starting", epath ] + eargs ).join(' ') }
+      Dir.chdir( run_dir ) do
+        system( "<%= bundle_command %>",
+                'exec',
+                exe_path,
+                *eargs ) or raise( Iyyov::DaemonFailed, "Start failed with #{$?}" )
+      end
+      @state = :up
+      true
+    rescue Iyyov::DaemonFailed, Errno::ENOENT => e
+      @log.error( "On exec", e )
+      @state = :failed
+      false
+    end
+
+  end
+
+end

data/test/test_components.rb

@@ -32,29 +32,57 @@ module SyncWrap
   # non-trivial differentiation.
   AUTO_TESTS =
     [ [ RHEL, CommercialJDK ],
-      [ Ubuntu, CRubyVM ],
-      [ RHEL,   CRubyVM ],
+      [ Debian ],
+      [ Debian, CRubyVM ],
+      [ CentOS, CRubyVM ],
       [ EtcHosts ],
-      [ RHEL,   JRubyVM, RunUser, Iyyov, Geminabox ],
-      [ Ubuntu, OpenJDK, JRubyVM, Hashdot ],
+      [ AmazonLinux, JRubyVM, RunUser, Iyyov, Geminabox ],
+      [ RHEL,   JRubyVM, BundlerGem ],
+      [ RHEL,   CRubyVM, BundlerGem ],
+      [ CentOS, JRubyVM, RakeGem ],
+      [ RHEL,   CRubyVM, RakeGem ],
+      [ RHEL,   RunUser, SourceTree,
+        source_dir: 'lib', require_clean: false ],
+      [ Debian, CRubyVM, BundlerGem, RunUser, Bundle,
+        bundle_path: File.expand_path( '../../lib', __FILE__ ) ],
+      [ AmazonLinux, RunUser, CRubyVM, BundlerGem,
+        SourceTree, { source_dir: 'lib', require_clean: false },
+        Bundle ],
+      [ Ubuntu, RunUser, JRubyVM, BundlerGem, Iyyov,
+        SourceTree, { source_dir: 'lib', require_clean: false },
+        Bundle, BundledIyyovDaemon ],
+      [ Ubuntu, RunUser, CRubyVM, BundlerGem, Puma,
+        puma_version: '2.9.0', rack_path: File.expand_path( '../../lib', __FILE__ ) ],
+      [ RHEL, RunUser, JRubyVM, BundlerGem,
+        SourceTree, { source_dir: 'lib', require_clean: false },
+        Bundle, Puma ],
+      [ Debian, OpenJDK, JRubyVM, Hashdot ],
       [ RHEL,   JRubyVM, RunUser, Iyyov ],
       [ Ubuntu, JRubyVM, RunUser, Iyyov, IyyovDaemon, name: 'test', version: '0' ],
-      [ RHEL,   JRubyVM ],
+      [ CentOS, JRubyVM ],
       [ RHEL,   MDRaid, raw_devices: 1 ],
-      [ Ubuntu, MDRaid, raw_devices: 2 ],
+      [ Debian, MDRaid, raw_devices: 2 ],
+      [ Debian, Network ],
       [ Ubuntu, Network ],
       [ RHEL,   Network ],
-      [ Ubuntu, OpenJDK ],
+      [ RHEL, { rhel_version: '7' }, Network ],
+      [ AmazonLinux, Network ],
+      [ Debian, OpenJDK ],
+      [ Debian, PostgreSQL ],
       [ Ubuntu, PostgreSQL ],
-      [ RHEL,   PostgreSQL ],
+      [ CentOS, PostgreSQL ],
       [ RHEL, Qpid ],
-      [ RHEL, QpidRepo, qpid_prebuild_repo: 'http://localhost' ],
+      [ CentOS, QpidRepo, qpid_prebuild_repo: 'http://localhost' ],
       [ RHEL ],
       [ RunUser ],
-      [ Ubuntu ],
+      [ RHEL,  CRubyVM, TarpitGem ],
+      [ RHEL,  JRubyVM, TarpitGem ],
+      [ RHEL, RunUser, JRubyVM, TarpitGem, user_install: true ],
       [ Users, home_users: [ 'bob' ] ] ]
 
+  # Test overrides to standard Context.
   class TestContext < Context
+    include Shell
     attr_accessor :commands
 
     def initialize( *args )
@@ -62,10 +90,34 @@ module SyncWrap
       super
     end
 
-    def capture_stream( *args )
+    # Run bash on localhost in dryrun mode (-n), for basic syntax
+    # checking.
+    def run_shell( command, opts = {} )
+      opts = opts.merge( dryrun: true, coalesce: false, accept: [0] )
+      args = sh_args( command, opts )
+      capture_stream( args, host, :sh, opts )
       @commands << args
-      [ 0, [] ]
+      nil
     end
+
+    # Run bash on localhost in dryrun mode (-n), for basic syntax
+    # checking. Return random selection of :accept return value and
+    # empty output text.
+    def capture_shell( command, opts = {} )
+      accept = opts[ :accept ] || [ 0 ]
+      opts = opts.merge( dryrun: true, coalesce: false, accept: [0] )
+      args = sh_args( command, opts )
+      capture_stream( args, host, :sh, opts )
+      @commands << args
+      [ accept[ rand( accept.length ) ], "" ]
+    end
+
+    # Don't run rsync. Return some or no changes at random.
+    def rsync( srcs, target, opts )
+      @commands << rsync_args( host, srcs, target, opts )
+      ( rand(2) == 1 ) ? [ :something ] : []
+    end
+
   end
 
   class TestComponents < MiniTest::Unit::TestCase
@@ -86,17 +138,24 @@ module SyncWrap
       define_method( "test_#{cname}_#{i}" ) do
         sp = Space.new
         host = sp.host( 'testhost' )
-        comps.each do |dep|
-          host.add( dep.new )
+        until comps.empty? do
+          dep_class = comps.shift
+          dep_class_opts = comps.first.is_a?( Hash ) ? comps.shift : {}
+          host.add( dep_class.new( dep_class_opts ) )
         end
         comp = comp_class.new( comp_class_opts )
         host.add( comp )
         pass
         if comp.respond_to?( :install )
-          with_test_context( sp, host ) do |ctx|
-            comp.install
-            ctx.flush
-            assert_operator( ctx.commands.length, :>, 0 )
+          # Repeatedly test for randomized permutations
+          3.times do
+            with_test_context( sp, host ) do |ctx|
+              comp.install
+              ctx.flush
+              assert_operator( ctx.commands.length, :>, 0 )
+              # each command run is an effective assert
+              ctx.commands.length.times { pass }
+            end
           end
         end
       end

data/test/test_version_support.rb

@@ -0,0 +1,65 @@
+#!/usr/bin/env jruby
+#.hashdot.profile += jruby-shortlived
+
+#--
+# Copyright (c) 2011-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
+# 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_relative 'setup'
+
+require 'syncwrap/version_support'
+
+class TestVersionSupport < MiniTest::Unit::TestCase
+  include SyncWrap::VersionSupport
+
+  def test_to_a
+    assert_equal( [ 1 ], version_string_to_a( [ 1 ] ) )
+    assert_equal( [ 1 ], version_string_to_a( '1' ) )
+    assert_equal( [ 'a' ], version_string_to_a( 'a' ) )
+    assert_equal( [ 1, 2 ], version_string_to_a( '1.2' ) )
+    assert_equal( [ 1, 'p2' ], version_string_to_a( '1.p2' ) )
+    assert_equal( [ 1, 2, 'p3' ], version_string_to_a( '1.2-p3' ) )
+  end
+
+  def test_gte
+    refute( version_gte?( [0], [1] ) )
+    assert( version_gte?( [1], [1] ) )
+    assert( version_gte?( [2], [1] ) )
+
+    refute( version_gte?( ['a'], ['b'] ) )
+    assert( version_gte?( ['b'], ['b'] ) )
+    assert( version_gte?( ['c'], ['b'] ) )
+
+    refute( version_gte?( [0],     [1,0] ) )
+    refute( version_gte?( [0,1],   [1,0] ) )
+    refute( version_gte?( [1],     [1,0] ) )
+    assert( version_gte?( [1,0],   [1,0] ) )
+    assert( version_gte?( [1,0,0], [1,0] ) )
+    assert( version_gte?( [1,1],   [1,0] ) )
+
+    assert( version_gte?( [1,'a'],   [1,'a'] ) )
+    assert( version_gte?( [1,'a',0], [1,'a'] ) )
+    assert( version_gte?( [1,'b'],   [1,'a'] ) )
+
+    refute( version_gte?( [1,1], [1,'a'] ) )
+  end
+
+  def test_lte
+    assert( version_lt?( [0], [1] ) )
+    refute( version_lt?( [1], [1] ) )
+    refute( version_lt?( [2], [1] ) )
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syncwrap
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - David Kellum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-13 00:00:00.000000000 Z
+date: 2014-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -171,8 +171,15 @@ files:
 - lib/syncwrap/base.rb
 - lib/syncwrap/cli.rb
 - lib/syncwrap/component.rb
+- lib/syncwrap/components/amazon_linux.rb
+- lib/syncwrap/components/arch.rb
+- lib/syncwrap/components/bundle.rb
+- lib/syncwrap/components/bundled_iyyov_daemon.rb
+- lib/syncwrap/components/bundler_gem.rb
+- lib/syncwrap/components/centos.rb
 - lib/syncwrap/components/commercial_jdk.rb
 - lib/syncwrap/components/cruby_vm.rb
+- lib/syncwrap/components/debian.rb
 - lib/syncwrap/components/etc_hosts.rb
 - lib/syncwrap/components/geminabox.rb
 - lib/syncwrap/components/hashdot.rb
@@ -183,9 +190,13 @@ files:
 - lib/syncwrap/components/network.rb
 - lib/syncwrap/components/open_jdk.rb
 - lib/syncwrap/components/postgresql.rb
+- lib/syncwrap/components/puma.rb
 - lib/syncwrap/components/qpid.rb
+- lib/syncwrap/components/rake_gem.rb
 - lib/syncwrap/components/rhel.rb
 - lib/syncwrap/components/run_user.rb
+- lib/syncwrap/components/source_tree.rb
+- lib/syncwrap/components/tarpit_gem.rb
 - lib/syncwrap/components/ubuntu.rb
 - lib/syncwrap/components/users.rb
 - lib/syncwrap/context.rb
@@ -198,6 +209,7 @@ files:
 - lib/syncwrap/rsync.rb
 - lib/syncwrap/ruby_support.rb
 - lib/syncwrap/shell.rb
+- lib/syncwrap/version_support.rb
 - sync/etc/corosync/corosync.conf
 - sync/etc/corosync/uidgid.d/qpid
 - sync/etc/gemrc
@@ -220,6 +232,7 @@ files:
 - sync/src/hashdot/profiles/jruby.hdp.erb
 - sync/src/hashdot/profiles/shortlived.hdp
 - sync/usr/local/etc/qpidd.conf
+- sync/var/iyyov/default/bundled_daemon.rb.erb
 - sync/var/iyyov/default/config.rb
 - sync/var/iyyov/default/daemon.rb.erb
 - sync/var/iyyov/jobs.rb.erb
@@ -236,6 +249,7 @@ files:
 - test/test_shell.rb
 - test/test_space.rb
 - test/test_space_main.rb
+- test/test_version_support.rb
 - test/zfile
 homepage: http://github.com/dekellum/syncwrap
 licenses: []