infra-testing-helpers 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8b8db2803644966ac8a3466b8dc0dcc8dc115de
-  data.tar.gz: bea9b38d4952f7e6a5de3ed5c85da5e453eb4c84
+  metadata.gz: 23f17c796b737aed580eb2254c6c81112a90a62d
+  data.tar.gz: ddba9dda5b5ad55f1ea34af756516ff5a7c85a1f
 SHA512:
-  metadata.gz: e89716f7af5970d719766b6720caf51a60a1aada3361084519a58bfc5509c1a4826117769b70b46cc9b6d9d2f55b442a00ed27315e35907811cbf2aba00d29db
-  data.tar.gz: 52404045732161e6f02e7cbee4b257a72390f3008b21580a3f3da5efeae4a771feb08906aafb02af4e26a5d646d91bca7f147fb8d2b4c63036facbcd8398154e
+  metadata.gz: 74107c7326119bfec7523e1788bcc8e0fe169fa68c85c417c09e233fe21f3b00d019c3dbf238083d1630d8b4e13adf977628a9bccc15a36ae039f82b84bf3d5a
+  data.tar.gz: cde6160c46ded14ad05265ab13ca1fc27168609e37787601ecf6ce45307036301d3cd273f8d167a9c742e08527b8dd02b2a482460e337c9b901544b67bb7b710

data/README.md

@@ -12,12 +12,14 @@ Next, lets have a look at your `spec_helper.rb` (probably generated by Serverspe
 ```ruby
 ...
 require 'infra_testing_helpers'
+InfraTestingHelpers.project_root = File.expand_path(File.dirname(__FILE__) + '/../')
 InfraTestingHelpers.module_path = 'modules/:another_module_path/'
 InfraTestingHelpers.site_pp = 'Exec { path => "/sbin:/usr/sbin:/bin:/usr/bin" }'
 InfraTestingHelpers.vagrant_shared_folder = '/etc/puppet'
 ...
 ```
 - `require 'infra_testing_helpers'` mixes in the functions we will use later in our specs as well as sets up a global `before` hook in RSpec. 
+- `InfraTestingHelpers.project_root` is the directory the Vagrantfile is located it. This is manditory
 - `InfraTestingHelpers.module_path` is the location of your modules. This defaults to just `modules/` if nothing is specified. 
 - `InfraTestingHelpers.site_pp` is the contents of your own `site.pp` file. If yours is rather large, you might want to dynamically populate this (`File.read`). Again, this is optional.
 - `InfraTestingHelpers.vagrant_shared_folder` reflects where your shared folder is in your `Vagrantfile`. This defaults to `/vagrant`.

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.2'
+  spec.version       = '0.0.3'
   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

@@ -10,9 +10,11 @@ module InfraTestingHelpers
     attr_reader :name
 
     def apply(manifest)
-      exit_code = run_command("sudo puppet apply --detailed-exitcode --modulepath #{@project_mount_point}/#{manifest.module_path}", :stdin => manifest.puppet_code)
-      raise PuppetApplyFailed unless exit_code == 0 or exit_code == 2
-      @applied = true
+      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}")
+        raise PuppetApplyFailed unless exit_code == 0 or exit_code == 2
+        @applied = true
+      end
     end
 
     def applied?

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)
+        local_site = InfraTestingHelpers::Site.new(InfraTestingHelpers.site_pp, InfraTestingHelpers.module_path, InfraTestingHelpers.project_root)
         local_site.add_manifest(manifest_code)
         box.apply(local_site)
       else
@@ -22,7 +22,7 @@ module InfraTestingHelpers
     private
 
     def global_site
-      @@global_site ||= InfraTestingHelpers::Site.new(InfraTestingHelpers.site_pp, InfraTestingHelpers.module_path)
+      @@global_site ||= InfraTestingHelpers::Site.new(InfraTestingHelpers.site_pp, InfraTestingHelpers.module_path, InfraTestingHelpers.project_root)
     end
 
     def box

data/lib/infra_testing_helpers/site.rb

@@ -1,9 +1,12 @@
+require 'tempfile'
+
 module InfraTestingHelpers
   class Site
 
-    def initialize(site_code, module_path)
+    def initialize(site_code, module_path, project_root)
       @site_code = site_code
       @module_path = module_path
+      @project_root = project_root
       @manifest_code = ""
     end
 
@@ -13,6 +16,18 @@ module InfraTestingHelpers
       @manifest_code << "#{manifest}\n"
     end
 
+    def manifest_file
+      file = Tempfile.new(['infra-testing-helpers', '.pp'], @project_root)
+      begin
+        file.puts puppet_code
+        file.fsync
+        yield(File.basename(file.path)) if block_given?
+      ensure 
+        file.close
+        file.unlink
+      end
+    end
+
     def puppet_code
       "#{@site_code}\n#{@manifest_code}"
     end

data/lib/infra_testing_helpers.rb

@@ -5,7 +5,8 @@ module InfraTestingHelpers
   @settings = {
     :module_path         => 'modules/',
     :site_pp             => '',
-    :vagrant_shared_folder => '/vagrant'
+    :vagrant_shared_folder => '/vagrant',
+    :project_root => nil,
   }
 
   def self.vagrant_shared_folder
@@ -32,6 +33,14 @@ module InfraTestingHelpers
     @settings[:module_path] = path
   end
 
+  def self.project_root
+    @settings[:project_root] or raise 'project_root has not been set'
+  end
+
+  def self.project_root=(path)
+    @settings[:project_root] = path
+  end
+
 end
 
 include InfraTestingHelpers::Helper

data/spec/functional_spec_helper.rb

@@ -6,7 +6,10 @@ require 'tempfile'
 require 'infra_testing_helpers'
 
 InfraTestingHelpers.module_path = 'spec/functional/modules/'
-InfraTestingHelpers.site_pp = "notify {'This is my site.pp':}"
+InfraTestingHelpers.site_pp = 'notify {"This is my site.pp":}
+$extlookup_precedence = ["hosts/%{fqdn}", "domains/%{domain}", "common"]
+'
+InfraTestingHelpers.project_root = File.expand_path(File.dirname(__FILE__) + '/../')
 
 set :backend, :ssh
 

data/spec/unit/puppet_vagrant/box_spec.rb

@@ -12,23 +12,24 @@ describe InfraTestingHelpers::Box do
     allow($?).to receive(:exitstatus).and_return(0)
     allow(manifest).to receive(:module_path).and_return('modules/')
     allow(manifest).to receive(:puppet_code).and_return('include some_manifest')
+    allow(manifest).to receive(:manifest_file).and_yield('tempfile_path.pp')
   end
 
   describe '#apply' do
 
     it 'successfully applies a manifest to the box' do
-      expect(box).to receive(:run_command).with('sudo puppet apply --detailed-exitcode --modulepath /vagrant/modules/',  {:stdin=>"include some_manifest"}).and_return(0)
+      expect(box).to receive(:run_command).with('sudo puppet apply --detailed-exitcode --modulepath /vagrant/modules/ /vagrant/tempfile_path.pp',).and_return(0)
       box.apply(manifest)
     end
 
     it 'successfully applies a manifest to the box and deals with weird exit codes' do
-      expect(box).to receive(:run_command).with('sudo puppet apply --detailed-exitcode --modulepath /vagrant/modules/',  {:stdin=>"include some_manifest"}).and_return(2)
+      expect(box).to receive(:run_command).with('sudo puppet apply --detailed-exitcode --modulepath /vagrant/modules/ /vagrant/tempfile_path.pp').and_return(2)
       box.apply(manifest)
     end
     
 
     it 'raises a InfraTestingHelpers::PuppetApplyFailed error if the puppet apply fails' do
-      allow(box).to receive(:run_command).with('sudo puppet apply --detailed-exitcode --modulepath /vagrant/modules/',  {:stdin=>"include some_manifest"}).and_return(1)
+      allow(box).to receive(:run_command).with('sudo puppet apply --detailed-exitcode --modulepath /vagrant/modules/ /vagrant/tempfile_path.pp').and_return(1)
 
       expect{box.apply(manifest)}.to raise_error(InfraTestingHelpers::PuppetApplyFailed)
     end
@@ -49,7 +50,7 @@ describe InfraTestingHelpers::Box do
       expect(box.applied?).to be true
     end
     it 'is false when a manifest is not applied successfully' do
-      allow(box).to receive(:run_command).with('sudo puppet apply --detailed-exitcode --modulepath /vagrant/modules/',  {:stdin=>"include some_manifest"}).and_return(1)
+      allow(box).to receive(:run_command).with('sudo puppet apply --detailed-exitcode --modulepath /vagrant/modules/ /vagrant/tempfile_path.pp').and_return(1)
       expect{box.apply(manifest)}.to raise_error(InfraTestingHelpers::PuppetApplyFailed)
 
       expect(box.applied?).to be false

data/spec/unit/puppet_vagrant/helper_spec.rb

@@ -20,6 +20,7 @@ describe InfraTestingHelpers::Helper do
     allow(box).to receive(:applied?).and_return false
     allow(InfraTestingHelpers).to receive(:module_path)
     allow(InfraTestingHelpers).to receive(:site_pp)
+    allow(InfraTestingHelpers).to receive(:project_root)
   end
 
   describe '#apply_manifest' do

data/spec/unit/puppet_vagrant/site_spec.rb

@@ -4,7 +4,8 @@ require 'infra_testing_helpers/site'
 
 describe InfraTestingHelpers::Site do
 
-  let(:site) { described_class.new('site.pp code', '/some/module/path') }
+  let(:site) { described_class.new('site.pp code', '/some/module/path', '/some/project/root') }
+  let(:tempfile) { double('Tempfile') }
 
   describe '#puppet_code' do
     it 'should contain the site.pp code' do
@@ -31,4 +32,39 @@ describe InfraTestingHelpers::Site do
     end
   end
 
+  describe '#manifest_file' do
+    before do
+      allow(Tempfile).to receive(:new).with(['infra-testing-helpers', '.pp'], '/some/project/root').and_return tempfile
+      allow(tempfile).to receive(:close)
+      allow(tempfile).to receive(:unlink)
+      allow(tempfile).to receive(:puts)
+      allow(tempfile).to receive(:fsync)
+    end
+    it 'writes the puppet code to a tempfile' do
+      expect(tempfile).to receive(:puts).with("site.pp code\n")
+
+      site.manifest_file
+    end
+    it 'syncs the file to the filesystem' do
+      expect(tempfile).to receive(:fsync)
+
+      site.manifest_file
+    end
+    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')
+    end
+    it 'closes the file after yielding' do
+      expect(tempfile).to receive(:close)
+
+      site.manifest_file
+    end
+    it 'closes the file after yielding' do
+      expect(tempfile).to receive(:unlink)
+
+      site.manifest_file
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infra-testing-helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ryan Doyle
@@ -113,3 +113,4 @@ test_files:
 - spec/unit/puppet_vagrant/box_spec.rb
 - spec/unit/puppet_vagrant/helper_spec.rb
 - spec/unit/puppet_vagrant/site_spec.rb
+has_rdoc: