Merge pull request redhat-openstack#23 from CyBeRoni/master

Really make $ensure variable

.fixtures.yml

@@ -0,0 +1,3 @@
+fixtures:
+  repositories:
+    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib"

.gemfile

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+
+gem 'puppetlabs_spec_helper', '>= 0.1.0', :require => false
+
+if puppetversion = ENV['PUPPET_VERSION']
+  gem 'puppet', puppetversion, :require => false
+
+  if puppetversion[0].chr.to_i < 3
+    gem 'hiera-puppet', :require => false
+  end
+
+else
+  gem 'puppet', :require => false
+end
+
+# vim:ft=ruby

.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3
+script: 'rake spec'
+env:
+  - PUPPET_VERSION="~> 2.7.0"
+  - PUPPET_VERSION="3.3"
+gemfile: .gemfile
+branches:
+  only:
+    - master
+notifications:
+  email: false

Rakefile

@@ -0,0 +1,2 @@
+require 'rake'
+require 'puppetlabs_spec_helper/rake_tasks'

manifests/client/install.pp

@@ -1,10 +1,8 @@
-class ssh::client::install (
-  $ensure = present
-) inherits ssh::params {
+class ssh::client::install {
   if $ssh::params::client_package_name {
     if !defined(Package[$ssh::params::client_package_name]) {
       package { $ssh::params::client_package_name:
-        ensure => $ensure,
+        ensure => $ssh::client::ensure,
       }
     }
   }

manifests/server/install.pp

@@ -1,10 +1,9 @@
-class ssh::server::install (
-    $ensure = present
-) inherits ssh::params {
+class ssh::server::install {
+  include ssh::params
   if $ssh::params::server_package_name {
     if !defined(Package[$ssh::params::server_package_name]) {
       package { $ssh::params::server_package_name:
-        ensure => $ensure,
+        ensure   => $ssh::server::ensure,
       }
     }
   }

spec/classes/client_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe 'ssh::client', :type => 'class' do
+    context "On Debian with no other parameters" do
+        let :facts do
+        {
+            :osfamily => 'Debian',
+            :interfaces => 'eth0',
+            :ipaddress_eth0 => '192.168.1.1'
+        }
+        end
+        it {
+            should contain_package('openssh-client').with(:ensure => 'present')
+        }
+    end
+    context "On Debian with custom ensure" do
+        let :facts do
+        {
+            :osfamily => 'Debian',
+            :interfaces => 'eth0',
+            :ipaddress_eth0 => '192.168.1.1'
+        }
+        end
+        let :params do
+        {
+            :ensure => 'latest'
+        }
+        end
+        it {
+            should contain_package('openssh-client').with(:ensure => 'latest')
+        }
+    end
+end

spec/classes/server_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe 'ssh::server', :type => 'class' do
+    context "On Debian with no other parameters" do
+        let :facts do
+        {
+            :osfamily => 'Debian',
+            :interfaces => 'eth0',
+            :ipaddress_eth0 => '192.168.1.1'
+        }
+        end
+        it {
+            should contain_package('openssh-server').with(:ensure => 'present')
+        }
+    end
+    context "On Debian with custom ensure" do
+        let :facts do
+        {
+            :osfamily => 'Debian',
+            :interfaces => 'eth0',
+            :ipaddress_eth0 => '192.168.1.1'
+        }
+        end
+        let :params do
+        {
+            :ensure => 'latest'
+        }
+        end
+        it {
+            should contain_package('openssh-server').with(:ensure => 'latest')
+        }
+    end
+end

spec/fixtures/modules/ssh/files

@@ -0,0 +1 @@
+../../../../files

spec/fixtures/modules/ssh/lib

@@ -0,0 +1 @@
+../../../../lib

spec/fixtures/modules/ssh/manifests

@@ -0,0 +1 @@
+../../../../manifests

spec/fixtures/modules/ssh/templates

@@ -0,0 +1 @@
+../../../../templates

spec/spec_helper.rb

@@ -1,18 +1,2 @@
-require 'pathname'
-dir = Pathname.new(__FILE__).parent
-$LOAD_PATH.unshift(dir, dir + 'lib', dir + '../lib')
-
-require 'mocha'
-require 'puppet'
-gem 'rspec', '=1.2.9'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-    config.mock_with :mocha
-end
-
-# We need this because the RAL uses 'should' as a method.  This
-# allows us the same behaviour but with a different method name.
-class Object
-    alias :must :should
-end
+require 'rspec-puppet'
+require 'puppetlabs_spec_helper/module_spec_helper'

tests/init.pp

@@ -1 +1 @@
-include ssh
+class {"::ssh::server": }

tests/server.pp

@@ -0,0 +1 @@
+include ssh::server