syncwrap 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a27d83ab1700ae7818a55ebace8c6c9bb29a99b
-  data.tar.gz: dfa29eebe123325201c9747dc6386e8f07072672
+  metadata.gz: c8747b0974cbb0b64ec21384e0e9f76edce077a6
+  data.tar.gz: df3d730eaa4ba91b3fc70ea80a9a74efd0f509e8
 SHA512:
-  metadata.gz: b0fe60aaf32e21729609ed41dd05815e1ec09e2718ecaff59e159138dc2e2929f61ebc26f455b52632d64c06bf8f26b9299590a9e0ba257cc87fc86415797b5e
-  data.tar.gz: a5644f8fd7109d47b9e260236035a612db074383c2c36d6bca1374c30bcb641f054196d4cad9e8821ef7d52126e14b29aed4b79e2874e9f7231546de88f61e97
+  metadata.gz: 26144f170e5a161982eec15e0f7b8b901c4b5a3eb2c73a36991aae6eab7a16476a9d0304d6ebf8b72ddd8fab214729563046f259f05b7a00c355a128f00dc1dd
+  data.tar.gz: 11f3c42c8f174332aaed9391228c8d97efe19734c67b2023c2a4164e32734a311c42a9b8cac9a5d80c10f0362c435ed7e582f1686624cf1223b42720339065d9

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 2.1.1 (2014-4-15)
+* Use 'syncwrap-' as tmpdir prefix.
+* Fix Users, RunUser use of useradd, adding -s and -m options, for
+  Ubuntu (where bash shell is not default)
+* Add RunUser.run_user_home option; no change in default
+* IyyovDaemon: handle case of non-version related job changes
+
 === 2.1.0 (2014-3-5)
 * Simplify existing state handling (i.e. Ubuntu.first_apt?, Users
   :just_created) by introducing SyncWrap::Component#state

data/Manifest.txt

@@ -5,6 +5,7 @@ Rakefile
 bin/syncwrap
 examples/LAYOUT.rdoc
 examples/Rakefile
+examples/db_setup.rb
 examples/ec2.rb
 examples/hello.rb
 examples/hello_binding.rb

data/README.rdoc

@@ -1,6 +1,7 @@
 = SyncWrap
 
 * http://github.com/dekellum/syncwrap
+* http://rdoc.gravitext.com/syncwrap/
 * {<img src="https://travis-ci.org/dekellum/syncwrap.png" />}[https://travis-ci.org/dekellum/syncwrap]
 
 == Description

data/Rakefile

@@ -6,3 +6,21 @@ require 'bundler/setup'
 require 'rjack-tarpit'
 
 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
+end

data/examples/LAYOUT.rdoc

@@ -16,6 +16,7 @@ by multiple examples.
 Here is what a complete end-user project setup might look like:
 
   deploy/
+  ├── Gemfile
   ├── lib/
   │   └── my_component.rb
   ├── .gitignore
@@ -24,23 +25,33 @@ Here is what a complete end-user project setup might look like:
   │   └── sec.pem
   ├── sync.rb
   └── sync/
-      ├── home
-      │   └── bob
-      │       └── .ssh
+      ├── home/
+      │   └── bob/
+      │       └── .ssh/
       │           └── authorized_keys
-      └── my/
-          └── config.rb.erb
+      └── var/
+          └── my_server/
+              └── config.rb.erb
 
 sync.rb:: The aforementioned default named sync-file, containing
           roles, components, hosts, and possibly profiles.
 
 sync/:: The default named sync root containing a tree of static files
-        and templates for pushing to hosts. See the rput.rb example
-        for usage.  The local sync root can contain overrides to the
-        syncwrap gem provided files/directories as well as new
-        files. Home directories and in particular
-        .ssh/authorized_keys is commonly used with the
-        SyncWrap::Users component.
+        and templates for pushing to hosts via
+        SyncWrap::Component#rput. The sub-directory structure
+        generally mimics the rput remote locations. See the rput.rb
+        example for usage.  The local sync root can contain overrides
+        to the syncwrap gem provided files/directories as well as new
+        files.
+
+sync/home/:: Default location for SyncWrap::Users provisioned
+             developer home directories (for ssh authorized_keys at
+             minimum).
+
+sync/var/:: Conventional location for daemon-component configuration
+            or other deployed files and templates (*.erb). Note that
+            with SyncWrap::RunUser at least, this maps by default to
+            the remote /var/local/runr directory.
 
 lib/:: Place project-specific components here. Once these are
        non-trivial its nicer to `require_relative` them into the
@@ -63,8 +74,9 @@ private/:: This directory is for sensitive files like credentials that
            ...which ignores and avoids check-in by mistake of any so
            named sub-directory and its contents.
 
+Gemfile:: Include a bundler Gemfile for precise version control of all
+          gems involved, including syncwrap.
+
 Without the private/ directories and sync.rb file, and adjusting lib/
 accordingly, you could also package this as a gem. This makes it easy
-to reuse components and files/templates across projects.  Include a
-bundler Gemfile in each deploy directory for precise version control
-of all gems involved, including syncwrap.
+to reuse components and files/templates across projects.

data/examples/db_setup.rb

@@ -0,0 +1,16 @@
+class MyDatabase < SyncWrap::Component
+  def install
+    %w[ bob joanne ].each { |u| pg_create_user( u ) }
+  end
+
+  def pg_create_user( user, flags=[] )
+    sql_test = "SELECT count(*) FROM pg_user WHERE usename = '#{user}'"
+    sh( <<-SH, user: 'postgres' )
+      if [[ $(psql -tA -c "#{sql_test}") == "0" ]]; then
+        createuser #{flags.join ' '} #{user}
+      fi
+    SH
+  end
+end
+
+host 'localhost', MyDatabase.new

data/lib/syncwrap/amazon_ec2.rb

@@ -286,7 +286,7 @@ module SyncWrap
         echo 'Defaults:#{user} !requiretty'   >> /etc/sudoers.d/#{user}
         chmod 440 /etc/sudoers.d/#{user}
       SH
-      script.split( "\n" ).map { |l| l.strip }.join( "\n" )
+      script.split( "\n" ).map( &:strip ).join( "\n" )
     end
 
   end

data/lib/syncwrap/amazon_ws.rb

@@ -333,7 +333,7 @@ module SyncWrap
     end
 
     def decode_roles( roles )
-      ( roles || "" ).split( /\s+/ ).map { |r| r.to_sym }
+      ( roles || "" ).split( /\s+/ ).map( &:to_sym )
     end
 
     # Wait until block returns truthy, sleeping for freq seconds

data/lib/syncwrap/base.rb

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

data/lib/syncwrap/cli.rb

@@ -282,10 +282,10 @@ TEXT
 
     def list_roles( hosts, multi )
       puts "Included Roles:" if multi
-      roles = hosts.map { |h| h.roles }.inject([],:|)
+      roles = hosts.map( &:roles ).inject([],:|)
       table = roles.map do |role|
         row = [ ':' + role.to_s ]
-        classes = space.role( role ).map { |c| c.class }
+        classes = space.role( role ).map( &:class )
         row << short_class_names( classes ).join(' ')
       end
       print_table( table )
@@ -309,7 +309,7 @@ TEXT
     end
 
     def print_table( table )
-      max_columns = table.map { |r| r.count }.max || 0
+      max_columns = table.map( &:count ).max || 0
       col_widths = max_columns.times.map do |i|
         table.map { |row| row[i] && row[i].length }.compact.max
       end

data/lib/syncwrap/components/iyyov_daemon.rb

@@ -70,24 +70,26 @@ module SyncWrap
     def standard_install
 
       create_service_dir( name, instance )
-      changes = rput_service_config
+      conf_changes = rput_service_config
 
-      # Shorten if the desired versioned process is already running.
       pid, ver = capture_running_version( name, instance )
-      if ver != version
-        gem_install( gem_name, version: version )
-        changes += rput( job_source,
-                         "#{iyyov_run_dir}/jobs.d/#{name_instance}.rb",
-                         user: run_user )
-        changes += iyyov_install_jobs
-      end
+
+      gem_install( gem_name, version: version ) if ver != version
+
+      # 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
 
       # If we found a daemon pid then kill if either:
       #
-      # (1) the version is the same (i.e no other signal via updates
-      #     above for Iyyov) but there was a config change or hashdot
-      #     was updated (i.e. new jruby version). In this case Iyyov
-      #     should be up to restart the daemon.
+      # (1) the version is the same but there was a config change or
+      #     hashdot was updated (i.e. new jruby version). In this case
+      #     Iyyov should be up to restart the daemon.
       #
       # (2) We are :imaging, in which case we want a graceful
       #     shutdown. In this case Iyyov should have already been kill
@@ -97,13 +99,13 @@ module SyncWrap
       # already stopped (i.e. crashed, etc) between above pid capture
       # and the kill.  Ignore kill failures.
       if pid &&
-          ( ( ver == version && ( !changes.empty? ||
+          ( ( ver == version && ( !conf_changes.empty? ||
                                   state[ :hashdot_updated ] ) ) ||
             state[ :imaging ] )
         rudo( "kill #{pid} || true" )
       end
 
-      changes
+      conf_changes + job_changes
     end
 
     def rput_service_config

data/lib/syncwrap/components/jruby_vm.rb

@@ -109,7 +109,7 @@ module SyncWrap
     alias :jruby_gem_install :gem_install
 
     def min_deps_supported?
-      varray = jruby_version.split('.').map { |n| n.to_i }
+      varray = jruby_version.split('.').map( &:to_i )
       ( varray <=> [1, 7, 5] ) >= 0
     end
 

data/lib/syncwrap/components/mdraid.rb

@@ -58,10 +58,11 @@ module SyncWrap
     attr_accessor :raid_chunk
 
     # A table of [ slice, path (,name) ] rows where; slice is a
-    # floating point ratio in range (0.0,1.0], path is the mount
-    # point, and name is the lvm name, defaulting if omitted to the
-    # last path element. The sum of all slice values in the table
-    # should be 1.0. Default: [ [ 1.0, '/data' ] ]
+    # Numeric in range (0.0..1.0), path is the mount point, and name
+    # is the lvm name, defaulting if omitted to the last path
+    # element. The sum of all slice values in the table should be 1.0,
+    # unless unallocated space is desired.
+    # Default: [ [ 1.0, '/data' ] ]
     attr_accessor :lvm_volumes
 
     # File System Type. Default: 'ext4'
@@ -154,7 +155,6 @@ module SyncWrap
 
     def create_raid( md )
       rlevel = raid_level || default_raid_level
-
       sudo <<-SH
         mdadm --create #{md} --level=#{rlevel} --chunk=#{raid_chunk} \
           --raid-devices=#{raw_devices.count} #{raw_devices.join ' '}

data/lib/syncwrap/components/run_user.rb

@@ -25,7 +25,7 @@ module SyncWrap
     # A user for running deployed daemons, jobs (default: 'runr')
     attr_accessor :run_user
 
-    # A group for running (default: nil -> same as run_user)
+    # A group for running (default: nil -> same as #run_user)
     attr_accessor :run_group
 
     # Root directory for persistent data and logs
@@ -36,11 +36,19 @@ module SyncWrap
       @run_dir || "/var/local/#{run_user}"
     end
 
+    # Home directory for the #run_user
+    # (default: nil -> unspecified)
+    attr_writer :run_user_home
+
+    def run_user_home
+      @run_user_home
+    end
+
     def initialize( opts = {} )
       @run_user    = 'runr'
       @run_group   = nil
       @run_dir     = nil
-
+      @run_user_home = nil
       super
     end
 
@@ -52,14 +60,13 @@ module SyncWrap
     # Create run_user if not already present
     def create_run_user
       sudo( "if ! id #{run_user} >/dev/null 2>&1; then", close: "fi" ) do
+        user_opts  = "-c 'Run User' -s /bin/bash"
+        user_opts += " -d #{run_user_home}" if run_user_home
         if run_group && run_group != run_user
-          sudo <<-SH
-            groupadd -f #{run_group}
-            useradd -g #{run_group} #{run_user}
-          SH
-        else
-          sudo "useradd #{run_user}"
+          sudo "groupadd -f #{run_group}"
+          user_opts += " -g #{run_group}"
         end
+        sudo "useradd #{user_opts} #{run_user}"
       end
     end
 

data/lib/syncwrap/components/users.rb

@@ -135,7 +135,7 @@ module SyncWrap
     def create_user( user )
       sudo <<-SH
         if ! id #{user} >/dev/null 2>&1; then
-          useradd #{user}
+          useradd -s /bin/bash -m #{user}
         fi
       SH
     end

data/lib/syncwrap/context.rb

@@ -273,7 +273,11 @@ module SyncWrap
     end
 
     def []( key )
-      @props[ key ] || @host[ key ]
+      if @props.has_key?( key )
+        @props[ key ]
+      else
+        @host[ key ]
+      end
     end
 
     def []=( key, val )

data/lib/syncwrap/rsync.rb

@@ -159,7 +159,7 @@ module SyncWrap
     def process_templates( srcs, opts ) # :doc:
       bnd = opts[ :erb_binding ] or raise "required :erb_binding param missing"
       erb_mode = opts[ :erb_mode ] || '<>' #Trim new line on "<% ... %>\n"
-      mktmpdir( 'syncwrap' ) do |tmp_dir|
+      mktmpdir( 'syncwrap-' ) do |tmp_dir|
         processed_sources = []
         out_dir = File.join( tmp_dir, 'd' ) #for default perms
         srcs.each do |src|
@@ -197,7 +197,7 @@ module SyncWrap
         FileUtils.mkdir_p( newdir, mode: 0700 )
         ENV['TMPDIR'] = newdir
       end
-      Dir.mktmpdir( 'syncwrap' ) do |tmp_dir|
+      Dir.mktmpdir( prefix ) do |tmp_dir|
         yield tmp_dir
       end
     ensure

data/lib/syncwrap.rb

@@ -188,9 +188,9 @@ module SyncWrap
     # roles, currently contained by the specified hosts or all hosts.
     def component_classes( hs = hosts )
       hs.
-        map { |h| h.components }.
+        map( &:components ).
         flatten.
-        map { |comp| comp.class }.
+        map( &:class ).
         uniq
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syncwrap
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - David Kellum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -170,6 +170,7 @@ files:
 - bin/syncwrap
 - examples/LAYOUT.rdoc
 - examples/Rakefile
+- examples/db_setup.rb
 - examples/ec2.rb
 - examples/hello.rb
 - examples/hello_binding.rb