vanagon 0.15.32 → 0.15.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 375fd51fd8b1c6621ed0e099c37a0dc5eba86d71e95dfa46f5ec1377cf08e6d2
-  data.tar.gz: 5674166cac8d6076372b19349eb067da104060690f0d2a50be8323e49321f6bd
+  metadata.gz: ef3ecc339b5f864a0ab7e3f63aade38439c35decacd7502a67867cdf3121a5df
+  data.tar.gz: e04110e53343d000e100230e11bf1083f07306a69c7a93c53bb0c7dcbe1cd965
 SHA512:
-  metadata.gz: 9f700b9835591d643b30cd619f71515268a512a524b042aaf53f0884c99462eea30f9844b51f7b470c6afc16a41580f3336004e81cdcc393731e855531c929b8
-  data.tar.gz: 41ff4776775dde183725b665fc83532dfba334acabdd5615f5e6d28e42f0aa6d738ee07a7e3ec2c81437cd01b68afc009d088828e748ed1944ef48b13ec6790b
+  metadata.gz: 1e5522d4f11a224d03011dd2d4eef0d6ad016ee12371b57d8bdc3309b509d71fae8262245551329e0e5556f4f12207fbc3ef00861da33054a9190237ce47a9fc
+  data.tar.gz: b25a4b76077dd3f5489d0523c60e0710c1b57341aad9c3cdd8c43ef70c92383b4057dcdfecada28565a0623012885275ad0c03b53117c169b2fb1a2af11ac992

data/lib/vanagon/component/dsl.rb

@@ -333,6 +333,15 @@ class Vanagon
         @component.options[:ref] = the_ref
       end
 
+      # Sets clone option for git repository
+      #
+      # @param option for cloning and value
+      def clone_option(option, value)
+        option_sym = option.to_sym
+        @component.options[:clone_options] ||= {}
+        @component.options[:clone_options][option_sym] = value
+      end
+
       # Set a build dir relative to the source directory.
       #
       # The build dir will be created before the configure block runs and configure/build/install commands will be run

data/lib/vanagon/component/source.rb

@@ -35,7 +35,8 @@ class Vanagon
             return Vanagon::Component::Source::Git.new uri,
               sum: options[:sum],
               ref: options[:ref],
-              workdir: options[:workdir]
+              workdir: options[:workdir],
+              clone_options: options[:clone_options]
           end
 
           if source_type == :http

data/lib/vanagon/component/source/git.rb

@@ -12,7 +12,7 @@ class Vanagon
   class Component
     class Source
       class Git
-        attr_accessor :url, :ref, :workdir
+        attr_accessor :url, :ref, :workdir, :clone_options
         attr_reader :version, :default_options, :repo
 
         class << self
@@ -55,6 +55,7 @@ class Vanagon
           @url = URI.parse(url.to_s)
           @ref = opts[:ref]
           @workdir = File.realpath(workdir)
+          @clone_options = opts[:clone_options] ||= {}
 
           # We can test for Repo existence without cloning
           raise Vanagon::InvalidRepo, "#{url} not a valid Git repo" unless valid_remote?
@@ -98,7 +99,11 @@ class Vanagon
         # Perform a git clone of @url as a lazy-loaded
         # accessor for @clone
         def clone
-          @clone ||= ::Git.clone(url, dirname, path: workdir)
+          if @clone_options.empty?
+            @clone ||= ::Git.clone(url, dirname, path: workdir)
+          else
+            @clone ||= ::Git.clone(url, dirname, path: workdir, **clone_options)
+          end
         end
 
         # Attempt to connect to whatever URL is provided and

data/lib/vanagon/project.rb

@@ -118,7 +118,7 @@ class Vanagon
     # @raise if the instance_eval on Project fails, the exception is reraised
     def self.load_project(name, configdir, platform, include_components = [])
       projfile = File.join(configdir, "#{name}.rb")
-      dsl = Vanagon::Project::DSL.new(name, platform, include_components)
+      dsl = Vanagon::Project::DSL.new(name, File.dirname(configdir), platform, include_components)
       dsl.instance_eval(File.read(projfile), projfile, 1)
       dsl._project
     rescue StandardError => e
@@ -153,6 +153,7 @@ class Vanagon
       @compiled_archive = false
       @generate_packages = true
       @yaml_settings = false
+      @upstream_metadata = {}
       @no_packaging = false
       @artifacts_to_fetch = []
     end
@@ -693,23 +694,42 @@ class Vanagon
       end
     end
 
+    # Recursive merge of metadata hashes
+    # Input is not modified
+    # In case of duplicate keys, original value is kept
+    #
+    # @param original [Hash] Metadata hash from original project
+    # @param upstream [Hash] Metadata hash from upstream project
+    # @return [Hash]
+    def metadata_merge(original, upstream)
+      upstream.merge(original) do |key, upstream_value, original_value|
+        if original_value.is_a?(Hash)
+          metadata_merge(original_value, upstream_value)
+        else
+          original_value
+        end
+      end
+    end
+
     # Writes a json file at `ext/build_metadata.<project>.<platform>.json` containing information
     # about what went into a built artifact
     #
     # @return [Hash] of build information
     def save_manifest_json(platform)
-      manifest = build_manifest_json(true)
+      manifest = build_manifest_json
+      metadata = metadata_merge(manifest, @upstream_metadata)
+
       ext_directory = 'ext'
       FileUtils.mkdir_p ext_directory
 
       metadata_file_name = "build_metadata.#{name}.#{platform.name}.json"
       File.open(File.join(ext_directory, metadata_file_name), 'w') do |f|
-        f.write(manifest)
+        f.write(JSON.pretty_generate(metadata))
       end
 
       ## VANAGON-132 Backwards compatibility: make a 'build_metadata.json' file
       File.open(File.join(ext_directory, 'build_metadata.json'), 'w') do |f|
-        f.write(manifest)
+        f.write(JSON.pretty_generate(metadata))
       end
     end
 
@@ -749,17 +769,18 @@ class Vanagon
     # @param upstream_project_name [String] The name of the vanagon project to load
     # @param upstream_git_url [URI] The URL to clone this vanagon project from
     # @param upstream_git_branch [String] The branch of the vanagon project to clone from
-    def load_upstream_settings(upstream_project_name, upstream_git_url, upstream_git_branch)
+    def load_upstream_settings(upstream_project_name, upstream_git_url, upstream_git_branch) # rubocop:disable Metrics/AbcSize
       Dir.mktmpdir do |working_directory|
         upstream_source = Vanagon::Component::Source::Git.new(upstream_git_url, workdir: working_directory, ref: upstream_git_branch)
         upstream_source.fetch
-        # We don't want to load any of the upstream components, so we're going to
-        # pass an array with an empty string as the component list for load_project
-        no_components = ['']
-        upstream_platform = Vanagon::Platform.load_platform(platform.name, File.join(working_directory, upstream_source.dirname, "configs", "platforms"))
-        upstream_project = Vanagon::Project.load_project(upstream_project_name, File.join(working_directory, upstream_source.dirname, "configs", "projects"), upstream_platform, no_components)
-        @settings.merge!(upstream_project.settings)
-        upstream_project.cleanup
+
+        Dir.chdir(File.join(working_directory, upstream_source.dirname)) do
+          upstream_platform = Vanagon::Platform.load_platform(platform.name, File.join(working_directory, upstream_source.dirname, "configs", "platforms"))
+          upstream_project = Vanagon::Project.load_project(upstream_project_name, File.join(working_directory, upstream_source.dirname, "configs", "projects"), upstream_platform)
+          @settings.merge!(upstream_project.settings)
+          @upstream_metadata = upstream_project.build_manifest_json
+          upstream_project.cleanup
+        end
       end
     end
 
@@ -799,5 +820,18 @@ class Vanagon
         @settings.merge!(YAML.safe_load(File.read(yaml_path), [Symbol]))
       end
     end
+
+    def load_upstream_metadata(metadata_uri)
+      puts "Loading metadata from #{metadata_uri}"
+      case metadata_uri
+      when /^http/
+        @upstream_metadata = JSON.parse(Net::HTTP.get(URI(metadata_uri)))
+      when /^file/
+        filename = metadata_uri.sub(/^file:\/\//, '')
+        @upstream_metadata = JSON.parse(File.read(filename))
+      else
+        raise Vanagon::Error, "Metadata URI must be 'file://' or 'http://', don't know how to parse #{metadata_uri}"
+      end
+    end
   end
 end

data/lib/vanagon/project/dsl.rb

@@ -12,13 +12,15 @@ class Vanagon
       # Constructor for the DSL object
       #
       # @param name [String] name of the project
+      # @param configdir [String] location for 'configs' directory for this project
       # @param platform [Vanagon::Platform] platform for the project to build against
       # @param include_components [List] optional list restricting the loaded components
       # @return [Vanagon::Project::DSL] A DSL object to describe the {Vanagon::Project}
-      def initialize(name, platform, include_components = [])
+      def initialize(name, configdir, platform, include_components = [])
         @name = name
         @project = Vanagon::Project.new(@name, platform)
         @include_components = include_components.to_set
+        @configdir = configdir
       end
 
       # Primary way of interacting with the DSL
@@ -179,11 +181,11 @@ class Vanagon
       # and reachable from the current commit in that repository.
       #
       def release_from_git
-        repo_object = Git.open(File.expand_path("..", Vanagon::Driver.configdir))
+        repo_object = Git.open(File.expand_path("..", @configdir))
         last_tag = repo_object.describe('HEAD', { :abbrev => 0 })
         release(repo_object.rev_list("#{last_tag}..HEAD", { :count => true }))
       rescue Git::GitExecuteError
-        warn "Directory '#{dirname}' cannot be versioned by git. Maybe it hasn't been tagged yet?"
+        warn "Directory '#{File.expand_path('..', @configdir)}' cannot be versioned by git. Maybe it hasn't been tagged yet?"
       end
 
       # Sets the version for the project based on a git describe of the
@@ -191,10 +193,10 @@ class Vanagon
       # and reachable from the current commit in that repository.
       #
       def version_from_git
-        git_version = Git.open(File.expand_path("..", Vanagon::Driver.configdir)).describe('HEAD', tags: true)
+        git_version = Git.open(File.expand_path("..", @configdir)).describe('HEAD', tags: true)
         version(git_version.split('-').reject(&:empty?).join('.'))
       rescue Git::GitExecuteError
-        warn "Directory '#{dirname}' cannot be versioned by git. Maybe it hasn't been tagged yet?"
+        warn "Directory '#{File.expand_path('..', @configdir)}' cannot be versioned by git. Maybe it hasn't been tagged yet?"
       end
 
       # Get the version string from a git branch name. This will look for a '.'
@@ -204,7 +206,7 @@ class Vanagon
       #
       # @return version string parsed from branch name, fails if unable to find version
       def version_from_branch
-        branch = Git.open(File.expand_path("..", Vanagon::Driver.configdir)).current_branch
+        branch = Git.open(File.expand_path("..", @configdir)).current_branch
         if branch =~ /(\d+(\.\d+)+)/
           return $1
         else
@@ -268,7 +270,7 @@ class Vanagon
       def component(name)
         warn "Loading #{name}" if @project.settings[:verbose]
         if @include_components.empty? or @include_components.include?(name)
-          component = Vanagon::Component.load_component(name, File.join(Vanagon::Driver.configdir, "components"), @project.settings, @project.platform)
+          component = Vanagon::Component.load_component(name, File.join(@configdir, "components"), @project.settings, @project.platform)
           @project.components << component
         end
       end
@@ -334,8 +336,9 @@ class Vanagon
       #
       # @param yaml_settings_uri [String] URI (file://... or http://...) to a file containing a yaml representation of vanagon settings
       # @param yaml_settings_sha1_uri [String] URI (file://... or http://...) to a file the sha1sum for the settings file
-      def inherit_yaml_settings(yaml_settings_uri, yaml_settings_sha1_uri = nil)
+      def inherit_yaml_settings(yaml_settings_uri, yaml_settings_sha1_uri = nil, metadata_uri: nil)
         @project.load_yaml_settings(yaml_settings_uri, yaml_settings_sha1_uri)
+        @project.load_upstream_metadata(metadata_uri) if metadata_uri
       end
 
       # Set a package override. Will call the platform-specific implementation

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

@@ -869,4 +869,15 @@ end" }
       expect(comp._component.rpm_ghost_files).to eq([Vanagon::Common::Pathname.file('ghost')])
     end
   end
+
+  describe "#clone option" do
+    it "sets a branch and depth options correctly" do
+      comp = Vanagon::Component::DSL.new('test-fixture', {}, {})
+      comp.clone_option 'depth', 10
+      comp.clone_option 'branch', 'foo'
+
+      expect(comp._component.options[:clone_options][:depth]).to eq(10)
+      expect(comp._component.options[:clone_options][:branch]).to eq('foo')
+    end
+  end
 end

data/spec/lib/vanagon/component/source/git_spec.rb

@@ -38,6 +38,40 @@ describe "Vanagon::Component::Source::Git" do
       expect(git_source.workdir)
         .to eq('/tmp/bar')
     end
+
+    it "with no clone options should be empty" do
+      git_source = @klass.new(@local_url, ref: @ref_tag, workdir: "/tmp/foo")
+      expect(git_source.clone_options)
+          .to be {}
+    end
+
+    it "add clone options depth and branch" do
+      expected_clone_options = {:branch => "bar", :depth => 50 }
+      git_source = @klass.new(@local_url, ref: @ref_tag, workdir: "/tmp/foo", :clone_options => expected_clone_options)
+      expect(git_source.clone_options)
+          .to  be(expected_clone_options)
+    end
+  end
+
+  describe "#clone" do
+    before :each do
+      clone = double(Git::Base)
+      @file_path = "/tmp/foo"
+      allow(::Git).to receive(:clone).and_return(clone)
+      expect(File).to receive(:realpath).and_return(@file_path)
+    end
+    it "repository" do
+      git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo")
+      expect(::Git).to receive(:clone).with(git_source.url, git_source.dirname, path: @file_path)
+      git_source.clone
+    end
+
+    it "a particular branch with a depth" do
+      expected_clone_options = {:branch => "foo", :depth => 50 }
+      git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo", :clone_options => expected_clone_options)
+      expect(::Git).to receive(:clone).with(git_source.url, git_source.dirname, path: @file_path, **expected_clone_options)
+      git_source.clone
+    end
   end
 
   describe "#dirname" do

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

@@ -19,6 +19,7 @@ WORKDIR = "#{WORK_BASE}/workdir"
 WIXTESTFILES = File.expand_path("./spec/fixtures/wix/resources/windows/wix")
 
 describe "Vanagon::Platform::Windows" do
+  let(:configdir) { '/a/b/c' }
   platforms =[
     {
       :name                   => "windows-2012r2-x64",
@@ -75,7 +76,7 @@ describe "Vanagon::Platform::Windows" do
         it "skips package generation for 'archive' package types" do
           cur_plat.instance_eval(plat[:block])
           cur_plat.package_type 'archive'
-          proj = Vanagon::Project::DSL.new('test-fixture', cur_plat._platform, [])
+          proj = Vanagon::Project::DSL.new('test-fixture', configdir, cur_plat._platform, [])
           proj.instance_eval(project_block)
           expect(cur_plat._platform.generate_package(proj._project)).to eq([])
         end
@@ -83,7 +84,7 @@ describe "Vanagon::Platform::Windows" do
         it "generates a package_name for 'archive' package types" do
           cur_plat.instance_eval(plat[:block])
           cur_plat.package_type 'archive'
-          proj = Vanagon::Project::DSL.new('test-fixture', cur_plat._platform, [])
+          proj = Vanagon::Project::DSL.new('test-fixture', configdir, cur_plat._platform, [])
           proj.instance_eval(project_block)
           expect(cur_plat._platform.package_name(proj._project)).to eq('test-fixture-0.0.0-archive')
         end
@@ -91,7 +92,7 @@ describe "Vanagon::Platform::Windows" do
         it "skips packaging artifact generation for 'archive' package types" do
           cur_plat.instance_eval(plat[:block])
           cur_plat.package_type 'archive'
-          proj = Vanagon::Project::DSL.new('test-fixture', cur_plat._platform, [])
+          proj = Vanagon::Project::DSL.new('test-fixture', configdir, cur_plat._platform, [])
           proj.instance_eval(project_block)
           expect(cur_plat._platform.generate_packaging_artifacts('',proj._project.name,'',proj._project)).to eq(nil)
         end
@@ -207,7 +208,7 @@ describe "Vanagon::Platform::Windows" do
         describe "generate_wix_dirs" do
 
           it "returns one directory with install_service defaults" do
-            proj = Vanagon::Project::DSL.new('test-fixture', vanagon_platform, [])
+            proj = Vanagon::Project::DSL.new('test-fixture', configdir, vanagon_platform, [])
             proj.instance_eval(project_block)
             cur_plat.instance_eval(plat[:block])
             comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
@@ -223,7 +224,7 @@ describe "Vanagon::Platform::Windows" do
           end
 
           it "returns one directory with non-default name" do
-            proj = Vanagon::Project::DSL.new('test-fixture', vanagon_platform, [])
+            proj = Vanagon::Project::DSL.new('test-fixture', configdir, vanagon_platform, [])
             proj.instance_eval(project_block)
             cur_plat.instance_eval(plat[:block])
             comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
@@ -239,7 +240,7 @@ describe "Vanagon::Platform::Windows" do
           end
 
           it "returns nested directory correctly with \\" do
-            proj = Vanagon::Project::DSL.new('test-fixture', vanagon_platform, [])
+            proj = Vanagon::Project::DSL.new('test-fixture', configdir, vanagon_platform, [])
             proj.instance_eval(project_block)
             cur_plat.instance_eval(plat[:block])
             comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
@@ -259,7 +260,7 @@ describe "Vanagon::Platform::Windows" do
 
 
           it "adds a second directory for the same input but different components" do
-            proj = Vanagon::Project::DSL.new('test-fixture', vanagon_platform, [])
+            proj = Vanagon::Project::DSL.new('test-fixture', configdir, vanagon_platform, [])
             proj.instance_eval(project_block)
             cur_plat.instance_eval(plat[:block])
             comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
@@ -278,7 +279,7 @@ describe "Vanagon::Platform::Windows" do
           end
 
           it "returns correctly formatted multiple nested directories" do
-            proj = Vanagon::Project::DSL.new('test-fixture', vanagon_platform, [])
+            proj = Vanagon::Project::DSL.new('test-fixture', configdir, vanagon_platform, [])
             proj.instance_eval(project_block)
             cur_plat.instance_eval(plat[:block])
             comp = Vanagon::Component::DSL.new('service-test-1', {}, cur_plat._platform)

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

@@ -14,8 +14,7 @@ end" }
 
   describe '#version_from_git' do
     it 'sets the version based on the git describe' do
-      expect(Vanagon::Driver).to receive(:configdir).and_return(configdir)
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
 
       # Lying is bad. You shouldn't lie. But sometimes when you're
@@ -37,8 +36,7 @@ end" }
       expect(proj._project.version).to eq('1.2.3.1234')
     end
     it 'sets the version based on the git describe with multiple dashes' do
-      expect(Vanagon::Driver).to receive(:configdir).and_return(configdir)
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
 
       # See previous description of "indescribable cyclopean obelisk"
@@ -62,8 +60,7 @@ end" }
       tag = double
       log = double
       diff = double
-      expect(Vanagon::Driver).to receive(:configdir).and_return(configdir)
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
       repo = double("repo")
       expect(::Git)
@@ -93,8 +90,7 @@ end" }
         '3.8' => '3.8',
       }
 
-      expect(Vanagon::Driver).to receive(:configdir).exactly(branches.length).times.and_return(configdir)
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
 
       branches.each do |branch, version|
@@ -118,8 +114,7 @@ end" }
         'just-a-branch-name'
       ]
 
-      expect(Vanagon::Driver).to receive(:configdir).exactly(branches.length).times.and_return(configdir)
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
 
       branches.each do |branch|
@@ -140,7 +135,7 @@ end" }
 
   describe '#directory' do
     it 'adds a directory to the list of directories' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
       proj.directory('/a/b/c/d', mode: '0755')
       expect(proj._project.directories).to include(Vanagon::Common::Pathname.new('/a/b/c/d', mode: '0755'))
@@ -149,7 +144,7 @@ end" }
 
   describe '#user' do
     it 'sets a user for the project' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
       proj.user('test-user')
       expect(proj._project.user).to eq(Vanagon::Common::User.new('test-user'))
@@ -158,7 +153,7 @@ end" }
 
   describe '#target_repo' do
     it 'sets the target_repo for the project' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
       proj.target_repo "pc1"
       expect(proj._project.repo).to eq("pc1")
@@ -167,7 +162,7 @@ end" }
 
   describe '#noarch' do
     it 'sets noarch on the project to true' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
       proj.noarch
       expect(proj._project.noarch).to eq(true)
@@ -176,20 +171,20 @@ end" }
 
   describe '#generate_source_artifacts' do
     it 'defaults to false' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
       expect(proj._project.source_artifacts).to eq(false)
     end
 
     it 'sets source_artifacts to true' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
       proj.generate_source_artifacts true
       expect(proj._project.source_artifacts).to eq(true)
     end
 
     it 'sets source_artifacts to false' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
       proj.generate_source_artifacts false
       expect(proj._project.source_artifacts).to eq(false)
@@ -198,7 +193,7 @@ end" }
 
   describe '#identifier' do
     it 'sets the identifier for the project' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
       proj.identifier "com.example"
       expect(proj._project.identifier).to eq("com.example")
@@ -207,14 +202,14 @@ end" }
 
   describe '#cleanup_during_build' do
     it 'sets @cleanup to true' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
       proj.cleanup_during_build
       expect(proj._project.cleanup).to eq(true)
     end
 
     it 'defaults to nil' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
       expect(proj._project.cleanup).to be_nil
     end
@@ -224,7 +219,7 @@ end" }
     let(:version_file) { '/opt/puppetlabs/puppet/VERSION' }
 
     it 'sets version_file for the project' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
       proj.write_version_file(version_file)
       expect(proj._project.version_file.path).to eq(version_file)
@@ -233,14 +228,14 @@ end" }
 
   describe "#release" do
     it 'sets the release for the project' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
       proj.release '12'
       expect(proj._project.release).to eq('12')
     end
 
     it 'defaults to 1' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
       expect(proj._project.release).to eq('1')
     end
@@ -249,7 +244,6 @@ end" }
   describe "#provides" do
     before do
       allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
-      allow(Vanagon::Driver).to receive(:configdir).and_return(configdir)
       @el_plat = Vanagon::Platform::DSL.new('el-5-x86_64')
       @el_plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
       @deb_plat = Vanagon::Platform::DSL.new('ubuntu-16.04-amd64')
@@ -257,7 +251,7 @@ end" }
     end
 
     it 'adds the package provide to the list of provides' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
       proj.provides('thing1')
       proj.provides('thing2')
@@ -269,7 +263,7 @@ end" }
     # we don't actually use deb versions for provides at this point, but
     # testing it works nonetheless
     it 'supports deb versioned provides' do
-      proj = Vanagon::Project::DSL.new('test-fixture', @deb_plat._platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, @deb_plat._platform, [])
       proj.instance_eval(project_block)
       proj.provides('thing1', '1.2.3')
       expect(proj._project.get_provides.count).to eq(1)
@@ -288,7 +282,7 @@ end" }
         '=' => '='
       }
       operators.each do |initial, munged|
-        proj = Vanagon::Project::DSL.new('test-fixture', @deb_plat._platform, [])
+        proj = Vanagon::Project::DSL.new('test-fixture', configdir, @deb_plat._platform, [])
         proj.instance_eval(project_block)
         proj.provides('thing1', "#{initial}1.2.3")
         expect(proj._project.get_provides.count).to eq(1)
@@ -300,7 +294,7 @@ end" }
     it 'adds whitespace for rpm versions' do
       operators=['<','>','<=','>=','=']
       operators.each do |operator|
-        proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
+        proj = Vanagon::Project::DSL.new('test-fixture', configdir, @el_plat._platform, [])
         proj.instance_eval(project_block)
         proj.provides('thing1', "#{operator}1.2.3")
         expect(proj._project.get_provides.count).to eq(1)
@@ -310,7 +304,7 @@ end" }
     end
 
     it 'supports versioned provides' do
-      proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, @el_plat._platform, [])
       proj.instance_eval(project_block)
       proj.provides('thing1', '1.2.3')
       expect(proj._project.get_provides.count).to eq(1)
@@ -319,7 +313,7 @@ end" }
      end
 
     it 'gets rid of duplicates' do
-      proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, @el_plat._platform, [])
       proj.instance_eval(project_block)
       proj.provides('thing1', '1.2.3')
       proj.provides('thing1', '>=1.2.3')
@@ -332,7 +326,6 @@ end" }
   describe "#replaces" do
     before do
       allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
-      allow(Vanagon::Driver).to receive(:configdir).and_return(configdir)
       @el_plat = Vanagon::Platform::DSL.new('el-5-x86_64')
       @el_plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
       @deb_plat = Vanagon::Platform::DSL.new('ubuntu-16.04-amd64')
@@ -340,7 +333,7 @@ end" }
     end
 
     it 'adds the package replacement to the list of replacements' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
       proj.replaces('thing1')
       proj.replaces('thing2')
@@ -350,7 +343,7 @@ end" }
      end
 
     it 'supports versioned replaces' do
-      proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, @el_plat._platform, [])
       proj.instance_eval(project_block)
       proj.replaces('thing1', '1.2.3')
       expect(proj._project.get_replaces.count).to eq(1)
@@ -359,7 +352,7 @@ end" }
     end
 
     it 'supports deb versioned replaces' do
-      proj = Vanagon::Project::DSL.new('test-fixture', @deb_plat._platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, @deb_plat._platform, [])
       proj.instance_eval(project_block)
       proj.replaces('thing1', '1.2.3')
       expect(proj._project.get_replaces.count).to eq(1)
@@ -376,7 +369,7 @@ end" }
         '=' => '='
       }
       operators.each do |initial, munged|
-        proj = Vanagon::Project::DSL.new('test-fixture', @deb_plat._platform, [])
+        proj = Vanagon::Project::DSL.new('test-fixture', configdir, @deb_plat._platform, [])
         proj.instance_eval(project_block)
         proj.replaces('thing1', "#{initial}1.2.3")
         expect(proj._project.get_replaces.count).to eq(1)
@@ -388,7 +381,7 @@ end" }
     it 'adds whitespace for rpm versions' do
       operators=['<','>','<=','>=','=']
       operators.each do |operator|
-        proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
+        proj = Vanagon::Project::DSL.new('test-fixture', configdir, @el_plat._platform, [])
         proj.instance_eval(project_block)
         proj.replaces('thing1', "#{operator}1.2.3")
         expect(proj._project.get_replaces.count).to eq(1)
@@ -398,7 +391,7 @@ end" }
     end
 
     it 'gets rid of duplicates' do
-      proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, @el_plat._platform, [])
       proj.instance_eval(project_block)
       proj.replaces('thing1', '1.2.3')
       proj.replaces('thing1', '<1.2.3')
@@ -411,7 +404,6 @@ end" }
   describe "#conflicts" do
     before do
       allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
-      allow(Vanagon::Driver).to receive(:configdir).and_return(configdir)
       @el_plat = Vanagon::Platform::DSL.new('el-5-x86_64')
       @el_plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
       @deb_plat = Vanagon::Platform::DSL.new('ubuntu-16.04-amd64')
@@ -419,7 +411,7 @@ end" }
     end
 
     it 'adds the package conflict to the list of conflicts' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform)
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)
       proj.instance_eval(project_block)
       proj.conflicts('thing1')
       proj.conflicts('thing2')
@@ -429,7 +421,7 @@ end" }
      end
 
     it 'supports versioned conflicts' do
-      proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, @el_plat._platform, [])
       proj.instance_eval(project_block)
       proj.conflicts('thing1', '1.2.3')
       expect(proj._project.get_conflicts.count).to eq(1)
@@ -438,7 +430,7 @@ end" }
      end
 
     it 'supports deb versioned conflicts' do
-      proj = Vanagon::Project::DSL.new('test-fixture', @deb_plat._platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, @deb_plat._platform, [])
       proj.instance_eval(project_block)
       proj.conflicts('thing1', '1.2.3')
       expect(proj._project.get_conflicts.count).to eq(1)
@@ -455,7 +447,7 @@ end" }
         '=' => '='
       }
       operators.each do |initial, munged|
-        proj = Vanagon::Project::DSL.new('test-fixture', @deb_plat._platform, [])
+        proj = Vanagon::Project::DSL.new('test-fixture', configdir, @deb_plat._platform, [])
         proj.instance_eval(project_block)
         proj.conflicts('thing1', "#{initial}1.2.3")
         expect(proj._project.get_conflicts.count).to eq(1)
@@ -467,7 +459,7 @@ end" }
     it 'adds whitespace for rpm versions' do
       operators=['<','>','<=','>=','=']
       operators.each do |operator|
-        proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
+        proj = Vanagon::Project::DSL.new('test-fixture', configdir, @el_plat._platform, [])
         proj.instance_eval(project_block)
         proj.conflicts('thing1', "#{operator}1.2.3")
         expect(proj._project.get_conflicts.count).to eq(1)
@@ -477,7 +469,7 @@ end" }
     end
 
     it 'gets rid of duplicates' do
-      proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, @el_plat._platform, [])
       proj.instance_eval(project_block)
       proj.conflicts('thing1', '1.2.3')
       proj.conflicts('thing1', '<1.2.3')
@@ -496,7 +488,6 @@ end"
 
     before do
       allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
-      allow(Vanagon::Driver).to receive(:configdir).and_return(configdir)
       @el_plat = Vanagon::Platform::DSL.new('el-5-x86_64')
       @el_plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
       @osx_plat = Vanagon::Platform::DSL.new('osx-10.10-x86_64')
@@ -505,13 +496,13 @@ end"
     end
 
     it 'adds package_overrides on supported platforms' do
-      proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, @el_plat._platform, [])
       proj.instance_eval(project_block)
       expect(proj._project.package_overrides).to include("TEST_VAR='foo'")
     end
 
     it 'fails on usupported platforms' do
-      proj = Vanagon::Project::DSL.new('test-fixture', @osx_plat._platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, @osx_plat._platform, [])
       expect{ proj.instance_eval(project_block) }.to raise_error(RuntimeError)
     end
   end
@@ -527,24 +518,23 @@ 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
 
     it 'stores the component in the project if the included components set is empty' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform, [])
       proj.instance_eval(project_block)
       expect(proj._project.components).to include(component)
     end
 
     it 'stores the component in the project if the component name is listed in the included components set' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform, ['some-component'])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform, ['some-component'])
       proj.instance_eval(project_block)
       expect(proj._project.components).to include(component)
     end
 
     it 'does not store the component if the included components set is not empty and does not include the component name' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform, ['some-different-component'])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform, ['some-different-component'])
       proj.instance_eval(project_block)
       expect(proj._project.components).to_not include(component)
     end
@@ -568,19 +558,19 @@ end"
     }
 
     it 'has an empty project.fetch_artifact when fetch_artifact is not called' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform, [])
       proj.instance_eval(empty_project_block)
       expect(proj._project.artifacts_to_fetch).to eq([])
     end
 
     it 'Adds a path to project.fetch_artifact when fetch_artifact is called' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform, [])
       proj.instance_eval(project_block)
       expect(proj._project.artifacts_to_fetch).to eq(['foo/bar/baz.file'])
     end
 
     it 'Adds multiple paths to project.fetch_artifact when fetch_artifact is called more than once' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform, [])
       proj.instance_eval(project_block_multiple)
       expect(proj._project.artifacts_to_fetch).to eq(['foo/bar/baz.file', 'foo/foobar/foobarbaz.file'])
     end
@@ -603,19 +593,19 @@ end"
     }
 
     it 'has no_packaging set to false by default' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform, [])
       proj.instance_eval(empty_project_block)
       expect(proj._project.no_packaging).to eq(false)
     end
 
     it 'sets no_packaging to true when proj.no_packaging true is called' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform, [])
       proj.instance_eval(project_block)
       expect(proj._project.no_packaging).to eq(true)
     end
 
     it 'sets no_packaging to false when proj.no_packaging false is called' do
-      proj = Vanagon::Project::DSL.new('test-fixture', platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform, [])
       proj.instance_eval(project_block_false)
       expect(proj._project.no_packaging).to eq(false)
     end

data/spec/lib/vanagon/project_spec.rb

@@ -121,7 +121,7 @@ describe 'Vanagon::Project' do
     it 'returns only the highest level directories' do
       test_sets.each do |set|
         expect(component).to receive(:directories).and_return([])
-        proj = Vanagon::Project::DSL.new('test-fixture', platform, [])
+        proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform, [])
         proj.instance_eval(project_block)
         set[:directories].each {|dir| proj.directory dir }
         expect(proj._project.get_root_directories.sort).to eq(set[:results].sort)
@@ -138,32 +138,40 @@ describe 'Vanagon::Project' do
       expect(git_source).to receive(:fetch).and_return(true)
 
       # stubs for the upstream project
-      upstream_proj = Vanagon::Project::DSL.new('upstream-test', upstream_platform, [])
+      upstream_proj = Vanagon::Project::DSL.new('upstream-test', configdir, upstream_platform, [])
       upstream_proj.instance_eval(upstream_project_block)
       expect(Vanagon::Project).to receive(:load_project).and_return(upstream_proj._project)
       expect(Vanagon::Platform).to receive(:load_platform).and_return(upstream_platform)
+
+      class Vanagon
+        class Project
+          BUILD_TIME = '2017-07-10T13:34:25-07:00'
+          VANAGON_VERSION = '0.0.0-rspec'
+        end
+      end
+
     end
 
     it 'loads upstream settings' do
-      inheriting_proj = Vanagon::Project::DSL.new('inheritance-test', platform, [])
+      inheriting_proj = Vanagon::Project::DSL.new('inheritance-test', configdir, platform, [])
       inheriting_proj.instance_eval(inheriting_project_block)
       expect(inheriting_proj._project.settings[:test]).to eq('upstream-test')
     end
 
     it 'overrides duplicate settings from before the load' do
-      inheriting_proj = Vanagon::Project::DSL.new('inheritance-test', platform, [])
+      inheriting_proj = Vanagon::Project::DSL.new('inheritance-test', configdir, platform, [])
       inheriting_proj.instance_eval(preset_inheriting_project_block)
       expect(inheriting_proj._project.settings[:test]).to eq('upstream-test')
     end
 
     it 'lets you override settings after the load' do
-      inheriting_proj = Vanagon::Project::DSL.new('inheritance-test', platform, [])
+      inheriting_proj = Vanagon::Project::DSL.new('inheritance-test', configdir, platform, [])
       inheriting_proj.instance_eval(postset_inheriting_project_block)
       expect(inheriting_proj._project.settings[:test]).to eq('inheritance-test')
     end
 
     it 'merges settings' do
-      inheriting_proj = Vanagon::Project::DSL.new('inheritance-test', platform, [])
+      inheriting_proj = Vanagon::Project::DSL.new('inheritance-test', configdir, platform, [])
       inheriting_proj.instance_eval(inheriting_project_block_with_settings)
       expect(inheriting_proj._project.settings[:test]).to eq('upstream-test')
       expect(inheriting_proj._project.settings[:merged]).to eq('yup')
@@ -176,7 +184,7 @@ describe 'Vanagon::Project' do
     end
 
     it 'loads settings set in platforms' do
-      settings_proj = Vanagon::Project::DSL.new('settings-test', dummy_platform_settings, [])
+      settings_proj = Vanagon::Project::DSL.new('settings-test', configdir, dummy_platform_settings, [])
       settings_proj.instance_eval(project_block)
       expect(settings_proj._project.settings[:platform_test]).to eq('debian')
     end
@@ -531,7 +539,7 @@ describe 'Vanagon::Project' do
     it "builds packages by default" do
       platform = Vanagon::Platform::DSL.new('el-7-x86_64')
       platform.instance_eval("platform 'el-7-x86_6' do |plat| end")
-      proj = Vanagon::Project::DSL.new('test-fixture', platform._platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform._platform, [])
       expect(platform._platform).to receive(:generate_package) { ["# making a package"] }
       expect(proj._project.generate_package).to eq(["# making a package"])
     end
@@ -539,7 +547,7 @@ describe 'Vanagon::Project' do
     it "builds packages and archives if configured for both" do
       platform = Vanagon::Platform::DSL.new('el-7-x86_64')
       platform.instance_eval("platform 'el-7-x86_6' do |plat| end")
-      proj = Vanagon::Project::DSL.new('test-fixture', platform._platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform._platform, [])
       proj.generate_archives(true)
       expect(platform._platform).to receive(:generate_package) { ["# making a package"] }
       expect(platform._platform).to receive(:generate_compiled_archive) { ["# making an archive"] }
@@ -549,7 +557,7 @@ describe 'Vanagon::Project' do
     it "can build only archives" do
       platform = Vanagon::Platform::DSL.new('el-7-x86_64')
       platform.instance_eval("platform 'el-7-x86_6' do |plat| end")
-      proj = Vanagon::Project::DSL.new('test-fixture', platform._platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform._platform, [])
       proj.generate_archives(true)
       proj.generate_packages(false)
       expect(platform._platform).to receive(:generate_compiled_archive) { ["# making an archive"] }
@@ -559,7 +567,7 @@ describe 'Vanagon::Project' do
     it "builds nothing if that's what you really want" do
       platform = Vanagon::Platform::DSL.new('el-7-x86_64')
       platform.instance_eval("platform 'el-7-x86_6' do |plat| end")
-      proj = Vanagon::Project::DSL.new('test-fixture', platform._platform, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform._platform, [])
       proj.generate_packages(false)
       expect(proj._project.generate_package).to eq([])
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.15.32
+  version: 0.15.33
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -266,40 +266,40 @@ 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/git/rev_list_spec.rb
-- spec/lib/vanagon/driver_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/engine/pooler_spec.rb
+- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
+- spec/lib/vanagon/engine/docker_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/platform/deb_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_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/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/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/dsl_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/platform_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/optparse_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
-- spec/lib/vanagon/engine/hardware_spec.rb
-- spec/lib/vanagon/engine/ec2_spec.rb
-- spec/lib/vanagon/engine/base_spec.rb
-- spec/lib/vanagon/engine/docker_spec.rb
-- spec/lib/vanagon/engine/pooler_spec.rb
-- spec/lib/vanagon/engine/local_spec.rb
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/extensions/ostruct/json_spec.rb
-- spec/lib/vanagon/extensions/string_spec.rb
-- spec/lib/vanagon/extensions/set/json_spec.rb
-- spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/vanagon/project_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/rpm_spec.rb
+- spec/lib/git/rev_list_spec.rb