infra-testing-helpers 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46cab553c44d5eee82696bfae7180b99fa9d436b
-  data.tar.gz: 10ff278b9b6f191f32d7ee828e49fcc78f0c0740
+  metadata.gz: 9003be0b1502fbe6c48b1a988ce89187837dee8b
+  data.tar.gz: 8e9cef21fc594ea5ff33cb482dfcf38dce216716
 SHA512:
-  metadata.gz: 0bfeec87961e3c2301d7f47c457228377763e50f9dcfd2428b92e68422ef5480244fac267125eb7716c776fd2bbaba9a535315be52a73dde640a0e21da663af6
-  data.tar.gz: 46e087ff2a8bde92dc47fef571744229756377e152238239da4cb1f742213fc73ddce3925136067584c604bbabd0d6b40d8d9e272265420e1a6598e8b52fb38e
+  metadata.gz: 0418830d842377c81ce1e97fb7a944471d1bdb8e995272b9d2ba40895e637a5e727fe2ed830b45a6f28df1533c89bb383dc2fd79e73bfdf62a7ddbf991be2a2d
+  data.tar.gz: b1eb8290e9b9525ad55ab6379e849eef93402289b746e40458e8ec9f0ac85f01729912e7880a2b4bfae3beef2bf86be2e8886aee9d187038b7276096cabec716

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    infra-testing-helpers (0.0.2)
+    infra-testing-helpers (0.0.5)
       rspec
 
 GEM

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'
 ...
@@ -42,9 +42,9 @@ describe 'apache' do
   describe 'worker mode' do
     before do
       apply_manifest 'class {"apache": mpm => "worker"}'
-      describe process('httpd.woker') do
-        it { should be_running }
-      end
+    end
+    describe process('httpd.woker') do
+      it { should be_running }
     end
   end
   
@@ -65,4 +65,4 @@ Finished in 6.92 seconds (files took 5.05 seconds to load)
 
 `apply_manifest` will apply Puppet code differently depending on the scope in which it is called. In the global rspec scope, it will apply the manifests before running any tests. If you have multiple specs with `apply_manifest` in the global scope, they are lazily evaluated and run as a single puppet apply. This helps speed up Puppet runs and can detect duplicate resource definitions.
 
-When `apply_manifests` is run within a `before` block it is applied instantly. This is useful for testing manifests that can not co-exist with others or for testing different arguments to the same manifest.
+When `apply_manifests` is run within a `before` block it is applied when the block is evaluated. This is useful for testing manifests that can not co-exist with others or for testing different arguments to the same manifest.

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.4'
+  spec.version       = '0.0.5'
   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

@@ -23,9 +23,17 @@ module InfraTestingHelpers
 
     def run_command(command, opts = {})
       stdin = opts[:stdin] ? " << EOF\n#{opts[:stdin]}\nEOF" : ""
-      system "vagrant ssh #{@name} --command \"#{command}\"#{stdin}"
+      run_in_clean_environment "vagrant ssh #{@name} --command \"#{command}\"#{stdin}"
       $?.exitstatus
     end
+
+    def run_in_clean_environment(command)
+      if ENV['BUNDLE_GEMFILE']
+        Bundler.clean_system command
+      else
+        system command
+      end
+    end
   
   end
 end

data/spec/functional/failing_spec.rb

@@ -0,0 +1,10 @@
+require 'functional_spec_helper'
+
+
+describe 'applying a manifest' do
+
+  it 'raises an error if it cannot apply the manifest' do
+    expect{ apply_manifest 'include test_manifest::invalid' }.to raise_error InfraTestingHelpers::PuppetApplyFailed
+  end
+
+end

data/spec/functional/modules/test2_manifest/manifests/invalid.pp

@@ -0,0 +1,3 @@
+class test_manifest::invalid {
+  file { not valid puppet }
+}

data/spec/unit/{puppet_vagrant → infra_testing_helpers}/box_spec.rb

@@ -13,6 +13,8 @@ describe InfraTestingHelpers::Box do
     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('/vagrant/tempfile_path.pp')
+    allow(box).to receive(:system)
+    allow(Bundler).to receive(:clean_system)
   end
 
   describe '#apply' do
@@ -60,25 +62,24 @@ describe InfraTestingHelpers::Box do
 
   describe '#run_command' do
     it 'runs the command on the box' do
-      expect(box).to receive(:system).with('vagrant ssh default --command "some_command"')
+      expect(Bundler).to receive(:clean_system).with('vagrant ssh default --command "some_command"')
       box.run_command('some_command')
     end
 
     it 'runs the command on the box with the box name' do
       box = described_class.new('somebox')
-      expect(box).to receive(:system).with('vagrant ssh somebox --command "some_command"')
+      expect(Bundler).to receive(:clean_system).with('vagrant ssh somebox --command "some_command"')
       box.run_command('some_command')
     end
 
     it 'returns the exit status of the command that ran' do
-      allow(box).to receive(:system)
       allow($?).to receive(:exitstatus).and_return(1)
 
       expect(box.run_command('foo')).to eql(1)
     end
 
     it 'pipes stdin to the command if given' do
-      expect(box).to receive(:system).with("vagrant ssh default --command \"some_command\" << EOF\nsomething\nEOF")
+      expect(Bundler).to receive(:clean_system).with("vagrant ssh default --command \"some_command\" << EOF\nsomething\nEOF")
       box.run_command('some_command', :stdin => "something")
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infra-testing-helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ryan Doyle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -70,15 +70,17 @@ files:
 - lib/infra_testing_helpers/box.rb
 - lib/infra_testing_helpers/helper.rb
 - lib/infra_testing_helpers/site.rb
+- spec/functional/failing_spec.rb
 - spec/functional/modules/test2_manifest/manifests/init.pp
+- spec/functional/modules/test2_manifest/manifests/invalid.pp
 - spec/functional/modules/test_manifest/manifests/init.pp
 - spec/functional/sample2_spec.rb
 - spec/functional/sample_spec.rb
 - spec/functional_spec_helper.rb
 - spec/spec_helper.rb
-- spec/unit/puppet_vagrant/box_spec.rb
-- spec/unit/puppet_vagrant/helper_spec.rb
-- spec/unit/puppet_vagrant/site_spec.rb
+- spec/unit/infra_testing_helpers/box_spec.rb
+- spec/unit/infra_testing_helpers/helper_spec.rb
+- spec/unit/infra_testing_helpers/site_spec.rb
 homepage: https://github.com/ryandoyle/infra-testing-helpers
 licenses:
 - MIT
@@ -104,13 +106,14 @@ signing_key:
 specification_version: 4
 summary: Integrations with RSpec, Puppet and Vagrant to help infrastructure testing
 test_files:
+- spec/functional/failing_spec.rb
 - spec/functional/modules/test2_manifest/manifests/init.pp
+- spec/functional/modules/test2_manifest/manifests/invalid.pp
 - spec/functional/modules/test_manifest/manifests/init.pp
 - spec/functional/sample2_spec.rb
 - spec/functional/sample_spec.rb
 - spec/functional_spec_helper.rb
 - spec/spec_helper.rb
-- spec/unit/puppet_vagrant/box_spec.rb
-- spec/unit/puppet_vagrant/helper_spec.rb
-- spec/unit/puppet_vagrant/site_spec.rb
-has_rdoc: 
+- spec/unit/infra_testing_helpers/box_spec.rb
+- spec/unit/infra_testing_helpers/helper_spec.rb
+- spec/unit/infra_testing_helpers/site_spec.rb