puppet-retrospec 1.0.0 → 1.1.0

data/spec/unit/generators/type_generator_spec.rb

@@ -39,140 +39,140 @@ describe 'type generator' do
   end
 
   let(:context) do
-    { :module_path => module_path, :template_dir => retrospec_templates_path}
+    { :module_path => module_path, :template_dir => retrospec_templates_path }
   end
 
   let(:args) do
-    ['-p', 'param_one', 'param_two','-a', 'config1',
-      'config2', '-n', type_name]
+    ['-p', 'param_one', 'param_two', '-a', 'config1',
+     'config2', '-n', type_name]
+  end
+
+  let(:cli_opts) do
+    Retrospec::Puppet::Generators::TypeGenerator.run_cli(context, args)
+  end
+
+  let(:generator) do
+    Retrospec::Puppet::Generators::TypeGenerator.new(module_path, cli_opts)
+  end
+
+  it 'returns type dir' do
+    expect(generator.type_dir).to eq(type_dir)
+  end
+
+  it 'returns module path' do
+    expect(generator.type_spec_dir).to eq(type_spec_dir)
+  end
+
+  it 'can return type name' do
+    expect(generator.type_name).to eq('vhost')
+  end
+
+  it 'can generate a type file' do
+    file_path = File.join(fixtures_path, 'modules', 'tomcat', 'lib', 'puppet', 'type', 'vhost.rb')
+    expect(generator.generate_type_files).to eq(file_path)
+    expect(File.exist?(File.join(generator.type_dir, "#{generator.type_name}.rb")))
+  end
+
+  it 'can generate a spec file' do
+    allow(generator).to receive(:type_dir).and_return(fixtures_type_path)
+    allow(generator).to receive(:type_name_path).and_return(File.join(type_dir, "#{generator.type_name}.rb"))
+    files = [File.join(type_spec_dir, 'bmc_spec.rb'),
+             File.join(type_spec_dir, 'bmcuser_spec.rb'),
+             File.join(type_spec_dir, 'db_opatch_spec.rb')]
+    expect(generator.generate_type_spec_files).to eq(files)
+  end
+
+  describe 'cli' do
+    let(:context) do
+      { :module_path => module_path, :template_dir => File.expand_path(File.join(ENV['HOME'], '.retrospec', 'repos', 'retrospec-puppet-templates')) }
+    end
+
+    let(:type_name) do
+      'vhost'
+    end
+
+    let(:args) do
+      ['-p', 'param_one', 'param_two', '-a', 'prop_one',
+       'prop_two', '-n', type_name]
     end
 
     let(:cli_opts) do
-      Retrospec::Puppet::Generators::TypeGenerator.run_cli(context, args)
+      cli_opts = Retrospec::Puppet::Generators::TypeGenerator.run_cli(context, args)
     end
 
     let(:generator) do
-      Retrospec::Puppet::Generators::TypeGenerator.new(module_path, cli_opts)
+      Retrospec::Puppet::Generators::TypeGenerator.new(cli_opts[:module_path], cli_opts)
+    end
+
+    after :each do
+      FileUtils.rm_rf(File.dirname(File.dirname(generator.type_name_path))) # ensure the file does not exist
+      FileUtils.rm_rf(File.dirname(generator.type_spec_dir))
     end
 
-    it 'returns type dir' do
-      expect(generator.type_dir).to eq(type_dir)
+    it 'can run the cli options' do
+      # specify the parameters
+      expect(cli_opts).to be_an_instance_of Hash
+      expect(cli_opts[:properties]).to eq(%w(prop_one prop_two))
+      expect(cli_opts[:parameters]).to eq(%w(param_one param_two))
+      expect(cli_opts[:name]).to eq('vhost')
     end
 
-    it 'returns module path' do
-      expect(generator.type_spec_dir).to eq(type_spec_dir)
+    it 'generate type file with correct number of properties' do
+      file = generator.generate_type_files
+      require file
+      t = Puppet::Type.type(:vhost)
+      expect(t.properties.count). to eq(3)
     end
 
-    it 'can return type name' do
-      expect(generator.type_name).to eq('vhost')
+    context 'parameters' do
+      let(:args) do
+        ['-p', 'param_one', 'param_two', '-a', 'prop_one',
+         'prop_two', '-n', 'vhost']
+      end
+      it 'generate type file with correct number of parameters' do
+        file = generator.generate_type_files
+        require file
+        t = Puppet::Type.type(:vhost)
+        expect(t.parameters.count). to eq(2)
+      end
     end
 
-    it 'can generate a type file' do
-      file_path = File.join(fixtures_path, 'modules', 'tomcat', 'lib', 'puppet', 'type', 'vhost.rb')
-      expect(generator.generate_type_files).to eq(file_path)
-      expect(File.exist?(File.join(generator.type_dir, "#{generator.type_name}.rb")))
+    context 'providers' do
+      let(:args) do
+        ['-p', 'param_one', 'param_two', '-a', 'prop_one',
+         'prop_two', '-n', type_name, '--providers', 'default1', 'default2']
+      end
+
+      it 'generate type' do
+        file = generator.generate_type_files
+        require file
+        t = Puppet::Type.type(:vhost)
+        expect(File.exist?(file)).to eq(true)
+      end
+
+      it 'generate providers' do
+        file = generator.generate_type_files
+        p_vhost = File.join(provider_dir, 'vhost')
+        expect(File.exist?(File.join(p_vhost, 'default1.rb'))).to eq(true)
+        expect(File.exist?(File.join(p_vhost, 'default2.rb'))).to eq(true)
+        expect(generator.context.providers).to eq(%w(default1 default2))
+      end
     end
 
-    it 'can generate a spec file' do
-      allow(generator).to receive(:type_dir).and_return(fixtures_type_path)
-      allow(generator).to receive(:type_name_path).and_return(File.join(type_dir, "#{generator.type_name}.rb"))
-      files = [File.join(type_spec_dir, 'bmc_spec.rb'),
-        File.join(type_spec_dir, 'bmcuser_spec.rb'),
-        File.join(type_spec_dir, 'db_opatch_spec.rb')]
-        expect(generator.generate_type_spec_files).to eq(files)
+    describe 'existing type' do
+      let(:type_name) do
+        'package'
       end
 
-      describe 'cli' do
-        let(:context) do
-          { :module_path => module_path, :template_dir => File.expand_path(File.join(ENV['HOME'], '.retrospec', 'repos', 'retrospec-puppet-templates')) }
-        end
-
-        let(:type_name) do
-          'vhost'
-        end
-
-        let(:args) do
-          ['-p', 'param_one', 'param_two','-a', 'prop_one',
-            'prop_two', '-n', type_name]
-          end
-
-          let(:cli_opts) do
-            cli_opts = Retrospec::Puppet::Generators::TypeGenerator.run_cli(context, args)
-          end
-
-          let(:generator) do
-            Retrospec::Puppet::Generators::TypeGenerator.new(cli_opts[:module_path], cli_opts)
-          end
-
-          after :each do
-            FileUtils.rm_rf(File.dirname(File.dirname(generator.type_name_path))) # ensure the file does not exist
-            FileUtils.rm_rf(File.dirname(generator.type_spec_dir))
-          end
-
-          it 'can run the cli options' do
-            # specify the parameters
-            expect(cli_opts).to be_an_instance_of Hash
-            expect(cli_opts[:properties]).to eq(%w(prop_one prop_two))
-            expect(cli_opts[:parameters]).to eq(%w(param_one param_two))
-            expect(cli_opts[:name]).to eq('vhost')
-          end
-
-          it 'generate type file with correct number of properties' do
-            file = generator.generate_type_files
-            require file
-            t = Puppet::Type.type(:vhost)
-            expect(t.properties.count). to eq(3)
-          end
-
-          context 'parameters' do
-            let(:args) do
-              ['-p', 'param_one', 'param_two','-a', 'prop_one',
-                'prop_two', '-n', 'vhost']
-              end
-              it 'generate type file with correct number of parameters' do
-                file = generator.generate_type_files
-                require file
-                t = Puppet::Type.type(:vhost)
-                expect(t.parameters.count). to eq(2)
-              end
-            end
-
-            context 'providers' do
-              let(:args) do
-                ['-p', 'param_one', 'param_two','-a', 'prop_one',
-                  'prop_two', '-n', type_name, '--providers', 'default1', 'default2']
-                end
-
-                it 'generate type' do
-                  file = generator.generate_type_files
-                  require file
-                  t = Puppet::Type.type(:vhost)
-                  expect(File.exist?(file)).to eq(true)
-                end
-
-                it 'generate providers' do
-                  file = generator.generate_type_files
-                  p_vhost = File.join(provider_dir, 'vhost')
-                  expect(File.exist?(File.join(p_vhost, 'default1.rb'))).to eq(true)
-                  expect(File.exist?(File.join(p_vhost, 'default2.rb'))).to eq(true)
-                  expect(generator.context.providers).to eq(%w(default1 default2))
-                end
-              end
-
-              describe 'existing type' do
-                let(:type_name) do
-                  'package'
-                end
-
-                before :each do
-                  FileUtils.rm_rf(type_spec_dir)
-                  FileUtils.rm_rf(type_dir)
-                end
-
-                # it 'raise error' do
-                #   expect{Retrospec::Puppet::Generators::TypeGenerator.new(module_path,
-                #      cli_opts)}.to raise_exception Retrospec::Puppet::Generators::CoreTypeException
-                # end
-              end
-            end
-          end
+      before :each do
+        FileUtils.rm_rf(type_spec_dir)
+        FileUtils.rm_rf(type_dir)
+      end
+
+      # it 'raise error' do
+      #   expect{Retrospec::Puppet::Generators::TypeGenerator.new(module_path,
+      #      cli_opts)}.to raise_exception Retrospec::Puppet::Generators::CoreTypeException
+      # end
+    end
+  end
+end

data/spec/unit/plugin_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 require 'retrospec'
 
 describe 'puppet' do
-
   it 'can show the version' do
     expect(Retrospec::Puppet::VERSION).to be_instance_of(String)
   end
@@ -27,7 +26,6 @@ describe 'puppet' do
   end
 
   describe 'new_module' do
-
     let(:module_path) do
       '/tmp/testabc123'
     end
@@ -44,7 +42,6 @@ describe 'puppet' do
       }
     end
 
-
     describe 'without module path' do
       before(:each) do
         FileUtils.rm_rf('/tmp/testabc123')
@@ -55,7 +52,7 @@ describe 'puppet' do
       end
 
       let(:global_opts) do
-        {:module_path => module_path }
+        { :module_path => module_path }
       end
 
       let(:args) do
@@ -66,8 +63,8 @@ describe 'puppet' do
         retrospec
         expect(File.exist?(File.join(module_path, 'testabc123', 'manifests', 'init.pp'))).to eq(true)
         expect(File.exist?(File.join(module_path, 'testabc123', 'metadata.json'))).to eq(true)
-        # FIXME temporary disabling schema
-        #expect(File.exist?(File.join(module_path, 'testabc123', 'testabc123_schema.yaml'))).to eq(true)
+        # FIXME: temporary disabling schema
+        # expect(File.exist?(File.join(module_path, 'testabc123', 'testabc123_schema.yaml'))).to eq(true)
         metadata = JSON.parse(File.read(File.join(module_path, 'testabc123', 'metadata.json')))
         expect(metadata['author']).to eq('test_name')
         expect(metadata['license']).to eq('Apache-3.0')
@@ -80,7 +77,7 @@ describe 'puppet' do
       end
 
       let(:global_opts) do
-        {:module_path => module_path }
+        { :module_path => module_path }
       end
 
       before(:all) do
@@ -95,8 +92,8 @@ describe 'puppet' do
         retrospec
         expect(File.exist?(File.join(module_path, 'manifests', 'init.pp'))).to eq(true)
         expect(File.exist?(File.join(module_path, 'metadata.json'))).to eq(true)
-        # FIXME temporary disabling schema
-        #expect(File.exist?(File.join(module_path, 'testabc124_schema.yaml'))).to eq(true)
+        # FIXME: temporary disabling schema
+        # expect(File.exist?(File.join(module_path, 'testabc124_schema.yaml'))).to eq(true)
         metadata = JSON.parse(File.read(File.join(module_path, 'metadata.json')))
         expect(metadata['author']).to eq('test_name')
         expect(metadata['license']).to eq('Apache-3.0')
@@ -121,15 +118,15 @@ describe 'puppet' do
     end
 
     let(:global_opts) do
-      {:module_path => module_path }
+      { :module_path => module_path }
     end
 
     before(:each) do
       FileUtils.rm_rf(module_path)
       # ensure the module exists
       Retrospec::Plugins::V1::Puppet.run_cli(global_opts,
-       global_config, plugin_config,
-        ['new_module', '-n', 'testabc123'])
+                                             global_config, plugin_config,
+                                             ['new_module', '-n', 'testabc123'])
     end
 
     describe 'new_report' do
@@ -138,7 +135,7 @@ describe 'puppet' do
       end
 
       it 'should create report rb file' do
-        report_file = File.join(module_path,'lib', 'puppet', 'reports', 'test_report.rb')
+        report_file = File.join(module_path, 'lib', 'puppet', 'reports', 'test_report.rb')
         retrospec
         expect(File.read(report_file)).to match(/Puppet::Reports\.register_report\(:test_report\)/)
         expect(File.exist?(report_file)).to eq(true)
@@ -146,14 +143,13 @@ describe 'puppet' do
     end
 
     describe 'new_fact' do
-
       let(:args) do
         ['new_fact', '-n', 'test_fact']
       end
 
       it 'should create spec and rb file' do
         retrospec
-        expect(File.exist?(File.join(module_path,'lib', 'facter', 'test_fact.rb'))).to eq(true)
+        expect(File.exist?(File.join(module_path, 'lib', 'facter', 'test_fact.rb'))).to eq(true)
         expect(File.exist?(File.join(module_path, 'spec', 'unit', 'facter', 'test_fact_spec.rb'))).to eq(true)
       end
     end
@@ -163,7 +159,7 @@ describe 'puppet' do
         'type_a'
       end
       let(:type_dir) do
-        File.join(module_path,'lib', 'puppet', 'type')
+        File.join(module_path, 'lib', 'puppet', 'type')
       end
 
       let(:type_spec_dir) do
@@ -193,20 +189,18 @@ describe 'puppet' do
       end
     end
     describe 'new_provider' do
-
       let(:args) do
         ['new_provider', '-n', 'pname', '--type', 'type_a']
       end
 
       it 'should create spec and rb file' do
         retrospec
-        expect(File.exist?(File.join(module_path,'lib', 'puppet', 'provider', 'type_a', 'pname.rb'))).to eq(true)
+        expect(File.exist?(File.join(module_path, 'lib', 'puppet', 'provider', 'type_a', 'pname.rb'))).to eq(true)
         expect(File.exist?(File.join(module_path, 'spec', 'unit', 'puppet', 'provider', 'type_a', 'pname_spec.rb'))).to eq(true)
       end
     end
 
     describe 'new_function' do
-
       describe 'v3' do
         let(:args) do
           ['new_function', '-n', 'test_func_v3', '--type', 'v3']
@@ -214,14 +208,13 @@ describe 'puppet' do
 
         it 'should create v3 function' do
           retrospec
-          expect(File.exist?(File.join(module_path,'lib', 'puppet','parser', 'functions', 'test_func_v3.rb'))).to eq(true)
+          expect(File.exist?(File.join(module_path, 'lib', 'puppet', 'parser', 'functions', 'test_func_v3.rb'))).to eq(true)
         end
 
         it 'should create v3 function spec file' do
           retrospec
           expect(File.exist?(File.join(module_path, 'spec', 'functions', 'test_func_v3_spec.rb'))).to eq(true)
         end
-
       end
       describe 'v4' do
         let(:args) do
@@ -230,7 +223,7 @@ describe 'puppet' do
 
         it 'should create v4 function' do
           retrospec
-          expect(File.exist?(File.join(module_path,'lib', 'puppet', 'functions', 'test_func_v4.rb'))).to eq(true)
+          expect(File.exist?(File.join(module_path, 'lib', 'puppet', 'functions', 'test_func_v4.rb'))).to eq(true)
         end
 
         it 'should create v4 function spec file' do

data/spec/unit/puppet-retrospec_spec.rb

@@ -120,7 +120,7 @@ describe 'puppet-retrospec' do
     context 'should' do
       let(:plugin_config) do
         {
-           :enable_beaker_tests => true
+          :enable_beaker_tests => true
         }
       end
       it 'create acceptance test files' do
@@ -148,7 +148,7 @@ describe 'puppet-retrospec' do
     context 'should not' do
       let(:plugin_config) do
         {
-           :enable_beaker_tests => false
+          :enable_beaker_tests => false
         }
       end
       let(:rs) do
@@ -182,7 +182,6 @@ describe 'puppet-retrospec' do
         expect(File.exist?(filepath)).to eq(false)
       end
     end
-
   end
 
   it 'should create proper spec helper file' do
@@ -215,8 +214,7 @@ describe 'puppet-retrospec' do
                                                 'tomcat::purge_connectors' => nil,
                                                 'tomcat::purge_realms' => nil,
                                                 'tomcat::manage_user' => nil,
-                                                'tomcat::manage_group' => nil
-                                               )
+                                                'tomcat::manage_group' => nil)
 
     expect(File.read(filepath)).to include('#"tomcat::catalina_home" => \'\',')
   end

data/spec/unit/spec_object_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'spec_object' do
-
   let(:path) do
     File.join(fixture_modules_path, 'tomcat')
   end
@@ -21,26 +20,24 @@ describe 'spec_object' do
   end
 
   it 'should get all hiera data' do
-    expect(puppet_context.class_hiera_data('tomcat')).to eq({"tomcat::catalina_home" => nil,
-                                                             "tomcat::group" => nil,
-                                                             "tomcat::install_from_source" => nil,
-                                                             "tomcat::manage_group" => nil,
-                                                             "tomcat::manage_user" => nil,
-                                                             "tomcat::purge_connectors" => nil,
-                                                             "tomcat::purge_realms" => nil,
-                                                             "tomcat::user" => nil,
-                                                            })
+    expect(puppet_context.class_hiera_data('tomcat')).to eq('tomcat::catalina_home' => nil,
+                                                            'tomcat::group' => nil,
+                                                            'tomcat::install_from_source' => nil,
+                                                            'tomcat::manage_group' => nil,
+                                                            'tomcat::manage_user' => nil,
+                                                            'tomcat::purge_connectors' => nil,
+                                                            'tomcat::purge_realms' => nil,
+                                                            'tomcat::user' => nil)
   end
 
   it 'should get all hiera data' do
-    expect(puppet_context.all_hiera_data).to eq({"tomcat::catalina_home" => nil,
-                                                             "tomcat::group" => nil,
-                                                             "tomcat::install_from_source" => nil,
-                                                             "tomcat::manage_group" => nil,
-                                                             "tomcat::manage_user" => nil,
-                                                             "tomcat::purge_connectors" => nil,
-                                                             "tomcat::purge_realms" => nil,
-                                                             "tomcat::user" => nil,
-                                                            })
+    expect(puppet_context.all_hiera_data).to eq('tomcat::catalina_home' => nil,
+                                                'tomcat::group' => nil,
+                                                'tomcat::install_from_source' => nil,
+                                                'tomcat::manage_group' => nil,
+                                                'tomcat::manage_user' => nil,
+                                                'tomcat::purge_connectors' => nil,
+                                                'tomcat::purge_realms' => nil,
+                                                'tomcat::user' => nil)
   end
-end
+end