infra-testing-helpers 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23f17c796b737aed580eb2254c6c81112a90a62d
-  data.tar.gz: ddba9dda5b5ad55f1ea34af756516ff5a7c85a1f
+  metadata.gz: 46cab553c44d5eee82696bfae7180b99fa9d436b
+  data.tar.gz: 10ff278b9b6f191f32d7ee828e49fcc78f0c0740
 SHA512:
-  metadata.gz: 74107c7326119bfec7523e1788bcc8e0fe169fa68c85c417c09e233fe21f3b00d019c3dbf238083d1630d8b4e13adf977628a9bccc15a36ae039f82b84bf3d5a
-  data.tar.gz: cde6160c46ded14ad05265ab13ca1fc27168609e37787601ecf6ce45307036301d3cd273f8d167a9c742e08527b8dd02b2a482460e337c9b901544b67bb7b710
+  metadata.gz: 0bfeec87961e3c2301d7f47c457228377763e50f9dcfd2428b92e68422ef5480244fac267125eb7716c776fd2bbaba9a535315be52a73dde640a0e21da663af6
+  data.tar.gz: 46e087ff2a8bde92dc47fef571744229756377e152238239da4cb1f742213fc73ddce3925136067584c604bbabd0d6b40d8d9e272265420e1a6598e8b52fb38e

data/README.md

@@ -13,7 +13,7 @@ Next, lets have a look at your `spec_helper.rb` (probably generated by Serverspe
 ...
 require 'infra_testing_helpers'
 InfraTestingHelpers.project_root = File.expand_path(File.dirname(__FILE__) + '/../')
-InfraTestingHelpers.module_path = 'modules/:another_module_path/'
+InfraTestingHelpers.module_path = ['modules/:another_module_path/']
 InfraTestingHelpers.site_pp = 'Exec { path => "/sbin:/usr/sbin:/bin:/usr/bin" }'
 InfraTestingHelpers.vagrant_shared_folder = '/etc/puppet'
 ...

data/infra-testing-helpers.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "infra-testing-helpers"
-  spec.version       = '0.0.3'
+  spec.version       = '0.0.4'
   spec.authors       = ["Ryan Doyle"]
   spec.email         = ["ryan@doylenet.net"]
   spec.summary       = %q{Integrations with RSpec, Puppet and Vagrant to help infrastructure testing}

data/lib/infra_testing_helpers/box.rb

@@ -1,9 +1,8 @@
 module InfraTestingHelpers
   class PuppetApplyFailed < StandardError; end
   class Box
-    def initialize(name, project_mount_point)
+    def initialize(name)
       @name = name
-      @project_mount_point = project_mount_point
       @applied = false
     end
 
@@ -11,7 +10,7 @@ module InfraTestingHelpers
 
     def apply(manifest)
       manifest.manifest_file do |file|
-        exit_code = run_command("sudo puppet apply --detailed-exitcode --modulepath #{@project_mount_point}/#{manifest.module_path} #{@project_mount_point}/#{file}")
+        exit_code = run_command("sudo puppet apply --detailed-exitcode --modulepath #{manifest.module_path} #{file}")
         raise PuppetApplyFailed unless exit_code == 0 or exit_code == 2
         @applied = true
       end

data/lib/infra_testing_helpers/helper.rb

@@ -6,7 +6,7 @@ module InfraTestingHelpers
 
     def apply_manifest(manifest_code)
       if box.applied?
-        local_site = InfraTestingHelpers::Site.new(InfraTestingHelpers.site_pp, InfraTestingHelpers.module_path, InfraTestingHelpers.project_root)
+        local_site = InfraTestingHelpers::Site.new(InfraTestingHelpers.site_pp, InfraTestingHelpers.module_path, InfraTestingHelpers.project_root, InfraTestingHelpers.vagrant_shared_folder)
         local_site.add_manifest(manifest_code)
         box.apply(local_site)
       else
@@ -22,11 +22,11 @@ module InfraTestingHelpers
     private
 
     def global_site
-      @@global_site ||= InfraTestingHelpers::Site.new(InfraTestingHelpers.site_pp, InfraTestingHelpers.module_path, InfraTestingHelpers.project_root)
+      @@global_site ||= InfraTestingHelpers::Site.new(InfraTestingHelpers.site_pp, InfraTestingHelpers.module_path, InfraTestingHelpers.project_root, InfraTestingHelpers.vagrant_shared_folder)
     end
 
     def box
-      @@box ||= InfraTestingHelpers::Box.new('default', InfraTestingHelpers.vagrant_shared_folder)
+      @@box ||= InfraTestingHelpers::Box.new('default')
     end
 
   end

data/lib/infra_testing_helpers/site.rb

@@ -3,15 +3,23 @@ require 'tempfile'
 module InfraTestingHelpers
   class Site
 
-    def initialize(site_code, module_path, project_root)
+    def initialize(site_code, module_path, project_root, project_mount_point)
       @site_code = site_code
       @module_path = module_path
       @project_root = project_root
+      @project_mount_point = project_mount_point
       @manifest_code = ""
     end
 
     attr_reader :module_path
 
+    def module_path
+      @module_path.inject('') do |memo, path|
+        memo << "#{@project_mount_point}/#{path}:"
+        memo
+      end[0...-1]
+    end
+
     def add_manifest(manifest)
       @manifest_code << "#{manifest}\n"
     end
@@ -21,7 +29,7 @@ module InfraTestingHelpers
       begin
         file.puts puppet_code
         file.fsync
-        yield(File.basename(file.path)) if block_given?
+        yield("#{@project_mount_point}/#{File.basename(file.path)}") if block_given?
       ensure 
         file.close
         file.unlink

data/spec/functional_spec_helper.rb

@@ -5,7 +5,7 @@ require 'net/ssh'
 require 'tempfile'
 require 'infra_testing_helpers'
 
-InfraTestingHelpers.module_path = 'spec/functional/modules/'
+InfraTestingHelpers.module_path = ['spec/functional/modules/']
 InfraTestingHelpers.site_pp = 'notify {"This is my site.pp":}
 $extlookup_precedence = ["hosts/%{fqdn}", "domains/%{domain}", "common"]
 '

data/spec/unit/puppet_vagrant/box_spec.rb

@@ -5,14 +5,14 @@ require 'infra_testing_helpers/box'
 describe InfraTestingHelpers::Box do
 
   let(:manifest) { double('Manifest') }
-  let(:box) { described_class.new('default', '/vagrant') }
+  let(:box) { described_class.new('default') }
   
   before do 
     allow_message_expectations_on_nil
     allow($?).to receive(:exitstatus).and_return(0)
-    allow(manifest).to receive(:module_path).and_return('modules/')
+    allow(manifest).to receive(:module_path).and_return('/vagrant/modules/')
     allow(manifest).to receive(:puppet_code).and_return('include some_manifest')
-    allow(manifest).to receive(:manifest_file).and_yield('tempfile_path.pp')
+    allow(manifest).to receive(:manifest_file).and_yield('/vagrant/tempfile_path.pp')
   end
 
   describe '#apply' do
@@ -65,7 +65,7 @@ describe InfraTestingHelpers::Box do
     end
 
     it 'runs the command on the box with the box name' do
-      box = described_class.new('somebox', '/vagrant')
+      box = described_class.new('somebox')
       expect(box).to receive(:system).with('vagrant ssh somebox --command "some_command"')
       box.run_command('some_command')
     end
@@ -89,7 +89,7 @@ describe InfraTestingHelpers::Box do
     end
 
     it 'has a name if specified' do
-      box = described_class.new('somebox', '/vagrant')
+      box = described_class.new('somebox')
       expect(box.name).to eql 'somebox'
     end
   end

data/spec/unit/puppet_vagrant/site_spec.rb

@@ -4,7 +4,7 @@ require 'infra_testing_helpers/site'
 
 describe InfraTestingHelpers::Site do
 
-  let(:site) { described_class.new('site.pp code', '/some/module/path', '/some/project/root') }
+  let(:site) { described_class.new('site.pp code', ['modules', 'other_modules'], '/some/project/root', '/vagrant') }
   let(:tempfile) { double('Tempfile') }
 
   describe '#puppet_code' do
@@ -32,6 +32,12 @@ describe InfraTestingHelpers::Site do
     end
   end
 
+  describe '#module_path' do
+    it 'returns the module path as a flattened path' do
+      expect(site.module_path).to eql '/vagrant/modules:/vagrant/other_modules'
+    end
+  end
+
   describe '#manifest_file' do
     before do
       allow(Tempfile).to receive(:new).with(['infra-testing-helpers', '.pp'], '/some/project/root').and_return tempfile
@@ -53,7 +59,7 @@ describe InfraTestingHelpers::Site do
     it 'yeilds the base filename of the tempfile' do 
       allow(tempfile).to receive(:path).and_return('/tmp/tempfile_base_path.pp')
 
-      expect { |b| site.manifest_file(&b) }.to yield_with_args('tempfile_base_path.pp')
+      expect { |b| site.manifest_file(&b) }.to yield_with_args('/vagrant/tempfile_base_path.pp')
     end
     it 'closes the file after yielding' do
       expect(tempfile).to receive(:close)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infra-testing-helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryan Doyle