vanagon 0.15.29 → 0.15.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 877a697fd57ce53c0dd89e1b099fe85c72f9287b5a5b7e15d04b6bcc97e5f2c0
-  data.tar.gz: 0b3560e9264fcffed179d31aa158ffe323b06afd52c79497fd2878e2f34c68e9
+  metadata.gz: 4917406e87bb1c0bcd88d6ace341e339c44911e20d8247f1db35f647ec410f4e
+  data.tar.gz: c537dce6713fe063b707c1f690d6349a21939722d7571229192765071e444c74
 SHA512:
-  metadata.gz: 6934be1647dd79e6eef5134e9d0ce6a5b1e3741d1cdd312a93577e7b679e5d2e0c5cd1ee75826b64cca0356dcbee60a274470c75bf562d45dddbd49570ab73f3
-  data.tar.gz: 4e6108cdf712ab062d1910f05fa05ea64c2ec54dc8500a7dd314bab495c41f5f9ef171ca466ba3aeb4f251ecc0d9697c46f3bac05b94923f62ba3ef25fed5e8d
+  metadata.gz: 037d6022077165c30e43d4357a2dac1cfdd231edf3afdb54537e01c29211f8e3229ea95af1d816817f310d3e4c98d2d049c68705fb304ff307d3c9ff5f154a5e
+  data.tar.gz: b77851bd99b21a4fcd95ce8e7378305ea79dec14d24851b432fbabc484f62b56ee9bed79ec44fe7072186bac968f5d3d15d943de097ba487fc864b1d3f917d08

data/bin/build_requirements

@@ -7,7 +7,7 @@ require 'vanagon/extensions/hashable'
 load File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "vanagon.rb"))
 
 optparse = Vanagon::OptParse.new("#{File.basename(__FILE__)} <project-name> <platform-name> [options]", %i[workdir configdir engine])
-options = optparse.parse! ARGV
+optparse.parse! ARGV
 
 project = ARGV[0]
 platform = ARGV[1]

data/bin/render

@@ -9,7 +9,6 @@ options = optparse.parse! ARGV
 
 project = ARGV[0]
 platforms = ARGV[1]
-targets = ARGV[2]
 
 if project.nil? or platforms.nil?
   warn "project and platform are both required arguments."

data/lib/vanagon/common/user.rb

@@ -13,7 +13,7 @@ class Vanagon
       # Equality. How does it even work?
       #
       # @return [true, false] true if all attributes have equal values. false otherwise.
-      def ==(other) # rubocop:disable Metrics/AbcSize
+      def ==(other)
         other.name == self.name && \
           other.group == self.group && \
           other.shell == self.shell && \

data/lib/vanagon/component/dsl.rb

@@ -411,7 +411,7 @@ class Vanagon
       # This environment is included in the configure, build and install steps.
       #
       # @param env [Hash] mapping of keys to values to add to the environment for the component
-      def environment(*env) # rubocop:disable Metrics/AbcSize
+      def environment(*env)
         if env.size == 1 && env.first.is_a?(Hash)
           warn <<-WARNING.undent
             the component DSL method signature #environment({Key => Value}) is deprecated

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

@@ -120,7 +120,7 @@ class Vanagon
                 location = URI.parse(response.header['location'])
                 download(uri + location, target_file)
               when Net::HTTPSuccess
-                open(File.join(@workdir, target_file), 'w') do |io|
+                File.open(File.join(@workdir, target_file), 'w') do |io|
                   response.read_body { |chunk| io.write(chunk) }
                 end
               else

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

@@ -74,6 +74,16 @@ class Vanagon
           # @deprecated Please use the component DSL method #mirror(<URI>)
           #   instead. This method will be removed before Vanagon 1.0.0.
           def parse_and_rewrite(uri)
+            return uri if rewrite_rules.empty?
+            if uri.match?(/^git:http/)
+              warn <<-HERE.undent
+                `fustigit` parsing doesn't get along with how we specify the source
+                type by prefixing `git`. As `rewrite_rules` are deprecated, we'll
+                replace `git:http` with `http` in your uri. At some point this will
+                break.
+              HERE
+              uri.sub!(/^git:http/, 'http')
+            end
             url = URI.parse(uri)
             return url unless url.scheme
             rewrite(url.to_s, url.scheme)

data/lib/vanagon/extensions/set/json.rb

@@ -3,7 +3,7 @@ require 'json'
 
 module SetJson
   def to_json(*options)
-    to_a.to_json *options
+    to_a.to_json(*options)
   end
 end
 

data/lib/vanagon/platform/deb.rb

@@ -72,11 +72,11 @@ class Vanagon
       def add_repo_target(definition)
         if File.extname(definition.path) == '.deb'
           # repo definition is an deb (like puppetlabs-release)
-          "curl -o local.deb '#{definition}' && dpkg -i local.deb; rm -f local.deb"
+          "#{@curl} -o local.deb '#{definition}' && dpkg -i local.deb; rm -f local.deb"
         else
           reponame = "#{SecureRandom.hex}-#{File.basename(definition.path)}"
           reponame = "#{reponame}.list" if File.extname(reponame) != '.list'
-          "curl -o '/etc/apt/sources.list.d/#{reponame}' '#{definition}'"
+          "#{@curl} -o '/etc/apt/sources.list.d/#{reponame}' '#{definition}'"
         end
       end
 
@@ -87,7 +87,7 @@ class Vanagon
       def add_gpg_key(gpg_key)
         gpgname = "#{SecureRandom.hex}-#{File.basename(gpg_key.path)}"
         gpgname = "#{gpgname}.gpg" if gpgname !~ /\.gpg$/
-        "curl -o '/etc/apt/trusted.gpg.d/#{gpgname}' '#{gpg_key}'"
+        "#{@curl} -o '/etc/apt/trusted.gpg.d/#{gpgname}' '#{gpg_key}'"
       end
 
       # Returns the commands to add a given repo target and optionally a gpg key to the build system
@@ -140,6 +140,7 @@ class Vanagon
         @tar = "tar"
         @patch = "/usr/bin/patch"
         @num_cores = "/usr/bin/nproc"
+        @curl = "curl --silent --show-error --fail"
         @valid_operators = ['<', '>', '<=', '>=', '=', '<<', '>>']
         super(name)
       end

data/lib/vanagon/platform/dsl.rb

@@ -412,6 +412,14 @@ class Vanagon
       def add_build_repository(*args)
         @platform.add_build_repository(*args)
       end
+
+      def setting(name, value)
+        @platform.settings[name] = value
+      end
+
+      def settings
+        @platform.settings
+      end
     end
   end
 end

data/lib/vanagon/platform/rpm/sles.rb

@@ -21,7 +21,7 @@ class Vanagon
           if definition.scheme =~ /^(http|ftp)/
             if File.extname(definition.path) == '.rpm'
               # repo definition is an rpm (like puppetlabs-release)
-              commands << "curl -o local.rpm '#{definition}'; rpm -Uvh local.rpm; rm -f local.rpm"
+              commands << "curl --silent --show-error --fail -o local.rpm '#{definition}'; rpm -Uvh local.rpm; rm -f local.rpm"
             else
               commands << "yes | zypper -n --no-gpg-checks #{flag} -t YUM --repo '#{definition}'"
             end

data/lib/vanagon/platform/rpm.rb

@@ -68,14 +68,14 @@ class Vanagon
         if definition.scheme =~ /^(http|ftp)/
           if File.extname(definition.path) == '.rpm'
             # repo definition is an rpm (like puppetlabs-release)
-            commands << "curl -o local.rpm '#{definition}'; rpm -Uvh local.rpm; rm -f local.rpm"
+            commands << "#{@curl} -o local.rpm '#{definition}'; rpm -Uvh local.rpm; rm -f local.rpm"
           else
             reponame = "#{SecureRandom.hex}-#{File.basename(definition.path)}"
             reponame = "#{reponame}.repo" if File.extname(reponame) != '.repo'
             if is_cisco_wrlinux?
-              commands << "curl -o '/etc/yum/repos.d/#{reponame}' '#{definition}'"
+              commands << "#{@curl} -o '/etc/yum/repos.d/#{reponame}' '#{definition}'"
             else
-              commands << "curl -o '/etc/yum.repos.d/#{reponame}' '#{definition}'"
+              commands << "#{@curl} -o '/etc/yum.repos.d/#{reponame}' '#{definition}'"
             end
           end
         end
@@ -103,6 +103,7 @@ class Vanagon
         @patch ||= "/usr/bin/patch"
         @num_cores ||= "/bin/grep -c 'processor' /proc/cpuinfo"
         @rpmbuild ||= "/usr/bin/rpmbuild"
+        @curl = "curl --silent --show-error --fail"
         super(name)
       end
     end

data/lib/vanagon/platform/solaris_10.rb

@@ -156,7 +156,7 @@ class Vanagon
           if build_dependency =~ /^http.*\.gz/
             # Fetch, unpack, install...this assumes curl is present.
             package = build_dependency.sub(/^http.*\//, '')
-            http << "tmpdir=$(#{mktemp}); (cd ${tmpdir} && curl -O #{build_dependency} && gunzip -c #{package} | pkgadd -d /dev/stdin -a /var/tmp/noask all)"
+            http << "tmpdir=$(#{mktemp}); (cd ${tmpdir} && curl --silent --show-error --fail -O #{build_dependency} && gunzip -c #{package} | pkgadd -d /dev/stdin -a /var/tmp/noask all)"
           else
             # Opencsw dependencies. At this point we assume that pkgutil is installed.
             pkgutil << build_dependency
@@ -199,5 +199,3 @@ class Vanagon
     end
   end
 end
-
-

data/lib/vanagon/platform.rb

@@ -135,9 +135,9 @@ class Vanagon
     # Platform names currently contain some information about the platform. Fields
     # within the name are delimited by the '-' character, and this regex can be used to
     # extract those fields.
-    PLATFORM_REGEX = /^(.*)-(.*)-(.*)$/
+    PLATFORM_REGEX = /^(.*)-(.*)-(.*)$/.freeze
 
-    VERSION_REGEX = /^([=<>]+)\s*([^<>=]*)$/
+    VERSION_REGEX = /^([=<>]+)\s*([^<>=]*)$/.freeze
 
     # Loads a given platform from the configdir
     #
@@ -220,6 +220,7 @@ class Vanagon
     # @return [Vanagon::Platform] the platform with the given name
     def initialize(name) # rubocop:disable Metrics/AbcSize
       @name = name
+      @settings = {}
       @os_name = os_name
       @os_version = os_version
       @architecture = architecture
@@ -344,6 +345,20 @@ class Vanagon
       return !!@name.match(/^fedora-.*$/)
     end
 
+    # Utility matcher to determine is the platform is a debian variety
+    #
+    # @return [true, false] true if it is a debian variety, false otherwise
+    def is_debian?
+      return !!@name.match(/^debian-.*$/)
+    end
+
+    # Utility matcher to determine is the platform is a ubuntu variety
+    #
+    # @return [true, false] true if it is a ubuntu variety, false otherwise
+    def is_ubuntu?
+      return !!@name.match(/^ubuntu-.*$/)
+    end
+
     # Utility matcher to determine is the platform is an aix variety
     #
     # @return [true, false] true if it is an aix variety, false otherwise

data/lib/vanagon/project.rb

@@ -7,7 +7,7 @@ require 'digest'
 require 'ostruct'
 
 # Used to parse the vendor field into name and email
-VENDOR_REGEX = /^(.*) <(.*)>$/
+VENDOR_REGEX = /^(.*) <(.*)>$/.freeze
 
 class Vanagon
   class Project
@@ -139,7 +139,7 @@ class Vanagon
       @components = []
       @requires = []
       @directories = []
-      @settings = {}
+      @settings = platform.settings
       # Environments are like Hashes but with specific constraints
       # around their keys and values.
       @environment = Vanagon::Environment.new
@@ -756,7 +756,8 @@ class Vanagon
         # 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_project = Vanagon::Project.load_project(upstream_project_name, File.join(working_directory, upstream_source.dirname, "configs", "projects"), platform, 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
       end

data/lib/vanagon/utilities.rb

@@ -34,9 +34,9 @@ class Vanagon
 
     # If Digest::const_get fails, it'll raise a LoadError when it tries to
     # pull in the subclass `type`. We catch that error, and fail instead.
-     rescue LoadError
-       fail "Don't know how to produce a sum of type: '#{type}' for '#{file}'"
-     end
+    rescue LoadError
+      fail "Don't know how to produce a sum of type: '#{type}' for '#{file}'"
+    end
 
     # Simple wrapper around Net::HTTP. Will make a request of the given type to
     # the given url and return the body as parsed by JSON.
@@ -112,9 +112,12 @@ class Vanagon
     # @return [String, false] Returns either the full path to the command or false if the command cannot be found
     # @raise [RuntimeError] If the command is required and cannot be found
     def find_program_on_path(command, required = true)
+      extensions = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
       ENV['PATH'].split(File::PATH_SEPARATOR).each do |path_elem|
-        location = File.join(path_elem, command)
-        return location if FileTest.executable?(location)
+        extensions.each do |ext|
+          location = File.join(path_elem, "#{command}#{ext}")
+          return location if FileTest.executable?(location)
+        end
       end
 
       if required

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

@@ -14,7 +14,7 @@ end
 
 describe Vanagon::Component::Rules do
   let(:platform) do
-    OpenStruct.new(:patch => "/usr/bin/patch", :make => '/usr/bin/make')
+    OpenStruct.new(:patch => "/usr/bin/patch", :make => '/usr/bin/make', :settings => {})
   end
 
   let(:project) do

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

@@ -33,14 +33,20 @@ describe 'Vanagon::Platform::DSL' do
       expect(SecureRandom).to receive(:hex).and_return(hex_value)
       plat.instance_eval(deb_platform_block)
       plat.apt_repo(apt_definition)
-      expect(plat._platform.provisioning).to include("curl -o '/etc/apt/sources.list.d/#{hex_value}-pl-puppet-agent-0.2.1-wheezy.list' '#{apt_definition}'")
+      expect(plat._platform.provisioning[0]).to include('apt-get', 'install', 'curl')
+      expect(plat._platform.provisioning[1]).to include(
+        'curl', '--silent', '--show-error', '--fail',
+        "-o '/etc/apt/sources.list.d/#{hex_value}-pl-puppet-agent-0.2.1-wheezy.list' '#{apt_definition}'")
     end
 
     it "installs a deb when given a deb" do
       plat = Vanagon::Platform::DSL.new('debian-test-fixture')
       plat.instance_eval(deb_platform_block)
       plat.apt_repo(apt_definition_deb)
-      expect(plat._platform.provisioning).to include("curl -o local.deb '#{apt_definition_deb}' && dpkg -i local.deb; rm -f local.deb")
+      expect(plat._platform.provisioning[0]).to include('apt-get', 'install', 'curl')
+      expect(plat._platform.provisioning[1]).to include(
+        'curl', '--silent', '--show-error', '--fail',
+        "-o local.deb '#{apt_definition_deb}' && dpkg -i local.deb; rm -f local.deb")
     end
 
     it "installs a gpg key if given one" do
@@ -48,7 +54,9 @@ describe 'Vanagon::Platform::DSL' do
       expect(SecureRandom).to receive(:hex).and_return(hex_value).twice
       plat.instance_eval(deb_platform_block)
       plat.apt_repo(apt_definition, apt_definition_gpg)
-      expect(plat._platform.provisioning).to include("curl -o '/etc/apt/trusted.gpg.d/#{hex_value}-keyring.gpg' '#{apt_definition_gpg}'")
+      expect(plat._platform.provisioning[0]).to include('apt-get', 'install', 'curl')
+      expect(plat._platform.provisioning[1]).to include(
+        'curl', '--silent', '--show-error', '--fail', "-o '/etc/apt", hex_value)
     end
   end
 
@@ -58,7 +66,10 @@ describe 'Vanagon::Platform::DSL' do
       expect(SecureRandom).to receive(:hex).and_return(hex_value)
       plat.instance_eval(el_5_platform_block)
       plat.yum_repo(el_definition)
-      expect(plat._platform.provisioning).to include("curl -o '/etc/yum.repos.d/#{hex_value}-pl-puppet-agent-0.2.1-el-7-x86_64.repo' '#{el_definition}'")
+      expect(plat._platform.provisioning[0]).to include('rpm -q curl', 'yum -y install curl')
+      expect(plat._platform.provisioning[1]).to include(
+        'curl', '--silent', '--show-error', '--fail',
+        "-o '/etc/yum.repos.d/#{hex_value}-pl-puppet-agent-0.2.1-el-7-x86_64.repo' '#{el_definition}'")
     end
 
     it "works for specifically redhat platforms" do
@@ -66,7 +77,10 @@ describe 'Vanagon::Platform::DSL' do
       expect(SecureRandom).to receive(:hex).and_return(hex_value)
       plat.instance_eval(redhat_7_platform_block)
       plat.yum_repo(el_definition)
-      expect(plat._platform.provisioning).to include("curl -o '/etc/yum.repos.d/#{hex_value}-pl-puppet-agent-0.2.1-el-7-x86_64.repo' '#{el_definition}'")
+      expect(plat._platform.provisioning[0]).to include('rpm -q curl', 'yum -y install curl')
+      expect(plat._platform.provisioning[1]).to include(
+        'curl','--silent', '--show-error', '--fail',
+        "-o '/etc/yum.repos.d/#{hex_value}-pl-puppet-agent-0.2.1-el-7-x86_64.repo' '#{el_definition}'")
     end
 
     # This test currently covers wrlinux 5 and 7
@@ -75,7 +89,10 @@ describe 'Vanagon::Platform::DSL' do
       expect(SecureRandom).to receive(:hex).and_return(hex_value)
       plat.instance_eval(cicso_wrlinux_platform_block)
       plat.yum_repo(cisco_wrlinux_definition)
-      expect(plat._platform.provisioning).to include("curl -o '/etc/yum/repos.d/#{hex_value}-pl-puppet-agent-0.2.1-cisco-wrlinux-5-x86_64.repo' '#{cisco_wrlinux_definition}'")
+      expect(plat._platform.provisioning[0]).to include('rpm -q curl', 'yum -y install curl')
+      expect(plat._platform.provisioning[1]).to include(
+        'curl','--silent', '--show-error', '--fail',
+         "-o '/etc/yum/repos.d/#{hex_value}-pl-puppet-agent-0.2.1-cisco-wrlinux-5-x86_64.repo' '#{cisco_wrlinux_definition}'")
     end
 
     describe "installs a rpm when given a rpm" do
@@ -83,8 +100,9 @@ describe 'Vanagon::Platform::DSL' do
         plat = Vanagon::Platform::DSL.new('el-5-fixture')
         plat.instance_eval(el_5_platform_block)
         plat.yum_repo(el_definition_rpm)
-        expect(plat._platform.provisioning).to include("rpm -q curl > /dev/null || yum -y install curl")
-        expect(plat._platform.provisioning).to include("curl -o local.rpm '#{el_definition_rpm}'; rpm -Uvh local.rpm; rm -f local.rpm")
+        expect(plat._platform.provisioning[0]).to include('rpm -q curl', 'yum -y install curl')
+        expect(plat._platform.provisioning[1]).to include(
+          'curl', '--silent', '--show-error', '--fail', "-o local.rpm '#{el_definition_rpm}'; rpm -Uvh local.rpm; rm -f local.rpm")
       end
     end
   end
@@ -101,7 +119,9 @@ describe 'Vanagon::Platform::DSL' do
       plat = Vanagon::Platform::DSL.new('sles-test-fixture')
       plat.instance_eval(sles_platform_block)
       plat.zypper_repo(sles_definition_rpm)
-      expect(plat._platform.provisioning).to include("curl -o local.rpm '#{sles_definition_rpm}'; rpm -Uvh local.rpm; rm -f local.rpm")
+      expect(plat._platform.provisioning[0]).to include(
+        'curl', '--silent', '--show-error', '--fail',
+        "-o local.rpm '#{sles_definition_rpm}'; rpm -Uvh local.rpm; rm -f local.rpm")
     end
   end
 

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

@@ -31,6 +31,10 @@ describe "Vanagon::Platform::Windows" do
     },
   ]
 
+  let(:vanagon_platform) do
+    OpenStruct.new(:settings => {})
+  end
+
   platforms.each do |plat|
     context "on #{plat[:name]}" do
       let(:platform) { plat }
@@ -203,7 +207,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', {}, [])
+            proj = Vanagon::Project::DSL.new('test-fixture', vanagon_platform, [])
             proj.instance_eval(project_block)
             cur_plat.instance_eval(plat[:block])
             comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
@@ -219,7 +223,7 @@ describe "Vanagon::Platform::Windows" do
           end
 
           it "returns one directory with non-default name" do
-            proj = Vanagon::Project::DSL.new('test-fixture', {}, [])
+            proj = Vanagon::Project::DSL.new('test-fixture', vanagon_platform, [])
             proj.instance_eval(project_block)
             cur_plat.instance_eval(plat[:block])
             comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
@@ -235,7 +239,7 @@ describe "Vanagon::Platform::Windows" do
           end
 
           it "returns nested directory correctly with \\" do
-            proj = Vanagon::Project::DSL.new('test-fixture', {}, [])
+            proj = Vanagon::Project::DSL.new('test-fixture', vanagon_platform, [])
             proj.instance_eval(project_block)
             cur_plat.instance_eval(plat[:block])
             comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
@@ -255,7 +259,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', {}, [])
+            proj = Vanagon::Project::DSL.new('test-fixture', vanagon_platform, [])
             proj.instance_eval(project_block)
             cur_plat.instance_eval(plat[:block])
             comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
@@ -274,7 +278,7 @@ describe "Vanagon::Platform::Windows" do
           end
 
           it "returns correctly formatted multiple nested directories" do
-            proj = Vanagon::Project::DSL.new('test-fixture', {}, [])
+            proj = Vanagon::Project::DSL.new('test-fixture', 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

@@ -8,11 +8,14 @@ describe 'Vanagon::Project::DSL' do
 "project 'test-fixture' do |proj|
 end" }
   let(:configdir) { '/a/b/c' }
+  let(:platform) do
+    OpenStruct.new(:settings => {})
+  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', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', platform)
       proj.instance_eval(project_block)
 
       # Lying is bad. You shouldn't lie. But sometimes when you're
@@ -35,7 +38,7 @@ end" }
     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', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', platform)
       proj.instance_eval(project_block)
 
       # See previous description of "indescribable cyclopean obelisk"
@@ -60,7 +63,7 @@ end" }
       log = double
       diff = double
       expect(Vanagon::Driver).to receive(:configdir).and_return(configdir)
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', platform)
       proj.instance_eval(project_block)
       repo = double("repo")
       expect(::Git)
@@ -91,7 +94,7 @@ end" }
       }
 
       expect(Vanagon::Driver).to receive(:configdir).exactly(branches.length).times.and_return(configdir)
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', platform)
       proj.instance_eval(project_block)
 
       branches.each do |branch, version|
@@ -116,7 +119,7 @@ end" }
       ]
 
       expect(Vanagon::Driver).to receive(:configdir).exactly(branches.length).times.and_return(configdir)
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', platform)
       proj.instance_eval(project_block)
 
       branches.each do |branch|
@@ -137,7 +140,7 @@ end" }
 
   describe '#directory' do
     it 'adds a directory to the list of directories' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', 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'))
@@ -146,7 +149,7 @@ end" }
 
   describe '#user' do
     it 'sets a user for the project' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', platform)
       proj.instance_eval(project_block)
       proj.user('test-user')
       expect(proj._project.user).to eq(Vanagon::Common::User.new('test-user'))
@@ -155,7 +158,7 @@ end" }
 
   describe '#target_repo' do
     it 'sets the target_repo for the project' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', platform)
       proj.instance_eval(project_block)
       proj.target_repo "pc1"
       expect(proj._project.repo).to eq("pc1")
@@ -164,7 +167,7 @@ end" }
 
   describe '#noarch' do
     it 'sets noarch on the project to true' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', platform)
       proj.instance_eval(project_block)
       proj.noarch
       expect(proj._project.noarch).to eq(true)
@@ -173,20 +176,20 @@ end" }
 
   describe '#generate_source_artifacts' do
     it 'defaults to false' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', 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', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', 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', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', platform)
       proj.instance_eval(project_block)
       proj.generate_source_artifacts false
       expect(proj._project.source_artifacts).to eq(false)
@@ -195,7 +198,7 @@ end" }
 
   describe '#identifier' do
     it 'sets the identifier for the project' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', platform)
       proj.instance_eval(project_block)
       proj.identifier "com.example"
       expect(proj._project.identifier).to eq("com.example")
@@ -204,14 +207,14 @@ end" }
 
   describe '#cleanup_during_build' do
     it 'sets @cleanup to true' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', 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', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', platform)
       proj.instance_eval(project_block)
       expect(proj._project.cleanup).to be_nil
     end
@@ -221,7 +224,7 @@ end" }
     let(:version_file) { '/opt/puppetlabs/puppet/VERSION' }
 
     it 'sets version_file for the project' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', platform)
       proj.instance_eval(project_block)
       proj.write_version_file(version_file)
       expect(proj._project.version_file.path).to eq(version_file)
@@ -230,14 +233,14 @@ end" }
 
   describe "#release" do
     it 'sets the release for the project' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', 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', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', platform)
       proj.instance_eval(project_block)
       expect(proj._project.release).to eq('1')
     end
@@ -254,7 +257,7 @@ end" }
     end
 
     it 'adds the package provide to the list of provides' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', platform)
       proj.instance_eval(project_block)
       proj.provides('thing1')
       proj.provides('thing2')
@@ -337,7 +340,7 @@ end" }
     end
 
     it 'adds the package replacement to the list of replacements' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', platform)
       proj.instance_eval(project_block)
       proj.replaces('thing1')
       proj.replaces('thing2')
@@ -416,7 +419,7 @@ end" }
     end
 
     it 'adds the package conflict to the list of conflicts' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', platform)
       proj.instance_eval(project_block)
       proj.conflicts('thing1')
       proj.conflicts('thing2')
@@ -529,19 +532,19 @@ end"
     end
 
     it 'stores the component in the project if the included components set is empty' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {}, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', 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', {}, ['some-component'])
+      proj = Vanagon::Project::DSL.new('test-fixture', 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', {}, ['some-different-component'])
+      proj = Vanagon::Project::DSL.new('test-fixture', platform, ['some-different-component'])
       proj.instance_eval(project_block)
       expect(proj._project.components).to_not include(component)
     end
@@ -565,19 +568,19 @@ end"
     }
 
     it 'has an empty project.fetch_artifact when fetch_artifact is not called' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {}, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', 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', {}, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', 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', {}, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', platform, [])
       proj.instance_eval(project_block_multiple)
       expect(proj._project.artifacts_to_fetch).to eq(['foo/bar/baz.file', 'foo/foobar/foobarbaz.file'])
     end
@@ -600,19 +603,19 @@ end"
     }
 
     it 'has no_packaging set to false by default' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {}, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', 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', {}, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', 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', {}, [])
+      proj = Vanagon::Project::DSL.new('test-fixture', platform, [])
       proj.instance_eval(project_block_false)
       expect(proj._project.no_packaging).to eq(false)
     end

data/spec/lib/vanagon/project_spec.rb

@@ -6,6 +6,12 @@ require 'fakefs/spec_helpers'
 describe 'Vanagon::Project' do
   let(:component) { double(Vanagon::Component) }
   let(:configdir) { '/a/b/c' }
+  let(:platform) do
+    OpenStruct.new(:settings => {})
+  end
+  let(:upstream_platform) do
+    OpenStruct.new(:settings => {})
+  end
 
   let(:project_block) {
     "project 'test-fixture' do |proj|
@@ -46,16 +52,18 @@ describe 'Vanagon::Project' do
     end"
   }
 
-  let (:dummy_platform_sysv) {
+  let (:dummy_platform_settings) {
     plat = Vanagon::Platform::DSL.new('debian-6-i386')
     plat.instance_eval("platform 'debian-6-i386' do |plat|
                        plat.servicetype 'sysv'
                        plat.servicedir '/etc/init.d'
                        plat.defaultdir '/etc/default'
+                       settings[:platform_test] = 'debian'
                     end")
     plat._platform
   }
 
+
   describe '#vendor=' do
     dummy_platform = Vanagon::Platform.new('el-7-x86_64')
     good_vendor = 'Puppet Inc. <release@puppet.com>'
@@ -113,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', {}, [])
+        proj = Vanagon::Project::DSL.new('test-fixture', 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)
@@ -130,37 +138,50 @@ 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_proj = Vanagon::Project::DSL.new('upstream-test', 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)
     end
 
     it 'loads upstream settings' do
-      inheriting_proj = Vanagon::Project::DSL.new('inheritance-test', {}, [])
+      inheriting_proj = Vanagon::Project::DSL.new('inheritance-test', 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', {}, [])
+      inheriting_proj = Vanagon::Project::DSL.new('inheritance-test', 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', {}, [])
+      inheriting_proj = Vanagon::Project::DSL.new('inheritance-test', 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', {}, [])
+      inheriting_proj = Vanagon::Project::DSL.new('inheritance-test', 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')
     end
   end
 
+  describe 'platform settings' do
+    before do
+      allow(Vanagon::Component).to receive(:load_component).with('some-component', any_args).and_return(component)
+    end
+
+    it 'loads settings set in platforms' do
+      settings_proj = Vanagon::Project::DSL.new('settings-test', dummy_platform_settings, [])
+      settings_proj.instance_eval(project_block)
+      expect(settings_proj._project.settings[:platform_test]).to eq('debian')
+    end
+  end
+
   describe "#load_yaml_settings" do
     subject(:project) do
       project = Vanagon::Project.new('yaml-inheritance-test', Vanagon::Platform.new('aix-7.2-ppc'))
@@ -237,7 +258,7 @@ describe 'Vanagon::Project' 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', {})
+      @proj = Vanagon::Project.new('test-fixture-with-comps', platform)
       @not_included_comp = Vanagon::Component.new('test-fixture-not-included', {}, {})
       @proj.components << @not_included_comp
     end
@@ -306,7 +327,7 @@ describe 'Vanagon::Project' do
 
   describe '#get_preinstall_actions' do
     it "Collects the preinstall actions for the specified package state" do
-      proj = Vanagon::Project.new('action-test', {})
+      proj = Vanagon::Project.new('action-test', platform)
       proj.get_preinstall_actions('upgrade')
       proj.get_preinstall_actions('install')
       expect(proj.get_preinstall_actions('install')).to be_instance_of(String)
@@ -315,39 +336,39 @@ describe 'Vanagon::Project' do
 
   describe '#get_trigger_scripts' do
     it "Collects the install triggers for the project for the specified packing state" do
-      proj = Vanagon::Project.new('action-test', {})
+      proj = Vanagon::Project.new('action-test', platform)
       expect(proj.get_trigger_scripts('install')).to eq({})
       expect(proj.get_trigger_scripts('upgrade')).to be_instance_of(Hash)
     end
     it 'fails with empty install trigger action' do
-      proj = Vanagon::Project.new('action-test', {})
+      proj = Vanagon::Project.new('action-test', platform)
       expect { proj.get_trigger_scripts([]) }.to raise_error(Vanagon::Error)
     end
     it 'fails with incorrect install trigger action' do
-      proj = Vanagon::Project.new('action-test', {})
+      proj = Vanagon::Project.new('action-test', platform)
       expect { proj.get_trigger_scripts('foo') }.to raise_error(Vanagon::Error)
     end
   end
 
   describe '#get_interest_triggers' do
     it "Collects the interest triggers for the project for the specified packaging state" do
-      proj = Vanagon::Project.new('action-test', {})
+      proj = Vanagon::Project.new('action-test', platform)
       expect(proj.get_interest_triggers('install')).to eq([])
       expect(proj.get_interest_triggers('upgrade')).to be_instance_of(Array)
     end
     it 'fails with empty interest trigger action' do
-      proj = Vanagon::Project.new('action-test', {})
+      proj = Vanagon::Project.new('action-test', platform)
       expect { proj.get_interest_triggers([]) }.to raise_error(Vanagon::Error)
     end
     it 'fails with incorrect interest trigger action' do
-      proj = Vanagon::Project.new('action-test', {})
+      proj = Vanagon::Project.new('action-test', platform)
       expect { proj.get_interest_triggers('foo') }.to raise_error(Vanagon::Error)
     end
   end
 
   describe '#get_activate_triggers' do
     it "Collects the activate triggers for the project for the specified packaging state" do
-      proj = Vanagon::Project.new('action-test', {})
+      proj = Vanagon::Project.new('action-test', platform)
       expect(proj.get_activate_triggers()).to be_instance_of(Array)
       expect(proj.get_activate_triggers()).to be_instance_of(Array)
     end
@@ -355,7 +376,7 @@ describe 'Vanagon::Project' do
 
   describe '#generate_dependencies_info' do
     before(:each) do
-      @proj = Vanagon::Project.new('test-project', {})
+      @proj = Vanagon::Project.new('test-project', platform)
     end
 
     it "returns a hash of components and their versions" do
@@ -386,7 +407,7 @@ describe 'Vanagon::Project' do
         end
       end
 
-      @proj = Vanagon::Project.new('test-project', {})
+      @proj = Vanagon::Project.new('test-project', platform)
     end
 
     it 'should generate a hash with the expected build metadata' do
@@ -546,12 +567,12 @@ describe 'Vanagon::Project' do
 
   describe '#get_rpm_ghost_files' do
     it 'returns an empty array when there are no ghost files' do
-      proj = Vanagon::Project.new('test-ghost', {})
+      proj = Vanagon::Project.new('test-ghost', platform)
       expect(proj.get_rpm_ghost_files).to eq([])
     end
 
     it 'returns ghost files when some are set' do
-      proj = Vanagon::Project.new('test-ghosts', {})
+      proj = Vanagon::Project.new('test-ghosts', platform)
       comp = Vanagon::Component.new('ghosts', {}, {})
       comp.add_rpm_ghost_file('ghost')
       proj.components << comp

data/spec/lib/vanagon/utilities_spec.rb

@@ -44,6 +44,29 @@ describe "Vanagon::Utilities" do
 
       expect(Vanagon::Utilities.find_program_on_path(command, false)).to be(false)
     end
+
+    it 'finds commands with file extensions' do
+      # Set PATHEXT so we can test this outside of windows
+      orig_pathext = ENV['PATHEXT']
+      ENV['PATHEXT'] = '.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.CPL'
+      extensions = ENV['PATHEXT'].split(';')
+
+      # take a random element from path for testing
+      test_path = ENV['PATH'].split(File::PATH_SEPARATOR).sample
+      expect(FileTest).to receive(:executable?).with(File.join(test_path, "#{command}.VBS")).and_return(true)
+
+      # have an `allow` for the negative cases so rspec doesn't fail with unexpected
+      # function calls
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path_elem|
+        allow(FileTest).to receive(:executable?).with(File.join(path_elem, command))
+        extensions.each do |ext|
+          allow(FileTest).to receive(:executable?).with(File.join(path_elem, "#{command}#{ext}"))
+        end
+      end
+
+      expect(Vanagon::Utilities.find_program_on_path(command)).to eq(File.join(test_path, "#{command}.VBS"))
+      ENV['PATHEXT'] = orig_pathext
+    end
   end
 
   describe '#local_command' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.15.29
+  version: 0.15.30
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2019-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -253,7 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -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/project_spec.rb
-- spec/lib/vanagon/common/pathname_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/engine/local_spec.rb
+- spec/lib/vanagon/component/source/rewrite_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/dsl_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/component/source_spec.rb
+- spec/lib/vanagon/engine/hardware_spec.rb
 - spec/lib/vanagon/engine/base_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/local_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
-- spec/lib/vanagon/engine/hardware_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
-- spec/lib/vanagon/optparse_spec.rb
-- spec/lib/vanagon/environment_spec.rb
+- spec/lib/vanagon/engine/pooler_spec.rb
+- spec/lib/vanagon/engine/ec2_spec.rb
 - spec/lib/vanagon/driver_spec.rb
+- spec/lib/vanagon/platform_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/common/pathname_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
 - spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/environment_spec.rb
 - spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/vanagon/platform_spec.rb
-- spec/lib/vanagon/component/source_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/local_spec.rb
-- spec/lib/vanagon/component/source/rewrite_spec.rb
-- spec/lib/vanagon/component/source/http_spec.rb
+- spec/lib/vanagon/optparse_spec.rb
+- spec/lib/vanagon/platform/windows_spec.rb
 - spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
 - spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/platform/rpm_spec.rb
 - spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/windows_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/vanagon/platform/solaris_11_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/extensions/ostruct/json_spec.rb
+- spec/lib/git/rev_list_spec.rb