puppet-armature 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39ee81e7821523113eb5b9868a0dca398ef3a6b0
-  data.tar.gz: 31da92d00fb15e345c8fdb28fce24e6e07fb1ec0
+  metadata.gz: 1c583eeec96331a7050861894eead4b88bdd0a4d
+  data.tar.gz: 1a69219101f220fbb501c3fc9a241881c193cd3b
 SHA512:
-  metadata.gz: a2c928a9daa31005a7d80b757080c6f41cd7b3785703c05bb61b10a51df848675b7907da9b63381d15a48b745ce6dfe3de1c19d50cbb7dbea2f83dfc69a8f141
-  data.tar.gz: d174e15de2dd26fbe228fed75383ffc6377afd166e79388a690e689f6d8f27329ebc4603e40bdd65e111cb91b94a2e295ce9f7b7fecf14d1f707bba29b87bba9
+  metadata.gz: 4278d3ff34d1bb711b47cd5088eb7f48c05c2c57a62c4f111d370d44c7f9b25044d4adca2a01b84f197884efb20e41ef3fe34eb00d41653786afa5bf0f491aef
+  data.tar.gz: 5210242988bb7fb870f7375b1a1dcdf0e0b3c74750d40136804c79531623bd1e265edcd2a097d0dc0fed2956d6363225e6ea141b4ed55a8969b540ddc11dbbfa

data/docs/puppetfile-syntax.md

@@ -1,25 +1,57 @@
 # Puppetfile syntax
 
-The Puppetfile is just ruby. Armature provides one important function:
+The Puppetfile is just ruby. There are a few important declarations:
 
-### `mod 'name', :git=>'url', :ref=>'ref'`
-Specifies a module to install.
+### `forge 'https://forge.puppet.com'`
+
+This specifies what “forge” to use. You don't need to specify this unless you
+have a caching proxy, or your own Forge-like web site.
+
+### `mod 'owner-name', 'version'`
+
+Install a module from the Forge. This will use whatever “forge” was last set
+with the `forge` function.
+
+* **owner-name:** This is the name of the Forge user and the name of the
+  module. The module name is what's used in your Puppet code.
+* **version:** The version of the module to install. If you don't specify a
+  version, or use `:latest`, this will check the Forge for the latest version
+  of the module every time this environment is deployed.
+
+This uses the same syntax as suggested by the Forge.
+
+### `mod 'name', :git=>'url', :tag=>'tag'`
+
+Install a module with git.
 
 * **name:** The name of the module. You use this in your Puppet code to
   reference the module's classes and defined types.
 * **url:** The URL of the git repo holding the module.
-* **ref:** The ref in the repo to check out. May be a branch, a tag, or a sha.
-  Defaults to "master".
+
+You may optionally use one of the following parameters. If you don't specify
+one, it will default to the master branch.
+
+* `:tag => 'tag'` This assumes that the tag will never change.
+* `:branch => 'branch'` This will check for updates to the branch on every
+  deploy.
+* `:commit => 'SHA'`
+
+You can also use `:ref` to specify any of the above, or another type of git
+ref. Using this will cause armature to check for updates on every deploy.
 
 ## Example
 
 ~~~ ruby
+mod 'puppetlabs-ntp', '7.3.0'
+mod 'puppetlabs-stdlib'
+
 mod 'autosign',
-  :git => 'git://github.com/danieldreier/puppet-autosign.git',
+  :git    => 'git://github.com/danieldreier/puppet-autosign.git',
+  :commit => '0e1367db3fe43a62b38d96a373db8b465cb8fdb3'
 
 mod 'aws',
   :git => 'git://github.com/puppetlabs/puppetlabs-aws.git',
-  :ref => '1.4.0'
+  :tag => '1.4.0'
 ~~~
 
 ## Compatibility
@@ -28,6 +60,3 @@ Armature does not support the full syntax of either
 [r10k](https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd) or
 [librarian-puppet](http://librarian-puppet.com). It will likely support more of
 r10k's syntax at some point.
-
-It does provide a `forge` function which accepts any arguments and is ignored.
-This is only for compatility with the Puppetfile I'm using.

data/lib/armature/environments.rb

@@ -55,7 +55,7 @@ module Armature
       if @fix_environment_names && ! self.class.valid_environment_name?(name)
         old = name
         name = old.gsub(/[^A-Za-z0-9_]/, "_")
-        @logger.info("Changing invalid environment name \"#{old}\" to \"#{name}\"")
+        @logger.warn("Changing invalid environment name \"#{old}\" to \"#{name}\"")
       end
 
       self.class.assert_valid_environment_name(name)

data/lib/armature/puppetfile.rb

@@ -27,7 +27,12 @@ module Armature
         raise "Module #{name} declared twice"
       end
 
-      if options.is_a?(String) || options == {} || options == nil
+      is_forge = options.is_a?(Symbol) \
+        || options.is_a?(String) \
+        || options == {} \
+        || options == nil
+
+      if is_forge
         _mod_forge(full_name, name, options)
       elsif options[:git]
         _mod_git(name, options)
@@ -36,9 +41,11 @@ module Armature
       end
     end
 
-    def _mod_forge(full_name, name, version="latest")
+    def _mod_forge(full_name, name, version=:latest)
       if version == nil || version == {}
         version = "latest"
+      else
+        version = version.to_s
       end
 
       repo = Repo::Forge.from_url(@cache, @forge_url, full_name)

data/lib/armature/repo/forge.rb

@@ -88,7 +88,7 @@ class Armature::Repo::Forge < Armature::Repo
 
   # Get ref object
   def general_ref(version)
-    if version.nil? || version == "latest"
+    if version.nil? || version.to_s == "latest"
       latest_ref()
     else
       version_ref(version)

data/lib/armature/version.rb

@@ -1,4 +1,4 @@
 module Armature
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
   HOMEPAGE = "https://github.com/danielparks/armature"
 end

data/puppet-armature.gemspec

@@ -4,17 +4,24 @@ spec = Gem::Specification.new do |s|
   s.name = 'puppet-armature'
   s.version = Armature::VERSION
   s.author = 'Daniel Parks'
-  s.email = 'dp-os-armature@oxidized.org'
+  s.email = 'os-armature@demonhorse.net'
   s.homepage = Armature::HOMEPAGE
   s.license = 'BSD-2-Clause'
   s.platform = Gem::Platform::RUBY
   s.summary = 'Deploy Puppet environments and manage modules'
-  s.description = 'Armature sets up Puppet environments for each branch in your control repo and installs modules as specified by the Puppetfile for each environment. It is designed as a replacement for r10k.'
+  s.description = <<-EOF
+    Armature sets up Puppet environments for each branch in your control repo,
+    then installs the modules specified in the Puppetfile for each environment.
+
+    It is designed as a much faster replacement for r10k, though it does not
+    have all of r10k's features.
+  EOF
   s.files = `git ls-files`.split("\n")
   s.require_paths << 'lib'
   s.has_rdoc = false
   s.bindir = 'bin'
   s.executables << 'armature'
+  s.required_ruby_version = '>= 2.0.0'
   s.add_runtime_dependency('gli','2.14.0')
   s.add_runtime_dependency('logging','~> 2')
   s.add_development_dependency('minitest','~> 5.9')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-armature
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Daniel Parks
@@ -52,10 +52,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.9'
-description: Armature sets up Puppet environments for each branch in your control
-  repo and installs modules as specified by the Puppetfile for each environment. It
-  is designed as a replacement for r10k.
-email: dp-os-armature@oxidized.org
+description: |2
+      Armature sets up Puppet environments for each branch in your control repo,
+      then installs the modules specified in the Puppetfile for each environment.
+
+      It is designed as a much faster replacement for r10k, though it does not
+      have all of r10k's features.
+email: os-armature@demonhorse.net
 executables:
 - armature
 extensions: []
@@ -101,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="