puppet-armature 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cf1d192c7f3bd7e27b82ded9f4a8fa5e7277647
-  data.tar.gz: d5882f18aa5102f3adb6068bf7c0cc97194c0ecf
+  metadata.gz: f0a8b80f2d44ce34400277ea4760820da4e6fd66
+  data.tar.gz: 2857d139910bfb9e29700ec61a318f5162ce64a5
 SHA512:
-  metadata.gz: 28a7b7c5e6937603dca25c7a63bf9bf33fb03258414397c5a722eff52df61ab5211c830296e05c6ef64a91688d26b1c6a04c6761fa923b328f0d84186cca7051
-  data.tar.gz: cfa8e3b8f55bbe670f870bb3b773277ffbf4009e0ca6728b9e4f727d8963c258ffbb737c8e43fa898a1bcef04536461cf713af1a944f735d2b0556d85f8eb0e0
+  metadata.gz: 00efc4bd4c00da1f8547a31be2c83db2bed1dc5dabb62ebbc5a5100808a7a87449e5a19c7b3b9b99b5b0499c27267d13b807cb9f4dcda278df3fc5cf815184bf
+  data.tar.gz: 4e4c492d820316e324c9cde18b37d7bbd76dce885df2231b6523e6405a3296e7c69b64542464d206bd1627b42ac879d529b1ed2c2f3354093d074ff90f64d883

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    armature (0.1.0)
+    puppet-armature (0.2.2)
       gli (= 2.14.0)
       logging (~> 2)
 
@@ -19,7 +19,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  armature!
+  puppet-armature!
 
 BUNDLED WITH
    1.10.4

data/README.md

@@ -3,7 +3,7 @@
 A tool for deploying Puppet environments and modules.
 
 ~~~
-$ armature deploy-branch my-puppet-code.git '*'
+$ armature deploy-branches my-puppet-code.git '*'
 ~~~
 
 Armature sets up Puppet environments for each branch in your control repo and
@@ -34,7 +34,7 @@ _This is an alpha release. The interface is likely to change significantly._
 There are three commands you need to use. Run `armature help` to learn about
 options, or `armature help <command>` to learn about a specific command.
 
-### `armature deploy-branch <git-url> <branch>`
+### `armature deploy-branches <git-url> <branch>`
 
 Deploys branches from a git repository as environments.
 

data/bin/armature

@@ -65,9 +65,9 @@ long_desc 'This accepts globs to match branch names. For example, specify "*"
   to deploy all branches.'
 arg 'GIT_URL'
 arg 'BRANCH', :multiple=>true
-command "deploy-branch" do |c|
+command "deploy-branches" do |c|
   c.desc "Delete environments that aren't being deployed"
-  c.switch [:d,"delete-old"]
+  c.switch [:d,"delete-other"]
   c.action do |global_options, options, arguments|
     # This should fail as early as possible (e.g. if the path isn't correct)
     environments = Armature::Environments.new(@environments_path, @cache)
@@ -88,7 +88,7 @@ command "deploy-branch" do |c|
       end
     end
 
-    if options["delete-old"]
+    if options["delete-other"]
       (Set.new(environments.names()) - branches).each do |name|
         environments.remove(name)
       end

data/lib/armature/environments.rb

@@ -30,8 +30,7 @@ module Armature
       # used in a Puppetfile. (Perhaps the cache is used for multiple repos?)
 
       # https://docs.puppet.com/puppet/latest/reference/lang_reserved.html#environments
-      # The docs are slightly wrong; A-Z are allowed.
-      if name !~ /\A[a-z0-9_]+\Z/i
+      if name !~ /\A[a-z0-9_]+\Z/
         raise "Invalid environment name '#{name}'"
       end
 

data/lib/armature/gitrepo.rb

@@ -51,15 +51,15 @@ module Armature
     def get_branches()
       freshen()
       data = git("for-each-ref",
-          "--format", "%(objectname) %(refname:strip=2)",
+          "--format", "%(objectname) %(refname)",
           "refs/heads")
       lines = data.split(/[\r\n]/).reject { |line| line == "" }
 
       lines.map do |line|
-        sha, branch = line.split(' ', 2)
-        ref = "refs/heads/#{branch}"
+        sha, ref = line.split(' ', 2)
         @ref_cache[ref] = [:mutable, sha, ref]
-        branch
+        # Strip refs/heads/ from the beginning of each ref
+        ref["refs/heads/".length .. -1]
       end
     end
 

data/lib/armature/version.rb

@@ -1,3 +1,3 @@
 module Armature
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-armature
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Daniel Parks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli