freighthop 0.0.6 → 0.1.0

data/modules/apt/metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apt",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "summary": "Puppet Labs Apt Module",
   "author": "Evolving Web / Puppet Labs",
   "description": "APT Module for Puppet",
@@ -18,29 +18,30 @@
     ".forge-release/publish": "1c1d6dd64ef52246db485eb5459aa941",
     ".forge-release/settings.xml": "06d768a57d582fe1ee078b563427e750",
     ".forge-release/validate": "7fffde8112f42a1ec986d49ba80ac219",
+    ".nodeset.yml": "78d78c172336a387a1067464434ffbcb",
     ".travis.yml": "782420dcc9d6412c79c30f03b1f3613c",
-    "CHANGELOG": "afd5267ae14ecd16f8b30ac7a34d9490",
-    "Gemfile": "6bac61e5713dbf7c477c0c8dccc00cf6",
-    "Gemfile.lock": "73d412ad5face41b380d04298137bb42",
+    "CHANGELOG": "f5488e1e891a8f8c47143dac790ddab3",
+    "Gemfile": "1bfa7eb6e30346c9ddb4a8b144b0d255",
+    "Gemfile.lock": "8ff8bc3d32bb7412bd97e48190a93b2f",
     "LICENSE": "20bcc606fc61ffba2b8cea840e8dce4d",
-    "Modulefile": "c49fc65c8164416b8dd5f62dbaa563f0",
-    "README.md": "48d8b527c8c0efa83223be6aebfe7114",
-    "Rakefile": "0254db5d3fc38c67a2c160d7296a24f8",
+    "Modulefile": "b34e93626fbc137cbb651952e7509839",
+    "README.md": "65176b395f7202fe5d222ae7b0de4e05",
+    "Rakefile": "0428ea3759a4692c91604396c406a9c1",
     "manifests/backports.pp": "09f1d86603d0f44a2169acb3eeea2a70",
     "manifests/builddep.pp": "4f313b5140c84aa7d5793b5a073c30dd",
     "manifests/conf.pp": "5ddf258195d414d93284dfd281a8d6e3",
     "manifests/debian/testing.pp": "aeb625bacb6a8df46c864ee9ee1cb5a5",
     "manifests/debian/unstable.pp": "108038596b05dc1d28975884693f73f5",
     "manifests/force.pp": "cf871e869f4114f32ab164de2a67e7e2",
-    "manifests/init.pp": "07ddf785dc2887a59d3b1ca0bb3f3444",
+    "manifests/init.pp": "5ec106a7a03313c544159a9a1f6b78e6",
     "manifests/key.pp": "3cf082ed91a3933ab7218d1be3464f4f",
     "manifests/params.pp": "ca4ce3730a65c43f884ab3e6445f1661",
     "manifests/pin.pp": "dea8cbaabc37010ce25838080608802b",
-    "manifests/ppa.pp": "83e80406afc451e8e8f216ebd982f973",
+    "manifests/ppa.pp": "754a83944ae79b5001fc0c0a8c775985",
     "manifests/release.pp": "427f3ee70a6a1e55fa291e58655bd5d9",
     "manifests/source.pp": "6eab8d33c173a066f5dec8474efdedb6",
     "manifests/unattended_upgrades.pp": "e97f908b42010ff9a85be4afd2c721ab",
-    "manifests/update.pp": "bff1331f5467f146edf9fa43475fe532",
+    "manifests/update.pp": "436c79f160f2cb603710795a9ec71ac7",
     "spec/classes/apt_spec.rb": "54841b04b42026770ed6d744a82c55df",
     "spec/classes/backports_spec.rb": "7d2454a881cc26edd3dcd3acb7ffd20f",
     "spec/classes/debian_testing_spec.rb": "fad1384cb9d3c99b2663d7df4762dc0e",
@@ -53,13 +54,20 @@
     "spec/defines/force_spec.rb": "97098c5b123be49e321e71cda288fe53",
     "spec/defines/key_spec.rb": "7800c30647b1ddf799b991110109cba0",
     "spec/defines/pin_spec.rb": "c912e59e9e3d1145280d659cccabe72b",
-    "spec/defines/ppa_spec.rb": "c7057d002f2d95ce95bc83c5089fa2c0",
-    "spec/defines/source_spec.rb": "caa3be1996630704730af19bc1ee798c",
+    "spec/defines/ppa_spec.rb": "72ce037a1d6ea0a33f369b1f3d98b3d6",
+    "spec/defines/source_spec.rb": "e553bb9598dbe2becba6ae7f91d4deb0",
     "spec/spec_helper.rb": "0db89c9a486df193c0e40095422e19dc",
+    "spec/spec_helper_system.rb": "e67d2574baae312f1095f90d78fdf5e9",
+    "spec/system/apt_builddep_spec.rb": "97be5a48d2d16d96cb7c35ccdbcdcb69",
+    "spec/system/apt_key_spec.rb": "098835d0c53c69390d4c3b6ea8ef3815",
+    "spec/system/apt_ppa_spec.rb": "c96f6d0bbdafac39beaf0d5e6eba9010",
+    "spec/system/apt_source_spec.rb": "df5aa98b03688884903c564bb507469f",
+    "spec/system/basic_spec.rb": "0a5b33d18254bedcb7886e34846ebff6",
+    "spec/system/class_spec.rb": "2ba4265236f00685c23cb00f908defc1",
     "templates/10periodic.erb": "2aeea866a39f19a62254abbb4f1bc59d",
     "templates/50unattended-upgrades.erb": "ae995ade214fdaefab51d335c85819ae",
     "templates/pin.pref.erb": "623249839cee7788fa0805a3474396db",
-    "templates/source.list.erb": "9ddccd6b59757d40e99158dbfe9a97e2",
+    "templates/source.list.erb": "65a016e60daf065c481f3d5f2c883324",
     "tests/builddep.pp": "4773f57072111e58f2ed833fa4489a88",
     "tests/debian/testing.pp": "1cbee56baddd6a91d981db8fddec70fb",
     "tests/debian/unstable.pp": "4b2a090afeb315752262386f4dbcd8ca",

data/modules/apt/spec/defines/ppa_spec.rb

@@ -45,7 +45,7 @@ describe 'apt::ppa', :type => :define do
 
           it { should contain_exec("add-apt-repository-#{t}").with(
             'command' => "/usr/bin/add-apt-repository #{options} #{t}",
-            'creates' => "/etc/apt/sources.list.d/#{filename}",
+            'unless'  => "/usr/bin/test -s /etc/apt/sources.list.d/#{filename}",
             'require' => ["File[/etc/apt/sources.list.d]", "Package[#{package}]"],
             'notify'  => "Exec[apt_update]"
             )
@@ -74,7 +74,7 @@ describe 'apt::ppa', :type => :define do
         it { should contain_exec("add-apt-repository-#{title}").with(
           'environment' => [],
           'command'     => "/usr/bin/add-apt-repository #{options} #{title}",
-          'creates'     => "/etc/apt/sources.list.d/#{filename}",
+          'unless'      => "/usr/bin/test -s /etc/apt/sources.list.d/#{filename}",
           'require'     => ["File[/etc/apt/sources.list.d]", "Package[#{package}]"],
           'notify'      => "Exec[apt_update]"
           )
@@ -100,7 +100,7 @@ describe 'apt::ppa', :type => :define do
             "https_proxy=http://user:pass@proxy:8080",
           ],
           'command'     => "/usr/bin/add-apt-repository #{options} #{title}",
-          'creates'     => "/etc/apt/sources.list.d/#{filename}",
+          'unless'      => "/usr/bin/test -s /etc/apt/sources.list.d/#{filename}",
           'require'     => ["File[/etc/apt/sources.list.d]", "Package[#{package}]"],
           'notify'      => "Exec[apt_update]"
           )

data/modules/apt/spec/defines/source_spec.rb

@@ -75,10 +75,10 @@ describe 'apt::source', :type => :define do
         if param_hash[:architecture]
           arch = "[arch=#{param_hash[:architecture]}]"
         end
-        content << "\ndeb #{arch} #{param_hash[:location]} #{param_hash[:release]} #{param_hash[:repos]}\n"
+        content << "\ndeb #{arch}#{param_hash[:location]} #{param_hash[:release]} #{param_hash[:repos]}\n"
 
         if param_hash[:include_src]
-          content << "deb-src #{arch} #{param_hash[:location]} #{param_hash[:release]} #{param_hash[:repos]}\n"
+          content << "deb-src #{arch}#{param_hash[:location]} #{param_hash[:release]} #{param_hash[:repos]}\n"
         end
         content
       end

data/modules/apt/spec/spec_helper_system.rb

@@ -0,0 +1,30 @@
+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
+
+RSpec.configure do |c|
+  # Project root
+  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+  # Enable colour
+  c.tty = true
+
+  c.include RSpecSystemPuppet::Helpers
+
+  # 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')
+    shell('puppet module install puppetlabs-stdlib')
+  end
+end

data/modules/apt/spec/system/apt_builddep_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper_system'
+
+describe 'apt::builddep' do
+
+  context 'reset' do
+    it 'removes packages' do
+      shell('apt-get -y remove glusterfs-server')
+      shell('apt-get -y remove g++')
+    end
+  end
+
+  context 'apt::builddep' do
+    it 'should work with no errors' do
+      pp = <<-EOS
+      include '::apt'
+      apt::builddep { 'glusterfs-server': }
+      EOS
+
+      puppet_apply(pp) do |r|
+        r.exit_code.should_not == 1
+      end
+    end
+
+    describe 'should install g++ as a dependency' do
+      describe package('g++') do
+        it { should be_installed }
+      end
+    end
+  end
+
+  context 'reset' do
+    it 'removes packages' do
+      shell('apt-get -y remove glusterfs-server')
+      shell('apt-get -y remove g++')
+    end
+  end
+
+end

data/modules/apt/spec/system/apt_key_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper_system'
+
+describe 'apt::key' do
+
+  context 'reset' do
+    it 'clean up keys' do
+      shell('apt-key del 4BD6EC30')
+      shell('apt-key del D50582E6')
+    end
+  end
+
+  context 'apt::key' do
+    it 'should work with no errors' do
+      pp = <<-EOS
+      include '::apt'
+      apt::key { 'puppetlabs':
+        key        => '4BD6EC30',
+        key_server => 'pgp.mit.edu',
+      }
+
+      apt::key { 'jenkins':
+        key        => 'D50582E6',
+        key_source => 'http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key',
+      }
+      EOS
+
+      puppet_apply(pp) do |r|
+        r.exit_code.should_not == 1
+      end
+    end
+
+    describe 'keys should exist' do
+      it 'finds puppetlabs key' do
+        shell('apt-key list | grep 4BD6EC30') do |r|
+          r.exit_code.should be_zero
+        end
+      end
+      it 'finds jenkins key' do
+        shell('apt-key list | grep D50582E6') do |r|
+          r.exit_code.should be_zero
+        end
+      end
+    end
+  end
+
+  context 'reset' do
+    it 'clean up keys' do
+      shell('apt-key del 4BD6EC30')
+      shell('apt-key del D50582E6')
+    end
+  end
+
+end

data/modules/apt/spec/system/apt_ppa_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper_system'
+
+describe 'apt::ppa' do
+
+  context 'reset' do
+    it 'removes ppa' do
+      shell('rm /etc/apt/sources.list.d/drizzle-developers-ppa*')
+      shell('rm /etc/apt/sources.list.d/raravena80-collectd5-*')
+    end
+  end
+
+  context 'adding a ppa that doesnt exist' do
+    it 'should work with no errors' do
+      pp = <<-EOS
+      include '::apt'
+      apt::ppa { 'ppa:drizzle-developers/ppa': }
+      EOS
+
+      puppet_apply(pp) do |r|
+        r.exit_code.should_not == 1
+      end
+    end
+
+    describe 'contains the source file' do
+      it 'contains a drizzle ppa source' do
+        shell('ls /etc/apt/sources.list.d/drizzle-developers-ppa-*.list') do |r|
+          r.exit_code.should be_zero
+        end
+      end
+    end
+  end
+
+  context 'readding a removed ppa.' do
+    it 'setup' do
+      shell('add-apt-repository -y ppa:raravena80/collectd5')
+      # This leaves a blank file
+      shell('add-apt-repository --remove ppa:raravena80/collectd5')
+    end
+
+    it 'should readd it successfully' do
+      pp = <<-EOS
+      include '::apt'
+      apt::ppa { 'ppa:raravena80/collectd5': }
+      EOS
+
+      puppet_apply(pp) do |r|
+        r.exit_code.should_not == 1
+      end
+    end
+  end
+
+  context 'reset' do
+    it 'removes added ppas' do
+      shell('rm /etc/apt/sources.list.d/drizzle-developers-ppa*')
+      shell('rm /etc/apt/sources.list.d/raravena80-collectd5-*')
+    end
+  end
+
+end

data/modules/apt/spec/system/apt_source_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper_system'
+
+describe 'apt::source' do
+
+  context 'reset' do
+    it 'clean up puppetlabs repo' do
+      shell('apt-key del 4BD6EC30')
+      shell('rm /etc/apt/sources.list.d/puppetlabs.list')
+    end
+  end
+
+  context 'apt::source' do
+    it 'should work with no errors' do
+      pp = <<-EOS
+      include '::apt'
+      apt::source { 'puppetlabs':
+        location   => 'http://apt.puppetlabs.com',
+        repos      => 'main',
+        key        => '4BD6EC30',
+        key_server => 'pgp.mit.edu',
+      }
+      EOS
+
+      puppet_apply(pp) do |r|
+        r.exit_code.should_not == 1
+      end
+    end
+
+    describe 'key should exist' do
+      it 'finds puppetlabs key' do
+        shell('apt-key list | grep 4BD6EC30') do |r|
+          r.exit_code.should be_zero
+        end
+      end
+    end
+
+    describe 'source should exist' do
+      describe file('/etc/apt/sources.list.d/puppetlabs.list') do
+        it { should be_file }
+      end
+    end
+  end
+
+  context 'reset' do
+    it 'clean up puppetlabs repo' do
+      shell('apt-key del 4BD6EC30')
+      shell('rm /etc/apt/sources.list.d/puppetlabs.list')
+    end
+  end
+
+end

data/modules/apt/spec/system/basic_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper_system'
+
+describe 'basic tests:' do
+  # Using puppet_apply as a subject
+  context puppet_apply 'notice("foo")' do
+    its(:stdout) { should =~ /foo/ }
+    its(:stderr) { should be_empty }
+    its(:exit_code) { should be_zero }
+  end
+end

data/modules/apt/spec/system/class_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper_system'
+
+describe 'apt class' do
+
+  context 'default parameters' do
+    # Using puppet_apply as a helper
+    it 'should work with no errors' do
+      pp = <<-EOS
+      class { 'apt': }
+      EOS
+
+      # Run it twice and test for idempotency
+      puppet_apply(pp) do |r|
+        r.exit_code.should_not == 1
+        r.refresh
+        r.exit_code.should be_zero
+      end
+    end
+  end
+end

data/modules/apt/templates/source.list.erb

@@ -1,5 +1,5 @@
 # <%= @name %>
-deb <% if @architecture %>[arch=<%= @architecture %>]<% end %> <%= @location %> <%= @release_real %> <%= @repos %>
+deb <% if @architecture %>[arch=<%= @architecture %>]<% end %><%= @location %> <%= @release_real %> <%= @repos %>
 <%- if @include_src then -%>
-deb-src <% if @architecture %>[arch=<%= @architecture %>]<% end %> <%= @location %> <%= @release_real %> <%= @repos %>
+deb-src <% if @architecture %>[arch=<%= @architecture %>]<% end %><%= @location %> <%= @release_real %> <%= @repos %>
 <%- end -%>

data/modules/freighthop/manifests/database/mysql.pp

@@ -0,0 +1,20 @@
+class freighthop::database::mysql(
+  $db_names,
+  $users,
+) {
+  include mysql::server
+
+  mysql::db{$db_names:
+    user => "notorious",
+    password => "notorious",
+    host => "localhost",
+    grant => ['All']
+  }
+  mysql_grant { $users:
+    ensure     => 'present',
+    options    => ['GRANT'],
+    privileges => ['ALL'],
+    table      => '*.*',
+    user       => 'notorious@%',
+  }
+}

data/modules/freighthop/manifests/database/postgres.pp

@@ -1,17 +1,17 @@
 class freighthop::database::postgres(
-  $databases,
-  $database_users,
+  $db_names,
+  $users,
 ) {
   include postgresql::server
 
-  postgresql::pg_hba_rule { 'local-users-get-everything':
+  postgresql::server::pg_hba_rule { 'local-users-get-everything':
     type        => 'local',
     database    => 'all',
     user        => 'all',
     auth_method => 'trust',
     order       => '0001',
   }
-  postgresql::pg_hba_rule { 'local-host-connections-get-everything':
+  postgresql::server::pg_hba_rule { 'local-host-connections-get-everything':
     type        => 'host',
     database    => 'all',
     user        => 'all',
@@ -19,8 +19,8 @@ class freighthop::database::postgres(
     auth_method => 'trust',
     order       => '0001',
   }
-  postgresql::database { $databases: }
-  postgresql::database_user { $database_users:
+  postgresql::server::database { $db_names: }
+  postgresql::server::role { $users:
     superuser     => true,
     createdb      => true,
     createrole    => true,

data/modules/freighthop/manifests/database.pp

@@ -1,12 +1,10 @@
 class freighthop::database(
-  $database_flavors,
-  $databases,
-  $database_users
+  $flavors
 ) {
-  if (member($database_flavors, 'postgres')) {
-    class { 'freighthop::database::postgres':
-      databases      => $databases,
-      database_users => $database_users,
-    }
+  if (member($flavors, 'postgres')) {
+    class { 'freighthop::database::postgres':}
+  }
+  if (member($flavors, 'mysql')) {
+    class { 'freighthop::database::mysql':}
   }
 }

data/modules/freighthop/manifests/init.pp

@@ -2,9 +2,6 @@ class freighthop(
   $ppas             = $freighthop::params::ppas,
   $packages         = $freighthop::params::packages,
   $languages        = $freighthop::params::languages,
-  $database_flavors = $freighthop::params::database_flavors,
-  $databases        = $freighthop::params::databases,
-  $database_users   = $freighthop::params::database_users,
   $ruby_version     = $freighthop::params::ruby_version,
   $app_name         = $freighthop::params::app_name,
   $app_root         = $freighthop::params::app_root,
@@ -34,9 +31,5 @@ class freighthop(
     ssl_key_path      => $ssl_key_path,
   } ->
 
-  class { 'freighthop::database':
-    database_flavors => $database_flavors,
-    databases        => $databases,
-    database_users   => $database_users,
-  }
+  class { 'freighthop::database':}
 }

data/modules/freighthop/manifests/params.pp

@@ -1,7 +1,4 @@
 class freighthop::params {
-  $database_flavors = []
-  $databases        = []
-  $database_users   = []
   $packages         = []
   $ppas             = []
   $languages        = []