simp-rake-helpers 3.7.0 → 4.0.0

data/spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/install.pp

@@ -0,0 +1,11 @@
+# == Class simpmod::install
+#
+# This class is called from simpmod for install.
+#
+class simpmod::install {
+  assert_private()
+
+  package { $::simpmod::package_name:
+    ensure => present
+  }
+}

data/spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/service.pp

@@ -0,0 +1,15 @@
+# == Class simpmod::service
+#
+# This class is meant to be called from simpmod.
+# It ensure the service is running.
+#
+class simpmod::service {
+  assert_private()
+
+  service { $::simpmod::service_name:
+    ensure     => running,
+    enable     => true,
+    hasstatus  => true,
+    hasrestart => true
+  }
+}

data/spec/lib/simp/rake/pupmod/fixtures/simpmod/metadata.json

@@ -0,0 +1,50 @@
+{
+  "name": "simp-simpmod",
+  "version": "0.1.0",
+  "author": "simp",
+  "summary": "A module fixture that models a simp module",
+  "license": "Apache-2.0",
+  "source": "",
+  "project_page": "",
+  "issues_url": "",
+  "tags": [
+    "simp"
+  ],
+  "dependencies": [
+    {
+      "name": "simp/iptables",
+      "version_requirement": ">= 6.0.1 < 7.0.0"
+    },
+    {
+      "name": "simp/simplib",
+      "version_requirement": ">= 3.3.1 < 4.0.0"
+    },
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 4.13.1 < 5.0.0"
+    }
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "puppet",
+      "version_requirement": ">= 4.6.0 < 5.0.0"
+    }
+  ],
+  "data_provider": "hiera"
+}

data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/nodesets/centos-combined-x64.yml

@@ -0,0 +1,22 @@
+# This nodeset spins up a simple one-host test VM for both EL6 and EL7
+HOSTS:
+  centos-7:
+    roles:
+      - server
+      - default
+      - master
+    platform:   el-7-x86_64
+    box:        centos/7
+    hypervisor: vagrant
+  centos-6:
+    roles:
+      - agent
+      - client
+    platform:   el-6-x86_64
+    box:        centos/6
+    hypervisor: vagrant
+CONFIG:
+  log_level: verbose
+  type:      aio
+  vagrant_memsize: 256
+  ## vb_gui: true

data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/nodesets/default.yml

@@ -0,0 +1 @@
+spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/nodesets/centos-combined-x64.yml

data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/class_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper_acceptance'
+
+test_name 'simpmod class'
+
+describe 'simpmod class' do
+  let(:manifest) {
+    <<-EOS
+      class { 'simpmod': }
+    EOS
+  }
+
+  context 'default parameters' do
+    # Using puppet_apply as a helper
+    it 'should work with no errors' do
+      apply_manifest(manifest, :catch_failures => true)
+    end
+
+    it 'should be idempotent' do
+      apply_manifest(manifest, :catch_changes => true)
+    end
+
+
+    describe package('simpmod') do
+      it { is_expected.to be_installed }
+    end
+
+    describe service('simpmod') do
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
+    end
+  end
+end

data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/nodesets

@@ -0,0 +1 @@
+spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/../../nodesets

data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/classes/init_spec.rb

@@ -0,0 +1,87 @@
+require 'spec_helper'
+
+describe 'simpmod' do
+  shared_examples_for "a structured module" do
+    it { is_expected.to compile.with_all_deps }
+    it { is_expected.to create_class('simpmod') }
+    it { is_expected.to contain_class('simpmod') }
+    it { is_expected.to contain_class('simpmod::install').that_comes_before('Class[simpmod::config]') }
+    it { is_expected.to contain_class('simpmod::config') }
+    it { is_expected.to contain_class('simpmod::service').that_subscribes_to('Class[simpmod::config]') }
+
+    it { is_expected.to contain_service('simpmod') }
+    it { is_expected.to contain_package('simpmod').with_ensure('present') }
+  end
+
+
+  context 'supported operating systems' do
+    on_supported_os.each do |os, facts|
+      context "on #{os}" do
+        let(:facts) do
+          facts
+        end
+
+        context "simpmod class without any parameters" do
+          let(:params) {{ }}
+          it_behaves_like "a structured module"
+          it { is_expected.to contain_class('simpmod').with_trusted_nets(['127.0.0.1/32']) }
+        end
+
+        context "simpmod class with firewall enabled" do
+          let(:params) {{
+            :trusted_nets     => ['10.0.2.0/24'],
+            :tcp_listen_port => 1234,
+            :enable_firewall => true,
+          }}
+          ###it_behaves_like "a structured module"
+          it { is_expected.to contain_class('simpmod::config::firewall') }
+
+          it { is_expected.to contain_class('simpmod::config::firewall').that_comes_before('Class[simpmod::service]') }
+          it { is_expected.to create_iptables__listen__tcp_stateful('allow_simpmod_tcp_connections').with_dports(1234)
+          }
+        end
+
+        context "simpmod class with selinux enabled" do
+          let(:params) {{
+            :enable_selinux => true,
+          }}
+          ###it_behaves_like "a structured module"
+          it { is_expected.to contain_class('simpmod::config::selinux') }
+          it { is_expected.to contain_class('simpmod::config::selinux').that_comes_before('Class[simpmod::service]') }
+          it { is_expected.to create_notify('FIXME: selinux') }
+        end
+
+        context "simpmod class with auditing enabled" do
+          let(:params) {{
+            :enable_auditing => true,
+          }}
+          ###it_behaves_like "a structured module"
+          it { is_expected.to contain_class('simpmod::config::auditing') }
+          it { is_expected.to contain_class('simpmod::config::auditing').that_comes_before('Class[simpmod::service]') }
+          it { is_expected.to create_notify('FIXME: auditing') }
+        end
+
+        context "simpmod class with logging enabled" do
+          let(:params) {{
+            :enable_logging => true,
+          }}
+          ###it_behaves_like "a structured module"
+          it { is_expected.to contain_class('simpmod::config::logging') }
+          it { is_expected.to contain_class('simpmod::config::logging').that_comes_before('Class[simpmod::service]') }
+          it { is_expected.to create_notify('FIXME: logging') }
+        end
+      end
+    end
+  end
+
+  context 'unsupported operating system' do
+    describe 'simpmod class without any parameters on Solaris/Nexenta' do
+      let(:facts) {{
+        :osfamily        => 'Solaris',
+        :operatingsystem => 'Nexenta',
+      }}
+
+      it { expect { is_expected.to contain_package('simpmod') }.to raise_error(Puppet::Error, /Nexenta not supported/) }
+    end
+  end
+end

data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper.rb

@@ -0,0 +1,92 @@
+require 'puppetlabs_spec_helper/module_spec_helper'
+require 'rspec-puppet'
+require 'simp/rspec-puppet-facts'
+include Simp::RspecPuppetFacts
+
+require 'pathname'
+
+# RSpec Material
+fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
+module_name = File.basename(File.expand_path(File.join(__FILE__,'../..')))
+
+default_hiera_config =<<-EOM
+---
+:backends:
+  - "rspec"
+  - "yaml"
+:yaml:
+  :datadir: "stub"
+:hierarchy:
+  - "%{custom_hiera}"
+  - "%{spec_title}"
+  - "%{module_name}"
+  - "default"
+EOM
+
+
+['hieradata','modules'].each do |dir|
+  _dir = File.join(fixture_path,dir)
+  FileUtils.mkdir_p(_dir) unless File.directory?(_dir)
+end
+
+RSpec.configure do |c|
+  # If nothing else...
+  c.default_facts = {
+    :production => {
+      #:fqdn           => 'production.rspec.test.localdomain',
+      :path           => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
+      :concat_basedir => '/tmp'
+    }
+  }
+
+  c.mock_framework = :rspec
+  c.mock_with :mocha
+
+  c.module_path = File.join(fixture_path, 'modules')
+  c.manifest_dir = File.join(fixture_path, 'manifests')
+  c.hiera_config = File.join(fixture_path,'hieradata','hiera.yaml')
+
+  # Useless backtrace noise
+  backtrace_exclusion_patterns = [ /spec_helper/, /gems/ ]
+
+  if c.respond_to?(:backtrace_exclusion_patterns)
+    c.backtrace_exclusion_patterns = backtrace_exclusion_patterns
+  elsif c.respond_to?(:backtrace_clean_patterns)
+    c.backtrace_clean_patterns = backtrace_exclusion_patterns
+  end
+
+  c.before(:all) do
+    data = YAML.load(default_hiera_config)
+    data[:yaml][:datadir] = File.join(fixture_path, 'hieradata')
+
+    File.open(c.hiera_config, 'w') do |f|
+      f.write data.to_yaml
+    end
+  end
+
+  c.before(:each) do
+    @spec_global_env_temp = Dir.mktmpdir('simpspec')
+
+    if defined?(environment)
+      FileUtils.mkdir_p(File.join(@spec_global_env_temp,environment.to_s))
+    end
+
+    # ensure the user running these tests has an accessible environmentpath
+    Puppet[:environmentpath] = @spec_global_env_temp
+    Puppet[:user] = Etc.getpwuid(Process.uid).name
+    Puppet[:group] = Etc.getgrgid(Process.gid).name
+  end
+
+  c.after(:each) do
+    FileUtils.rm_rf(@spec_global_env_temp) # clean up the mocked environmentpath
+    @spec_global_env_temp = nil
+  end
+end
+
+Dir.glob("#{RSpec.configuration.module_path}/*").each do |dir|
+  begin
+    Pathname.new(dir).realpath
+  rescue
+    fail "ERROR: The module '#{dir}' is not installed. Tests cannot continue."
+  end
+end

data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper_acceptance.rb

@@ -0,0 +1,45 @@
+require 'beaker-rspec'
+require 'tmpdir'
+require 'yaml'
+require 'simp/beaker_helpers'
+include Simp::BeakerHelpers
+
+unless ENV['BEAKER_provision'] == 'no'
+  hosts.each do |host|
+    # Install Puppet
+    if host.is_pe?
+      install_pe
+    else
+      install_puppet
+    end
+  end
+end
+
+
+RSpec.configure do |c|
+  # ensure that environment OS is ready on each host
+  fix_errata_on hosts
+
+  # Readable test descriptions
+  c.formatter = :documentation
+
+  # Configure all nodes in nodeset
+  c.before :suite do
+    begin
+      # Install modules and dependencies from spec/fixtures/modules
+      copy_fixture_modules_to( hosts )
+
+      # Generate and install PKI certificates on each SUT
+      Dir.mktmpdir do |cert_dir|
+        run_fake_pki_ca_on( default, hosts, cert_dir )
+        hosts.each{ |sut| copy_pki_to( sut, cert_dir, '/etc/pki/simp-testing' )}
+      end
+    rescue StandardError, ScriptError => e
+      if ENV['PRY']
+        require 'pry'; binding.pry
+      else
+        raise e
+      end
+    end
+  end
+end

data/spec/lib/simp/rake/pupmod/helpers_spec.rb

@@ -3,12 +3,64 @@ require 'spec_helper'
 
 describe Simp::Rake::Pupmod::Helpers do
   before :each do
-    @obj = Simp::Rake::Pupmod::Helpers.new( File.dirname(__FILE__) )
+    fixtures_dir = File.expand_path( '../fixtures', __FILE__ )
+    @simpmod = Simp::Rake::Pupmod::Helpers.new(File.join(fixtures_dir, 'simpmod'))
+    @othermod = Simp::Rake::Pupmod::Helpers.new(File.join(fixtures_dir, 'othermod'))
   end
 
-  describe "#initialize" do
-    it "initialized (smoke test)" do
-      expect( @obj.class ).to eq Simp::Rake::Pupmod::Helpers
+  describe '#initialize' do
+    it 'initialized (smoke test)' do
+      expect( @simpmod.class ).to eq Simp::Rake::Pupmod::Helpers
+    end
+  end
+
+  describe '#metadata' do
+    it 'reads a valid metadata.json (simp)' do
+      expect( @simpmod.send( :metadata )['name'] ).to eq 'simp-simpmod'
+      expect( @othermod.send( :metadata )['name'] ).to eq 'other-othermod'
+    end
+  end
+
+  describe '::CHANGELOG_ENTRY_REGEX' do
+    before :all do
+      @rgx = Simp::Rake::Pupmod::Helpers::CHANGELOG_ENTRY_REGEX
+    end
+
+    it 'matches valid one-line CHANGELOG entries' do
+      expect("* Mon Jan 1 1970 First Last <email@domain.com> - 0.0.1\n").to match @rgx
+      expect("* Mon Jan 1 1970 First Last <email@domain.com> 0.0.1\n").to match @rgx
+      expect("* Wed Oct 22 2014 First Middle Last <first.last-a1999@domain.com> - 2.0.0\n").to match @rgx
+      expect('* Wed Oct 22 2014 Name <first.last-a1999+gmail.label@domain.com> - 2.0.0').to match @rgx
+      expect('* Fri Jul 02 2010 Kamil Dudka <kdudka@redhat.com> 2.1.5-20').to match @rgx
+      expect('* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.5-21').to match @rgx
+    end
+
+    it "doesn't match invalid one-line CHANGELOG entries" do
+      expect("* Foo Jan 1 1970 First Last <email@domain.com> - 0.0.1\n").to_not match @rgx
+      expect("* Mon Xxn 1 1970 First Last <email@domain.com> - 0.0.1\n").to_not match @rgx
+      expect("* Mon Jan 111 1970 First Last <email@domain.com> - 0.0.1\n").to_not match @rgx
+      expect("* Mon Jan 1 1970 <email@domain.com> - 0.0.1\n").to_not match @rgx
+    end
+
+    it 'matches valid two-line CHANGELOG entries' do
+      skip "Not worth implementing right now"
+    end
+  end
+
+  describe "#changelog_annotation" do
+    it "generates a tag annotation from a valid SIMP module's CHANGELOG" do
+      _log = @simpmod.send( :changelog_annotation )
+      expect( _log.class ).to be String
+      expect( _log.size ).to be > 0
+      expect( _log.scan( /^Release of/ ).size ).to eq 1
+    end
+
+    it 'handles multiple CHANGELOG entries for the same release' do
+      _log = @simpmod.send( :changelog_annotation )
+      expect( _log.scan(/^\*.*\d+\.\d+\.\d+$/) ).to eq [
+        '* Tue Jan 2 1970 Second Author <email1@domain.com> - 0.1.0',
+        '* Mon Jan 1 1970 First Author <email2@domain.com> - 0.1.0',
+      ]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -73,6 +76,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: puppet-lint
   requirement: !ruby/object:Gem::Requirement
@@ -99,14 +105,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -127,14 +133,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: puppet-blacksmith
   requirement: !ruby/object:Gem::Requirement
@@ -478,6 +484,41 @@ files:
 - spec/lib/simp/rake/build/helpers_spec.rb
 - spec/lib/simp/rake/helpers_spec.rb
 - spec/lib/simp/rake/pkg_spec.rb
+- spec/lib/simp/rake/pupmod/fixtures/othermod/Gemfile
+- spec/lib/simp/rake/pupmod/fixtures/othermod/README.md
+- spec/lib/simp/rake/pupmod/fixtures/othermod/Rakefile
+- spec/lib/simp/rake/pupmod/fixtures/othermod/examples/init.pp
+- spec/lib/simp/rake/pupmod/fixtures/othermod/manifests/init.pp
+- spec/lib/simp/rake/pupmod/fixtures/othermod/metadata.json
+- spec/lib/simp/rake/pupmod/fixtures/othermod/spec/classes/init_spec.rb
+- spec/lib/simp/rake/pupmod/fixtures/othermod/spec/spec_helper.rb
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/CHANGELOG
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/CONTRIBUTORS
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/Gemfile
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/LICENSE
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/README.md
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/Rakefile
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/build/rpm_metadata/requires
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/data/common.yaml
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/hiera.yaml
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config.pp
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/auditing.pp
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/firewall.pp
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/logging.pp
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/pki.pp
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/selinux.pp
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/tcpwrappers.pp
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/init.pp
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/install.pp
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/service.pp
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/metadata.json
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/nodesets/centos-combined-x64.yml
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/nodesets/default.yml
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/class_spec.rb
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/nodesets
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/classes/init_spec.rb
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper.rb
+- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper_acceptance.rb
 - spec/lib/simp/rake/pupmod/helpers_spec.rb
 - spec/lib/simp/rake_spec.rb
 - spec/lib/simp/rpm_spec.rb