puppet-retrospec 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6e329b9bf28b9a369953d9fca8ff19d1cc32e82
-  data.tar.gz: f5198887c6b93f1b6b44383d2dd3f9183cb001eb
+  metadata.gz: ca1e5137298e9ae66d799a66eaf71a221e696379
+  data.tar.gz: 707f87e0cb1f5fb001d16459a037f8055806f9ba
 SHA512:
-  metadata.gz: e3601799c03379311d561889c8f9ecf7bafab7c817cf40d68ada86ed4ddbf572e01fd1dee95f685dcd6652c09c4efda9166dba6c30af767fd104d870c608f226
-  data.tar.gz: c21306e18c27ffac761fa3384c93f923b68063fe69e944b62bf828771b40634b62d9f3700eb0ebb0cda9aed1f0e3466a9cc0f7ad7fd54b1ec8932dc2cfb1437a
+  metadata.gz: c72d4b82b2eec85b0c29194f33822b3fe135246206c135f99f6cfd8f86a8c155a071f5e7cd9057ce8aa100b3d6d99df05fe53a275a6bb45d39bfe3871baa095b
+  data.tar.gz: 223c391870cedfb12b50dfc6246e91fbad7cbc667d4102dafa42d4e09c38b44b8a6f6be0e86b802cc78b8d9e91ac5cd068fe4807cb0d1067d6829a5505051639

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 1.4.1
+ * Adds real module data to common.yaml
 ## 1.4.0
  * Fixes gh-67 - adds abiltity to auto generate data in a module
  * Forces retrospec version 0.6.2 or greater

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet-retrospec (1.4.0)
+    puppet-retrospec (1.4.1)
       awesome_print
       facets
       retrospec (>= 0.6.2)

data/README.md

@@ -50,6 +50,10 @@ TOC Created by [gh-md-toc](https://github.com/ekalinin/github-markdown-toc)
 [![Gem Version](https://badge.fury.io/rb/puppet-retrospec.svg)](http://badge.fury.io/rb/puppet-retrospec)
 
 ## News
+### 5/10/17
+Adds ability to create module data.  With the release of puppet 4.9 we can now use module data.  
+Use the module_data generater to auto setup module data in your puppet module.  `retrospec puppet module_data`
+
 ### 4/20/17
 With all the changes in hiera recently and the ability to provide data in puppet modules.  I thought it would be a good 
 time to create a generator for retrospec to create hiera backends and data in module scaffolding. With the 1.6.0 release
@@ -60,6 +64,8 @@ Just run `retrospec puppet module_data` to auto create the scaffolding.
 Note: You must be using puppet 4.7+ (PE 2016.4.x) to actually use data in a module, but there is nothing stopping
 you from creating the scaffolding.
 
+Note: If you are using puppet 4.7-4.8 you will need to add `data_provider: "hiera"` in your module's metadata.json file.
+
 ### 3/7/17
 You can now sync files.  Any template file that contains a `.sync` in the file name will automatically
 be syncronized.  This is especially helpful for Gemfiles, Rakefiles and other static files that need to be updated.

data/lib/retrospec/plugins/v1/plugin/puppet.rb

@@ -167,6 +167,7 @@ Generates puppet rspec test code and puppet module components.
 
         def module_data(module_path, config, args=[])
           plugin_data = Retrospec::Puppet::Generators::ModuleDataGenerator.run_cli(config, args)
+          plugin_data[:puppet_context] = context
           p = Retrospec::Puppet::Generators::ModuleDataGenerator.new(module_path, plugin_data)
           p.run
         end

data/lib/retrospec/plugins/v1/plugin/version.rb

@@ -1,5 +1,5 @@
 module Retrospec
   module Puppet
-    VERSION = '1.4.0'
+    VERSION = '1.4.1'
   end
 end

data/spec/unit/generators/definition_generator_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe Retrospec::Puppet::Generators::DefinitionGenerator do
-  after(:each) do
-    FileUtils.rm(spec_file) if File.exist?(spec_file)
+  before(:each) do
+    FileUtils.rm_rf(spec_files_path) if File.exist?(spec_files_path)
   end
 
   let(:generator_opts) do
@@ -83,11 +83,11 @@ describe Retrospec::Puppet::Generators::DefinitionGenerator do
   describe 'spec files' do
     let(:generated_files) do
       [File.join(spec_files_path, 'one_define_spec.rb'),
-       File.join(spec_files_path, 'sub', 'settings_define_spec.rb')]
+       File.join(spec_files_path, 'sub', 'settings_define_spec.rb')].sort
     end
     it 'should generate a bunch of files' do
       files = Retrospec::Puppet::Generators::DefinitionGenerator.generate_spec_files(module_path, generator_opts)
-      expect(files).to eq(generated_files)
+      expect(files.sort).to eq(generated_files)
     end
   end
 end

data/spec/unit/generators/module_data_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe 'ModuleDataGenerator' do
   let(:cli_opts) do
     cli_opts = Retrospec::Puppet::Generators::ModuleDataGenerator.run_cli(context, opts)
+    cli_opts[:puppet_context] = puppet_context
+    cli_opts
   end
 
   let(:context) do
@@ -10,6 +12,18 @@ describe 'ModuleDataGenerator' do
       :template_dir => retrospec_templates_path }
   end
 
+  let(:puppet_context) do
+    # before we validate the module directory we should ensure the module exists by creating it
+    # validation also occurs when setting the module path
+    # these are required because the puppet module creates a singleton with some cached values
+    Utilities::PuppetModule.instance.module_dir_name = File.basename(module_path)
+    Utilities::PuppetModule.instance.module_name = File.basename(module_path)
+    Utilities::PuppetModule.instance.module_path = module_path
+    Utilities::PuppetModule.create_tmp_module_path # this is required to finish initialization
+    # setting the context is required to make other methods below work.  #TODO lazy create the context
+    ::Retrospec::Puppet::SpecObject.new(module_path, Utilities::PuppetModule.instance, context)
+  end
+
   let(:module_path) do
     File.join(fixture_modules_path, 'tomcat')
   end
@@ -38,7 +52,16 @@ describe 'ModuleDataGenerator' do
       generator.run
       expect(File.exist?(File.join(module_path, 'data'))).to eq(true)
       expect(File.exist?(File.join(module_path, 'functions'))).to eq(false)
-      expect(File.exist?(File.join(module_path, 'data', 'os'))).to eq(true)
+      expect(File.exist?(File.join(module_path, 'data', 'common.yaml'))).to eq(true)
+      expect(File.exist?(File.join(module_path, 'hiera.yaml'))).to eq(true)
+    end
+
+    it 'works with hiera data' do
+      generator.run
+      output = File.read(File.join(module_path, 'data', 'common.yaml'))
+      expect(output).to match(/tomcat/)
+      expect(File.exist?(File.join(module_path, 'data'))).to eq(true)
+      expect(File.exist?(File.join(module_path, 'functions'))).to eq(false)
       expect(File.exist?(File.join(module_path, 'data', 'common.yaml'))).to eq(true)
       expect(File.exist?(File.join(module_path, 'hiera.yaml'))).to eq(true)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-retrospec
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Corey Osman