vanagon 0.15.37 → 0.18.0

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,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.15.37
+  version: 0.18.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: docopt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +84,7 @@ description: Vanagon is a tool to build a single package out of a project, which
   itself contain one or more components.
 email: info@puppet.com
 executables:
+- vanagon
 - build
 - inspect
 - ship
@@ -91,10 +106,23 @@ files:
 - bin/repo
 - 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
 - lib/vanagon.rb
+- lib/vanagon/cli.rb
+- 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
 - lib/vanagon/common.rb
 - lib/vanagon/common/pathname.rb
 - lib/vanagon/common/user.rb
@@ -120,7 +148,6 @@ files:
 - lib/vanagon/extensions/ostruct/json.rb
 - lib/vanagon/extensions/set/json.rb
 - lib/vanagon/extensions/string.rb
-- lib/vanagon/optparse.rb
 - lib/vanagon/patch.rb
 - lib/vanagon/platform.rb
 - lib/vanagon/platform/deb.rb
@@ -204,6 +231,7 @@ files:
 - spec/fixtures/wix/resources/windows/wix/ui/ui-sample-1.wxs
 - spec/lib/git/rev_list_spec.rb
 - spec/lib/makefile_spec.rb
+- spec/lib/vanagon/cli_spec.rb
 - spec/lib/vanagon/common/pathname_spec.rb
 - spec/lib/vanagon/common/user_spec.rb
 - spec/lib/vanagon/component/dsl_spec.rb
@@ -226,7 +254,6 @@ files:
 - 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/osx_spec.rb
@@ -265,41 +292,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/git/rev_list_spec.rb
 - spec/lib/makefile_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
-- spec/lib/vanagon/platform_spec.rb
-- spec/lib/vanagon/project_spec.rb
-- spec/lib/vanagon/component_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/engine/ec2_spec.rb
-- spec/lib/vanagon/engine/hardware_spec.rb
+- spec/lib/vanagon/environment_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
-- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
+- spec/lib/vanagon/engine/hardware_spec.rb
+- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/local_spec.rb
-- spec/lib/vanagon/environment_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/driver_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/vanagon/component/source/rewrite_spec.rb
+- spec/lib/vanagon/engine/ec2_spec.rb
+- spec/lib/vanagon/extensions/string_spec.rb
+- spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/extensions/ostruct/json_spec.rb
+- spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/common/pathname_spec.rb
+- spec/lib/vanagon/common/user_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/rewrite_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/component/dsl_spec.rb
+- spec/lib/vanagon/component_spec.rb
 - spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/vanagon/optparse_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/common/pathname_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
 - spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/platform/osx_spec.rb
+- spec/lib/vanagon/platform/deb_spec.rb
 - spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/git/rev_list_spec.rb
+- spec/lib/vanagon/platform/solaris_10_spec.rb
+- spec/lib/vanagon/platform/osx_spec.rb
+- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
+- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/cli_spec.rb
+- spec/lib/vanagon/platform_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/vanagon/utilities_spec.rb
+- spec/lib/vanagon/driver_spec.rb

data/lib/vanagon/optparse.rb

@@ -1,86 +0,0 @@
-require 'optparse'
-
-class Vanagon
-  class OptParse
-    def initialize(banner, symbols = []) # rubocop:disable Metrics/AbcSize
-      ## symbols array kept for backward compatibility but ignored
-
-      @options = Hash.new
-      @options[:preserve] = :'on-failure'
-
-      @option_parser = OptionParser.new do |opts| # rubocop:disable Metrics/BlockLength
-        opts.banner = banner
-        opts.separator ""
-        opts.separator "Options:"
-
-        opts.on("-h",
-                "--help",
-                "Display help") do
-          $stdout.puts opts
-          exit 1
-        end
-
-        opts.on("-v",
-                "--verbose",
-                "Verbose output (does nothing)") do |verbose|
-          @options[:verbose] = verbose
-        end
-
-        opts.on("-w DIRECTORY",
-                "--workdir DIRECTORY",
-                "Working directory on the local host (defaults to calling mktemp)") do |workdir|
-          @options[:workdir] = workdir
-        end
-
-        opts.on("-r DIRECTORY",
-                "--remote-workdir DIRECTORY",
-                "Working directory on the remote host (defaults to calling mktemp)") do |remote|
-          @options[:"remote-workdir"] = remote
-        end
-
-        opts.on("-c DIRECTORY",
-                "--configdir DIRECTORY",
-                "Configuration directory (defaults to $CWD/configs)") do |configuration_directory|
-          @options[:configdir] = configuration_directory
-        end
-
-        opts.on("-e ENGINE",
-                "--engine ENGINE",
-                "Custom engine to use [base, local, docker, pooler] (defaults to \"pooler\")") do |engine|
-          @options[:engine] = engine
-        end
-
-        opts.on("--skipcheck",
-                "Skip the \"check\" stage when building components") do |skipcheck|
-          @options[:skipcheck] = skipcheck
-        end
-
-        opts.on("-p [RULE]",
-                "--preserve [RULE]",
-                ["never", "on-failure", "always"],
-                "Rule for VM preservation. [never, on-failure, always]") do |rule|
-          if rule.nil?
-            @options[:preserve] = :always
-          else
-            @options[:preserve] = rule.to_sym
-          end
-        end
-
-        opts.on("--only-build COMPONENT,COMPONENT,...",
-                Array,
-                "Only build listed COMPONENTs") do |components|
-          @options[:only_build] = components
-        end
-      end
-    end
-
-    def parse!(args)
-      @option_parser.parse!(args)
-      @options
-    end
-
-    def to_s
-      @optparse.to_s
-    end
-  end
-end

data/spec/lib/vanagon/optparse_spec.rb

@@ -1,64 +0,0 @@
-require 'vanagon/optparse'
-
-describe Vanagon::OptParse do
-
-  describe "options that don't take a value" do
-    [:skipcheck, :verbose].each do |flag|
-      it "can create an option parser that accepts the #{flag} flag" do
-        subject = described_class.new("test", [flag])
-        expect(subject.parse!(["--#{flag}"])).to have_key(flag)
-      end
-    end
-
-    describe "short options" do
-      [["v", :verbose]].each do |short, long|
-        it "maps the short option #{short} to #{long}" do
-          subject = described_class.new("test", [long])
-          expect(subject.parse!(["-#{short}"])).to include(long => true)
-        end
-      end
-    end
-  end
-
-  describe "options that only allow limited values" do
-    [[:preserve, ["always", "never", "on-failure"]]].each do |option, values|
-      values.each do |value|
-        it "can create a parser that accepts \"--#{option} #{value}\"" do
-          subject = described_class.new("test", [option, value])
-          expect(subject.parse!(["--#{option}", value])).to eq(option => value.to_sym)
-        end
-      end
-    end
-    [[:preserve, ["bad-argument"]]].each do |option, values|
-      values.each do |value|
-        it "rejects the bad argument \"--#{option} #{value}\"" do
-          subject = described_class.new("test", [option, value])
-          expect{subject.parse!(["--#{option}", value])}.to raise_error(OptionParser::InvalidArgument)
-        end
-      end
-    end
-    it "preserve defaults to :on-failure" do
-      subject = described_class.new("test")
-      expect(subject.parse!([])).to include(:preserve => :'on-failure')
-    end
-  end
-
-
-  describe "options that take a value" do
-    [:workdir, :configdir, :engine].each do |option|
-      it "can create an option parser that accepts the #{option} option" do
-        subject = described_class.new("test", [option])
-        expect(subject.parse!(["--#{option}", "hello"])).to include(option => "hello")
-      end
-    end
-
-    describe "short options" do
-      [["w", :workdir], ["c", :configdir], ["e", :engine]].each do |short, long|
-        it "maps the short option #{short} to #{long}" do
-          subject = described_class.new("test", [long])
-          expect(subject.parse!(["-#{short}", "hello"])).to include(long => "hello")
-        end
-      end
-    end
-  end
-end