generate-puppetfile 0.9.2 → 0.9.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWExOWZiYjAzNDk1NGFkYTAwMzBkMDAxMWU1NTdkMzQzNDdkNTc2Ng==
+    NDRjNTE2ZWYzNGU0MDNhNWYxYmYzYTg3MWI2NTc1YTJkNzlkM2U5Yg==
   data.tar.gz: !binary |-
-    N2JlNDViOTUyODBmNDE5OGU2YjU3OTQ3YWJlMjg3Y2ExNDRkMGEyOA==
+    Y2JkNjk3MWUyOTU4NDRjYzIwNTM4YWQ2YzU2YTA1ZjI1ZGNlYTkwNQ==
 SHA512:
   metadata.gz: !binary |-
-    MjBmNzMwYTBlODI5MTc0ZjQ5NzQwMGVkOGRhYzFmZjYyMTZkYTMyYmMxOTE2
-    YTZhMjY4NTNiM2RiZGMyMjlmNzk5MWNkMzczYWMyYTIwODA0MTQyZjIyM2Zh
-    MDczY2UzODQ1NmZhNTM0YjIzOTYxYTZiYmU2MThkMGFkZDRhMjY=
+    MmUxMTMwYjRmODdhZjk5OTE2Y2YwOTY2MTYwNjY4OTYyZTEzNjcwZDAwYTBh
+    MmI0YmIyMjA4ZGE5NzM4NmFiNmFkMzI4ZDYyZWFjYzU3NDQ0OGQ4NDQ1MDM2
+    NmZlYzAwMDg5NWM4MWZmY2U4NjJmYjg4ODlkM2NkMTcyNGFiNzE=
   data.tar.gz: !binary |-
-    NDA3MTI0MTg4ZmQxYjUyMjI4ZDM2NTQyYWZmYmE1YzAwYjNmNzc0MDc3NjA4
-    ODU5YjZlMzBmZTRhZDQ5YTRmMmRlOTY4NzYwYWNkYjQwNGIzZTBjNmM0OWIz
-    MDMzYTgwNzdjZjI0OWE0MWU3MTBkNWZlYjI4YzEyZmI0NTQ2ZWM=
+    MjdmN2YzYWJkOTY3MzY1NmQ5ZmYzNzFlNDg2YjMwM2ExNzBkYWFiODc3NTdh
+    MDdkMmUzZTViNDYzMjNkOGNhMTlhM2FjZjNiYjJlYjk3NWVkODY1NzY5YzVj
+    NGUzZWY2MzUxYTk5NmI3M2MxZjM0YjkyYWU3Nzk0YWFhNmEzYTM=

data/lib/generate_puppetfile/bin.rb

@@ -2,6 +2,7 @@
 require 'generate_puppetfile'
 require 'generate_puppetfile/optparser'
 require 'fileutils'
+require 'tempfile'
 
 module GeneratePuppetfile
   # Internal: The Bin class contains the logic for calling generate_puppetfile at the command line
@@ -45,7 +46,7 @@ module GeneratePuppetfile
       end
 
       puppetfile_contents = Hash.new
-      extras = Array.new
+      extras = []
       if @options[:puppetfile]
         puts "\nProcessing the puppetfile '#{@options[:puppetfile]}'...\n\n" if @options[:debug]
         puppetfile_contents = read_puppetfile(@options[:puppetfile])
@@ -58,7 +59,7 @@ module GeneratePuppetfile
       list_forge_modules(forge_module_list) if puppetfile_contents && @options[:debug]
       list_extras(puppetfile_contents[:extras]) if puppetfile_contents[:extras] && @options[:debug]
 
-      generate_puppetfile_contents(forge_module_list, puppetfile_contents[:extras])
+      generate_puppetfile_contents(forge_module_list, extras)
 
       return 0
     end
@@ -117,12 +118,16 @@ module GeneratePuppetfile
     #
     # module_list is an array of forge module names to be downloaded
     # extras is an array of strings
-    def generate_puppetfile_contents (module_list, extras = [])
-      workspace = `mktemp -d`
+    def generate_puppetfile_contents (module_list, extras)
+      unless module_list != [] || extras != []
+	puts "\nNo valid modules or existing Puppetfile content was found. Exiting.\n\n"
+	exit 1
+      end
+
+      workspace = Dir.mktmpdir
 
       modulepath = "--modulepath #{workspace.chomp} "
       silence    = '>/dev/null 2>&1 '
-      strip_colors = 'sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"'
 
       puts "\nInstalling modules. This may take a few minutes.\n"
       module_list.each do |name|
@@ -138,16 +143,16 @@ forge 'http://forge.puppetlabs.com'
 # Modules discovered by generate-puppetfile
       EOF
 
-      puppetfile_body = `puppet module list #{modulepath} 2>/dev/null | #{strip_colors}`
-      puts puppetfile_body
+      puppetfile_body = `puppet module list #{modulepath} 2>/dev/null`
 
+      puppetfile_body.gsub!(/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]/, '') # Strips ANSI color codes
       puppetfile_body.gsub!(/^\/.*$/, '')
-      puppetfile_body.gsub!(/-/,    '/')
-      puppetfile_body.gsub!(/├── /, "mod '")
-      puppetfile_body.gsub!(/└── /, "mod '")
-      puppetfile_body.gsub!(/ \(v/, "', '")
-      puppetfile_body.gsub!(/\)$/,  "'")
-      puppetfile_body.gsub!(/^$\n/, '')
+      puppetfile_body.gsub!(/-/,      '/')
+      puppetfile_body.gsub!(/├── /,   "mod '")
+      puppetfile_body.gsub!(/└── /,   "mod '")
+      puppetfile_body.gsub!(/ \(v/,   "', '")
+      puppetfile_body.gsub!(/\)$/,    "'")
+      puppetfile_body.gsub!(/^$\n/,   '')
 
       puppetfile_footer = "# Discovered elements from existing Puppetfile\n"
       extras.each do |line|

data/lib/generate_puppetfile/version.rb

@@ -1,3 +1,3 @@
 module GeneratePuppetfile
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generate-puppetfile
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Rob Nelson