puppet-masterless 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a17d62d001e6f74d9c4aede2a2007e342c63d10
-  data.tar.gz: 678a49091781147b49262a8626b3a7ccb893a7a4
+  metadata.gz: 94c151057d312cdbcfd45b8aa58f371fc759a649
+  data.tar.gz: 5811091ad9573e8fd0462e1fefa78b673d98014b
 SHA512:
-  metadata.gz: 3c6c5c2851a6e2b168bc7be6055836785c49fe5d3a3745e1e98d765b94068203309411418418d2362a79591c9581f52e2304614b140c551f5a265e5fc2922245
-  data.tar.gz: 7d0ebcd084a6c8c0ffe3eb1552c973f2088618a9a7360cff5d9279ab2e33071f98fd0dcfa4b9d2b7f45c3f746cb59fa2ccd7cfbb7c8563e597ea1f52387c0a59
+  metadata.gz: d83e1ee7b28c239dc8c561198c4a7508d8b2ce23932d127fa8ed5ed2b85c7531026ea220d1b67173b1aebb05690a9f57cd7427e07099d10dd1024d9d5821c934
+  data.tar.gz: cc3bc3657c4cf5d133924f766faeec0e89cc8a44c31c1de517d4c1bb08e3e744cc71a2586bb5e372ae2cbe0eee9622b5b0503023c9583520c1eaf49cc981656a

data/README.md

@@ -22,7 +22,7 @@ To install from [RubyGems.org][] just run:
 The program is a single Ruby file. To install it from source, simply put
 it somewhere on your PATH and make sure it's executable:
 
-    install -m 755 bin/puppet-masterless /usr/local/bin/puppet-masterless
+    install -m 755 src/puppet-masterless /usr/local/bin/puppet-masterless
 
 You can also install its man page, if desired:
 
@@ -57,7 +57,8 @@ about how this directory should be organised.
 The program accepts arguments according to a very simple command line
 grammar. To see a summary of the available options and what they
 control, run `puppet-masterless` without any arguments. For full
-documentation, refer to its man page[^2].
+documentation, refer to its man page[^2] or help text (accessed via
+`puppet-masterless help`).
 
 [^2]: You can view a Gem's man page by installing the [gem-man][]
   extension and running `gem man <gem>`.
@@ -71,7 +72,7 @@ It's assumed that your Puppet project is laid out something like this:
     <confdir>
     ├── puppet.conf
     ├── hiera.yaml
-    ├── hieradata
+    ├── data
     │   └── ...
     ├── manifests
     │   └── ...
@@ -82,21 +83,34 @@ All of these paths can be overridden by command line arguments, but the
 tool will work best if you use a project structure similar to this one.
 
 Most importantly, all paths in your Hiera configuration should be
-relative to the project's root. The following Hiera configuration
+relative to the project's root, so that `puppet-apply` will only consult
+Hiera data that's included in the package. In Hiera 5 this is usually
+the case by default, since paths are considered relative to your
+`hiera.yaml`:
+
+    ---
+    version: 5
+    defaults:
+      datadir: data
+      data_hash: yaml_data
+    hierarchy:
+      - name: Common data
+        path: common.yaml
+
+In Hiera 3, this must be done manually. The following `hiera.yaml`
 illustrates one way to do this, by explicitly setting `:datadir` to a
-path in your project's `confdir`. This way, `puppet-apply` will only
-consult Hiera data that's included in the package:
+path under your project's `confdir`:
 
     ---
     :backends:
       - yaml
     :yaml:
-      :datadir: "%{settings::confdir}/hieradata"
+      :datadir: "%{settings::confdir}/data"
 
 ## Contributing
 
- 1. Fork it from <https://gitlab.wgtn.cat-it.co.nz/devtools/puppet-masterless>
+ 1. Fork it from <https://gitlab.com/catalyst-it/puppet-masterless>
  2. Create a feature branch (`git checkout -b my-new-feature`)
  3. Commit your changes (`git commit -am 'Add some feature'`)
  4. Push to the branch (`git push origin my-new-feature`)
- 5. Create a Merge Request at <https://gitlab.wgtn.cat-it.co.nz/devtools/puppet-masterless/merge_requests>
+ 5. Create a Merge Request at <https://gitlab.com/catalyst-it/puppet-masterless/merge_requests>

data/bin/puppet-masterless

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2017-2018 Catalyst.net Ltd
+# Copyright (c) 2017-2019 Catalyst.net Ltd
 #
 # This file is part of puppet-masterless.
 #
@@ -236,7 +236,7 @@ rescue => e
   exit(1)
 end
 
-#1 .Dd January 5, 2018
+#1 .Dd January 28, 2019
 #1 .Dt PUPPET-MASTERLESS 1
 #1 .Os
 #1 .Sh NAME
@@ -410,13 +410,13 @@ end
 #1 .Sh CAVEATS
 #1 .No For this program to be useful, Puppet must be installed on the remote host.
 #1 .Pp
-#1 .No This program is only intended to work with Puppet 4.10. \&It may work
-#1 .No with other versions of Puppet, or it may not.
+#1 .No This program is only intended to work with Puppet 4.10 and 5.5. \&It
+#1 .No may work with other versions of Puppet, or it may not.
 #1 .Pp
 #1 .No The SSH functionality of this program is intentionally simplistic.
 #1 .No If you need more complex behaviour when connecting to remote machines,
 #1 .No use the
-#1 .Ql package
+#1 .Cm package
 #1 .No command in combination with a tool like
 #1 .Xr ansible 1 ,
 #1 .Xr cap 1 or
@@ -425,7 +425,7 @@ end
 #1 .No Very little information is displayed when an error occurs.
 #1 .Sh SECURITY CONSIDERATIONS
 #1 .No The
-#1 .Ql apply
+#1 .Cm apply
 #1 .No command uses
 #1 .Xr sudo 1
 #1 .No to assume a given user's identity on the remote host, with all of the
@@ -436,8 +436,8 @@ end
 #1 .Xr puppet-apply 8 .
 #1 .Sh IMPLEMENTATION NOTES
 #1 .Nm
-#1 .No is a Ruby script with no Gem dependencies. \&It should be possible to copy
-#1 .No and run it on any machine with Ruby 1.9 or newer.
+#1 .No is a single Ruby script with no Gem dependencies. \&It should be
+#1 .No possible to copy and run it on any machine with Ruby 1.9 or newer.
 #1 .Sh SEE ALSO
 #1 .Xr puppet 8 ,
 #1 .Xr puppet-apply 8 ,

data/man/puppet-masterless.1

@@ -1,4 +1,4 @@
-.Dd January 5, 2018
+.Dd January 28, 2019
 .Dt PUPPET-MASTERLESS 1
 .Os
 .Sh NAME
@@ -172,13 +172,13 @@ puppet-masterless package confdir test \\
 .Sh CAVEATS
 .No For this program to be useful, Puppet must be installed on the remote host.
 .Pp
-.No This program is only intended to work with Puppet 4.10. \&It may work
-.No with other versions of Puppet, or it may not.
+.No This program is only intended to work with Puppet 4.10 and 5.5. \&It
+.No may work with other versions of Puppet, or it may not.
 .Pp
 .No The SSH functionality of this program is intentionally simplistic.
 .No If you need more complex behaviour when connecting to remote machines,
 .No use the
-.Ql package
+.Cm package
 .No command in combination with a tool like
 .Xr ansible 1 ,
 .Xr cap 1 or
@@ -187,7 +187,7 @@ puppet-masterless package confdir test \\
 .No Very little information is displayed when an error occurs.
 .Sh SECURITY CONSIDERATIONS
 .No The
-.Ql apply
+.Cm apply
 .No command uses
 .Xr sudo 1
 .No to assume a given user's identity on the remote host, with all of the
@@ -198,8 +198,8 @@ puppet-masterless package confdir test \\
 .Xr puppet-apply 8 .
 .Sh IMPLEMENTATION NOTES
 .Nm
-.No is a Ruby script with no Gem dependencies. \&It should be possible to copy
-.No and run it on any machine with Ruby 1.9 or newer.
+.No is a single Ruby script with no Gem dependencies. \&It should be
+.No possible to copy and run it on any machine with Ruby 1.9 or newer.
 .Sh SEE ALSO
 .Xr puppet 8 ,
 .Xr puppet-apply 8 ,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-masterless
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2019-01-27 00:00:00.000000000 Z
 dependencies: []
 description: Packages and applies a Puppet project to a remote host.
 email: evanh@catalyst.net.nz