puppet-masterless 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f25c87151bb067f0180ff521e3d9321de1bde8c6
-  data.tar.gz: 27e83b426523ea8d6424f44826d9ce552ae20aa6
+  metadata.gz: 03f3fd21ff83a4bdfef031806d9134d1d8279d04
+  data.tar.gz: 366fcad2a93d6c24087b0df3c7c745f6efbf5491
 SHA512:
-  metadata.gz: 54f080712152dad70216e838c52664572e945e25fea3f15a4507a8208cece077cd087fbdc6c19a42b7e3c9f7b2db59e180b8bada031bb577dbe0ef8d7de2017c
-  data.tar.gz: bdab25968892f155f6fb37e0ebb462a975db8476c36978572b01463561a57ec82b2363ca851357dfb7954c8094d47509fcb39a75e768f4a1878d93e3c8e3c478
+  metadata.gz: 2a3cbf2eb8168f8c56375ec18baa5bea255ce27e38f4703619509afd58e840af0b3fd884431ff69a034f87c3b1c330f20db5a4377c26d0743cf20d44a1f7403d
+  data.tar.gz: bcd1344c6424166090cb441f9631a7ba3dee033361d1f0d05dc6292d94fbeae5c35c4c5904f80a6646a045aa9d42ce0898c10d0bc21aee8018983e967cc59d24

data/bin/puppet-masterless

@@ -1,32 +1,35 @@
 #!/usr/bin/env ruby
 #
-# Usage: puppet-masterless <subcommand> [<argument> ...] [-- puppet arguments ...]
+# Usage: puppet-masterless <command> [<argument> ...] [-- puppet arguments ...]
 #
 # Applies a local puppet project to a remote host.
 #
-# Available subcommands:
+# Available commands:
 #
-#   package
-#   apply
+#   apply                     - apply a project to a remote host
+#   package                   - package a project as a shell script
 #
 # Available arguments:
 #
-#   confdir <directory>
-#   hiera_config <file>
-#   manifest <file>
-#   modulepath <directory>
-#   puppet <executable>
-#   to <hostname>
-#   as <username>
-#   file <file>
+#   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.
+# At least "confdir" must be specified.
 #
 
+require 'fileutils'
 require 'shellwords'
+require 'securerandom'
 
 module PuppetMasterless
-  ARCHIVE_NAME = 'puppet-masterless'
+  ARCHIVE_NAME = 'puppet-package'
   ARCHIVE_OPTIONS = '--ignore-failed-read --exclude-vcs'
   DEFAULT_PUPPET = 'puppet'
   REMOTE_USER = 'root'
@@ -40,19 +43,15 @@ module PuppetMasterless
       @puppet = DEFAULT_PUPPET
       @user = REMOTE_USER
       @workdir = REMOTE_WORKDIR
-      @output = "#{ARCHIVE_NAME}.sh"
+      @output = "#{ARCHIVE_NAME}-#{SecureRandom.hex(4)}"
     end
 
-    def banner
-      File.read(__FILE__).lines[1..23].map { |s| s.gsub(/^# ?/, '') }
-    end
-
-    def usage n = 1
+    def usage(n = 1)
       STDERR.puts(banner)
       exit(n)
     end
 
-    def collect args
+    def collect(args)
       while word = args.shift
         case word
         when 'with', 'and'
@@ -65,6 +64,7 @@ module PuppetMasterless
         when 'as' then @user = args.shift
         when 'file' then @files << args.shift
         when '--', nil then @args = args.slice!(0..-1)
+        when 'output' then collect_output(args)
         else fail 'Invalid argument: ' << word
         end
       end
@@ -73,16 +73,19 @@ module PuppetMasterless
     def validate
       fail 'No confdir specified' unless @confdir
       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')
 
       fail 'No such confdir: ' << @confdir unless File.directory?(@confdir)
       fail 'No such manifest: ' << @manifest unless File.exist?(@manifest)
 
       @modulepath = nil unless File.directory?(@modulepath)
       @hiera_config = nil unless File.file?(@hiera_config)
+      @hieradata = nil unless File.directory?(@hieradata)
     end
 
     def package
@@ -90,22 +93,28 @@ module PuppetMasterless
     end
 
     def apply
-      if @hostname
-        create_distribution
-        apply_remote
-      else
-        apply_local
-      end
+      @hostname ? apply_remote : apply_local
     end
 
   private
 
+    def banner
+      File.read(__FILE__).lines[1..24].map { |s| s.gsub(/^# ?/, '') }
+    end
+
+    def collect_output(args)
+      usage(1) unless args.shift == 'file'
+      @output = args.shift
+    end
+
     def archive_command
-      "tar -czf- #{ARCHIVE_OPTIONS} --transform 's|^|#{@path.gsub("'", "'\''")}/|' \
-         #{@files.shelljoin} \
-         #{@manifest.shellescape} \
-         #{@modulepath.shellescape if @modulepath} \
-         #{@hiera_config.shellescape if @hiera_config}"
+      command = "tar -cf- #{ARCHIVE_OPTIONS} --transform 's|^|#{@path.gsub("'", "'\''")}/|'"
+      command << ' ' << @files.shelljoin
+      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
@@ -129,20 +138,24 @@ module PuppetMasterless
     end
 
     def apply_remote
+      STDERR.puts("Notice: Creating distribution")
+      create_distribution
+
       STDERR.puts('Notice: Copying to ' << @hostname)
       fail 'Copy command failed' unless system("scp -q #{@output.shellescape} #{@hostname.shellescape}:#{@workdir.shellescape}")
+
       STDERR.puts('Notice: Applying to ' << @hostname)
       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}")
     end
 
     def create_distribution
-      STDERR.puts("Notice: Creating distribution")
-
       File.open(@output, 'w') do |o|
         o.puts("#!/bin/sh -e")
-        o.puts("sed '0,/^# EOF$/d' \"$0\" | tar -xzf-")
+        o.puts("umask 077")
+        o.puts("sed '0,/^# EOF$/d' \"$0\" | gunzip -f | tar -xf-")
         o.puts("cd #{@path.shellescape}")
         o.puts(local_apply_command)
         o.puts("exit 1")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-masterless
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Evan Hanson