vanagon 0.16.0 → 0.19.0

data/resources/deb/control.erb

@@ -18,7 +18,7 @@ Breaks: <%= get_replaces.map { |replace| "#{replace.replacement} #{replace.versi
 Conflicts: <%= get_conflicts.map { |conflict| "#{conflict.pkgname} #{conflict.version ? "(#{conflict.version})" : ""}" }.join(", ") %>
 <%- end -%>
 <%- unless get_requires.empty? -%>
-Depends: <%= get_requires.join(", ") %>
+Depends: <%= get_requires.map { |req| "#{req.requirement} #{req.version ? "(#{req.version})" : ""}" }.join(", ") %>
 <%- end -%>
 <%- unless get_provides.empty? -%>
 Provides: <%= get_provides.map { |prov| prov.provide }.join(", ") %>

data/resources/osx/postinstall.erb

@@ -6,7 +6,11 @@
 dest_file = config.path.gsub(/\.pristine$/, '') -%>
 
 if [ -f "<%= dest_file %>" ]; then
-  echo "Detected file at '<%= dest_file %>'; updated file at '<%= config.path %>'."
+  if diff "<%= config.path %>" "<%= dest_file %>" > /dev/null; then
+    rm -f "<%= config.path %>"
+  else
+    echo "Detected file at '<%= dest_file %>'; updated file at '<%= config.path %>'."
+  fi
 else
   mv '<%= config.path %>' '<%= dest_file %>'
 fi

data/resources/rpm/project.spec.erb

@@ -77,7 +77,7 @@ Source1:        file-list-for-rpm
 Autoprov: 0
 Autoreq: 0
 <%- get_requires.each do |requires| -%>
-Requires:  <%= requires %>
+Requires:  <%= requires.requirement %><%= requires.version ? " #{requires.version}" : "" %>
 <%- end -%>
 
 # All rpm packages built by vanagon have the pre-/post-install script

data/resources/solaris/10/depend.erb

@@ -1,3 +1,3 @@
-<%- get_requires.each do |requirement| -%>
-P <%= requirement %>
+<%- get_requires.each do |requires| -%>
+P <%= requires.requirement %>
 <%- end -%>

data/resources/solaris/10/postinstall.erb

@@ -10,7 +10,11 @@
 dest_file = config.path.gsub(/\.pristine$/, '') -%>
 
 if [ -f "<%= dest_file %>" ]; then
-  echo "Detected file at '<%= dest_file %>'; updated file at '<%= config.path %>'."
+  if diff "<%= config.path %>" "<%= dest_file %>" > /dev/null; then
+    rm -f "<%= config.path %>"
+  else
+    echo "Detected file at '<%= dest_file %>'; updated file at '<%= config.path %>'."
+  fi
 else
   cp -pr '<%= config.path %>' '<%= dest_file %>'
 fi
@@ -19,7 +23,11 @@ fi
 
 # Set up any specific permissions needed...
 <%- (get_directories + get_configfiles + get_files).select { |pathname| pathname.has_overrides? }.uniq.each do |file_or_directory| -%>
-  <%= "chmod '#{file_or_directory.mode}' '#{file_or_directory.path}'" if file_or_directory.mode %>
+  <%- if file_or_directory.mode -%>
+  if [ -f "<%= file_or_directory.path %>" ] || [ -d "<%= file_or_directory.path %>" ]; then
+    chmod '<%= file_or_directory.mode %>' '<%= file_or_directory.path %>'
+  fi
+  <%- end -%>
   <%- if file_or_directory.owner -%>
     if getent passwd '<%= file_or_directory.owner %>' &> /dev/null; then
       chown '<%= file_or_directory.owner %>' '<%= file_or_directory.path %>'

data/resources/solaris/11/p5m.erb

@@ -17,8 +17,8 @@ set name=variant.opensolaris.zone value=global value=nonglobal
 %>
 
 # Add any needed dependencies
-<%- get_requires.each do |requirement| -%>
-depend fmri=pkg:/<%= requirement %> type=require
+<%- get_requires.each do |requires| -%>
+depend fmri=pkg:/<%= requires.requirement %> type=require
 <%- end -%>
 
 # Always drop /etc, /usr, and /var, it will cause conflicts with other system packages

data/spec/lib/vanagon/cli_spec.rb

@@ -78,3 +78,146 @@ describe Vanagon::CLI do
     end
   end
 end
+
+describe Vanagon::CLI::List do 
+  let(:cli) { Vanagon::CLI::List.new }
+  
+  describe "#output" do 
+      let(:list) { ['a', 'b', 'c']}
+      it "returns an array if space is false" do 
+          expect(cli.output(list, false)).to eq(list)
+      end 
+      it "returns space separated if space is true" do 
+          expect(cli.output(list, true)).to eq('a b c')
+      end 
+  end
+
+  describe "#run" do 
+    let(:projects){ ['foo', 'bar', 'baz'] }
+    let(:platforms){ ['1', '2', '3'] }
+    let(:output_both){
+"- Projects
+foo
+bar
+baz
+
+- Platforms
+1
+2
+3
+"
+}
+    context "specs with standard config path" do
+      before(:each) do
+        expect(Dir).to receive(:exist?)
+          .with("#{File.join(Dir.pwd, 'configs', 'platforms')}")
+          .and_return(true)
+        expect(Dir).to receive(:exist?)
+          .with("#{File.join(Dir.pwd, 'configs', 'projects')}")
+          .and_return(true)
+        expect(Dir).to receive(:children)
+          .with("#{File.join(Dir.pwd, 'configs', 'projects')}")
+          .and_return(projects)
+        expect(Dir).to receive(:children)
+          .with("#{File.join(Dir.pwd, 'configs', 'platforms')}")
+          .and_return(platforms)
+      end
+      let(:options_empty) { {
+        nil=>false, 
+        :configdir=>"#{Dir.pwd}/configs", 
+        :platforms=>false, 
+        :projects=>false, 
+        :use_spaces=>false
+      } }
+      let(:options_platforms_only) { {
+        nil=>false, 
+        :configdir=>"#{Dir.pwd}/configs", 
+        :platforms=>true, 
+        :projects=>false, 
+        :use_spaces=>false
+      } }
+      let(:options_projects_only) { {
+        nil=>false, 
+        :configdir=>"#{Dir.pwd}/configs", 
+        :platforms=>false, 
+        :projects=>true, 
+        :use_spaces=>false
+      } }
+      let(:options_space_only) { {
+        nil=>false, 
+        :configdir=>"#{Dir.pwd}/configs", 
+        :platforms=>false, 
+        :projects=>false, 
+        :use_spaces=>true
+      } }
+
+      it "outputs projects and platforms with no options passed" do 
+        expect do
+          cli.run(options_empty)
+        end.to output(output_both).to_stdout
+      end
+      
+      let(:output_both_space){
+"- Projects
+foo bar baz
+
+- Platforms
+1 2 3
+"
+}
+      it "outputs projects and platforms space separated" do 
+        expect do
+          cli.run(options_space_only)
+        end.to output(output_both_space).to_stdout
+      end
+
+      let(:output_platforms){
+"- Platforms
+1
+2
+3
+"
+}
+      it "outputs only platforms when platforms is passed" do 
+        expect do
+          cli.run(options_platforms_only)
+        end.to output(output_platforms).to_stdout
+      end
+
+      let(:output_projects){
+"- Projects
+foo
+bar
+baz
+"
+}
+      it "outputs only projects when projects is passed" do 
+        expect do
+          cli.run(options_projects_only)
+        end.to output(output_projects).to_stdout
+      end
+    end
+
+    context "spec with a configdir specified" do
+      let(:options_configdir) { {
+        nil=>false, 
+        :configdir=> '/configs', 
+        :platforms=>false, 
+        :projects=>false, 
+        :use_spaces=>false} }
+      it "it successfully takes the configs directory" do 
+        expect(Dir).to receive(:exist?).with('/configs' + '/platforms')
+          .and_return(true)
+        expect(Dir).to receive(:exist?).with('/configs' + '/projects')
+          .and_return(true)
+        expect(Dir).to receive(:children).with('/configs' + '/projects')
+          .and_return(projects)
+        expect(Dir).to receive(:children).with('/configs' + '/platforms')
+          .and_return(platforms)
+        expect do
+          cli.run(options_configdir)
+        end.to output(output_both).to_stdout
+      end
+    end
+  end
+end

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

@@ -313,11 +313,18 @@ end" }
       comp = Vanagon::Component::DSL.new('requires-test', {}, {})
       comp.requires('library1')
       comp.requires('library2')
-      expect(comp._component.requires).to include('library1')
-      expect(comp._component.requires).to include('library2')
+      expect(comp._component.requires.first.requirement).to include('library1')
+      expect(comp._component.requires.last.requirement).to include('library2')
     end
   end
 
+    it 'supports versioned requires' do
+      comp = Vanagon::Component::DSL.new('requires-test', {}, {})
+      comp.requires('library1', '1.2.3')
+      expect(comp._component.requires.first.requirement).to eq('library1')
+      expect(comp._component.requires.first.version).to eq('1.2.3')
+    end
+
   describe '#provides' do
     it 'adds the package provide to the list of provides' do
       comp = Vanagon::Component::DSL.new('provides-test', {}, {})

data/spec/lib/vanagon/component_spec.rb

@@ -5,8 +5,9 @@ describe "Vanagon::Component" do
   describe "#get_environment" do
     subject { Vanagon::Component.new('env-test', {}, {}) }
 
-    it "prints a deprecation warning to STDERR" do
-      expect { subject.get_environment }.to output(/deprecated/).to_stderr
+    it "logs a deprecation warning with VanagonLogger.info" do
+      expect(VanagonLogger).to receive(:info).with(/deprecated/)
+      subject.get_environment
     end
 
     it "returns a makefile compatible environment" do

data/spec/lib/vanagon/driver_spec.rb

@@ -50,7 +50,7 @@ describe 'Vanagon::Driver' do
       info = create_driver(redhat).build_host_info
 
       expect(info).to match({ 'name'   => 'centos-7-x86_64',
-                              'engine' => 'pooler' })
+                              'engine' => 'always_be_scheduling' })
     end
 
     it 'returns the vmpooler template with an explicit engine' do

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

@@ -2,6 +2,7 @@ require 'vanagon/engine/always_be_scheduling'
 require 'vanagon/driver'
 require 'vanagon/platform'
 require 'logger'
+require 'spec_helper'
 
 class Vanagon
   class Driver
@@ -45,6 +46,8 @@ describe 'Vanagon::Engine::AlwaysBeScheduling' do
                     end")
     plat._platform
   }
+  let(:pooler_token_file) { File.expand_path('~/.vanagon-token') }
+  let(:floaty_config) { File.expand_path('~/.vmfloaty.yml') }
 
   describe '#validate_platform' do
     it 'returns true if the platform has the required attributes' do
@@ -81,4 +84,113 @@ describe 'Vanagon::Engine::AlwaysBeScheduling' do
         .to eq('always_be_scheduling')
     end
   end
-end
+
+  describe '#read_vanagon_token' do
+    it 'takes the first line for abs token, second line is optional' do
+      token_value = 'decade'
+      allow(File).to receive(:exist?)
+                         .with(pooler_token_file)
+                         .and_return(true)
+
+      allow(File).to receive(:read)
+                         .with(pooler_token_file)
+                         .and_return(token_value)
+
+      abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
+      expect(abs_service.token).to eq('decade')
+      expect(abs_service.token_vmpooler).to eq(nil)
+    end
+    it 'takes the second line as vmpooler token' do
+      token_value = "decade\nanddaycade"
+      allow(File).to receive(:exist?)
+                         .with(pooler_token_file)
+                         .and_return(true)
+
+      allow(File).to receive(:read)
+                         .with(pooler_token_file)
+                         .and_return(token_value)
+
+      abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
+      expect(abs_service.token).to eq('decade')
+      expect(abs_service.token_vmpooler).to eq('anddaycade')
+    end
+  end
+
+  describe '#read_vmfloaty_token' do
+    before :each do
+      allow(File).to receive(:exist?)
+                         .with(pooler_token_file)
+                         .and_return(false)
+
+      allow(File).to receive(:exist?)
+                         .with(floaty_config)
+                         .and_return(true)
+    end
+    token_value = 'decade'
+    it %(reads a token from '~/.vmfloaty.yml at the top level') do
+      allow(YAML).to receive(:load_file)
+                         .with(floaty_config)
+                         .and_return({'token' => token_value})
+
+      abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
+      expect(abs_service.token).to eq(token_value)
+      expect(abs_service.token_vmpooler).to eq(nil)
+    end
+    it %(reads a token from '~/.vmfloaty.yml in the abs service') do
+      allow(YAML).to receive(:load_file)
+                         .with(floaty_config)
+                         .and_return({'services' =>
+                                          {'MYabs' => {'type'=>'abs', 'token'=>token_value, 'url'=>'foo'}}
+                                     })
+
+      abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
+      expect(abs_service.token).to eq(token_value)
+      expect(abs_service.token_vmpooler).to eq(nil)
+    end
+    it %(reads a token from '~/.vmfloaty.yml in the abs service and includes the vmpooler token') do
+      vmp_token_value = 'deecade'
+      allow(YAML).to receive(:load_file)
+                         .with(floaty_config)
+                         .and_return({'services' =>
+                                          {'MYabs' => {'type'=>'abs', 'token'=>token_value, 'url'=>'foo', 'vmpooler_fallback' => 'myvmp'},
+                                           'myvmp' => {'token'=>vmp_token_value, 'url'=>'bar'}}
+                                     })
+
+      abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
+      expect(abs_service.token).to eq(token_value)
+      expect(abs_service.token_vmpooler).to eq(vmp_token_value)
+    end
+  end
+  describe '#select_target_from' do
+    it 'runs successfully' do
+      hostname = 'faint-whirlwind.puppet.com'
+      stub_request(:post, "https://foobar/request").
+          to_return({status: 202, body: "", headers: {}},{status: 200, body: '[{"hostname":"'+hostname+'","type":"aix-6.1-ppc","engine":"nspooler"}]', headers: {}})
+      abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
+      abs_service.select_target_from("https://foobar")
+      expect(abs_service.target).to eq(hostname)
+    end
+    it 'returns a warning if the first request is not a 202' do
+      hostname = 'fainter-whirlwind.puppet.com'
+      stub_request(:post, "https://foobar/request").
+          to_return({status: 404, body: "", headers: {}},{status: 200, body: '[{"hostname":"'+hostname+'","type":"aix-6.1-ppc","engine":"nspooler"}]', headers: {}})
+      allow_any_instance_of(VanagonLogger).to receive(:info)
+      expect_any_instance_of(VanagonLogger).to receive(:info).with("failed to request ABS with code 404")
+      abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
+      pooler = abs_service.select_target_from("https://foobar")
+      expect(pooler).to eq('')
+    end
+    it 'returns a warning and retries until request is a 200' do
+      hostname = 'faintest-whirlwind.puppet.com'
+      stub_request(:post, "https://foobar/request").
+          to_return({status: 202, body: "", headers: {}},
+                    {status: 503, body: "", headers: {}},
+                    {status: 200, body: '[{"hostname":"'+hostname+'","type":"aix-6.1-ppc","engine":"nspooler"}]', headers: {}})
+      allow_any_instance_of(VanagonLogger).to receive(:info)
+      expect_any_instance_of(VanagonLogger).to receive(:info).with(/Waiting 1 seconds to check if ABS request has been filled/)
+      abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
+      abs_service.select_target_from("https://foobar")
+      expect(abs_service.target).to eq(hostname)
+    end
+  end
+end

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

@@ -27,6 +27,8 @@ if defined? ::Aws
     end
 
     it 'returns "ec2" name' do
+      stub_request(:get, "http://169.254.169.254/latest/meta-data/iam/security-credentials/").
+          to_return(status: 200, body: "", headers: {})
       expect(Vanagon::Engine::Ec2.new(platform_ec2).name).to eq('ec2')
     end
   end

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

@@ -6,7 +6,7 @@ describe 'Vanagon::Engine::Pooler' do
   let (:platform_with_vcloud_name) {
     plat = Vanagon::Platform::DSL.new('debian-6-i386')
     plat.instance_eval("platform 'debian-6-i386' do |plat|
-                      plat.vcloud_name 'debian-6-i386'
+                      plat.vmpooler_template 'debian-6-i386'
                     end")
     plat._platform
   }

data/spec/spec_helper.rb

@@ -19,6 +19,7 @@ end
 
 require 'tmpdir'
 require 'vanagon'
+require 'webmock/rspec'
 
 RSpec.configure do |c|
   c.before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -107,6 +107,8 @@ files:
 - bin/ship
 - bin/sign
 - bin/vanagon
+- extras/completions/vanagon.bash
+- extras/completions/vanagon.zsh
 - lib/git/basic_submodules.rb
 - lib/git/rev_list.rb
 - lib/makefile.rb
@@ -115,7 +117,9 @@ files:
 - lib/vanagon/cli/build.rb
 - lib/vanagon/cli/build_host_info.rb
 - lib/vanagon/cli/build_requirements.rb
+- lib/vanagon/cli/completion.rb
 - lib/vanagon/cli/inspect.rb
+- lib/vanagon/cli/list.rb
 - lib/vanagon/cli/render.rb
 - lib/vanagon/cli/ship.rb
 - lib/vanagon/cli/sign.rb
@@ -144,6 +148,7 @@ files:
 - lib/vanagon/extensions/ostruct/json.rb
 - lib/vanagon/extensions/set/json.rb
 - lib/vanagon/extensions/string.rb
+- lib/vanagon/logger.rb
 - lib/vanagon/patch.rb
 - lib/vanagon/platform.rb
 - lib/vanagon/platform/deb.rb
@@ -288,41 +293,41 @@ signing_key:
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/driver_spec.rb
-- spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/cli_spec.rb
-- spec/lib/vanagon/environment_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/component/source_spec.rb
+- spec/lib/vanagon/component/dsl_spec.rb
 - spec/lib/vanagon/component/source/local_spec.rb
-- spec/lib/vanagon/component/source/git_spec.rb
-- spec/lib/vanagon/component/source/http_spec.rb
 - spec/lib/vanagon/component/source/rewrite_spec.rb
-- spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/vanagon/component/source/http_spec.rb
+- spec/lib/vanagon/component/source/git_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/extensions/set/json_spec.rb
 - spec/lib/vanagon/extensions/string_spec.rb
 - spec/lib/vanagon/extensions/ostruct/json_spec.rb
+- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/platform/solaris_10_spec.rb
+- spec/lib/vanagon/platform/deb_spec.rb
+- spec/lib/vanagon/platform/osx_spec.rb
+- spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/common/pathname_spec.rb
+- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/utilities_spec.rb
+- spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
 - spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/vanagon/environment_spec.rb
+- spec/lib/vanagon/driver_spec.rb
+- spec/lib/vanagon/cli_spec.rb
 - spec/lib/vanagon/platform_spec.rb
 - spec/lib/vanagon/engine/local_spec.rb
-- spec/lib/vanagon/engine/hardware_spec.rb
+- spec/lib/vanagon/engine/ec2_spec.rb
 - spec/lib/vanagon/engine/always_be_scheduling_spec.rb
-- spec/lib/vanagon/engine/pooler_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
-- spec/lib/vanagon/engine/ec2_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/common/pathname_spec.rb
-- spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/engine/hardware_spec.rb
+- spec/lib/vanagon/engine/pooler_spec.rb
 - spec/lib/makefile_spec.rb
 - spec/lib/git/rev_list_spec.rb