generate-puppetfile 0.9.6 → 0.9.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OGVmN2JhZWExMjZjZGViZDk1N2Q5OTc1NjIxMDFlNmVkYzlkNzViZg==
-  data.tar.gz: !binary |-
-    ZjBlZWI4OGVhYjA2MTUyM2Q1MjY4YjBjZDQ0MjFkODE0YTE5ZTdlZg==
+SHA1:
+  metadata.gz: 046880c28c4dd0c6b7e9a4c90e0c367d7c3ff98f
+  data.tar.gz: f54a50e8fc4ea2cf60b7e3f1cf68f2a415ede968
 SHA512:
-  metadata.gz: !binary |-
-    YTcwYjg3YmU3ODkwNTliMzc4NDZjMTRkOTljZTlmYzJhM2NjZjM0N2Y0N2M2
-    Njc5MTdkNzljODNhMjZjYmY0NjhmZTliMTY5ZWZiM2VmYzIxZGUyMDU3NDcz
-    OTQyNWFhYWMxYTFmMmRkZTI4YTljODQ4MWNhNmQxMzA5MzQ0OTg=
-  data.tar.gz: !binary |-
-    MTVkNmI4YzJlMGJjMmU2YmZhNjFiOTZiYmY1YmJlYTZlY2E0YjYzY2FhN2Zl
-    MWNhNmE0ZmIyNjQyMWRkNjhiMTgwYWVjMzc2N2IxZWU4NWY4OWVjYzUxNTMz
-    NGYzNTMxYmNlYmI0YjMyZDNlY2Q1NDFmODUyZjMzM2I1ZDA5YTg=
+  metadata.gz: 91f353684c05b1043a821ce7db214f073a380df2f99b105a05b1f23e18223048b749c11f2441578733ceb6fb4025f03d0bae36815c801cbf4ded8be18f279648
+  data.tar.gz: b05c4d699fb020dd5d2fecfe85f66871459dc4cc0c73e7cd2418c6ef50cafe8c6b755bff4687fea7f7acadabd50d1ef2748ebad0e90a91b687630a7b057bce98

data/lib/generate_puppetfile/bin.rb

@@ -4,14 +4,17 @@ require 'generate_puppetfile/optparser'
 require 'fileutils'
 require 'tempfile'
 require 'json'
+require 'mkmf'
 
 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)
+    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
     Silence   = '>/dev/null 2>&1 '
+    Puppetfile_Header = '# Modules discovered by generate-puppetfile'
+    Extras_Note = '# Discovered elements from existing Puppetfile'
 
     # Public: Initialize a new GeneratePuppetfile::Bin
     #
@@ -38,6 +41,12 @@ module GeneratePuppetfile
         return 1
       end
 
+      if (! verify_puppet_exists())
+        $stderr.puts "generate-puppetfile: Could not find a 'puppet' executable."
+        $stderr.puts "  Please make puppet available in your path before trying again."
+        return 1
+      end
+
       forge_module_list = Array.new
 
       if @args
@@ -148,14 +157,15 @@ Your Puppetfile has been generated. Copy and paste between the markers:
       }
 
       File.foreach(puppetfile) do |line|
-        if Module_regex.match(line)
+        if Module_Regex.match(line)
           name = $1
           print "    #{name} looks like a forge module.\n" if @options[:debug]
           puppetfile_contents[:modules].push(name)
         else
           next if line =~ /^forge/
           next if line =~ /^\s+$/
-          next if line =~ /# Discovered elements from existing Puppetfile/
+          next if line =~ /#{Puppetfile_Header}/
+          next if line =~ /#{Extras_Note}/
 
           puppetfile_contents[:extras].push(line)
         end
@@ -164,6 +174,12 @@ Your Puppetfile has been generated. Copy and paste between the markers:
       puppetfile_contents
     end
 
+    # Public: Verify that Puppet is available in the path
+    def verify_puppet_exists()
+      MakeMakefile::Logging.instance_variable_set(:@logfile, File::NULL)
+      find_executable0('puppet')
+    end
+
     # Public: Download the list of modules and their dependencies to @workspace
     #
     # module_list is an array of forge module names to be downloaded
@@ -173,6 +189,7 @@ Your Puppetfile has been generated. Copy and paste between the markers:
         command  = "puppet module install #{name} "
         command += @modulepath + Silence
 
+        puts "Calling '#{command}'" if @options[:debug]
         system(command)
       end
     end
@@ -202,12 +219,12 @@ Your Puppetfile has been generated. Copy and paste between the markers:
       puppetfile_contents = <<-EOF
 forge 'http://forge.puppetlabs.com'
 
-# Modules discovered by generate-puppetfile
+#{Puppetfile_Header}
       EOF
 
       puppetfile_contents += generate_module_output()
 
-      puppetfile_contents += "# Discovered elements from existing Puppetfile\n" unless extras == []
+      puppetfile_contents += "#{Extras_Note}\n" unless extras == []
       extras.each do |line|
         puppetfile_contents += "#{line}"
       end unless extras == []

data/lib/generate_puppetfile/version.rb

@@ -1,3 +1,3 @@
 module GeneratePuppetfile
-  VERSION = '0.9.6'
+  VERSION = '0.9.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generate-puppetfile
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Rob Nelson
@@ -14,16 +14,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -74,8 +74,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - bin/generate-puppetfile
+- README.md
 - lib/generate_puppetfile.rb
 - lib/generate_puppetfile/bin.rb
 - lib/generate_puppetfile/optparser.rb
@@ -90,17 +90,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Generate a Puppetfile