freighthop 0.3.3 → 0.4.0

data/modules/concat/manifests/setup.pp

@@ -1,50 +1,50 @@
-# Sets up the concat system.
+# === Class: concat::setup
 #
-# $concatdir is where the fragments live and is set on the fact concat_basedir.
-# Since puppet should always manage files in $concatdir and they should
-# not be deleted ever, /tmp is not an option.
+# Sets up the concat system. This is a private class.
 #
-# $puppetversion should be either 24 or 25 to enable a 24 compatible
-# mode, in 24 mode you might see phantom notifies this is a side effect
-# of the method we use to clear the fragments directory.
-#
-# The regular expression below will try to figure out your puppet version
-# but this code will only work in 0.24.8 and newer.
+# [$concatdir]
+#   is where the fragments live and is set on the fact concat_basedir.
+#   Since puppet should always manage files in $concatdir and they should
+#   not be deleted ever, /tmp is not an option.
 #
 # It also copies out the concatfragments.sh file to ${concatdir}/bin
+#
 class concat::setup {
-  $id = $::id
-  $root_group = $id ? {
-    root    => 0,
-    default => $id
+  if $caller_module_name != $module_name {
+    warning("${name} is deprecated as a public API of the ${module_name} module and should no longer be directly included in the manifest.")
   }
 
   if $::concat_basedir {
     $concatdir = $::concat_basedir
   } else {
-    fail ("\$concat_basedir not defined. Try running again with pluginsync enabled")
+    fail ('$concat_basedir not defined. Try running again with pluginsync=true on the [master] and/or [main] section of your node\'s \'/etc/puppet/puppet.conf\'.')
+  }
+
+  $script_name = $::kernel ? {
+    'windows' => 'concatfragments.rb',
+    default   => 'concatfragments.sh'
+  }
+
+  $script_path = "${concatdir}/bin/${script_name}"
+
+  $script_command   = $::kernel ? {
+    'windows' => "ruby.exe ${script_path}",
+    default   => $script_path
   }
 
-  $majorversion = regsubst($::puppetversion, '^[0-9]+[.]([0-9]+)[.][0-9]+$', '\1')
-  $fragments_source = $majorversion ? {
-    24      => 'puppet:///concat/concatfragments.sh',
-    default => 'puppet:///modules/concat/concatfragments.sh'
+  File {
+    backup => false,
   }
 
-  file{"${concatdir}/bin/concatfragments.sh":
-    owner  => $id,
-    group  => $root_group,
+  file { $script_path:
+    ensure => file,
+    owner  => $::id,
     mode   => '0755',
-    source => $fragments_source;
+    source => "puppet:///modules/concat/${script_name}",
+  }
 
-  [ $concatdir, "${concatdir}/bin" ]:
+  file { [ $concatdir, "${concatdir}/bin" ]:
     ensure => directory,
-    owner  => $id,
-    group  => $root_group,
-    mode   => '0750';
-
-  ## Old versions of this module used a different path.
-  '/usr/local/bin/concatfragments.sh':
-    ensure => absent;
+    mode   => '0755',
   }
 }

data/modules/concat/metadata.json

@@ -1,31 +1,50 @@
 {
-  "license": "Apache",
+  "name": "puppetlabs-concat",
+  "version": "1.1.0-rc1",
+  "source": "git://github.com/puppetlabs/puppetlabs-concat.git",
+  "author": "Puppetlabs",
+  "license": "Apache 2.0",
+  "summary": "Concat module",
+  "description": "Concat module",
+  "project_page": "http://github.com/puppetlabs/puppetlabs-concat",
   "dependencies": [
-
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 3.0.0"
+    }
   ],
-  "source": "git://github.com/ripienaar/puppet-concat.git",
-  "version": "0.2.0",
-  "description": "Concat module",
-  "summary": "Concat module",
   "types": [
 
   ],
-  "author": "R.I.Pienaar",
-  "project_page": "http://github.com/ripienaar/puppet-concat",
-  "name": "ripienaar-concat",
   "checksums": {
-    "spec/fixtures/manifests/site.pp": "d41d8cd98f00b204e9800998ecf8427e",
-    "files/concatfragments.sh": "256169ee61115a6b717b2844d2ea3128",
+    "CHANGELOG": "e8e366be83819324f167e4966a872bdc",
+    "Gemfile": "d84cde6589d6c4003f15744d1eb0a2f0",
+    "Gemfile.lock": "39cbdebd1a4a3f3e9870fd28ef4d51ab",
+    "LICENSE": "f5a76685d453424cd63dde1535811cf0",
+    "Modulefile": "974590b1e266245fd03dc100d685e38e",
+    "README.md": "3a7350be9aff722e9aa04d4abefd5f28",
+    "Rakefile": "96b14653a661e66ab8dc54c33c103a9c",
+    "files/concatfragments.rb": "6784c28044a4204efb75fe4eb759816a",
+    "files/concatfragments.sh": "e7aaa4c45316eb97d2d88b57334c4060",
+    "lib/facter/concat_basedir.rb": "ff080677e7f192b9b96911698b0b9b3d",
+    "manifests/fragment.pp": "01bd7ea14eec8a3d95d895dccbb3351a",
+    "manifests/init.pp": "fc4c46156e23b9562c85f136cf16502e",
+    "manifests/setup.pp": "1d4c51a1883f05129e56b869e0201f92",
     "spec/spec_helper.rb": "0db89c9a486df193c0e40095422e19dc",
-    "README.markdown": "f0605b99afffca3404e3a80dad951d83",
-    "Modulefile": "5dda7c51425f5337bb3234993a52732f",
-    "CHANGELOG": "543eb3beeb56b779171cff6e181a44cb",
-    "manifests/fragment.pp": "a34e1f60a31bb64eaed22745f70a88e7",
-    "lib/facter/concat_basedir.rb": "f2e991697602ffb3e80e0cc9efa37f3a",
-    "spec/defines/init_spec.rb": "cc8ce111b49906033dbf7837bc6b7495",
-    "manifests/init.pp": "7128c08a525c7bbc8bf4a721ad1c4f3e",
-    "manifests/setup.pp": "dc8d30bc47d447c5bde2c390fd34541c",
-    "Rakefile": "f37e6131fe7de9a49b09d31596f5fbf1",
-    "LICENSE": "f5a76685d453424cd63dde1535811cf0"
+    "spec/spec_helper_system.rb": "048464aba919291ea7a2041e4aad2fdd",
+    "spec/system/basic_spec.rb": "9135d9af6a21f16980ab59b58e91ed9a",
+    "spec/system/concat_spec.rb": "84379caf03862d05c68518eb351b1710",
+    "spec/system/deprecation_warnings_spec.rb": "234e697f7716d21581cdf5f1b4d87ecb",
+    "spec/system/empty_spec.rb": "36f131e28e0ac134a7c8c141814370fa",
+    "spec/system/fragment_source_spec.rb": "7fc98976cf94cd0b395846ecbf7f4889",
+    "spec/system/replace_spec.rb": "8186d0bc3f2bdb5edbb00a77846dc219",
+    "spec/system/symbolic_name_spec.rb": "c3634e28d287c4021859c556256be9fc",
+    "spec/system/warn_spec.rb": "94edec0fdd519d0911a5beb90bd1c90e",
+    "spec/unit/classes/concat_setup_spec.rb": "6d3729833715d65f3c50c2153caed6bc",
+    "spec/unit/defines/concat_fragment_spec.rb": "ced7c3b1b6d7f2e65c6dc066aa8c0527",
+    "spec/unit/defines/concat_spec.rb": "33f09af54a1d9039c5316743f34fc7bc",
+    "spec/unit/facts/concat_basedir_spec.rb": "cf00f5a07948436fa0a84d00fc098539",
+    "tests/fragment.pp": "9adc3d9ba61676066072e1b949a37dbb",
+    "tests/init.pp": "bd3ce7d2ee146744b5dbbaae8a927043"
   }
 }

data/modules/{apt → concat}/spec/spec_helper_system.rb

@@ -1,11 +1,9 @@
 require 'rspec-system/spec_helper'
 require 'rspec-system-puppet/helpers'
 require 'rspec-system-serverspec/helpers'
-
-include RSpecSystemPuppet::Helpers
-
 include Serverspec::Helper::RSpecSystem
 include Serverspec::Helper::DetectOS
+include RSpecSystemPuppet::Helpers
 
 RSpec.configure do |c|
   # Project root
@@ -18,13 +16,20 @@ RSpec.configure do |c|
 
   # This is where we 'setup' the nodes before running our tests
   c.before :suite do
-    # May as well update here as this can only run on apt-get machines.
-    shell('apt-get update')
     # Install puppet
     puppet_install
 
     # Install modules and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'apt')
+    puppet_module_install(:source => proj_root, :module_name => 'concat')
     shell('puppet module install puppetlabs-stdlib')
   end
+
+  c.before(:all) do
+    shell('mkdir -p /tmp/concat')
+  end
+  c.after(:all) do
+    shell('rm -rf /tmp/concat /var/lib/puppet/concat')
+  end
+
+  c.treat_symbols_as_metadata_keys_with_true_values = true
 end

data/modules/{firewall → concat}/spec/system/basic_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper_system'
 describe "basic tests:" do
   context 'make sure we have copied the module across' do
     # No point diagnosing any more if the module wasn't copied properly
-    context shell 'ls /etc/puppet/modules/firewall' do
+    context shell 'ls /etc/puppet/modules/concat' do
       its(:stdout) { should =~ /Modulefile/ }
       its(:stderr) { should be_empty }
       its(:exit_code) { should be_zero }

data/modules/concat/spec/system/concat_spec.rb

@@ -0,0 +1,154 @@
+require 'spec_helper_system'
+
+describe 'basic concat test' do
+
+  shared_examples 'successfully_applied' do |pp|
+    context puppet_apply(pp) do
+      its(:stderr) { should be_empty }
+      its(:exit_code) { should_not == 1 }
+      its(:refresh) { should be_nil }
+      its(:stderr) { should be_empty }
+      its(:exit_code) { should be_zero }
+    end
+
+    describe file('/var/lib/puppet/concat') do
+      it { should be_directory }
+      it { should be_owned_by 'root' }
+      it { should be_grouped_into 'root' }
+      it { should be_mode 755 }
+    end
+    describe file('/var/lib/puppet/concat/bin') do
+      it { should be_directory }
+      it { should be_owned_by 'root' }
+      it { should be_grouped_into 'root' }
+      it { should be_mode 755 }
+    end
+    describe file('/var/lib/puppet/concat/bin/concatfragments.sh') do
+      it { should be_file }
+      it { should be_owned_by 'root' }
+      #it { should be_grouped_into 'root' }
+      it { should be_mode 755 }
+    end
+    describe file('/var/lib/puppet/concat/_tmp_concat_file') do
+      it { should be_directory }
+      it { should be_owned_by 'root' }
+      it { should be_grouped_into 'root' }
+      it { should be_mode 750 }
+    end
+    describe file('/var/lib/puppet/concat/_tmp_concat_file/fragments') do
+      it { should be_directory }
+      it { should be_owned_by 'root' }
+      it { should be_grouped_into 'root' }
+      it { should be_mode 750 }
+    end
+    describe file('/var/lib/puppet/concat/_tmp_concat_file/fragments.concat') do
+      it { should be_file }
+      it { should be_owned_by 'root' }
+      it { should be_grouped_into 'root' }
+      it { should be_mode 640 }
+    end
+    describe file('/var/lib/puppet/concat/_tmp_concat_file/fragments.concat.out') do
+      it { should be_file }
+      it { should be_owned_by 'root' }
+      it { should be_grouped_into 'root' }
+      it { should be_mode 640 }
+    end
+  end
+
+  context 'owner/group root' do
+    pp = <<-EOS
+      concat { '/tmp/concat/file':
+        owner => 'root',
+        group => 'root',
+        mode  => '0644',
+      }
+
+      concat::fragment { '1':
+        target  => '/tmp/concat/file',
+        content => '1',
+        order   => '01',
+      }
+
+      concat::fragment { '2':
+        target  => '/tmp/concat/file',
+        content => '2',
+        order   => '02',
+      }
+    EOS
+
+    it_behaves_like 'successfully_applied', pp
+
+    describe file('/tmp/concat/file') do
+      it { should be_file }
+      it { should be_owned_by 'root' }
+      it { should be_grouped_into 'root' }
+      it { should be_mode 644 }
+      it { should contain '1' }
+      it { should contain '2' }
+    end
+    describe file('/var/lib/puppet/concat/_tmp_concat_file/fragments/01_1') do
+      it { should be_file }
+      it { should be_owned_by 'root' }
+      it { should be_grouped_into 'root' }
+      it { should be_mode 640 }
+    end
+    describe file('/var/lib/puppet/concat/_tmp_concat_file/fragments/02_2') do
+      it { should be_file }
+      it { should be_owned_by 'root' }
+      it { should be_grouped_into 'root' }
+      it { should be_mode 640 }
+    end
+  end
+
+  context 'owner/group non-root' do
+    before(:all) do
+      shell "groupadd -g 42 bob"
+      shell "useradd -u 42 -g 42 bob"
+    end
+
+    pp="
+      concat { '/tmp/concat/file':
+        owner => 'bob',
+        group => 'bob',
+        mode  => '0644',
+      }
+
+      concat::fragment { '1':
+        target  => '/tmp/concat/file',
+        content => '1',
+        order   => '01',
+      }
+
+      concat::fragment { '2':
+        target  => '/tmp/concat/file',
+        content => '2',
+        order   => '02',
+      }
+    "
+
+    it_behaves_like 'successfully_applied', pp
+
+    describe file('/tmp/concat/file') do
+      it { should be_file }
+      it { should be_owned_by 'bob' }
+      it { should be_grouped_into 'bob' }
+      it { should be_mode 644 }
+      it { should contain '1' }
+      it { should contain '2' }
+    end
+    describe file('/var/lib/puppet/concat/_tmp_concat_file/fragments/01_1') do
+      it { should be_file }
+      it { should be_owned_by 'root' }
+      it { should be_grouped_into 'root' }
+      it { should be_mode 640 }
+      it { should contain '1' }
+    end
+    describe file('/var/lib/puppet/concat/_tmp_concat_file/fragments/02_2') do
+      it { should be_file }
+      it { should be_owned_by 'root' }
+      it { should be_grouped_into 'root' }
+      it { should be_mode 640 }
+      it { should contain '2' }
+    end
+  end
+end

data/modules/concat/spec/system/deprecation_warnings_spec.rb

@@ -0,0 +1,247 @@
+require 'spec_helper_system'
+
+describe 'deprecation warnings' do
+
+  shared_examples 'has_warning'do |pp, w|
+    context puppet_apply(pp) do
+      its(:stderr) { should =~ /#{Regexp.escape(w)}/m }
+      its(:exit_code) { should_not == 1 }
+      its(:refresh) { should be_nil }
+      its(:stderr) { should =~ /#{Regexp.escape(w)}/m }
+      its(:exit_code) { should be_zero }
+    end
+  end
+
+  context 'concat gnu parameter' do
+    pp = <<-EOS
+      concat { '/tmp/concat/file':
+        gnu => 'foo',
+      }
+      concat::fragment { 'foo':
+        target  => '/tmp/concat/file',
+        content => 'bar',
+      }
+    EOS
+    w = 'The $gnu parameter to concat is deprecated and has no effect'
+
+    it_behaves_like 'has_warning', pp, w
+  end
+
+  context 'concat warn parameter =>' do
+    ['true', 'yes', 'on'].each do |warn|
+      context warn do
+        pp = <<-EOS
+          concat { '/tmp/concat/file':
+            warn => '#{warn}',
+          }
+          concat::fragment { 'foo':
+            target  => '/tmp/concat/file',
+            content => 'bar',
+          }
+        EOS
+        w = 'Using stringified boolean values (\'true\', \'yes\', \'on\', \'false\', \'no\', \'off\') to represent boolean true/false as the $warn parameter to concat is deprecated and will be treated as the warning message in a future release'
+
+        it_behaves_like 'has_warning', pp, w
+
+        describe file('/tmp/concat/file') do
+          it { should be_file }
+          it { should contain '# This file is managed by Puppet. DO NOT EDIT.' }
+          it { should contain 'bar' }
+        end
+      end
+    end
+
+    ['false', 'no', 'off'].each do |warn|
+      context warn do
+        pp = <<-EOS
+          concat { '/tmp/concat/file':
+            warn => '#{warn}',
+          }
+          concat::fragment { 'foo':
+            target  => '/tmp/concat/file',
+            content => 'bar',
+          }
+        EOS
+        w = 'Using stringified boolean values (\'true\', \'yes\', \'on\', \'false\', \'no\', \'off\') to represent boolean true/false as the $warn parameter to concat is deprecated and will be treated as the warning message in a future release'
+
+        it_behaves_like 'has_warning', pp, w
+
+        describe file('/tmp/concat/file') do
+          it { should be_file }
+          it { should_not contain '# This file is managed by Puppet. DO NOT EDIT.' }
+          it { should contain 'bar' }
+        end
+      end
+    end
+  end
+
+  context 'concat::fragment ensure parameter' do
+    context 'target file exists' do
+      before(:all) do
+        shell("/bin/echo 'file1 contents' > /tmp/concat/file1")
+      end
+      after(:all) do
+        # XXX this test may leave behind a symlink in the fragment directory
+        # which could cause warnings and/or breakage from the subsequent tests
+        # unless we clean it up. 
+        shell('rm -rf /tmp/concat /var/lib/puppet/concat')
+        shell('mkdir -p /tmp/concat')
+      end
+
+      pp = <<-EOS
+        concat { '/tmp/concat/file': }
+        concat::fragment { 'foo':
+          target => '/tmp/concat/file',
+          ensure => '/tmp/concat/file1',
+        }
+      EOS
+      w = 'Passing a value other than \'present\' or \'absent\' as the $ensure parameter to concat::fragment is deprecated.  If you want to use the content of a file as a fragment please use the $source parameter.'
+
+      it_behaves_like 'has_warning', pp, w
+
+      describe file('/tmp/concat/file') do
+        it { should be_file }
+        it { should contain 'file1 contents' }
+      end
+
+      # check that the fragment can be changed from a symlink to a plain file
+
+      pp = <<-EOS
+        concat { '/tmp/concat/file': }
+        concat::fragment { 'foo':
+          target  => '/tmp/concat/file',
+          content => 'new content',
+        }
+      EOS
+
+      context puppet_apply(pp) do
+        its(:stderr) { should be_empty }
+        its(:exit_code) { should_not == 1 }
+        its(:refresh) { should be_nil }
+        its(:stderr) { should be_empty }
+        its(:exit_code) { should be_zero }
+      end
+
+      describe file('/tmp/concat/file') do
+        it { should be_file }
+        it { should contain 'new content' }
+        it { should_not contain 'file1 contents' }
+      end
+    end # target file exists
+
+    context 'target does not exist' do
+      after(:all) do
+        # XXX this test may leave behind a symlink in the fragment directory
+        # which could cause warnings and/or breakage from the subsequent tests
+        # unless we clean it up. 
+        shell('rm -rf /tmp/concat /var/lib/puppet/concat')
+        shell('mkdir -p /tmp/concat')
+      end
+
+      pp = <<-EOS
+        concat { '/tmp/concat/file': }
+        concat::fragment { 'foo':
+          target => '/tmp/concat/file',
+          ensure => '/tmp/concat/file1',
+        }
+      EOS
+      w = 'Passing a value other than \'present\' or \'absent\' as the $ensure parameter to concat::fragment is deprecated.  If you want to use the content of a file as a fragment please use the $source parameter.'
+
+      it_behaves_like 'has_warning', pp, w
+
+      describe file('/tmp/concat/file') do
+        it { should be_file }
+      end
+
+      # check that the fragment can be changed from a symlink to a plain file
+
+      pp = <<-EOS
+        concat { '/tmp/concat/file': }
+        concat::fragment { 'foo':
+          target  => '/tmp/concat/file',
+          content => 'new content',
+        }
+      EOS
+
+      context puppet_apply(pp) do
+        its(:stderr) { should be_empty }
+        its(:exit_code) { should_not == 1 }
+        its(:refresh) { should be_nil }
+        its(:stderr) { should be_empty }
+        its(:exit_code) { should be_zero }
+      end
+
+      describe file('/tmp/concat/file') do
+        it { should be_file }
+        it { should contain 'new content' }
+      end
+    end # target file exists
+
+  end # concat::fragment ensure parameter
+
+  context 'concat::fragment mode parameter' do
+    pp = <<-EOS
+      concat { '/tmp/concat/file': }
+      concat::fragment { 'foo':
+        target  => '/tmp/concat/file',
+        content => 'bar',
+        mode    => 'bar',
+      }
+    EOS
+    w = 'The $mode parameter to concat::fragment is deprecated and has no effect'
+
+    it_behaves_like 'has_warning', pp, w
+  end
+
+  context 'concat::fragment owner parameter' do
+    pp = <<-EOS
+      concat { '/tmp/concat/file': }
+      concat::fragment { 'foo':
+        target  => '/tmp/concat/file',
+        content => 'bar',
+        owner   => 'bar',
+      }
+    EOS
+    w = 'The $owner parameter to concat::fragment is deprecated and has no effect'
+
+    it_behaves_like 'has_warning', pp, w
+  end
+
+  context 'concat::fragment group parameter' do
+    pp = <<-EOS
+      concat { '/tmp/concat/file': }
+      concat::fragment { 'foo':
+        target  => '/tmp/concat/file',
+        content => 'bar',
+        group   => 'bar',
+      }
+    EOS
+    w = 'The $group parameter to concat::fragment is deprecated and has no effect'
+
+    it_behaves_like 'has_warning', pp, w
+  end
+
+  context 'concat::fragment backup parameter' do
+    pp = <<-EOS
+      concat { '/tmp/concat/file': }
+      concat::fragment { 'foo':
+        target  => '/tmp/concat/file',
+        content => 'bar',
+        backup  => 'bar',
+      }
+    EOS
+    w = 'The $backup parameter to concat::fragment is deprecated and has no effect'
+
+    it_behaves_like 'has_warning', pp, w
+  end
+
+  context 'include concat::setup' do
+    pp = <<-EOS
+      include concat::setup
+    EOS
+    w = 'concat::setup is deprecated as a public API of the concat module and should no longer be directly included in the manifest.'
+
+    it_behaves_like 'has_warning', pp, w
+  end
+
+end

data/modules/concat/spec/system/empty_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper_system'
+
+describe 'basic concat test' do
+  context 'should run successfully' do
+    pp = <<-EOS
+      concat { '/tmp/concat/file':
+        owner => root,
+        group => root,
+        mode  => '0644',
+        force => true,
+      }
+    EOS
+
+    context puppet_apply(pp) do
+      its(:stderr) { should be_empty }
+      its(:exit_code) { should_not == 1 }
+      its(:refresh) { should be_nil }
+      its(:stderr) { should be_empty }
+      its(:exit_code) { should be_zero }
+    end
+
+    describe file('/tmp/concat/file') do
+      it { should be_file }
+      it { should_not contain '1\n2' }
+    end
+  end
+end