vanagon 0.8.2 → 0.9.1

data/spec/lib/vanagon/engine/pooler_spec.rb

@@ -18,29 +18,93 @@ describe 'Vanagon::Engine::Pooler' do
     plat._platform
   }
 
+  before :each do
+    # suppress `#warn` output during tests
+    allow_any_instance_of(Vanagon::Platform::DSL).to receive(:warn)
+
+    # stubbing ENV doesn't actually intercept ENV because ENV
+    # is special and you aren't. So we have to mangle the value
+    # of ENV around each of these tests if we want to prevent
+    # actual user credentials from being loaded, or attempt to
+    # validate the way that credentials are read.
+    ENV['REAL_HOME'] = ENV.delete 'HOME'
+    ENV['REAL_VMPOOLER_TOKEN'] = ENV.delete 'VMPOOLER_TOKEN'
+    ENV['HOME'] = Dir.mktmpdir
+
+    # This should help maintain the ENV['HOME'] masquerade
+    allow(Dir).to receive(:home).and_return(ENV['HOME'])
+  end
+
+  after :each do
+    # Altering ENV directly is a legitimate code-smell.
+    # We should at least clean up after ourselves.
+    ENV['HOME'] = ENV.delete 'REAL_HOME'
+    ENV['VMPOOLER_TOKEN'] = ENV.delete 'REAL_VMPOOLER_TOKEN'
+  end
+
+  # We don't want to run the risk of reading legitimate user
+  # data from a user who is unfortunate enough to be running spec
+  # tests on their local machine. This means we have to intercept
+  # and stub out a very specific environment, where:
+  #   1) an environment variable exists
+  #   2) the env. var is unset, and only a ~/.vmpooler-token file exists
+  #   3) the env. var is unset, and only a ~/.vmfloaty.yml file exists
   describe "#load_token" do
-    after(:each) { ENV['VMPOOLER_TOKEN'] = nil }
+    let(:environment_value) { 'cafebeef' }
+    let(:token_value) { 'decade' }
+    let(:pooler_token_file) { File.expand_path('~/.vanagon-token') }
+    let(:floaty_config) { File.expand_path('~/.vmfloaty.yml') }
+
+    it 'prefers the VMPOOLER_TOKEN environment variable to a config file' do
+      allow(ENV).to receive(:[])
+                      .with('VMPOOLER_TOKEN')
+                      .and_return(environment_value)
+
+      expect(Vanagon::Engine::Pooler.new(platform).token)
+        .to_not eq(token_value)
 
-    let(:token_file) { double(File) }
-    let(:token_filename) { 'abcd' }
+      expect(Vanagon::Engine::Pooler.new(platform).token)
+        .to eq(environment_value)
+    end
+
+    it %(reads a token from '~/.vanagon-token' if the environment variable is not set) do
+      allow(File).to receive(:exist?)
+                      .with(pooler_token_file)
+                      .and_return(true)
 
-    it 'prefers an env var to a file' do
-      ENV['VMPOOLER_TOKEN'] = 'abcd'
-      expect(File).to_not receive(:expand_path).with('~/.vanagon-token')
-      expect(Vanagon::Engine::Pooler.new(platform).token).to eq('abcd')
+      allow(File).to receive(:read)
+                      .with(pooler_token_file)
+                      .and_return(token_value)
+
+      expect(Vanagon::Engine::Pooler.new(platform).token)
+        .to eq(token_value)
     end
 
-    it 'falls back to a file if the env var is not set' do
-      expect(File).to receive(:expand_path).with('~/.vanagon-token').and_return(token_filename)
-      expect(File).to receive(:exist?).with(token_filename).and_return(true)
-      expect(File).to receive(:open).with(token_filename).and_return(token_file)
-      expect(token_file).to receive(:read).and_return('abcd')
-      expect(Vanagon::Engine::Pooler.new(platform).token).to eq('abcd')
+    it %(reads a token from '~/.vmfloaty.yml' if '~/.vanagon-token' doesn't exist) do
+      allow(File).to receive(:exist?)
+                      .with(pooler_token_file)
+                      .and_return(false)
+
+      allow(File).to receive(:exist?)
+                      .with(floaty_config)
+                      .and_return(true)
+
+      allow(YAML).to receive(:load_file)
+                      .with(floaty_config)
+                      .and_return({'token' => token_value})
+
+      expect(Vanagon::Engine::Pooler.new(platform).token).to eq(token_value)
     end
 
-    it 'returns nil if there is no env var or file' do
-      expect(File).to receive(:expand_path).with('~/.vanagon-token').and_return(token_filename)
-      expect(File).to receive(:exist?).with(token_filename).and_return(false)
+    it %(returns 'nil' if no vmpooler token configuration exists) do
+      allow(File).to receive(:exist?)
+                      .with(pooler_token_file)
+                      .and_return(false)
+
+      allow(File).to receive(:exist?)
+                      .with(floaty_config)
+                      .and_return(false)
+
       expect(Vanagon::Engine::Pooler.new(platform).token).to be_nil
     end
   end

data/spec/lib/vanagon/platform/dsl_spec.rb

@@ -20,6 +20,11 @@ describe 'Vanagon::Platform::DSL' do
 
   let(:hex_value) { "906264d248061b0edb1a576cc9c8f6c7" }
 
+  before :each do
+    # suppress `#warn` output during tests
+    allow_any_instance_of(Vanagon::Platform::DSL).to receive(:warn)
+  end
+
   # These apt_repo, yum_repo, and zypper_repo methods are all deprecated.
   describe '#apt_repo' do
     it "grabs the file and adds .list to it" do
@@ -106,6 +111,15 @@ describe 'Vanagon::Platform::DSL' do
     end
   end
 
+  describe '#abs_resource_name' do
+    it 'sets the instance variable on platform' do
+      plat = Vanagon::Platform::DSL.new('solaris-test-fixture')
+      plat.instance_eval(solaris_10_platform_block)
+      plat.abs_resource_name 'solaris-10-x86_64'
+      expect(plat._platform.abs_resource_name).to eq('solaris-10-x86_64')
+    end
+  end
+
   describe '#vmpooler_template' do
     it 'sets the instance variable on platform' do
       plat = Vanagon::Platform::DSL.new('solaris-test-fixture')

data/spec/lib/vanagon/platform/windows_spec.rb

@@ -135,7 +135,7 @@ HERE
 
         it "Copies Hierarchy of files from Product Specific Directory to output directory with ERB translation as necessary" do
           # setup source directories and run artifact generation
-          FileUtils.cp_r("#{WIXTESTFILES}/", "#{PROJ_ROOT}/resources/windows/", :verbose => true)
+          FileUtils.cp_r("#{WIXTESTFILES}/", "#{PROJ_ROOT}/resources/windows/")
           cur_plat._platform.generate_msi_packaging_artifacts(WORKDIR, plat[:projname], binding)
           # check the result
           expect(File).to exist("#{WORKDIR}/wix/file-1.wxs")
@@ -154,7 +154,7 @@ HERE
 
         it "Copies Hierarchy of files from vanagon directory to output directory with ERB translation as necessary" do
           # setup source directories and run artifact generation
-          FileUtils.cp_r("#{WIXTESTFILES}/", "#{VANAGON_ROOT}/resources/windows/", :verbose => true)
+          FileUtils.cp_r("#{WIXTESTFILES}/", "#{VANAGON_ROOT}/resources/windows/")
           cur_plat._platform.generate_msi_packaging_artifacts(WORKDIR, plat[:projname], binding)
           # check the result
           expect(File).to exist("#{WORKDIR}/wix/file-1.wxs")

data/spec/lib/vanagon/project_spec.rb

@@ -11,13 +11,15 @@ describe 'Vanagon::Project' do
     end"
   }
 
-  before do
-    allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
-    allow(Vanagon::Driver).to receive(:configdir).and_return(configdir)
-    allow(Vanagon::Component).to receive(:load_component).with('some-component', any_args).and_return(component)
-  end
 
   describe '#get_root_directories' do
+
+    before do
+      allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
+      allow(Vanagon::Driver).to receive(:configdir).and_return(configdir)
+      allow(Vanagon::Component).to receive(:load_component).with('some-component', any_args).and_return(component)
+    end
+
     let(:test_sets) do
       [
         {
@@ -41,4 +43,76 @@ describe 'Vanagon::Project' do
       end
     end
   end
+
+  describe "#filter_component" do
+
+    # All of the following tests should be run with one project level
+    # component that isn't included in the build_deps of another component
+    before(:each) do
+      @proj = Vanagon::Project.new('test-fixture-with-comps', {})
+      @not_included_comp = Vanagon::Component.new('test-fixture-not-included', {}, {})
+      @proj.components << @not_included_comp
+    end
+
+    it "returns nil when given a component that doesn't exist" do
+      expect(@proj.filter_component("fake")).to eq([])
+    end
+
+    it "returns only the component with no build deps" do
+      comp = Vanagon::Component.new('test-fixture1', {}, {})
+      @proj.components << comp
+      expect(@proj.filter_component(comp.name)).to eq([comp])
+    end
+
+    it "returns component and one build dep" do
+      comp1 = Vanagon::Component.new('test-fixture1', {}, {})
+      comp2 = Vanagon::Component.new('test-fixture2', {}, {})
+      comp1.build_requires << comp2.name
+      @proj.components << comp1
+      @proj.components << comp2
+      expect(@proj.filter_component(comp1.name)).to eq([comp1, comp2])
+    end
+
+    it "returns only the component with build deps that are not components of the @project" do
+      comp = Vanagon::Component.new('test-fixture1', {}, {})
+      comp.build_requires << "fake-name"
+      @proj.components << comp
+      expect(@proj.filter_component(comp.name)).to eq([comp])
+    end
+
+    it "returns the component and build deps with both @project components and external build deps" do
+      comp1 = Vanagon::Component.new('test-fixture1', {}, {})
+      comp2 = Vanagon::Component.new('test-fixture2', {}, {})
+      comp1.build_requires << comp2.name
+      comp1.build_requires << "fake-name"
+      @proj.components << comp1
+      @proj.components << comp2
+      expect(@proj.filter_component(comp1.name)).to eq([comp1, comp2])
+    end
+
+    it "returns the component and multiple build deps" do
+      comp1 = Vanagon::Component.new('test-fixture1', {}, {})
+      comp2 = Vanagon::Component.new('test-fixture2', {}, {})
+      comp3 = Vanagon::Component.new('test-fixture3', {}, {})
+      comp1.build_requires << comp2.name
+      comp1.build_requires << comp3.name
+      @proj.components << comp1
+      @proj.components << comp2
+      @proj.components << comp3
+      expect(@proj.filter_component(comp1.name)).to eq([comp1, comp2, comp3])
+    end
+
+    it "returns the component and multiple build deps with external build deps" do
+      comp1 = Vanagon::Component.new('test-fixture1', {}, {})
+      comp2 = Vanagon::Component.new('test-fixture2', {}, {})
+      comp3 = Vanagon::Component.new('test-fixture3', {}, {})
+      comp1.build_requires << comp2.name
+      comp1.build_requires << comp3.name
+      comp1.build_requires << "another-fake-name"
+      @proj.components << comp1
+      @proj.components << comp2
+      @proj.components << comp3
+      expect(@proj.filter_component(comp1.name)).to eq([comp1, comp2, comp3])
+    end
+  end
 end

data/spec/lib/vanagon/utilities_spec.rb

@@ -2,6 +2,11 @@ require 'vanagon/utilities'
 require 'tmpdir'
 
 describe "Vanagon::Utilities" do
+  before :each do
+    # suppress `#warn` output during tests
+    allow(Vanagon::Utilities).to receive(:warn)
+  end
+
   describe "#find_program_on_path" do
     let(:command) { "thingie" }
 

data/spec/spec_helper.rb

@@ -1,6 +1,26 @@
+require 'tmpdir'
+require 'vanagon'
+
+if ENV["COVERAGE"]
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter '.bundle'
+    add_filter 'spec'
+    add_filter 'vendor'
+  end
+end
+
 RSpec.configure do |c|
   c.before do
-    allow($stdout).to receive(:puts)
-    allow($stderr).to receive(:puts)
+    allow_any_instance_of(Vanagon::Component::Source::Git).to receive(:puts)
+    allow_any_instance_of(Vanagon::Component::Source::Http).to receive(:puts)
+    allow_any_instance_of(Vanagon::Component::Source::Local).to receive(:puts)
+
+    class Vanagon
+      module Utilities
+        def puts(*args)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.1
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -87,6 +87,7 @@ files:
 - lib/vanagon/component/source/http.rb
 - lib/vanagon/component/source/local.rb
 - lib/vanagon/driver.rb
+- lib/vanagon/engine/always_be_scheduling.rb
 - lib/vanagon/engine/base.rb
 - lib/vanagon/engine/docker.rb
 - lib/vanagon/engine/ec2.rb
@@ -149,6 +150,7 @@ files:
 - spec/fixtures/component/mcollective.service
 - spec/fixtures/component/test-fixture.json
 - spec/fixtures/files/fake_dir.tar.gz
+- spec/fixtures/files/fake_dir/fake_file.txt
 - spec/fixtures/files/fake_file.txt
 - spec/fixtures/files/fake_file_ext.7z
 - spec/fixtures/files/fake_file_ext.bz
@@ -167,6 +169,7 @@ files:
 - spec/fixtures/files/fake_file_ext.xz
 - spec/fixtures/files/fake_file_ext.z
 - spec/fixtures/files/fake_file_ext.zip
+- spec/fixtures/files/fake_nested_dir/fake_dir/fake_file.txt
 - spec/fixtures/wix/resources/windows/wix/file-1.wxs
 - spec/fixtures/wix/resources/windows/wix/file-2.wxs
 - spec/fixtures/wix/resources/windows/wix/file-3.wxs.erb
@@ -187,6 +190,7 @@ files:
 - spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component_spec.rb
 - spec/lib/vanagon/driver_spec.rb
+- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
 - spec/lib/vanagon/engine/ec2_spec.rb
@@ -229,40 +233,41 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
 - spec/lib/makefile_spec.rb
+- spec/lib/vanagon/common/pathname_spec.rb
+- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/component/dsl_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/component/source/git_spec.rb
 - spec/lib/vanagon/component/source/http_spec.rb
 - spec/lib/vanagon/component/source/local_spec.rb
-- spec/lib/vanagon/component/source/git_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/component/dsl_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/common/pathname_spec.rb
-- spec/lib/vanagon/extensions/set/json_spec.rb
-- spec/lib/vanagon/extensions/ostruct/json_spec.rb
-- spec/lib/vanagon/extensions/string_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/optparse_spec.rb
-- spec/lib/vanagon/project_spec.rb
 - spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/driver_spec.rb
+- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
-- spec/lib/vanagon/engine/pooler_spec.rb
+- spec/lib/vanagon/engine/docker_spec.rb
 - spec/lib/vanagon/engine/ec2_spec.rb
 - spec/lib/vanagon/engine/hardware_spec.rb
 - spec/lib/vanagon/engine/local_spec.rb
-- spec/lib/vanagon/engine/docker_spec.rb
-- spec/lib/vanagon/driver_spec.rb
+- spec/lib/vanagon/engine/pooler_spec.rb
+- spec/lib/vanagon/extensions/ostruct/json_spec.rb
+- spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/extensions/string_spec.rb
+- spec/lib/vanagon/optparse_spec.rb
+- spec/lib/vanagon/platform/deb_spec.rb
+- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
+- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/platform_spec.rb
 - spec/lib/vanagon/project/dsl_spec.rb
+- spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
 - spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/platform_spec.rb