puppetfiler 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72bb5dbc926cb8024b65dff3573a27112e99e68a
-  data.tar.gz: 3a822b5184db3bc8542d829d8296e11fb5aae35f
+  metadata.gz: 8a50bc1960b97634408cec4d7e84d25cabbe41f0
+  data.tar.gz: ed068a7360a344ba9d7fceef40f0ef050557cd89
 SHA512:
-  metadata.gz: 711c16cd68c5f8e94ee8df7911830cc40c5357fc26cdfb7bf87a5d091e1e0794e24c354cf570aec8876bf3288071842129318621515f9a44deb836a62c50afed
-  data.tar.gz: ef6264f1187fad42e8b0b9dac675dc986f2b50c4290d01cb26dc75c484e34d02afb2be3fc6a5c3d122cc2deb9ad5182f0a6602039556341fdce59ee845e62a00
+  metadata.gz: 8bed7ce700bffad204830c134249cfa59068eb38cf3a6683c6b8d025c45614a339d992a22a552126874744300e07df2a6b147f7d0b22cacc6f46348518453f6b
+  data.tar.gz: b989261ae649ca89699ca4521f00edfc3b1c62fa0da4c2e4ba95f1c503367358ffb131e82c53489e0b3a2dfa386d589c9d1a90949c5670b7dbf6ec102a4e3185

data/README.rst

@@ -55,3 +55,39 @@ Puppetfile.
 	  ref: 1.8.1
 
 .. _puppetlabs_spec_helper: https://github.com/puppetlabs/puppetlabs_spec_helper
+
+Gerating .fixture.yml when executing rake tasks
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code:: ruby
+
+    require 'puppetfiler'
+
+    desc 'Generate .fixtures.yml'
+    task :fixtures do
+        pf = Puppetfiler::Puppetfile.new('Puppetfile')
+        fixtures = pf.fixture(
+            {
+                'forge_modules' => {
+                    /.*/ => {
+                        'flags' => '--module_repository https://inhouse.forge.lan/',
+                    },
+                },
+            },
+        )
+        File.write('.fixtures.yml', fixtures.to_yaml)
+    end
+
+    task :spec => [:fixtures]
+    task :test do
+        [:metadata_lint, :lint, :validate, :spec].each do |test|
+            Rake::Task[test].invoke
+        end
+    end
+
+Allowed keys in the passed modifiers are 'forge_modules' and
+'repositories', which are hashes with strings or regular expressions as
+keys and hashes or strings as values.
+
+Also see the rspec test ``takes a hash with pattern matches and returns
+fixtures as a hash`` in ``spec/puppetfiler/puppetfile_spec.rb``.

data/Rakefile

@@ -10,6 +10,16 @@ Cucumber::Rake::Task.new(:features) do |t|
 end
 
 task :default do
+    require 'simplecov'
+    require 'simplecov-console'
+
+    SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+      SimpleCov::Formatter::HTMLFormatter,
+      SimpleCov::Formatter::Console,
+    ]
+
+    SimpleCov.start
+
     %i{spec features}.each do |task|
         Rake::Task[task].invoke
     end

data/data/simple_puppetfile.rb

@@ -0,0 +1,9 @@
+moduledir 'external_modules'
+
+mod 'puppetlabs/stdlib', '4.13.1'
+
+mod 'goscript', :git => 'https://github.com/ntnn/puppet-goscript'
+
+mod 'inifile',
+    :git => 'https://github.com/puppetlabs/puppetlabs-inifile',
+    :tag => '1.6.0'

data/exe/puppetfiler

@@ -1,5 +1,33 @@
 #!/usr/bin/env ruby
 
+if ENV['COVERAGE']
+    # from https://stackoverflow.com/questions/20207667/how-does-one-configure-cucumber-aruba-to-use-simplecov
+    require 'simplecov'
+
+    # As described in the issue, every process must have an unique name:
+    SimpleCov.command_name "binary #{Process.pid}"
+
+    # When running with aruba simplecov was using /tmp/aruba as the root folder.
+    # This is to force using the project folder
+    SimpleCov.root(File.join(File.expand_path(File.dirname(__FILE__)), '..'))
+
+    SimpleCov.start do
+        filters.clear
+
+        # Because simplecov filters everything outside of the SimpleCov.root
+        # This should be added, cf.
+        # https://github.com/colszowka/simplecov#default-root-filter-and-coverage-for-things-outside-of-it
+        add_filter do |src|
+            !(src.filename =~ /^#{SimpleCov.root}/) unless src.filename =~ /project/
+        end
+
+        # Ignoring test folders and tmp for Aruba
+        add_filter '/spec/'
+        add_filter '/features/'
+        add_filter '/tmp/'
+    end
+end
+
 require 'puppetfiler/cli'
 
 Puppetfiler::CLI.start

data/lib/puppetfiler/cli.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'yaml'
 require 'puppetfiler/puppetfile'
 require 'puppetfiler/version'
 
@@ -19,7 +20,7 @@ module Puppetfiler
         desc 'fixture [puppetfile]', 'Create puppetlabs_spec_helper compatible .fixtures.yml from puppetfile'
         method_option :stdout, :aliases => '-o'
         def fixture(puppetfile = 'Puppetfile')
-            f = Puppetfiler::Puppetfile.new(puppetfile).fixture
+            f = Puppetfiler::Puppetfile.new(puppetfile).fixture.to_yaml
 
             if options[:stdout]
                 puts f

data/lib/puppetfiler/puppetfile.rb

@@ -1,8 +1,12 @@
-require 'erb'
 require 'puppetfiler/mod'
 
 module Puppetfiler
     class Puppetfile
+        attr :modules
+        attr :repos
+        attr :puppetfile
+        attr :maxlen_name
+
         def initialize(path = 'Puppetfile')
             @modules    = {}
             @repos      = {}
@@ -11,37 +15,22 @@ module Puppetfiler
             @maxlen_name = 0
             @maxlen_ver  = 0
 
-            # TODO heredocs are ugly, maybe ruby has a way to store them
-            # elsewhere as .erb
-            # Also omit forge_modules/repositories if the referring key is
-            # empty
-            @fixture_template = <<-EOT
----
-fixtures:
-  forge_modules:
-<% @modules.each do |name, version| -%>
-    <%= name.split('/')[1] %>:
-      repo: <%= name %>
-      ref: <%= version %>
-<% end -%>
-  repositories:
-<% @repos.each do |name, hash| -%>
-    <%= name %>:
-      repo: <%= hash[:uri] %>
-      ref: <%= hash[:ref] %>
-<% end -%>
-EOT
-
             self.evaluate
         end
 
         def evaluate
-            # TODO add error handling if target doesn't exist
-            self.instance_eval(File.read(@puppetfile))
-        end
+            if not File.exists?(@puppetfile)
+                STDERR.puts "Puppetfile not found at path '#{@puppetfile}'"
+                return nil
+            end
 
-        def maxlen_name
-            @maxlen_name
+            begin
+                self.instance_eval(File.read(@puppetfile))
+            rescue SyntaxError => error
+                STDERR.puts "Puppetfile at path '#{@puppetfile}' is invalid:"
+                STDERR.puts error
+                return nil
+            end
         end
 
         def maxlen_ver
@@ -66,8 +55,63 @@ EOT
             return updates
         end
 
-        def fixture
-            ERB.new(@fixture_template, nil, '-').result(binding)
+        def fixture(modifiers = {})
+            fixtures = {
+                'forge_modules' => {},
+                'repositories'  => {},
+            }
+
+            fixtures.each do |k, v|
+                modifiers[k] = {} if not modifiers.has_key?(k)
+            end
+
+            @modules.each do |name, version|
+                short = name.split('/')[1]
+                value = {
+                    'repo' => name,
+                    'ref'  => version,
+                }
+
+                modifiers['forge_modules'].each do |modifier, merger|
+                    # TODO use x.match?(y) on ruby 2.4
+                    value.merge!(merger) if name =~ /#{modifier}/
+                end
+
+                fixtures['forge_modules'][short] = value
+            end
+
+            @repos.each do |name, hash|
+                if hash.has_key?(:ref)
+                    content = {
+                        'repo' => hash[:uri],
+                        'ref'  => hash[:ref],
+                    }
+
+                    modifiers['repositories'].each do |modifier, merger|
+                        content.merge!(merger) if name =~ /#{modifier}/
+                    end
+                else
+                    content = hash[:uri]
+
+                    modifiers['repositories'].each do |modifier, merger|
+                        if name =~ /#{modifier}/
+                            if merger.is_a?(String)
+                                content = merger
+                            else
+                                content = {
+                                    'repo' => hash[:uri],
+                                }
+
+                                content.merge!(merger)
+                            end
+                        end
+                    end
+                end
+
+                fixtures['repositories'][name] = content
+            end
+
+            fixtures
         end
 
         private

data/lib/puppetfiler/version.rb

@@ -1,3 +1,3 @@
 module Puppetfiler
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/puppetfiler.rb

@@ -1,3 +1,6 @@
+require 'puppetfiler/cli'
+require 'puppetfiler/mod'
+require 'puppetfiler/puppetfile'
 require 'puppetfiler/version'
 
 module Puppetfiler

data/puppetfiler.gemspec

@@ -29,6 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'cucumber', '~> 2.4'
   spec.add_development_dependency 'aruba', '~> 0.14.2'
   spec.add_development_dependency 'pry', '~> 0.10.4'
+  spec.add_development_dependency 'simplecov', '~> 0.13.0'
+  spec.add_development_dependency 'simplecov-console', '~> 0.4.1'
 
   spec.add_dependency 'puppet_forge', '~> 2.2'
   spec.add_dependency 'semantic_puppet', '~> 0.1.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetfiler
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Nelo-T. Wallus
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.4
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+- !ruby/object:Gem::Dependency
+  name: simplecov-console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: puppet_forge
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +182,7 @@ files:
 - TODO
 - bin/console
 - bin/setup
+- data/simple_puppetfile.rb
 - exe/puppetfiler
 - lib/puppetfiler.rb
 - lib/puppetfiler/cli.rb
@@ -181,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Miscallenous actions on Puppetfiles