syncwrap 2.8.3 → 2.9.0

data/lib/syncwrap/systemd.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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
@@ -19,14 +19,37 @@ module SyncWrap
   # Support module for the systemd service manager, PID 1
   module SystemD
 
-    # Run systemd `systemctl` command with args via sudo as root.  A
-    # trailing hash is interpreted as options and passed to
+    # Run systemd `systemctl` command with args via sudo. If the first
+    # arg is 'status', defer to #systemctl_status.  A trailing hash is
+    # interpreted as options and passed to sudo. Since systemctl
+    # returns non-zero for a variety of normal conditions, the :accept
+    # option can be passed to account for these, as well as :error =>
+    # false.
+    def systemctl( *args )
+      opts = args.last.is_a?( Hash ) && args.pop || {}
+      args.flatten!
+      if args.first == 'status'
+        args.shift
+        systemctl_status( *args, opts )
+      else
+        sudo( "systemctl #{args.join ' '}", opts )
+      end
+    end
+
+    # Run `systemctl status` via sudo, with special case stripping of
+    # whitespace from the end of line output via a sed filter. This is
+    # not an issue with an interactive terminal because output is
+    # piped to pager (less), apparently with '--chop-long-lines'.
+    #
+    # A trailing hash is interpreted as options and passed to
     # sudo. Since systemctl returns non-zero for a variety of normal
     # conditions, the :accept option can be passed to account for
     # these, as well as :error => false.
-    def systemctl( *args )
-      opts = args.last.is_a?( Hash ) && args.pop || {}
-      sudo( "systemctl #{args.join ' '}", opts )
+    def systemctl_status( *units )
+      opts = units.last.is_a?( Hash ) && units.pop || {}
+      sudo( <<-SH, opts )
+        systemctl status #{units.join ' '} | sed -E -e 's/\\s+$//'
+      SH
     end
 
     # Expand given shortname to "shortname.service" as used for the

data/lib/syncwrap/systemd_service.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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
@@ -112,7 +112,7 @@ module SyncWrap
     # is also disabled, which may be relevent for merged commands.
     def status
       require_systemd_service!
-      systemctl( 'status', *systemd_units, error: false, accept: [0,1,2,3] )
+      systemctl_status( *systemd_units, error: false, accept: [0,1,2,3] )
     end
 
     protected

data/lib/syncwrap/user_data.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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
@@ -14,23 +14,20 @@
 # permissions and limitations under the License.
 #++
 
+require 'syncwrap/sudoers'
+
 module SyncWrap
 
   # Utility methods for generating scripts to pass as user data.
   module UserData
+    extend Sudoers
 
     private
 
     # Returns an sh script to allow no password, no tty sudo for a
     # specified user by writing a file to /etc/sudoers.d/<user>
-    def no_tty_sudoer( user )
-      script = <<-SH
-        #!/bin/sh -e
-        echo '#{user} ALL=(ALL) NOPASSWD:ALL'  > /etc/sudoers.d/#{user}
-        echo 'Defaults:#{user} !requiretty'   >> /etc/sudoers.d/#{user}
-        chmod 440 /etc/sudoers.d/#{user}
-      SH
-      script.split( "\n" ).map( &:strip ).join( "\n" )
+    def no_tty_sudoer( user, opts = {} )
+      self.sudoers_d_script( user, opts )
     end
 
     module_function :no_tty_sudoer

data/lib/syncwrap/version_support.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/zone_balancer.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/sync/postgresql/postgresql.conf.erb

@@ -38,7 +38,7 @@
 # option or PGDATA environment variable, represented here as ConfigDir.
 
 <% if pg_specify_etc_config %>
-data_directory = '/var/lib/postgresql/<%= pg_version %>/main'
+data_directory = '<%= pg_data_dir %>'
                                         # use data in another directory
                                         # (change requires restart)
 hba_file = '/etc/postgresql/<%= pg_version %>/main/pg_hba.conf'
@@ -175,7 +175,7 @@ max_stack_depth = <%= max_stack_depth %> # min 100kB
 #bgwriter_delay = 200ms                 # 10-10000ms between rounds
 #bgwriter_lru_maxpages = 100            # 0-1000 max buffers written/round
 #bgwriter_lru_multiplier = 2.0          # 0-10.0 multiplier on buffers scanned/round
-#bgwriter_flush_after = 0               # 0 disables,
+#bgwriter_flush_after = 0               # measured in pages, 0 disables,
                                         # default is 512kB on linux, 0 otherwise (9.6+)
 
 # - Asynchronous Behavior -
@@ -186,7 +186,7 @@ effective_io_concurrency = <%= effective_io_concurrency %>
 #max_parallel_workers_per_gather = 0    # taken from max_worker_processes  (9.6+)
 #old_snapshot_threshold = -1            # 1min-60d; -1 disables; 0 is immediate (9.6+)
                                         # (change requires restart)
-#backend_flush_after = 0                # 0 disables, default is 0
+#backend_flush_after = 0                # measured in pages, 0 disables
 
 #------------------------------------------------------------------------------
 # WRITE AHEAD LOG

data/sync/src/hashdot/profiles/jruby.hdp.erb

@@ -10,4 +10,8 @@ jruby.bindir  = <%= local_root %>/bin
 hashdot.profile += jruby-common
 
 # Rubygems Home (Install)
+<% if jruby_gem_home_prop? %>
 jruby.gem.home = <%= local_root %>/lib/jruby/gems
+<% else %>
+hashdot.env.GEM_HOME = <%= local_root %>/lib/jruby/gems
+<% end %>

data/test/setup.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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
@@ -14,10 +14,7 @@
 # permissions and limitations under the License.
 #++
 
-require 'rubygems'
 require 'bundler/setup'
-
-require 'minitest/unit'
 require 'minitest/autorun'
 
 begin

data/test/test_components.rb

@@ -2,7 +2,7 @@
 #.hashdot.profile += jruby-shortlived
 
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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
@@ -40,6 +40,7 @@ module SyncWrap
     [ [ RHEL, CommercialJDK ],
       [ Debian ],
       [ Debian, CRubyVM ],
+      [ Debian, OpenJDK, JRubyVM, jruby_version: '9.1.12.0' ],
       [ CentOS, CRubyVM ],
       [ Arch, CRubyVM ],
       [ EtcHosts ],

data/test/test_context.rb

@@ -2,7 +2,7 @@
 #.hashdot.profile += jruby-shortlived
 
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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_rput.rb

@@ -2,7 +2,7 @@
 #.hashdot.profile += jruby-shortlived
 
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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_rsync.rb

@@ -2,7 +2,7 @@
 #.hashdot.profile += jruby-shortlived
 
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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_shell.rb

@@ -2,7 +2,7 @@
 #.hashdot.profile += jruby-shortlived
 
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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_space.rb

@@ -2,7 +2,7 @@
 #.hashdot.profile += jruby-shortlived
 
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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_space_main.rb

@@ -2,7 +2,7 @@
 #.hashdot.profile += jruby-shortlived
 
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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_version_support.rb

@@ -2,7 +2,7 @@
 #.hashdot.profile += jruby-shortlived
 
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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_zone_balancer.rb

@@ -2,7 +2,7 @@
 #.hashdot.profile += jruby-shortlived
 
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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: syncwrap
 version: !ruby/object:Gem::Version
-  version: 2.8.3
+  version: 2.9.0
 platform: ruby
 authors:
 - David Kellum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -98,28 +98,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.8.4
+        version: 5.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.8.4
+        version: 5.9.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: rjack-tarpit
   requirement: !ruby/object:Gem::Requirement
@@ -213,6 +213,7 @@ files:
 - lib/syncwrap/rsync.rb
 - lib/syncwrap/ruby_support.rb
 - lib/syncwrap/shell.rb
+- lib/syncwrap/sudoers.rb
 - lib/syncwrap/systemd.rb
 - lib/syncwrap/systemd_service.rb
 - lib/syncwrap/user_data.rb
@@ -284,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A rather direct provisioning and deployment system in ruby, bash over ssh,