generate-puppetfile 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74c325d7f762e47f55fba2f375beb89d3290dba6
-  data.tar.gz: f9ce877a4bb8767f929087ef88a12dafb76800ab
+  metadata.gz: b6cfe094ce5b85bfe42cc9d3322df42e66e7114a
+  data.tar.gz: 5b6d91785f56a5371a33c138bcad94e534768f88
 SHA512:
-  metadata.gz: e704859f2f28ec656203052abf78164ef957e3486598d5427dcb4d5510ae206ac8718606d5da217ea97b995630e055bd4288b2c5b14e80ff9028e9bda68ea44b
-  data.tar.gz: 298d3dee5228f34fa838f46835a71f142e922bf2da4e85641806ae82130da387aa43f94b40da74944b3e52e64bad41a0cd6ac3e0f3343797bd13622bd0b22315
+  metadata.gz: 3f2ccf87f37078a07a0b2643e0caa735537f8038585f86ff4de90d7b666d21fa1ac712011cfcbe0719a0da37d2adbd6d917901eb71076d1b4831b796bcbf357e
+  data.tar.gz: 366bb61416ed9f2aaa4d2b66e2d0f93dbc112074672e66df88ea827ca1d2d21c1c21fdca6065a696f2cc2e6698b1941a992ae9de609927cf7435da0769ce11b7

data/README.md

@@ -1,3 +1,4 @@
+[![Build Status](https://travis-ci.org/rnelson0/puppet-generate-puppetfile.png?branch=master)](https://travis-ci.org/rnelson0/puppet-generate-puppetfile)
 [![Gem Version](https://badge.fury.io/rb/generate-puppetfile.svg)](https://badge.fury.io/rb/generate-puppetfile)
 
 Tired of searching for dependencies on the forge and hoping you got everything? Have an existing Puppetfile that's getting long in the tooth? Use generate-puppetfile to generate a list of modules and their dependencies, at the latest version, in Puppetfile format for use with r10k or librarian-puppet.

data/lib/generate_puppetfile/bin.rb

@@ -11,9 +11,10 @@ module GeneratePuppetfile
   # Internal: The Bin class contains the logic for calling generate_puppetfile at the command line
   class Bin
     Module_Regex = Regexp.new("mod ['\"]([a-z0-9_]+\/[a-z0-9_]+)['\"](, ['\"](\\d\.\\d\.\\d)['\"])?", Regexp::IGNORECASE)
-    @options = {}     # Options hash
-    @workspace = nil  # Working directory for module download and inspection
-    @module_data = {} # key: modulename, value: version number
+    @options = {}         # Options hash
+    @workspace = nil      # Working directory for module download and inspection
+    @module_data = {}     # key: modulename, value: version number
+    @download_errors = '' # A list of errors encountered while downloading modules. Should remain empty.
     Silence = ('>' + File::NULL.to_str + ' 2>&1 ').freeze
     Puppetfile_Header = '# Modules discovered by generate-puppetfile'.freeze
     Extras_Note = '# Discovered elements from existing Puppetfile'.freeze
@@ -84,17 +85,22 @@ module GeneratePuppetfile
       @module_data = generate_module_data
       puppetfile_contents = generate_puppetfile_contents(extras)
 
-      create_puppetfile(puppetfile_contents) if @options[:create_puppetfile]
+      if @download_errors == ''
+        create_puppetfile(puppetfile_contents) if @options[:create_puppetfile]
+        display_puppetfile(puppetfile_contents) unless @options[:silent]
 
-      display_puppetfile(puppetfile_contents) unless @options[:silent]
+        if @options[:create_fixtures]
+          fixtures_data = generate_fixtures_data
+          write_fixtures_data(fixtures_data)
+        end
 
-      if @options[:create_fixtures]
-        fixtures_data = generate_fixtures_data
-        write_fixtures_data(fixtures_data)
+        cleanup_workspace
+      else
+        $stderr.puts @download_errors
+        display_puppetfile(puppetfile_contents) unless @options[:silent]
+        return 2
       end
 
-      cleanup_workspace
-
       0
     end
 
@@ -183,11 +189,16 @@ Your Puppetfile has been generated. Copy and paste between the markers:
     # module_list is an array of forge module names to be downloaded
     def download_modules(module_list)
       puts "\nInstalling modules. This may take a few minutes.\n\n" unless @options[:silent]
+
+      @download_errors = ''
       module_list.each do |name|
         next if _download_module(name)
-        $stderr.puts "There was a problem with the module name '#{name}'.".red
-        $stderr.puts '  Check that module exists as you spelled it and/or your connectivity to the puppet forge.'.red
-        return 2
+        @download_errors << "There was a problem with the module name '#{name}'.".red + "\n"
+      end
+
+      if @download_errors != ''
+        @download_errors << '  Check that modules exist as under the listed name, and/or your connectivity to the puppet forge.'.red + "\n\n"
+        @download_errors << 'Here is the PARTIAL Puppetfile that would have been generated.'.red + "\n\n\n"
       end
     end
 

data/lib/generate_puppetfile/version.rb

@@ -1,3 +1,3 @@
 module GeneratePuppetfile
-  VERSION = '0.9.10'.freeze
+  VERSION = '0.9.11'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generate-puppetfile
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Rob Nelson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-26 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize