puppet-masterless 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c92e1a6b43a5b98773af8b769d752ec38ab36b6703df0fcb3f5021729b9dbd38
-  data.tar.gz: ec90a19bb036bd8166a54cdfba7137370560d313e54748926e92c3408125432f
+  metadata.gz: 6b3bb17823c02cbfbce76665f5165016bca937dd3eb2f164429a52b3df056a76
+  data.tar.gz: fae05d595c946b852bcfd810dbb1218447b0ea67305170e65a2de226f54a1bc1
 SHA512:
-  metadata.gz: 371ad6220621c70420885ea853a6cc541489b31257faee85f38d02cab607d6f748c561b0f920232027dc60fde345346f8fad80c5986a6517f2c6eb16a061b58d
-  data.tar.gz: 752186acfd8d467161ed42845036b14d22bf54690e31d9fa48939783025fdbacdf76738a78a8271224c3aa4893b056776df070cb34cfc8e966477daf86bd772d
+  metadata.gz: 07e946316edfbc816f6896384a80fe89b462eed8d797a05227b854c0449945b90eeeafbd35df33596ac7c6e4e180b783ce5be2d19407eef074b59ddaa05bd302
+  data.tar.gz: 5670581453e9a6718c76a8274cccb0fe65e99757d8c9fa9d82e412e31f61af3ae9040bab0a3f9abae657b954342c5ccc7d4c9a3cd962d035867236931cbcd35a

data/bin/puppet-masterless

@@ -56,18 +56,18 @@ module PuppetMasterless
   DEFAULT_SUDO = 'sudo'
   REMOTE_USER = 'root'
   REMOTE_WORKDIR = '/tmp'
-  VERSION = %{0.2.3}
+  VERSION = %{0.2.4}
 
   class Main
     def initialize
       @files = []
       @args = []
-      @path = ARCHIVE_NAME
+      @path = "#{ARCHIVE_NAME}-#{SecureRandom.hex(4)}"
+      @output = "#{ARCHIVE_NAME}-#{SecureRandom.hex(4)}"
       @puppet = DEFAULT_PUPPET
       @sudo = DEFAULT_SUDO
       @user = REMOTE_USER
       @workdir = REMOTE_WORKDIR
-      @output = "#{ARCHIVE_NAME}-#{SecureRandom.hex(4)}"
     end
 
     def usage(n = 1)
@@ -185,7 +185,8 @@ module PuppetMasterless
     end
 
     def remote_apply_command
-      "#{@sudo} -u #{@user.shellescape} #{@workdir.shellescape}/#{@output.shellescape}"
+      command = "trap 'rm -f #{@workdir.shellescape}/#{@output.shellescape}' EXIT"
+      command << "; #{@sudo} -u #{@user.shellescape} #{@workdir.shellescape}/#{@output.shellescape}"
     end
 
     def apply_local
@@ -197,14 +198,15 @@ module PuppetMasterless
       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}")
+      begin
+        STDERR.puts('Notice: Copying to ' << @hostname)
+        fail 'Copy command failed' unless system("scp -q #{@output.shellescape} #{@hostname.shellescape}:#{@workdir.shellescape}")
+      ensure
+        FileUtils.rm_f(@output)
+      end
 
       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} rm -f #{@workdir.shellescape}/#{@output.shellescape}")
     end
 
     def create_distribution
@@ -340,8 +342,9 @@ end
 #1 Defaults to
 #1 .Dq puppet .
 #1 .It Cm output file Aq filename
-#1 Set the output filename. If not given, a randomly-generated filename in
-#1 the current directory is used.
+#1 Set the output filename. If not given, a randomly-generated filename of the form
+#1 .Dq puppet-package-XXXXXXXX
+#1 is used.
 #1 .Pp
 #1 Applies only to the
 #1 .Cm package
@@ -450,7 +453,8 @@ end
 #1 file location and data directory:
 #1 .Bd -literal -offset indent
 #1 puppet-masterless package confdir test \\
-#1   with file hiera and hiera_config hiera/test.yaml
+#1   with file hiera and hiera_config hiera/test.yaml \\
+#1   output file puppet.sh
 #1 .Ed
 #1 .Pp
 #1 .Sh CAVEATS

data/man/puppet-masterless.1

@@ -84,8 +84,9 @@ installed in a directory that is not on the active user's
 Defaults to
 .Dq puppet .
 .It Cm output file Aq filename
-Set the output filename. If not given, a randomly-generated filename in
-the current directory is used.
+Set the output filename. If not given, a randomly-generated filename of the form
+.Dq puppet-package-XXXXXXXX
+is used.
 .Pp
 Applies only to the
 .Cm package
@@ -194,7 +195,8 @@ project as a shell script, including a non-standard Hiera configuration
 file location and data directory:
 .Bd -literal -offset indent
 puppet-masterless package confdir test \\
-  with file hiera and hiera_config hiera/test.yaml
+  with file hiera and hiera_config hiera/test.yaml \\
+  output file puppet.sh
 .Ed
 .Pp
 .Sh CAVEATS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-masterless
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake