rspec-puppet 0.1.2 → 0.1.3

data/bin/rspec-puppet-init

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+
+require 'rspec-puppet'
+require 'optparse'
+
+options = {
+  :module_name => nil,
+}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: rspec-puppet-init [options]"
+
+  opts.on('-n', '--name NAME', 'The name of the module (override autodetection)') do |v|
+    options[:module_name] = v
+  end
+end.parse!
+
+RSpec::Puppet::Setup.run(options[:module_name])

data/lib/rspec-puppet.rb

@@ -2,10 +2,12 @@ require 'puppet'
 require 'rspec'
 require 'rspec-puppet/matchers'
 require 'rspec-puppet/example'
+require 'rspec-puppet/setup'
 
 RSpec.configure do |c|
   c.add_setting :module_path, :default => '/etc/puppet/modules'
   c.add_setting :manifest_dir, :default => nil
   c.add_setting :manifest, :default => nil
   c.add_setting :template_dir, :default => nil
+  c.add_setting :config, :default => nil
 end

data/lib/rspec-puppet/example/class_example_group.rb

@@ -12,6 +12,7 @@ module RSpec::Puppet
       Puppet[:manifestdir] = self.respond_to?(:manifest_dir) ? manifest_dir : RSpec.configuration.manifest_dir
       Puppet[:manifest] = self.respond_to?(:manifest) ? manifest : RSpec.configuration.manifest
       Puppet[:templatedir] = self.respond_to?(:template_dir) ? template_dir : RSpec.configuration.template_dir
+      Puppet[:config] = self.respond_to?(:config) ? config : RSpec.configuration.config
 
       klass_name = self.class.top_level_description.downcase
 

data/lib/rspec-puppet/example/define_example_group.rb

@@ -14,6 +14,7 @@ module RSpec::Puppet
       Puppet[:manifestdir] = self.respond_to?(:manifest_dir) ? manifest_dir : RSpec.configuration.manifest_dir
       Puppet[:manifest] = self.respond_to?(:manifest) ? manifest : RSpec.configuration.manifest
       Puppet[:templatedir] = self.respond_to?(:template_dir) ? template_dir : RSpec.configuration.template_dir
+      Puppet[:config] = self.respond_to?(:config) ? config : RSpec.configuration.config
 
       # If we're testing a standalone module (i.e. one that's outside of a
       # puppet tree), the autoloader won't work, so we need to fudge it a bit.

data/lib/rspec-puppet/example/host_example_group.rb

@@ -12,6 +12,7 @@ module RSpec::Puppet
       Puppet[:manifestdir] = self.respond_to?(:manifest_dir) ? manifest_dir : RSpec.configuration.manifest_dir
       Puppet[:manifest] = self.respond_to?(:manifest) ? manifest : RSpec.configuration.manifest
       Puppet[:templatedir] = self.respond_to?(:template_dir) ? template_dir : RSpec.configuration.template_dir
+      Puppet[:config] = self.respond_to?(:config) ? config : RSpec.configuration.config
       Puppet[:code] = ""
 
       nodename = self.class.top_level_description.downcase

data/lib/rspec-puppet/matchers/create_generic.rb

@@ -17,7 +17,7 @@ module RSpec::Puppet
 
       def without(*args, &block)
         params = args.shift
-        @expected_undef_params = (@expected_undef_params || []) | params.to_a
+        @expected_undef_params = (@expected_undef_params || []) | Array(params)
         self
       end
 
@@ -50,6 +50,11 @@ module RSpec::Puppet
                   ret = false
                   (@errors ||= []) << "#{name.to_s} matching `#{value.inspect}` but its value of `#{rsrc_hsh[name.to_sym].inspect}` does not"
                 end
+              elsif value.kind_of?(Array) then
+                unless rsrc_hsh[name.to_sym].join == value.join
+                  ret = false
+                  (@errors ||= []) << "#{name.to_s} set to `#{value.inspect}` but it is set to `#{rsrc_hsh[name.to_sym].inspect}` in the catalogue"
+                end
               else
                 unless rsrc_hsh[name.to_sym].to_s == value.to_s
                   ret = false
@@ -81,7 +86,32 @@ module RSpec::Puppet
       end
 
       def description
-        "create #{@referenced_type}[#{@title}]"
+        values = []
+        if @expected_params
+          @expected_params.each do |name, value|
+            if value.kind_of?(Regexp)
+              values << "#{name.to_s} matching #{value.inspect}"
+            else
+              values << "#{name.to_s} => #{value.inspect}"
+            end
+          end
+        end
+
+        if @expected_undef_params
+          @expected_undef_params.each do |name, value|
+            values << "#{name.to_s} undefined"
+          end
+        end
+
+        unless values.empty?
+          if values.length == 1
+            value_str = " with #{values.first}"
+          else
+            value_str = " with #{values[0..-2].join(", ")} and #{values[-1]}"
+          end
+        end
+
+        "contain #{@referenced_type}[#{@title}]#{value_str}"
       end
 
     private

data/lib/rspec-puppet/setup.rb

@@ -0,0 +1,144 @@
+require 'puppet'
+require 'fileutils'
+
+module RSpec::Puppet
+  class Setup
+    def self.run(module_name=nil)
+      unless is_module_dir?
+        $stderr.puts "Does not appear to be a Puppet module.  Aborting"
+        return false
+      end
+
+      if module_name.nil?
+        module_name = get_module_name
+        if module_name.nil?
+          $stderr.puts "Unable to determine module name.  Aborting"
+          return false
+        end
+      end
+
+      [
+        'spec',
+        'spec/classes',
+        'spec/defines',
+        'spec/functions',
+        'spec/hosts',
+        'spec/fixtures',
+        'spec/fixtures/manifests',
+        'spec/fixtures/modules',
+        "spec/fixtures/modules/#{module_name}",
+      ].each { |dir| safe_mkdir(dir) }
+
+      safe_touch('spec/fixtures/manifests/site.pp')
+
+      ['manifests','lib','files','templates'].each do |dir|
+        if File.exist? dir
+          safe_make_symlink("../../../../#{dir}", "spec/fixtures/modules/#{module_name}/#{dir}")
+        end
+      end
+
+      safe_create_spec_helper
+      safe_create_rakefile
+    end
+
+  protected
+    def self.get_module_name
+      p = Puppet::Parser::Lexer.new
+      module_name = nil
+      Dir["manifests/*.pp"].entries.each do |manifest|
+        p.string = File.read(manifest)
+        tokens = p.fullscan
+        i = tokens.index { |token| [:CLASS, :DEFINE].include? token.first }
+        unless i.nil?
+          module_name = tokens[i + 1].last[:value].split('::').first
+          break
+        end
+      end
+      module_name
+    end
+
+    def self.is_module_dir?
+      Dir["*"].entries.include? "manifests"
+    end
+
+    def self.safe_mkdir(dir)
+      if File.exists? dir
+        unless File.directory? dir
+          $stderr.puts "!! #{dir} already exists and is not a directory"
+        end
+      else
+        FileUtils.mkdir dir
+        puts " + #{dir}/"
+      end
+    end
+
+    def self.safe_touch(file)
+      if File.exists? file
+        unless File.file? file
+          $stderr.puts "!! #{file} already exists and is not a regular file"
+        end
+      else
+        FileUtils.touch file
+        puts " + #{file}"
+      end
+    end
+
+    def self.safe_create_spec_helper
+      content = <<-EOF
+require 'rspec-puppet'
+
+fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
+
+RSpec.configure do |c|
+  c.module_path = File.join(fixture_path, 'modules')
+  c.manifest_dir = File.join(fixture_path, 'manifests')
+end
+EOF
+      if File.exists? 'spec/spec_helper.rb'
+        old_content = File.read('spec/spec_helper.rb')
+        if old_content != content
+          $stderr.puts "!! spec/spec_helper.rb already exists and differs from template"
+        end
+      else
+        File.open('spec/spec_helper.rb', 'w') do |f|
+          f.puts content
+        end
+        puts ' + spec/spec_helper.rb'
+      end
+    end
+
+    def self.safe_make_symlink(source, target)
+      if File.exists? target
+        unless File.symlink? target
+          $stderr.puts "!! #{file} already exists and is not a symlink"
+        end
+      else
+        FileUtils.ln_s(source, target)
+        puts " + #{target}"
+      end
+    end
+
+    def self.safe_create_rakefile
+      content = <<-EOF
+require 'rake'
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/*/*_spec.rb'
+end
+EOF
+      if File.exists? 'Rakefile'
+        old_content = File.read('Rakefile')
+        if old_content != content
+          $stderr.puts "!! Rakefile already exists and differs from template"
+        end
+      else
+        File.open('Rakefile', 'w') do |f|
+          f.puts content
+        end
+        puts ' + Rakefile'
+      end
+    end
+  end
+end

data/rspec-puppet.gemspec

@@ -1,11 +1,14 @@
 Gem::Specification.new do |s|
   s.name = 'rspec-puppet'
-  s.version = '0.1.2'
+  s.version = '0.1.3'
   s.homepage = 'https://github.com/rodjek/rspec-puppet/'
   s.summary = 'RSpec tests for your Puppet manifests'
   s.description = 'RSpec tests for your Puppet manifests'
 
+  s.executables = ['rspec-puppet-init']
+
   s.files = [
+    'bin/rspec-puppet-init',
     'lib/rspec-puppet/example/class_example_group.rb',
     'lib/rspec-puppet/example/define_example_group.rb',
     'lib/rspec-puppet/example/function_example_group.rb',
@@ -16,6 +19,7 @@ Gem::Specification.new do |s|
     'lib/rspec-puppet/matchers/include_class.rb',
     'lib/rspec-puppet/matchers/run.rb',
     'lib/rspec-puppet/matchers.rb',
+    'lib/rspec-puppet/setup.rb',
     'lib/rspec-puppet/support.rb',
     'lib/rspec-puppet.rb',
     'LICENSE',

data/spec/classes/boolean_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
 
-describe 'boolean' do
-  let(:title) { 'bool.testing' }
-  let(:params) { { :bool => false } }
+if Puppet::PUPPETVERSION !~ /0\.2/
+  describe 'boolean' do
+    let(:title) { 'bool.testing' }
+    let(:params) { { :bool => false } }
   
-  it { should create_notify("bool testing")\
-    .with_message("This will print when \$bool is false.") }
-
+    it { should create_notify("bool testing")\
+      .with_message("This will print when \$bool is false.") }
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-puppet
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Tim Sharpe
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-15 00:00:00 Z
+date: 2012-04-07 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -33,13 +34,14 @@ dependencies:
   version_requirements: *id001
 description: RSpec tests for your Puppet manifests
 email: tim@sharpe.id.au
-executables: []
-
+executables: 
+- rspec-puppet-init
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
+- bin/rspec-puppet-init
 - lib/rspec-puppet/example/class_example_group.rb
 - lib/rspec-puppet/example/define_example_group.rb
 - lib/rspec-puppet/example/function_example_group.rb
@@ -50,6 +52,7 @@ files:
 - lib/rspec-puppet/matchers/include_class.rb
 - lib/rspec-puppet/matchers/run.rb
 - lib/rspec-puppet/matchers.rb
+- lib/rspec-puppet/setup.rb
 - lib/rspec-puppet/support.rb
 - lib/rspec-puppet.rb
 - LICENSE
@@ -68,6 +71,7 @@ files:
 - spec/fixtures/modules/sysctl/manifests/init.pp
 - spec/functions/split_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/rodjek/rspec-puppet/
 licenses: []
 
@@ -97,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: RSpec tests for your Puppet manifests