generate-puppetfile 0.9.11 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6cfe094ce5b85bfe42cc9d3322df42e66e7114a
-  data.tar.gz: 5b6d91785f56a5371a33c138bcad94e534768f88
+  metadata.gz: bf16afea209bd8ac2e30eed90aeb581f0bce4465
+  data.tar.gz: 58974916249c3e57b4c91f615bea19a2ac9a463c
 SHA512:
-  metadata.gz: 3f2ccf87f37078a07a0b2643e0caa735537f8038585f86ff4de90d7b666d21fa1ac712011cfcbe0719a0da37d2adbd6d917901eb71076d1b4831b796bcbf357e
-  data.tar.gz: 366bb61416ed9f2aaa4d2b66e2d0f93dbc112074672e66df88ea827ca1d2d21c1c21fdca6065a696f2cc2e6698b1941a992ae9de609927cf7435da0769ce11b7
+  metadata.gz: ccf96edd51e4c63a367ba622d35b05f5e46f575d5bcd2132c40e0693f09f0794e2518119e5d6c1991e46986e2433f5d13ced307268a63584bf99d2bd82a02688
+  data.tar.gz: dbd28f66578958bfa335fbaa9716df6a3cd1c0e09f4458584bb2eae794f7c6dcdc75795bcdf9e96ad1e4ade7f8dd31b46c7843d637ff428e832d0f496ed2e891

data/README.md

@@ -24,16 +24,16 @@ Your Puppetfile has been generated. Copy and paste between the markers:
 forge 'http://forge.puppetlabs.com'
 
 # Modules discovered by generate-puppetfile
-
 mod 'echocat/nfs', '1.7.1'
 mod 'herculesteam/augeasproviders_core', '2.1.2'
 mod 'herculesteam/augeasproviders_shellvar', '2.2.0'
 mod 'puppetlabs/concat', '1.2.4'
 mod 'puppetlabs/stdlib', '4.9.0'
 mod 'rnelson0/certs', '0.6.2'
-
 # Discovered elements from existing Puppetfile
-
+# Modules from github
+mod 'lab_config',
+  :git => 'git@github.com:puppetinabox/lab_config.git'
 =======================================================================
 
 ```
@@ -51,7 +51,6 @@ Your Puppetfile has been generated. Copy and paste between the markers:
 forge 'http://forge.puppetlabs.com'
 
 # Modules discovered by generate-puppetfile
-
 mod 'ajjahn/dhcp', '0.2.0'
 mod 'croddy/make', '0.0.5'
 mod 'garethr/erlang', '0.3.0'
@@ -94,16 +93,19 @@ mod 'thias/bind', '0.5.1'
 mod 'yguenane/augeas', '0.1.1'
 mod 'yguenane/ygrpms', '0.1.0'
 mod 'zack/r10k', '3.1.1'
-
 # Discovered elements from existing Puppetfile
 # Modules from the Puppet Forge
 # Modules from Github
 mod 'lab_config',
   :git => 'git@github.com:puppetinabox/lab_config.git'
-
 =======================================================================
 ```
 
+## Changes
+Documentation of important pre-1.0.0 changes
+
+* *0.10.0*: `--fixtures` has been replaced with `--create-fixtures`. `-f` is still an alias for this argument.
+
 ## Limitations
 
 * Parsing of an existing Puppetfile is naive. Anything that doesn't look like a forge module is preserved and then added to the end of the new Puppetfile. Verify that no ordering errors are introduced before using the new file.

data/lib/generate_puppetfile/bin.rb

@@ -277,12 +277,44 @@ forge 'http://forge.puppetlabs.com'
     def generate_fixtures_data
       puts "\nGenerating .fixtures.yml using module name #{@options[:modulename]}" unless @options[:silent]
 
-      # Header for fixtures file creates a symlink for the current module"
-      fixtures_data = <<-EOF
-fixtures:
-  symlinks:
-    #{@options[:modulename]}: "\#{source_dir}"
-      EOF
+      # Determine if there are symlinks, either for the default modulename, or for anything in the modulepath
+      symlinks = []
+      modulepath = ''
+      if (File.exists?('environment.conf') and environment_conf = File.read('environment.conf'))
+        puts "\nGenerating .fixtures.yml for a controlrepo." unless @options[:silent]
+
+        environment_conf.split("\n").each do |line|
+          modulepath = (line.split('='))[1].gsub(/\s+/,'') if line =~ /^modulepath/
+        end
+
+        paths = modulepath.split(':').delete_if { |path| path =~ /^\$/ }
+        paths.each do |path|
+          Dir["#{path}/*"].each do |module_location|
+            module_name = File.basename(module_location)
+            module_path = module_location
+            symlinks << {
+              :name => module_name,
+              :path => '"#{source_dir}/' + module_path + '"',
+            }
+          end
+        end
+      else
+        puts "\nGenerating .fixtures.yml using module name #{@options[:modulename]}." unless @options[:silent]
+
+        symlinks << { 
+          :name => @options[:modulename],
+          :path => '"#{source_dir}"',
+        }
+      end
+
+      # Header for fixtures file creates symlinks for the controlrepo's modulepath, or for the current module"
+      fixtures_data = "fixtures:\n"
+      if symlinks
+        fixtures_data += "  symlinks:\n"
+        symlinks.each do |symlink|
+          fixtures_data += "    #{symlink[:name]}: #{symlink[:path]}\n"
+        end
+      end
 
       fixtures_data += "  forge_modules:\n" if @module_data != {}
       @module_data.keys.each do |modulename|

data/lib/generate_puppetfile/optparser.rb

@@ -28,11 +28,11 @@ module GeneratePuppetfile
           options[:create_puppetfile] = true
         end
 
-        opts.on('-f', '--fixtures', 'Create a .fixtures.yml file in the working directory. Somewhat naive.') do
+        opts.on('-f', '--create-fixtures', 'Create a .fixtures.yml file in the working directory. This works in a module directory or at the top if your controlrepo..') do
           options[:create_fixtures] = true
         end
 
-        opts.on('-m', '--modulename NAME', "Name of the module the fixtures file will be used with. Optional. Defaults to 'profile'.") do |name|
+        opts.on('-m', '--modulename NAME', "Name of the module the fixtures file will be used with. Optional, for use with --create-fixtures when used in a module directory. Defaults to 'profile'. ") do |name|
           options[:modulename] = name
         end
 

data/lib/generate_puppetfile/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generate-puppetfile
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors:
 - Rob Nelson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -109,6 +109,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.39.0
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Generate a Puppetfile for use with r10k based on an existing file or
   a list of modules.
 email: rnelson0@gmail.com
@@ -148,4 +176,3 @@ signing_key:
 specification_version: 4
 summary: Generate a Puppetfile
 test_files: []
-has_rdoc: