syncwrap 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a94bbce85319bea7ab7ee215feee79a2f33d2b0
-  data.tar.gz: 8f031221c85ae70474788dfee38e6d5c05e73c3d
+  metadata.gz: 31766d4da53365ca66e620737ad154a7ffdcbac9
+  data.tar.gz: b18b461aaf1ece566be69c71d217113aa8da8473
 SHA512:
-  metadata.gz: e480edaffd434f726454f2721e95816d085dde7b9114378d49877fe15f0bc7a09bb88b7e61c1fd9c7ce331692fa003e3f237b6e948f94e5d46f93297fc144b29
-  data.tar.gz: 3f4c2eacd8c0e726e91ef71c403c34b5225aaa8c3526d2a6ace7f5c24b8a46af6feabb36ea3d4b903bc59e3405bbfdf239a385d8ac4d0b0b9b9c4f013c5d0c2d
+  metadata.gz: 9c95179c17e29b9d1fa2e0690481f7e9548db9c19b20e390995661f82e5bbdd0517c7f7b032d87c55032086ce069497199e0aa08314d14afcbd4f799f048104a
+  data.tar.gz: 6b9fe9ed21313705a4604214d4bea5f88d79ff314b3898933383b44269af453454379452733f95fab4228d3f8b253783b6cdd6c6d78e9541e2af95ec99667da5

data/History.rdoc

@@ -1,3 +1,33 @@
+=== 2.3.0 (2014-9-20)
+* Add SyncWrap::Debian (with Ubuntu as child), SyncWrap::CentOS and
+  SyncWrap::AmazonLinux (with RHEL as parent) to form a Distro
+  hierarchy with various version properties. Extends distribution
+  support and enables better distro-specific defaults (for example in
+  PostgreSQL).
+* Add Debian Network and PostgreSQL support
+* SyncWrap::OpenJDK notes on Debian JDK bloat from X11
+* Add preliminary (dev environment) support for SyncWrap::Arch Linux,
+  including support in OpenJDK and Hashdot.
+* Add SyncWrap::SourceTree and SyncWrap::Bundle components
+* Add SyncWrap::Puma component
+* Add SyncWrap::BundlerGem, SyncWrap::RakeGem, SyncWrap::TarpitGem
+  components
+* Add SyncWrap::BundledIyyovDaemon for Iyyov support for bundled Iyyov
+  daemons
+* Fix JRubyVM#gem_install version check
+* Add RubySupport#gem_install support for user_install as specific
+  user.
+* Protect various component accessors which should not be visible at
+  the Context level.
+* The SyncWrap::PostgreSQL#version deprecated/aliased in favor of
+  SyncWrap::PostgreSQL#pg_version
+* SyncWrap::RunUser#make_dir deprecated/aliased in favor of
+  SyncWrap::RunUser#mkdir_run_user
+* Introduce SyncWrap::VersionSupport and use for array-version
+  comparisons
+* Add TestComponents bash validate assertions, and random permutation
+  for changes
+
 === 2.2.0 (2014-7-13)
 * New SyncWrap::Component#sh :pipefail option to pass bash flag "-o
   pipefail" to return the first non-zero command return from a

data/Manifest.txt

@@ -30,8 +30,16 @@ lib/syncwrap/path_util.rb
 lib/syncwrap/rsync.rb
 lib/syncwrap/ruby_support.rb
 lib/syncwrap/shell.rb
+lib/syncwrap/version_support.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
@@ -42,9 +50,13 @@ lib/syncwrap/components/mdraid.rb
 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
 sync/etc/gemrc
@@ -70,6 +82,7 @@ sync/src/hashdot/profiles/jruby.hdp.erb
 sync/src/hashdot/profiles/shortlived.hdp
 sync/usr/local/etc/qpidd.conf
 sync/var/iyyov/jobs.rb.erb
+sync/var/iyyov/default/bundled_daemon.rb.erb
 sync/var/iyyov/default/config.rb
 sync/var/iyyov/default/daemon.rb.erb
 test/muddled_sync.rb
@@ -81,6 +94,7 @@ test/test_rsync.rb
 test/test_shell.rb
 test/test_space.rb
 test/test_space_main.rb
+test/test_version_support.rb
 test/zfile
 test/sync/d1/bar
 test/sync/d1/foo.erb

data/README.rdoc

@@ -79,11 +79,15 @@ examples directory and LAYOUT.
 
 == Components
 
-Components implementing SyncWrap::Distro, to expose common utility
-methods like dist_install:
+Component hierarchy implementing SyncWrap::Distro, for common methods
+like dist_install and other distribution-specific behaviors:
 
-* SyncWrap::RHEL (also supports CentOS, Amazon Linux)
-* SyncWrap::Ubuntu
+* SyncWrap::Arch (limited support)
+* SyncWrap::Debian
+  * SyncWrap::Ubuntu
+* SyncWrap::RHEL
+  * SyncWrap::CentOS
+  * SyncWrap::AmazonLinux
 
 Components implementing \#install:
 
@@ -104,6 +108,13 @@ Components implementing \#install:
 
 * SyncWrap::JRubyVM and/or SyncWrap::CRubyVM (MRI, from source)
 
+* SyncWrap::BundlerGem, SyncWrap::RakeGem, SyncWrap::TarpitGem - base
+  (pre-bundle) Rubygems
+
+* SyncWrap::SourceTree, SyncWrap::Bundle
+
+* SyncWrap::Puma
+
 * SyncWrap::Iyyov - job scheduler and process monitor with
   utilities for SyncWrap::IyyovDaemon deployment.
 
@@ -116,7 +127,6 @@ Components implementing \#install:
 The above only represents my more recent project needs. Pull requests
 to add, for example, the following would be well received:
 
-* Bundler install, for example for Sinatra apps
 * Bluepill
 * Rails (extra credit: without git fetch or per-host asset compile)
 * Nginx

data/Rakefile

@@ -9,18 +9,7 @@ RJack::TarPit.new( 'syncwrap' ).define_tasks
 
 desc "Upload RDOC to Amazon S3 (rdoc.gravitext.com/syncwrap, Oregon)"
 task :publish_rdoc => [ :clean, :rerdoc ] do
-  mime_types = {
-    '*.html' => 'text/html; charset=utf-8',
-    '*.css'  => 'text/css',
-    '*.js'   => 'text/javascript',
-    '*.png'  => 'image/png',
-    '*.gif'  => 'image/gif',
-  }
-  mime_types.each do |pat, mime_type|
-    sh <<-SH
-      s3cmd sync -P --exclude '*.*' --include '#{pat}' \
-        -m '#{mime_type}' \
-        doc/ s3://rdoc.gravitext.com/syncwrap/
-    SH
-  end
+  sh <<-SH
+    aws s3 sync --acl public-read doc/ s3://rdoc.gravitext.com/syncwrap/
+  SH
 end

data/lib/syncwrap/base.rb

@@ -15,7 +15,7 @@
 #++
 
 module SyncWrap
-  VERSION='2.2.0'
+  VERSION='2.3.0'
 
   GEM_ROOT = File.dirname(File.dirname(File.dirname(__FILE__))) # :nodoc:
 end

data/lib/syncwrap/components/amazon_linux.rb

@@ -0,0 +1,50 @@
+#--
+# 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 'syncwrap/components/rhel'
+
+module SyncWrap
+
+  # Customizations for Amazon Linux.
+  class AmazonLinux < RHEL
+
+    # Amazon Linux version, i.e. '2014.03.2'. No default value.
+    attr_accessor :amazon_version
+
+    alias :distro_version :amazon_version
+
+    # Return RHEL#rhel_version if specified, or provide comparable
+    # default RHEL version if #amazon_vesion is specified.
+    #
+    # History of Amazon Linux releases:
+    #
+    # * 2011.09 upgraded to glibc 2.12, parity with RHEL 6
+    #
+    # * 2014.03 upgraded to 2.17, parity with RHEL 7
+    #
+    # Note however that Amazon is still behind RHEL 7 in other
+    # respects (ex: systemd), and is ahead on other packages.
+    def rhel_version
+      super ||
+        ( amazon_version &&
+          ( ( version_gte?( amazon_version, [2014,3] ) && '7' ) ||
+            ( version_gte?( amazon_version, [2011,9] ) && '6' ) ||
+            '5' ) )
+    end
+
+  end
+
+end

data/lib/syncwrap/components/arch.rb

@@ -0,0 +1,37 @@
+#--
+# 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 'syncwrap/component'
+require 'syncwrap/distro'
+
+module SyncWrap
+
+  # \Arch Linux distro, partial implementation for pacman.
+  class Arch < Component
+    include SyncWrap::Distro
+
+    def dist_install( *pkgs )
+      opts = pkgs.last.is_a?( Hash ) && pkgs.pop || {}
+      sudo "pacman -S --noconfirm #{pkgs.join ' '}"
+    end
+
+    def dist_uninstall( *pkgs )
+      sudo "pacman -R --noconfirm #{pkgs.join ' '}"
+    end
+
+  end
+
+end

data/lib/syncwrap/components/bundle.rb

@@ -0,0 +1,111 @@
+#--
+# 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 'syncwrap/component'
+
+require 'syncwrap/git_help'
+require 'syncwrap/path_util'
+
+module SyncWrap
+
+  # Provision to `bundle install`, optionally triggered by a state change key.
+  #
+  # Host component dependencies: RunUser?, SourceTree?, BundlerGem
+  class Bundle < Component
+    include PathUtil
+
+    # Path to the Gemfile(.lock)
+    # (Default: SourceTree#remote_source_path)
+    attr_writer :bundle_path
+
+    def bundle_path
+      @bundle_path || remote_source_path
+    end
+
+    # The path to install bin stubs, if any. If relative, it is
+    # relative to #bundle_path.
+    # (Default: sbin; directory in #bundle_path)
+    # The default is purposefully not 'bin', so as to avoid clashes
+    # with source trees that already have a 'bin', for example that
+    # contain gem source as well.
+    attr_accessor :bundle_install_bin_stubs
+
+    protected
+
+    # An optional state key to check, indicating changes requiring
+    # bundle install (Default: nil; Example: :source_tree)
+    attr_accessor :change_key
+
+    # Hash of environment key/values to set on call to bundle install
+    # (Default: {} -> none)
+    attr_accessor :bundle_install_env
+
+    # User to perform the bundle install
+    # (Default: RunUser#run_user)
+    attr_writer :bundle_install_user
+
+    def bundle_install_user
+      @bundle_install_user || run_user
+    end
+
+    # The path to bundle install dependencies. If relative, it is
+    # relative to #bundle_path.
+    # (Default: ~/.gem -> the #bundle_install_user gems)
+    attr_accessor :bundle_install_path
+
+    public
+
+    def initialize( opts = {} )
+      @change_key = nil
+      @bundle_path = nil
+      @bundle_install_env = {}
+      @bundle_install_path = '~/.gem'
+      @bundle_install_user = nil
+      @bundle_install_bin_stubs = 'sbin'
+      super
+    end
+
+    def install
+      bundle_install if change_key.nil? || state[ change_key ]
+    end
+
+    def bundle_install
+      sh( "( cd #{bundle_path}", close: ')', user: bundle_install_user ) do
+        cmd = [ preamble, bundle_command, '_' + bundler_version + '_', 'install' ]
+
+        if bundle_install_path
+          cmd += [ '--path', bundle_install_path ]
+        end
+
+        if bundle_install_bin_stubs
+          cmd += [ '--binstubs', bundle_install_bin_stubs ]
+        end
+
+        sh( cmd.join(' '), user: bundle_install_user )
+      end
+    end
+
+    protected
+
+    def preamble
+      setters = bundle_install_env.map do |k,v|
+        k.to_s + '="' + v.gsub( /["\\]/ ) { |c| '\\' + c } + '"'
+      end
+      setters.join( ' ' )
+    end
+
+  end
+end

data/lib/syncwrap/components/bundled_iyyov_daemon.rb

@@ -0,0 +1,130 @@
+#--
+# 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 'syncwrap/component'
+
+module SyncWrap
+
+  # Provision a source/bundle installed, Iyyov launched and monitored jruby
+  # daemon using a standard set of conventions.  Can be used directly
+  # in the common case, or sub-classed as needed.
+  #
+  # Two :sync_paths files are searched for deployment: a config.rb and
+  # a jobs.d/<name>.rb.  If concrete or .erb variants of these are not
+  # found than an (empty) default/config.rb and a generic
+  # default/bundled_daemon.rb.erb are used. Again, these will work in
+  # the common case.
+  #
+  # Host component dependencies: RunUser, <ruby>, Iyyov
+  class BundledIyyovDaemon < Component
+
+    protected
+
+    # The daemon process name. (Default: SourceTree#remote_dir)
+    attr_writer :name
+
+    def name
+      @name || remote_dir
+    end
+
+    # An optional secondary instance name, useful if running more than
+    # one of 'name' on a host. (Default: nil)
+    attr_accessor :instance
+
+    # An optional state key to check, indicating changes requiring
+    # a daemon restart (Default: nil; Example: :source_tree)
+    attr_accessor :change_key
+
+    public
+
+    def initialize( opts = {} )
+      @name = nil
+      @instance = nil
+      @change_key = nil
+
+      super
+    end
+
+    def install
+      standard_install
+    end
+
+    protected
+
+    def standard_install
+      conf_changes = rput_service_config
+
+      # The job_source may contain more than just this daemon
+      # (i.e. additional tasks, etc.) Even if this is the
+      # default/daemon.rb.erb, it might have just been changed to
+      # that. So go ahead an rput in any case.
+      job_changes = rput( job_source,
+                          "#{iyyov_run_dir}/jobs.d/#{name_instance}.rb",
+                          user: run_user )
+      job_changes += iyyov_install_jobs
+
+      src_changes = ( change_key && state[ change_key ] ) || []
+
+      if ( ( src_changes + conf_changes ).length > 0 ||
+           state[ :hashdot_updated ] ||
+           state[ :imaging ] )
+        rudo( "kill $(< #{daemon_service_dir}/#{name}.pid ) || true" )
+      end
+
+      conf_changes + job_changes
+    end
+
+    def rput_service_config
+      rput( config_source, "#{daemon_service_dir}/config.rb", user: run_user )
+    end
+
+    def daemon_service_dir
+      service_dir( name, instance )
+    end
+
+    def exe_path
+      File.join( daemon_service_dir, 'init', name )
+    end
+
+    def name_instance
+      [ name, instance ].compact.join( '-' )
+    end
+
+    def job_source
+      sjob = "var/iyyov/jobs.d/#{name_instance}.rb"
+      unless find_source( sjob )
+        sjob = "var/iyyov/jobs.d/#{name}.rb"
+        unless find_source( sjob )
+          sjob = "var/iyyov/default/bundled_daemon.rb.erb"
+        end
+      end
+      sjob
+    end
+
+    def config_source
+      sconf = "var/#{name_instance}/config.rb"
+      unless find_source( sconf )
+        sconf = "var/#{name}/config.rb"
+        unless find_source( sconf )
+          sconf = 'var/iyyov/default/config.rb'
+        end
+      end
+      sconf
+    end
+
+  end
+
+end

data/lib/syncwrap/components/bundler_gem.rb

@@ -0,0 +1,47 @@
+#--
+# 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 'syncwrap/component'
+
+module SyncWrap
+
+  # Provision for the bundler rubygem and its (j)bundle command
+  #
+  # Host component dependencies: <ruby>
+  #
+  class BundlerGem < Component
+
+    # Bundler version to install (Default: 1.6.5)
+    attr_accessor :bundler_version
+
+    def initialize( opts = {} )
+      @bundler_version = '1.6.5'
+      super
+    end
+
+    def bundle_command
+      ( ruby_command == 'jruby' ) ? 'jbundle' : 'bundle'
+    end
+
+    def install
+      opts = { version: bundler_version }
+      opts[ :format_executable ] = true unless bundle_command == 'bundle'
+      gem_install( 'bundler', opts )
+    end
+
+  end
+
+end

data/lib/syncwrap/components/centos.rb

@@ -0,0 +1,28 @@
+#--
+# 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 'syncwrap/components/rhel'
+
+module SyncWrap
+
+  # Customizations for \CentOS and derivatives.
+  class CentOS < RHEL
+
+    alias :centos_version :rhel_version
+    alias :centos_version= :rhel_version=
+  end
+
+end

data/lib/syncwrap/components/cruby_vm.rb

@@ -17,6 +17,7 @@
 require 'syncwrap/component'
 require 'syncwrap/components/rhel'
 require 'syncwrap/ruby_support'
+require 'syncwrap/version_support'
 
 module SyncWrap
 
@@ -40,6 +41,7 @@ module SyncWrap
   # development however. Again you are currently on your own (beyond
   # RubySupport) if you wish to go this route.
   class CRubyVM < Component
+    include VersionSupport
     include RubySupport
 
     # The ruby version to install, as it appears in source packages
@@ -71,11 +73,6 @@ module SyncWrap
       "#{local_root}/bin/ruby"
     end
 
-    # Return ruby_version as an array of Integer values
-    def ruby_version_a
-      ruby_version.split( /[.\-p]+/ ).map( &:to_i )
-    end
-
     # If the current ruby_command is not at the desired ruby_version,
     # download source, configure, make and install.
     def install_ruby
@@ -111,7 +108,7 @@ module SyncWrap
     end
 
     def version_pattern
-      if ( ruby_version_a <=> [2,1] ) > 0
+      if version_gte?( ruby_version, [2,1] )
         # Starting with 2.1.x, the p# (patch number) is no longer used
         # for download, won't be in ruby_version, and shouldn't be
         # used for version comparison.