puppet-masterless 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0ed8aface71827a69d18e16e18084a12cd1549e
-  data.tar.gz: 82d1779ed59128a21005e193e9de7fe560ff1034
+  metadata.gz: 682169b63eab3d891e86b9fc6132e9825b20d9f5
+  data.tar.gz: 3279bdb87fa815b546a23090248781c05c0f4dc2
 SHA512:
-  metadata.gz: 49e7baee997edcc61bbc3d1e3b9e46bce2713848c8bd45bad16bbbd8b4f5512c1aaf543257c4e59bc8ee402433ec0be9bba01ef250deba9702ef64b1d4a31600
-  data.tar.gz: 57725f0ca6efc3c9fbf15e48ac637a5a26de792e6301f34e9543f13147cf8dbd003ef09dfead79eafda5b62c3b3d0e958e64e3a30f9c80b305a827224210682d
+  metadata.gz: cbd29e8b824afa0448cfb7574340be0ba30b8aa5ec95692686cdc1fe23f96f4a1f937bac8361af327298080230ffb0596270bd69112f09025ab41457a0726a55
+  data.tar.gz: f9cfa98d18f4127270ed7eebb8c8f033eeea74be08f95404751884a406347f47cfdb656675c080dfdb768a66eb5954ef01f4bd5eec38cd60f1ef694fb9e94331

data/bin/puppet-masterless

@@ -1,37 +1,58 @@
 #!/usr/bin/env ruby
 #
-# Usage: puppet-masterless <command> [<argument> ...] [-- puppet arguments ...]
+# Copyright (c) 2017-2018 Catalyst.net Ltd
 #
-# Applies a local puppet project to a remote host.
+# This file is part of puppet-masterless.
 #
-# Available commands:
+# puppet-masterless is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
 #
-#   apply                     - apply a project to a remote host
-#   package                   - package a project as a shell script
+# puppet-masterless is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
 #
-# Available arguments:
-#
-#   confdir <pathname>        - main project directory
-#   manifest <filename>       - manifest to apply
-#   hiera_config <filename>   - passed to --hiera_config
-#   modulepath <pathname>     - passed to --modulepath
-#   puppet <executable>       - location of puppet executable
-#   to <hostname>             - hostname of remote machine
-#   as <username>             - name of user running puppet-apply
-#   file <filename>           - include a file or directory
-#   output file <filename>    - output filename
-#
-# At least "confdir" must be specified.
+# You should have received a copy of the GNU General Public License
+# along with puppet-masterless. If not, see http://www.gnu.org/licenses/
 #
 
 require 'fileutils'
-require 'shellwords'
 require 'securerandom'
+require 'shellwords'
+
+#|
+#| Usage: puppet-masterless <command> [<argument> ...] [-- puppet arguments ...]
+#|
+#| Applies a local puppet project to a remote host.
+#|
+#| Available commands:
+#|
+#|   apply                     - apply a project to a remote host
+#|   package                   - package a project as a shell script
+#|
+#| Available arguments:
+#|
+#|   confdir <pathname>        - main project directory
+#|   manifest <filename>       - manifest to apply
+#|   hiera_config <filename>   - passed to --hiera_config
+#|   modulepath <pathname>     - passed to --modulepath
+#|   to <hostname>             - hostname of remote machine
+#|   puppet <executable>       - location of puppet executable on remote host
+#|   sudo <command>            - location of sudo executable on remote host
+#|   as <username>             - name of user running puppet-apply
+#|   file <filename>           - add file or directory to package
+#|   output file <filename>    - output filename for package
+#|
+#| At least "confdir" must be specified.
+#|
 
 module PuppetMasterless
   ARCHIVE_NAME = 'puppet-package'
   ARCHIVE_OPTIONS = '--ignore-failed-read --exclude-vcs'
   DEFAULT_PUPPET = 'puppet'
+  DEFAULT_SUDO = 'sudo'
   REMOTE_USER = 'root'
   REMOTE_WORKDIR = '/tmp'
 
@@ -41,6 +62,7 @@ module PuppetMasterless
       @args = []
       @path = ARCHIVE_NAME
       @puppet = DEFAULT_PUPPET
+      @sudo = DEFAULT_SUDO
       @user = REMOTE_USER
       @workdir = REMOTE_WORKDIR
       @output = "#{ARCHIVE_NAME}-#{SecureRandom.hex(4)}"
@@ -60,6 +82,7 @@ module PuppetMasterless
         when 'modulepath' then @modulepath = args.shift
         when 'hiera_config' then @hiera_config = args.shift
         when 'puppet' then @puppet = args.shift
+        when 'sudo' then @sudo = args.shift
         when 'to' then @hostname = args.shift
         when 'as' then @user = args.shift
         when 'file' then @files << args.shift
@@ -75,17 +98,24 @@ module PuppetMasterless
       fail 'No puppet specified' unless @puppet
       fail 'No output file specified' unless @output
 
-      @manifest ||= File.join(@confdir, 'manifests')
-      @modulepath ||= File.join(@confdir, 'modules')
-      @hiera_config ||= File.join(@confdir, 'hiera.yaml')
-      @hieradata ||= File.join(@confdir, 'hieradata')
+      modules = File.join(@confdir, 'modules')
+      manifests = File.join(@confdir, 'manifests')
+      hieradata = File.join(@confdir, 'hieradata')
+      hiera_yaml = File.join(@confdir, 'hiera.yaml')
+      puppet_conf = File.join(@confdir, 'puppet.conf')
+
+      @manifest ||= manifests
+      @modulepath ||= modules
+      @hiera_config ||= hiera_yaml
 
       fail 'No such confdir: ' << @confdir unless File.directory?(@confdir)
       fail 'No such manifest: ' << @manifest unless File.exist?(@manifest)
 
+      @files << hieradata if File.directory?(hieradata)
+      @files << puppet_conf if File.file?(puppet_conf)
+
       @modulepath = nil unless File.directory?(@modulepath)
       @hiera_config = nil unless File.file?(@hiera_config)
-      @hieradata = nil unless File.directory?(@hieradata)
     end
 
     def package
@@ -99,7 +129,7 @@ module PuppetMasterless
   private
 
     def banner
-      File.read(__FILE__).lines[1..24].map { |s| s.gsub(/^# ?/, '') }
+      File.read(__FILE__).lines.grep(/^#\|/).map { |s| s.gsub(/^#\| ?/, '') }
     end
 
     def collect_output(args)
@@ -113,23 +143,19 @@ module PuppetMasterless
       command << ' ' << @manifest.shellescape
       command << ' ' << @modulepath.shellescape if @modulepath
       command << ' ' << @hiera_config.shellescape if @hiera_config
-      command << ' ' << @hieradata.shellescape if @hieradata
       command << ' | gzip -f'
     end
 
     def local_apply_command
-      command = "exec #{@puppet} apply #{@manifest.shellescape} --verbose --show_diff --color true --confdir #{@confdir.shellescape}"
+      command = "#{@puppet} apply #{@manifest.shellescape} --verbose --show_diff --color true"
+      command << ' --confdir ' << @confdir.shellescape
       command << ' --modulepath ' << @modulepath.shellescape if @modulepath
       command << ' --hiera_config ' << @hiera_config.shellescape if @hiera_config
       command << ' ' << @args.shelljoin
     end
 
     def remote_apply_command
-      "sudo -u #{@user.shellescape} #{@workdir.shellescape}/#{@output.shellescape}"
-    end
-
-    def remote_cleanup_command
-      "sudo -u #{@user.shellescape} rm -f #{@workdir.shellescape}/#{@output.shellescape} -r #{@workdir.shellescape}/#{@path.shellescape}"
+      "#{@sudo} -u #{@user.shellescape} #{@workdir.shellescape}/#{@output.shellescape}"
     end
 
     def apply_local
@@ -148,7 +174,7 @@ module PuppetMasterless
       fail 'Apply command failed' unless system("ssh -q -t #{@hostname.shellescape} #{remote_apply_command.shellescape}")
     ensure
       FileUtils.rm_f(@output)
-      system("ssh -q -t #{@hostname.shellescape} #{remote_cleanup_command.shellescape}")
+      system("ssh -q -t #{@hostname.shellescape} rm -f #{@workdir.shellescape}/#{@output.shellescape}")
     end
 
     def create_distribution
@@ -156,10 +182,11 @@ module PuppetMasterless
         o.puts('#!/bin/sh -e')
         o.puts('umask 077')
         o.puts('cd "$(dirname "$0")"')
-        o.puts('sed "0,/^# EOF$/d" "$0" | gunzip -f | tar -xf-')
+        o.puts('trap "rm -rf ' << @workdir.shellescape << '/' << @path.shellescape << '" EXIT')
+        o.puts('sed -n 10,\\$p "$0" | gunzip -f | tar -xf-')
         o.puts('cd ' << @path.shellescape)
         o.puts(local_apply_command)
-        o.puts('exit 1')
+        o.puts('exit 0')
         o.puts('# EOF')
         o.chmod(0755)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-masterless
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Evan Hanson
@@ -10,8 +10,7 @@ bindir: bin
 cert_chain: []
 date: 2018-01-05 00:00:00.000000000 Z
 dependencies: []
-description: Packages and optionally applies a multi-file Puppet project to a remote
-  host via SSH.
+description: Packages and applies a Puppet project to a remote host.
 email: evanh@catalyst.net.nz
 executables:
 - puppet-masterless
@@ -19,7 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/puppet-masterless
-homepage: https://gitlab.wgtn.cat-it.co.nz/devtools/puppet-masterless
+homepage: https://gitlab.com/catalyst-it/puppet-masterless
 licenses:
 - GPLv3
 metadata: {}
@@ -42,5 +41,5 @@ rubyforge_project:
 rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
-summary: Apply a local puppet project to a remote host
+summary: Apply a local Puppet project to a remote host
 test_files: []