abide_dev_utils 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9e993f8a435b4be58831bc98cf1658533c8c1084f14c96c1a12ecd73ff89da6
-  data.tar.gz: 1120b6cc91eac28ff8168e808f13c16cf6c6d844b5928f04f4f4bb6d7cda0bcb
+  metadata.gz: 368f622d5a56407f757e47a212edaf4279afb6a5e36f075b0f1ce2e283463d53
+  data.tar.gz: 329f00503b626b086375c1b725d72758e90fb32a18cec37028348a1613d8bac3
 SHA512:
-  metadata.gz: bcf0b6aa95f003e5402be98cc797202949368ceff62e6cdb778f4002e452716ef5ef833bc0bcd34bb797f628997e1c807d88f191048a5afec767bd8bcb7dc7a3
-  data.tar.gz: 2ca0b4fb33d0329f13e3ce04d317427b4ba67c9937b4df739d991a1692871d19c17d1eeb24d5035573a676560795ae466e6df65148693258718aeda115c9e1d8
+  metadata.gz: 170f8389cc8a0c27e0bd6cb152ef3a1b314203b2e970ac838e2eb514728f1faec11ed0e057d81cbb8a26acccfc7a23299673bdf814e5e60f35eaddf91c6446b3
+  data.tar.gz: 5077c372590de6d0f40931f69f4d70a35be289440ad5e26f93730c4fab171f38262ec81d13616b2f7fba01ccba4c14cc6e82e2ca3a186f09207f7918e624aaca

data/README.md

@@ -125,7 +125,7 @@ Install the gem:
   * `--root-dir`, `-r` - Path to the root directory of your module. Defaults to the current working directory
   * `--absolute-template-dir`, `-A` - Allows you to specify an absolute path with `--template-dir`. This is useful if your template directory is not relative to your module's root directory
   * `--template-name`, `-n` - Allows you to specify a template name if it is different than the `TYPE` parameter
-  * `--vars`, `-v` - Comma-separated key=value pairs to pass in to the template renderer. This allows you to pass arbitrary values that can be used in your templates.
+  * `--vars`, `-V` - Comma-separated key=value pairs to pass in to the template renderer. This allows you to pass arbitrary values that can be used in your templates.
 
 `abide puppet new` exposes a few variables for you to use in your templates by default:
 

data/lib/abide_dev_utils/cli.rb

@@ -20,6 +20,7 @@ module Abide
       parser.main_options.version = AbideDevUtils::VERSION
       parser.main_options.banner = ROOT_CMD_BANNER
       parser.add_command(CmdParse::HelpCommand.new, default: true)
+      parser.add_command(CmdParse::VersionCommand.new(add_switches: true))
       parser.add_command(PuppetCommand.new)
       parser.add_command(XccdfCommand.new)
       parser.add_command(TestCommand.new)

data/lib/abide_dev_utils/ppt.rb

@@ -9,7 +9,7 @@ module AbideDevUtils
     # the full namespace for all classes in that directory.
     # @param puppet_class_dir [String] path to a dir containing Puppet manifests
     # @return [String] The namespace for all classes in manifests in the dir
-    def find_class_namespace(puppet_class_dir)
+    def self.find_class_namespace(puppet_class_dir)
       path = Pathname.new(puppet_class_dir)
       mod_root = nil
       ns_parts = []
@@ -34,7 +34,7 @@ module AbideDevUtils
     # metadata.json, if it exists, or by using the parent directory name.
     # @param pathname [Pathname] A Pathname object of the module's manifests dir
     # @return [String] The module's namespace root
-    def find_mod_root(pathname)
+    def self.find_mod_root(pathname)
       metadata_file = nil
       pathname.entries.each do |e|
         metadata_file = "#{pathname}/metadata.json" if File.basename(e) == 'metadata.json'
@@ -52,7 +52,7 @@ module AbideDevUtils
 
     # @return [Array] An array of frozen arrays where each sub-array's
     #   index 0 is class_name and index 1 is the full path to the file.
-    def find_all_classes_and_paths(puppet_class_dir)
+    def self.find_all_classes_and_paths(puppet_class_dir)
       all_cap = []
       Dir.each_child(puppet_class_dir) do |c|
         path = "#{puppet_class_dir}/#{c}"

data/lib/abide_dev_utils/ppt/coverage.rb

@@ -13,12 +13,14 @@ module AbideDevUtils
       def self.generate(puppet_class_dir, hiera_path, profile = nil)
         coverage = {}
         coverage['classes'] = {}
-        all_cap = find_all_classes_and_paths(puppet_class_dir)
+        all_cap = AbideDevUtils::Ppt.find_all_classes_and_paths(puppet_class_dir)
         invalid_classes = find_invalid_classes(all_cap)
-        valid_classes = all_cap.dup.transpose[0] - invalid_classes
+        valid_classes = find_valid_classes(all_cap, invalid_classes)
         coverage['classes']['invalid'] = invalid_classes
         coverage['classes']['valid'] = valid_classes
         hiera = YAML.safe_load(File.open(hiera_path))
+        profile&.gsub!(/^profile_/, '') unless profile.nil?
+
         matcher = profile.nil? ? /^profile_/ : /^profile_#{profile}/
         hiera.each do |k, v|
           key_base = k.split('::')[-1]
@@ -50,9 +52,13 @@ module AbideDevUtils
         out_hash
       end
 
-      def self.find_valid_classes(all_cap)
+      def self.find_valid_classes(all_cap, invalid_classes)
         all_classes = all_cap.dup.transpose[0]
-        all_classes - find_invalid_classes(all_cap)
+        return [] if all_classes.nil?
+
+        return all_classes - invalid_classes unless invalid_classes.nil?
+
+        all_classes
       end
 
       def self.find_invalid_classes(all_cap)

data/lib/abide_dev_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AbideDevUtils
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abide_dev_utils
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Heston Snodgrass