jimdo-rspec-puppet-helpers 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3c9f90c3d60269cd07cc30c1c63f7ae7a9deffc3
+  data.tar.gz: 6ce67672a8837410988cf904aa45e63bb5166ae2
+SHA512:
+  metadata.gz: 7020f05144f2daefd5efa4dec34f858c5bd65684738dcca800b9498b6cf6678d0573e207681462a054194fa0548f217edf95076f9aea4e8af59cce9c9032065b
+  data.tar.gz: 1b10a836a49703ceb8e3e5c9f411dc77c1493135fb9068cff1872d99b3183ee840db0b6f2fa9f42730e892337987f38c252fb68c5de10407b51083e948719cf0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jimdo-rspec-puppet-helpers (0.0.4)
+    jimdo-rspec-puppet-helpers (0.0.5)
 
 GEM
   remote: https://rubygems.org/
@@ -10,6 +10,7 @@ GEM
     facter (1.7.3)
     puppet (2.7.23)
       facter (~> 1.5)
+    rake (10.3.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -25,4 +26,5 @@ PLATFORMS
 DEPENDENCIES
   jimdo-rspec-puppet-helpers!
   puppet (~> 2.7)
+  rake
   rspec

data/jimdo-rspec-puppet-helpers.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jimdo-rspec-puppet-helpers}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Bonkowski", "Ingo Oeser", "Soenke Ruempler", "Ilya Margolin"]
@@ -16,15 +16,6 @@ Gem::Specification.new do |s|
   s.summary = %q{rspec-puppet helpers}
   s.test_files = ["spec/puppet_file_contains_spec.rb", "spec/spec_helper.rb"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 0"])
-  end
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
 end

data/lib/jimdo-rspec-puppet-helpers.rb

@@ -1,7 +1,17 @@
 require 'rspec'
 require 'puppet'
-require 'puppet/file_serving'
-require 'puppet/file_serving/metadata'
+
+def find_puppet_file(sources)
+  Array(sources).each do |source|
+    next unless source.start_with?("puppet:///modules")
+    elems = source.split("/")
+    Puppet[:modulepath].split(":").each do |modulepath|
+      filepath = File.join(modulepath, elems[4], "files", *elems[5..-1])
+      return filepath if File.exist?(filepath)
+    end
+  end
+  nil
+end
 
 RSpec::Matchers.define :puppet_file_contains do |file, expected|
   match do |actual|
@@ -17,19 +27,12 @@ RSpec::Matchers.define :puppet_file_contains do |file, expected|
       next
     end
 
-    file_data = nil
-    source_attr.each do |source|
-      file_data = Puppet::FileServing::Metadata.indirection.find(source)
-      break if file_data
-    end
-
-    if !file_data then
+    found_file = find_puppet_file(source_attr)
+    if found_file.nil? then
       @message = "no files specified in 'source' exist"
       next
     else
-      found_file = file_data.path
-
-      @message = "expected that #{file}(source=#{found_file}) matches #{expected}"
+      @message = "expected that #{file} (source=#{found_file}) matches #{expected}"
       expected.match(IO.read(found_file)) != nil
     end
   end

data/spec/puppet_file_contains_spec.rb

@@ -1,10 +1,14 @@
 require 'spec_helper'
 
 describe 'puppet_file_contains' do
+  before do
+    Puppet[:modulepath] = "spec/fixtures"
+  end
+
   context "resource not found" do
     subject {
-      catalog = double()
-      resource = double()
+      catalog = double
+      resource = double
       catalog.stub(:resource) { nil }
       catalog
     }
@@ -17,8 +21,8 @@ describe 'puppet_file_contains' do
 
   context "resource does not contain 'source' key" do
     subject {
-      catalog = double()
-      resource = double()
+      catalog = double
+      resource = double
       catalog.stub(:resource) { resource }
       resource.stub(:to_hash) { { :some_attribute => 1, :some_other_attribute => 2} }
       catalog
@@ -30,47 +34,49 @@ describe 'puppet_file_contains' do
     end
   end
 
-  context "resource is found, source is present" do
+  context "resource is found, file does not exist" do
     subject {
-      catalog = double()
-      resource = double()
+      catalog = double
+      resource = double
       catalog.stub(:resource) { resource }
       resource.stub(:to_hash) { { :source => ['puppet:///modules/modulex/path1', 'puppet:///modules/modulex/path2'] } }
       catalog
     }
 
-    context "no files found" do
-      it "will raise ExpectationNotMetError with 'expected source attribute'" do
-        Puppet::FileServing::Metadata.indirection.stub(:find) {
-          nil
-        }
-        expect {
-          should puppet_file_contains('/path/file', %r'regex')
-        }.to raise_error(RSpec::Expectations::ExpectationNotMetError, /no files specified in 'source' exist/)
-      end
+    it "will raise ExpectationNotMetError with 'no files exist'" do
+      expect {
+        should puppet_file_contains('/path/file', %r'regex')
+      }.to raise_error(RSpec::Expectations::ExpectationNotMetError, /no files specified in 'source' exist/)
     end
+  end
 
-    context "some file is found, but does not match regex" do
-      it "will raise ExpectationNotMetError with 'expected source attribute'" do
-        Puppet::FileServing::Metadata.indirection.stub(:find) {
-          double(:path => '/some/path/to/file')
-        }
-        IO.stub(:read).with('/some/path/to/file') { 'something else' }
-        expect {
-          should puppet_file_contains('/path/file', %r'regex')
-        }.to raise_error(RSpec::Expectations::ExpectationNotMetError, /^#{Regexp.quote("expected that /path/file(source=/some/path/to/file) matches")}/)
-      end
-    end
+  context "some file is found, but does not match regex" do
+    subject {
+      catalog = double
+      resource = double
+      catalog.stub(:resource) { resource }
+      resource.stub(:to_hash) { { :source => ['puppet:///modules/modulex/path1', 'puppet:///modules/modulex/somefile.txt'] } }
+      catalog
+    }
 
-    context "some file is found and matches regex" do
-      it "will raise ExpectationNotMetError with 'expected source attribute'" do
-        Puppet::FileServing::Metadata.indirection.stub(:find) {
-          double(:path => '/some/path/to/file')
-        }
-        IO.stub(:read).with('/some/path/to/file') { 'I do match a regex' }
+    it "will raise ExpectationNotMetError with 'expected source attribute'" do
+      expect {
         should puppet_file_contains('/path/file', %r'regex')
-      end
+      }.to raise_error(RSpec::Expectations::ExpectationNotMetError, /^#{Regexp.quote("expected that /path/file (source=#{Puppet[:modulepath]}/modulex/files/somefile.txt) matches")}/)
     end
   end
 
+  context "some file is found and matches regex" do
+    subject {
+      catalog = double
+      resource = double
+      catalog.stub(:resource) { resource }
+      resource.stub(:to_hash) { { :source => ['puppet:///modules/modulex/path1', 'puppet:///modules/modulex/anotherfile.txt'] } }
+      catalog
+    }
+
+    it "will raise no exception" do
+      should puppet_file_contains('/path/file', %r'some content')
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1 +1 @@
-require 'lib/jimdo-rspec-puppet-helpers.rb'
+require 'jimdo-rspec-puppet-helpers'

metadata

@@ -1,15 +1,9 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jimdo-rspec-puppet-helpers
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+version: !ruby/object:Gem::Version
+  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Daniel Bonkowski
 - Ingo Oeser
 - Soenke Ruempler
@@ -17,36 +11,45 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-04-03 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
+date: 2014-04-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: rspec-puppet helpers
-email: 
+email:
 - infrateam@jimdo.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .rspec
+files:
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -56,40 +59,29 @@ files:
 - lib/jimdo-rspec-puppet-helpers.rb
 - spec/puppet_file_contains_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: rspec-puppet helpers
-test_files: 
+test_files:
 - spec/puppet_file_contains_spec.rb
 - spec/spec_helper.rb