vanagon 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f430d963bf116d91cbf83256331875e5e335201
-  data.tar.gz: 1aa6339e0badadb4007b47f2220bade631525dd9
+  metadata.gz: 00aa7997dec07d58c44cb6d6076dd2560822d042
+  data.tar.gz: 79b4904349d110f3eb55f007db5b8cd3c907ae37
 SHA512:
-  metadata.gz: a9cc2b608f290d1c562edcba2044be400cc26e32d32dc36c5c58904d319cc210a6774e170ab863ccbe183460ceee00b3f3dbb2c600ba5fef16bc7505d3060a3e
-  data.tar.gz: 6e22988b5a57b7e73a56f48e3748afe11f2d261cb26fd9257a210c5cab2f5c48173639d390358d9022b6d2fa73e121dd13d1fb72e6eb80d52017a05737c9aeb7
+  metadata.gz: db753395aaf5db11fff64523b0ae2385e1d0919d53612e4b8d6a4402817bb4ee56919adf918845078e5c6459ac91dbdaa3429131495febc50111e6e1a313760f
+  data.tar.gz: 1521d569ad2be537fb72dd56ea21b4907c4bd365205312682b933b16262a5b456470f40799a76b9c782c2dc6f0dfb2c095f64e2a57b8c491c4d89da2f3e19cfe

data/lib/makefile.rb

@@ -1,10 +1,8 @@
 class Makefile
-
   # The Rule class defines a single Makefile rule.
   #
   # @see http://www.gnu.org/software/make/manual/make.html#Rule-Introduction
   class Rule
-
     # @!attribute [rw] target
     #   @return [String] The target generated by this rule.
     attr_accessor :target
@@ -43,7 +41,7 @@ class Makefile
       @dependencies = dependencies
       @recipe = recipe
 
-      block.call(self) if block
+      yield(self) if block
     end
 
     # Format this rule as a Makefile rule.

data/lib/vanagon/common/pathname.rb

@@ -44,7 +44,7 @@ class Vanagon
       # @example Create a new Vanagon::Common::Pathname, marked as a file.
       #   Vanagon::Common::Pathname.file('/etc/puppet/puppet/puppet.conf')
       def self.file(path, **args)
-        new(path, **args.merge!({ config: false}))
+        new(path, **args.merge!({ config: false }))
       end
 
       # An alias to {Vanagon::Common::Pathname}'s constructor method,
@@ -54,7 +54,7 @@ class Vanagon
       # @example Create a new configuration file, marked as a configuration file.
       #   Vanagon::Common::Pathname.configfile('/etc/puppet/puppet/puppet.conf')
       def self.configfile(path, **args)
-        new(path, **args.merge!({ config: true}))
+        new(path, **args.merge!({ config: true }))
       end
 
       # @return [Boolean] true if a self is marked as a configuration file.

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)
+      def ==(other) # rubocop:disable Metrics/AbcSize
         other.name == self.name && \
           other.group == self.group && \
           other.shell == self.shell && \

data/lib/vanagon/component.rb

@@ -41,7 +41,7 @@ class Vanagon
     # @param settings [Hash] the settings to be used in the component
     # @param platform [Vanagon::Platform] the platform to build the component for
     # @return [Vanagon::Component] the component with the given settings and platform
-    def initialize(name, settings, platform)
+    def initialize(name, settings, platform) # rubocop:disable Metrics/AbcSize
       @name = name
       @settings = settings
       @platform = platform

data/lib/vanagon/component/dsl.rb

@@ -22,7 +22,7 @@ class Vanagon
       # @param name [String] name of the componennt
       # @param block [Proc] DSL definition of the component to call
       def component(name, &block)
-        block.call(self, @component.settings, @component.platform)
+        yield(self, @component.settings, @component.platform)
       end
 
       # Accessor for the component.
@@ -54,35 +54,28 @@ class Vanagon
       #
       # @param block [Proc] the command(s) required to configure the component
       def configure(&block)
-        @component.configure << block.call
+        @component.configure << yield
       end
 
       # Set or add to the build call for the component. The commands required to build the component before testing/installing it.
       #
       # @param block [Proc] the command(s) required to build the component
       def build(&block)
-        @component.build << block.call
+        @component.build << yield
       end
 
       # Set or add to the check call for the component. The commands required to test the component before installing it.
       #
       # @param block [Proc] the command(s) required to test the component
       def check(&block)
-        @component.check << block.call
+        @component.check << yield
       end
 
       # Set or add to the install call for the component. The commands required to install the component.
       #
       # @param block [Proc] the command(s) required to install the component
       def install(&block)
-        @component.install << block.call
-      end
-
-      # Setup any specific environment required to configure, build or install the component
-      #
-      # @param block [Proc] the environment required to configure, build or install the component
-      def environment(&block)
-        @component.environment = block.call
+        @component.install << yield
       end
 
       # Add a patch to the list of patches to apply to the component's source after unpacking
@@ -168,7 +161,7 @@ class Vanagon
       # @param default_file [String] path to the default file relative to the source
       # @param service_name [String] name of the service
       # @param service_type [String] type of the service (network, application, system, etc)
-      def install_service(service_file, default_file = nil, service_name = @component.name, service_type: nil)
+      def install_service(service_file, default_file = nil, service_name = @component.name, service_type: nil) # rubocop:disable Metrics/AbcSize
         case @component.platform.servicetype
         when "sysv"
           target_service_file = File.join(@component.platform.servicedir, service_name)
@@ -223,7 +216,7 @@ class Vanagon
       # @param target [String] path to the desired target of the file
       # @param owner  [String] owner of the file
       # @param group  [String] group owner of the file
-      def install_file(source, target, mode: '0644', owner: nil, group:  nil)
+      def install_file(source, target, mode: '0644', owner: nil, group: nil)
         @component.install << "#{@component.platform.install} -d '#{File.dirname(target)}'"
         @component.install << "#{@component.platform.copy} -p '#{source}' '#{target}'"
         @component.add_file Vanagon::Common::Pathname.file(target, mode: mode, owner: owner, group: group)
@@ -235,7 +228,7 @@ class Vanagon
       # @param file [String] name of the configfile
       def configfile(file)
         # I AM SO SORRY
-        @component.delete_file "#{file}"
+        @component.delete_file file
         if @component.platform.name =~ /solaris-10|osx/
           @component.install << "mv '#{file}' '#{file}.pristine'"
           @component.add_file Vanagon::Common::Pathname.configfile("#{file}.pristine")

data/lib/vanagon/component/rules.rb

@@ -6,7 +6,6 @@ class Vanagon
   class Component
     # Vanagon::Component::Rules creates all Makefile rules for a given component.
     class Rules
-
       include Vanagon::Utilities::ShellUtilities
 
       # Create methods that generate Makefile rules.
@@ -67,7 +66,7 @@ class Vanagon
       #
       # @return [Makefile::Rule]
       def component_rule
-        Makefile::Rule.new("#{@component.name}", dependencies: ["#{@component.name}-install"])
+        Makefile::Rule.new(@component.name, dependencies: ["#{@component.name}-install"])
       end
 
       # Unpack the source for this component. The unpacking behavior depends on

data/lib/vanagon/component/source.rb

@@ -5,7 +5,7 @@ require 'vanagon/component/source/local'
 class Vanagon
   class Component
     class Source
-      SUPPORTED_PROTOCOLS = ['file', 'http', 'git']
+      SUPPORTED_PROTOCOLS = ['file', 'http', 'git'].freeze
       @@rewrite_rule = {}
 
       def self.register_rewrite_rule(protocol, rule)

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

@@ -10,7 +10,7 @@ class Vanagon
         attr_accessor :url, :sum, :file, :extension, :workdir, :cleanup
 
         # Extensions for files we intend to unpack during the build
-        ARCHIVE_EXTENSIONS = '.tar.gz', '.tgz', '.zip'
+        ARCHIVE_EXTENSIONS = ['.tar.gz', '.tgz', '.zip'].freeze
 
         # Constructor for the Http source type
         #
@@ -48,7 +48,7 @@ class Vanagon
         # Downloads the file from @url into the @workdir
         # @param target_url [String, URI, Addressable::URI] url of an http source to retrieve with GET
         # @raise [RuntimeError, Vanagon::Error] an exception is raised if the URI scheme cannot be handled
-        def download(target_url, target_file = nil)
+        def download(target_url, target_file = nil) # rubocop:disable Metrics/AbcSize
           uri = URI.parse(target_url.to_s)
           target_file ||= File.basename(uri.path)
 
@@ -93,7 +93,7 @@ class Vanagon
             when ".tar.gz", ".tgz"
               return "gunzip -c '#{@file}' | '#{tar}' xf -"
             when ".zip"
-              return "unzip '#{@file}' || 7za x -r -tzip -o'#{File.basename(@file, ".zip")}' '#{@file}'"
+              return "unzip '#{@file}' || 7za x -r -tzip -o'#{File.basename(@file, '.zip')}' '#{@file}'"
             end
           else
             # Extension does not appear to be an archive

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

@@ -10,7 +10,7 @@ class Vanagon
         attr_accessor :url, :file, :extension, :workdir, :cleanup
 
         # Extensions for files we intend to unpack during the build
-        ARCHIVE_EXTENSIONS = '.tar.gz', '.tgz', '.zip'
+        ARCHIVE_EXTENSIONS = ['.tar.gz', '.tgz', '.zip'].freeze
 
         # Constructor for the File source type
         #
@@ -51,7 +51,6 @@ class Vanagon
           end
 
           target_file
-
         end
 
         # Gets the command to extract the archive given if needed (uses @extension)
@@ -65,7 +64,7 @@ class Vanagon
             when ".tar.gz", ".tgz"
               return "gunzip -c '#{@file}' | '#{tar}' xf -"
             when ".zip"
-              return "unzip '#{@file}' || 7za x -r -tzip -o'#{File.basename(@file, ".zip")}' '#{@file}'"
+              return "unzip '#{@file}' || 7za x -r -tzip -o'#{File.basename(@file, '.zip')}' '#{@file}'"
             end
           else
             # Extension does not appear to be an archive
@@ -116,4 +115,4 @@ class Vanagon
       end
     end
   end
-end
+end

data/lib/vanagon/driver.rb

@@ -13,7 +13,7 @@ class Vanagon
     attr_accessor :platform, :project, :target, :workdir, :verbose, :preserve
     attr_accessor :timeout, :retry_count
 
-    def initialize(platform, project, options = { :configdir => nil, :target => nil, :engine => nil, :components => nil, :skipcheck => false, :verbose => false, :preserve => false })
+    def initialize(platform, project, options = { :configdir => nil, :target => nil, :engine => nil, :components => nil, :skipcheck => false, :verbose => false, :preserve => false }) # rubocop:disable Metrics/AbcSize
       @verbose = options[:verbose]
       @preserve = options[:preserve]
 
@@ -74,7 +74,7 @@ class Vanagon
       @project.components.map(&:build_requires).flatten.uniq - @project.components.map(&:name)
     end
 
-    def install_build_dependencies
+    def install_build_dependencies # rubocop:disable Metrics/AbcSize
       unless list_build_dependencies.empty?
         if @platform.build_dependencies && @platform.build_dependencies.command && !@platform.build_dependencies.command.empty?
           @engine.dispatch("#{@platform.build_dependencies.command} #{list_build_dependencies.join(' ')} #{@platform.build_dependencies.suffix}")
@@ -86,7 +86,7 @@ class Vanagon
       end
     end
 
-    def run
+    def run # rubocop:disable Metrics/AbcSize
       # Simple sanity check for the project
       if @project.version.nil? or @project.version.empty?
         raise Vanagon::Error, "Project requires a version set, all is lost."
@@ -115,7 +115,7 @@ class Vanagon
       end
     end
 
-    def prepare(workdir = nil)
+    def prepare(workdir = nil) # rubocop:disable Metrics/AbcSize
       @workdir = workdir ? FileUtils.mkdir_p(workdir).first : Dir.mktmpdir
       @engine.startup(@workdir)
 

data/lib/vanagon/engine/base.rb

@@ -76,7 +76,7 @@ class Vanagon
       def validate_platform
         missing_attrs = []
         @required_attributes.each do |attr|
-          if (!@platform.instance_variables.include?("@#{attr}".to_sym)) or @platform.instance_variable_get("@#{attr}".to_sym).nil?
+          if !@platform.instance_variables.include?("@#{attr}".to_sym) || @platform.instance_variable_get("@#{attr}".to_sym).nil?
             missing_attrs << attr
           end
         end

data/lib/vanagon/engine/ec2.rb

@@ -9,7 +9,7 @@ class Vanagon
       attr_accessor :ami, :key_name, :userdata, :key, :key_name, :shutdown_behavior
       attr_accessor :subnet_id, :instance_type
 
-      def initialize(platform, target = nil)
+      def initialize(platform, target = nil) # rubocop:disable Metrics/AbcSize
         super
 
         @ami = @platform.aws_ami

data/lib/vanagon/engine/hardware.rb

@@ -12,7 +12,6 @@ class Vanagon
     # Class to use when building on a hardware device (e.g. AIX, Switch, etc)
     #
     class Hardware < Base
-
       # This method is used to obtain a vm to build upon
       # For the base class we just return the target that was passed in
       def select_target

data/lib/vanagon/engine/local.rb

@@ -5,7 +5,6 @@ require 'vanagon/errors'
 class Vanagon
   class Engine
     class Local < Base
-
       def initialize(platform, target = nil)
         # local engine can't be used with a target
         super(platform, 'local machine')
@@ -38,14 +37,13 @@ class Vanagon
       end
 
       def ship_workdir(workdir)
-        FileUtils.cp_r(Dir.glob("#{workdir}/*"), "#{@remote_workdir}")
+        FileUtils.cp_r(Dir.glob("#{workdir}/*"), @remote_workdir)
       end
 
       def retrieve_built_artifact
         FileUtils.mkdir_p("output")
         FileUtils.cp_r(Dir.glob("#{@remote_workdir}/output/*"), "output/")
       end
-
     end
   end
 end

data/lib/vanagon/engine/pooler.rb

@@ -46,7 +46,7 @@ class Vanagon
       # This method is used to obtain a vm to build upon using the Puppet Labs'
       # vmpooler (https://github.com/puppetlabs/vmpooler)
       # @raise [Vanagon::Error] if a target cannot be obtained
-      def select_target
+      def select_target # rubocop:disable Metrics/AbcSize
         response = Vanagon::Utilities.http_request(
           "#{@pooler}/vm",
           'POST',

data/lib/vanagon/errors.rb

@@ -1,5 +1,4 @@
 class Vanagon
-
   # An error class that accepts a wrapped error message
   #
   class Error < StandardError

data/lib/vanagon/optparse.rb

@@ -2,7 +2,6 @@ require 'optparse'
 
 class Vanagon
   class OptParse
-
     FLAGS = {
         :workdir => ['-w DIR', '--workdir DIR', "Working directory where build source should be put (defaults to a tmpdir)"],
         :configdir => ['-c', '--configdir DIR', 'Configs dir (defaults to $pwd/configs)'],
@@ -11,7 +10,7 @@ class Vanagon
         :skipcheck => ['--skipcheck', 'Skip the `check` stage when building components'],
         :preserve => ['-p', '--preserve', 'Whether to tear down the VM on success or not (defaults to false)'],
         :verbose => ['-v', '--verbose', 'Verbose output (does nothing)'],
-      }
+      }.freeze
 
     def initialize(banner, options = [])
       @options = Hash[options.map { |v| [v, nil] }]

data/lib/vanagon/patch.rb

@@ -2,7 +2,6 @@ require 'vanagon/errors'
 
 class Vanagon
   class Patch
-
     # @!attribute [r] path
     #   @return [String] The path to the patch
     attr_reader :path

data/lib/vanagon/platform.rb

@@ -8,7 +8,7 @@ class Vanagon
     attr_accessor :docker_image, :ssh_port, :rpmbuild, :install, :platform_triple
     attr_accessor :target_user, :package_type, :find, :sort, :build_hosts, :copy, :cross_compiled
     attr_accessor :aws_ami, :aws_user_data, :aws_shutdown_behavior, :aws_key_name, :aws_region, :aws_key
-    attr_accessor :aws_instance_type, :aws_vpc_id, :aws_subnet_id
+    attr_accessor :aws_instance_type, :aws_vpc_id, :aws_subnet_id, :output_dir
 
     # 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
@@ -60,7 +60,7 @@ class Vanagon
     #
     # @param user [Vanagon::Common::User] the user to create
     # @return [String] the commands required to add a user to the system
-    def add_user(user)
+    def add_user(user) # rubocop:disable Metrics/AbcSize
       cmd_args = ["'#{user.name}'"]
       cmd_args.unshift "--home '#{user.homedir}'" if user.homedir
       if user.shell
@@ -95,7 +95,7 @@ class Vanagon
     #
     # @param name [String] name of the platform
     # @return [Vanagon::Platform] the platform with the given name
-    def initialize(name)
+    def initialize(name) # rubocop:disable Metrics/AbcSize
       @name = name
       @os_name = os_name
       @os_version = os_version
@@ -117,6 +117,16 @@ class Vanagon
       end
     end
 
+    # Get the output dir for packages. If the output_dir was defined already (by
+    # the platform config) then don't change it.
+    #
+    # @param target_repo [String] optional repo target for built packages defined
+    #   at the project level
+    # @return [String] relative path to where packages should be output to
+    def output_dir(target_repo = "")
+      @output_dir ||= File.join(@os_name, @os_version, target_repo, @architecture)
+    end
+
     # Sets and gets the name of the operating system for the platform.
     # Also has the side effect of setting the @os_name instance attribute
     #

data/lib/vanagon/platform/deb.rb

@@ -5,7 +5,7 @@ class Vanagon
       #
       # @param project [Vanagon::Project] project to build a debian package of
       # @return [Array] list of commands required to build a debian package for the given project from a tarball
-      def generate_package(project)
+      def generate_package(project) # rubocop:disable Metrics/AbcSize
         target_dir = project.repo ? output_dir(project.repo) : output_dir
         pkg_arch_opt = project.noarch ? "" : "-a#{@architecture}"
         ["mkdir -p output/#{target_dir}",
@@ -47,14 +47,6 @@ class Vanagon
         "#{project.name}_#{project.version}-#{project.release}#{@codename}_#{project.noarch ? 'all' : @architecture}.deb"
       end
 
-      # Get the expected output dir for the debian packages. This allows us to
-      # use some standard tools to ship internally.
-      #
-      # @return [String] relative path to where debian packages should be staged
-      def output_dir(target_repo = "")
-        File.join("deb", @codename, target_repo)
-      end
-
       # Returns the string to add a target repo to the platforms' provisioning
       #
       # @param definition [URI] A URI to a deb or list file

data/lib/vanagon/platform/dsl.rb

@@ -50,7 +50,7 @@ class Vanagon
                       fail "Platform not implemented for '#{@name}' yet. Please go do so..."
                     end
 
-        block.call(self)
+        yield(self)
         @platform
       end
 
@@ -313,6 +313,10 @@ class Vanagon
         @platform.codename = name
       end
 
+      def output_dir(directory)
+        @platform.output_dir = directory
+      end
+
       # Helper to setup a apt repository on a target system
       #
       # @param definition [String] the repo setup file, must be a valid uri, fetched with curl

data/lib/vanagon/platform/osx.rb

@@ -5,7 +5,7 @@ class Vanagon
       #
       # @param project [Vanagon::Project] project to build a osx package of
       # @return [Array] list of commands required to build a osx package for the given project from a tarball
-      def generate_package(project)
+      def generate_package(project) # rubocop:disable Metrics/AbcSize
         target_dir = project.repo ? output_dir(project.repo) : output_dir
 
         # Here we maintain backward compatibility with older vanagon versions
@@ -13,10 +13,11 @@ class Vanagon
         # in favor of just letting the makefile deliver the bill-of-materials
         # to the correct directory. This shouldn't be required at all then.
         if project.bill_of_materials.nil?
-          bom_install = [# Move bill-of-materials into a docdir
-           "mkdir -p $(tempdir)/osx/build/root/#{project.name}-#{project.version}/usr/local/share/doc/#{project.name}",
-           "mv $(tempdir)/osx/build/root/#{project.name}-#{project.version}/bill-of-materials $(tempdir)/osx/build/root/#{project.name}-#{project.version}/usr/local/share/doc/#{project.name}/bill-of-materials",]
-
+          bom_install = [
+            # Move bill-of-materials into a docdir
+            "mkdir -p $(tempdir)/osx/build/root/#{project.name}-#{project.version}/usr/local/share/doc/#{project.name}",
+            "mv $(tempdir)/osx/build/root/#{project.name}-#{project.version}/bill-of-materials $(tempdir)/osx/build/root/#{project.name}-#{project.version}/usr/local/share/doc/#{project.name}/bill-of-materials",
+          ]
         else
           bom_install = []
         end
@@ -63,7 +64,7 @@ class Vanagon
       # @param workdir [String] working directory to stage the evaluated templates in
       # @param name [String] name of the project
       # @param binding [Binding] binding to use in evaluating the packaging templates
-      def generate_packaging_artifacts(workdir, name, binding)
+      def generate_packaging_artifacts(workdir, name, binding) # rubocop:disable Metrics/AbcSize
         resources_dir = File.join(workdir, "resources", "osx")
         FileUtils.mkdir_p(resources_dir)
         script_dir = File.join(workdir, "scripts")
@@ -91,14 +92,6 @@ class Vanagon
         "#{project.name}-#{project.version}-#{project.release}.#{@os_name}#{@os_version}.dmg"
       end
 
-      # Get the expected output dir for the osx packages. This allows us to
-      # use some standard tools to ship internally.
-      #
-      # @return [String] relative path to where osx packages should be staged
-      def output_dir(target_repo = "")
-        File.join("apple", @os_version, target_repo, @architecture)
-      end
-
       # Constructor. Sets up some defaults for the osx platform and calls the parent constructor
       #
       # @param name [String] name of the platform

data/lib/vanagon/platform/rpm.rb

@@ -36,22 +36,14 @@ class Vanagon
         "#{project.name}-#{project.version}-#{project.release}.#{project.noarch ? 'noarch' : @architecture}.rpm"
       end
 
-      # Get the expected output dir for the rpm packages. This allows us to
-      # use some standard tools to ship internally.
-      #
-      # @return [String] relative path to where rpm packages should be staged
-      def output_dir(target_repo = "products")
-        File.join(@os_name, @os_version, target_repo, @architecture)
-      end
-
       def rpm_defines
         defines =  %(--define '_topdir $(tempdir)/rpmbuild' )
         # RPM doesn't allow dashes in the os_name. This was added to
         # convert cisco-wrlinux to cisco_wrlinux
-        defines << %(--define 'dist .#{@os_name.gsub('-', '_')}#{@os_version}' )
+        defines << %(--define 'dist .#{@os_name.tr('-', '_')}#{@os_version}' )
       end
 
-      def add_repository(definition)
+      def add_repository(definition) # rubocop:disable Metrics/AbcSize
         definition = URI.parse(definition)
 
         commands = ["rpm -q curl > /dev/null || yum -y install curl"]

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

@@ -21,7 +21,7 @@ class Vanagon
             commands << "tmpdir=$(mktemp -p /var/tmp -d)"
             commands << "cd ${tmpdir}"
             build_dependencies.each do |build_dependency|
-              if build_dependency.match(/^http.*\.rpm$/)
+              if build_dependency =~ /^http.*\.rpm$/
                 # We're downloading each package individually so
                 # failures are easier to troubleshoot
                 commands << %(curl --remote-name --location --fail --silent #{build_dependency} && echo "Successfully downloaded #{build_dependency}")

data/lib/vanagon/platform/solaris_10.rb

@@ -5,7 +5,7 @@ class Vanagon
       #
       # @param project [Vanagon::Project] project to build a solaris package of
       # @return [Array] list of commands required to build a solaris package for the given project from a tarball
-      def generate_package(project)
+      def generate_package(project) # rubocop:disable Metrics/AbcSize
         target_dir = project.repo ? output_dir(project.repo) : output_dir
         name_and_version = "#{project.name}-#{project.version}"
         pkg_name = package_name(project)
@@ -28,9 +28,11 @@ class Vanagon
         # in favor of just letting the makefile deliver the bill-of-materials
         # to the correct directory. This shouldn't be required at all then.
         if project.bill_of_materials.nil?
-          bom_install = [# Move bill-of-materials into a docdir
-          "mkdir -p $(tempdir)/#{name_and_version}/usr/share/doc/#{project.name}",
-          "mv $(tempdir)/#{name_and_version}/bill-of-materials $(tempdir)/#{name_and_version}/usr/share/doc/#{project.name}/bill-of-materials",]
+          bom_install = [
+            # Move bill-of-materials into a docdir
+            "mkdir -p $(tempdir)/#{name_and_version}/usr/share/doc/#{project.name}",
+            "mv $(tempdir)/#{name_and_version}/bill-of-materials $(tempdir)/#{name_and_version}/usr/share/doc/#{project.name}/bill-of-materials",
+          ]
         else
           bom_install = []
         end
@@ -106,7 +108,7 @@ class Vanagon
       #
       # @param user [Vanagon::Common::User] the user to create
       # @return [String] the commands required to add a user to the system
-      def add_user(user)
+      def add_user(user) # rubocop:disable Metrics/AbcSize
         # NB: system users aren't supported on solaris 10
         # Solaris 10 also doesn't support long flags
         cmd_args = ["'#{user.name}'"]
@@ -138,28 +140,20 @@ class Vanagon
         "#{project.name}-#{project.version}-#{project.release}.#{@architecture}.pkg.gz"
       end
 
-      # Get the expected output dir for the solaris 10 packages. This allows us to
-      # use some standard tools to ship internally.
-      #
-      # @return [String] relative path to where solaris 10 packages should be staged
-      def output_dir(target_repo = "")
-        File.join("solaris", @os_version, target_repo)
-      end
-
       # Because solaris has multiple terrible ways to install packages, we have
       # this method which generates a shell script to be executed on the system
       # which will install all of the build dependencies
       #
       # @param build_dependencies [Array] list of all build dependencies to install
       # @return [String] a command to install all of the build dependencies
-      def install_build_dependencies(build_dependencies)
+      def install_build_dependencies(build_dependencies) # rubocop:disable Metrics/AbcSize
         http = []
         pkgutil = []
         noasks = ["instance=overwrite", "partial=nocheck", "runlevel=nocheck", "idepend=nocheck", "rdepend=nocheck", "space=nocheck", "setuid=nocheck", "conflict=nocheck", "action=nocheck", "basedir=default"]
         noask_command = noasks.map { |noask| "echo '#{noask}' >> /var/tmp/noask" }.join('; ')
 
         build_dependencies.each do |build_dependency|
-          if build_dependency.match(/^http.*\.gz/)
+          if build_dependency =~ /^http.*\.gz/
             # Fetch, unpack, install...this assumes curl is present.
             package = build_dependency.sub(/^http.*\//, '')
             http << "tmpdir=$(mktemp -p /var/tmp -d); (cd ${tmpdir} && curl -O #{build_dependency} && gunzip -c #{package} | pkgadd -d /dev/stdin -a /var/tmp/noask all)"

data/lib/vanagon/platform/solaris_11.rb

@@ -5,7 +5,7 @@ class Vanagon
       #
       # @param project [Vanagon::Project] project to build a solaris package of
       # @return [Array] list of commands required to build a solaris package for the given project from a tarball
-      def generate_package(project)
+      def generate_package(project) # rubocop:disable Metrics/AbcSize
         target_dir = project.repo ? output_dir(project.repo) : output_dir
         name_and_version = "#{project.name}-#{project.version}"
         pkg_name = package_name(project)
@@ -106,14 +106,6 @@ class Vanagon
         "#{version},5.11-#{release}"
       end
 
-      # Get the expected output dir for the solaris 11 packages. This allows us to
-      # use some standard tools to ship internally.
-      #
-      # @return [String] relative path to where solaris 11 packages should be staged
-      def output_dir(target_repo = "")
-        File.join("solaris", @os_version, target_repo)
-      end
-
       # Constructor. Sets up some defaults for the solaris 11 platform and calls the parent constructor
       #
       # @param name [String] name of the platform

data/lib/vanagon/platform/windows.rb

@@ -77,7 +77,7 @@ class Vanagon
       # @param vanagon_root [String] Vanagon wix resources directory
       # @param destination [String] Destination directory
       # @param verbose [String] True or false
-      def merge_defaults_from_vanagon(vanagon_root, destination, verbose: false)
+      def merge_defaults_from_vanagon(vanagon_root, destination, verbose: false) # rubocop:disable Metrics/AbcSize
         # Will use this Pathname object for relative path calculations in loop below.
         vanagon_path = Pathname.new(vanagon_root)
         files = Dir.glob(File.join(vanagon_root, "**/*.*"))
@@ -140,7 +140,7 @@ class Vanagon
       # @param project [Vanagon::Project] project to build a nuget package of
       # @return [Array] list of commands required to build a nuget package for
       # the given project from a tarball
-      def generate_nuget_package(project)
+      def generate_nuget_package(project) # rubocop:disable Metrics/AbcSize
         target_dir = project.repo ? output_dir(project.repo) : output_dir
         ["mkdir -p output/#{target_dir}",
         "mkdir -p $(tempdir)/#{project.name}/tools",
@@ -161,7 +161,7 @@ class Vanagon
       #
       # @param project [Vanagon::Project] project to build a msi package of
       # @return [Array] list of commands required to build an msi package for the given project from a tarball
-      def generate_msi_package(project)
+      def generate_msi_package(project) # rubocop:disable Metrics/AbcSize
         target_dir = project.repo ? output_dir(project.repo) : output_dir
         wix_extensions = "-ext WiXUtilExtension -ext WixUIExtension"
         # Heat command documentation at: http://wixtoolset.org/documentation/manual/v3/overview/heat.html
@@ -186,7 +186,8 @@ class Vanagon
         # "Misc Dir for versions.txt, License file and Icon file"
         misc_dir = "SourceDir/#{project.settings[:base_dir]}/#{project.settings[:company_id]}/#{project.settings[:product_id]}/misc"
         # Actual array of commands to be written to the Makefile
-        ["mkdir -p output/#{target_dir}",
+        [
+          "mkdir -p output/#{target_dir}",
           "mkdir -p $(tempdir)/{SourceDir,wix/wixobj}",
           "#{@copy} -r wix/* $(tempdir)/wix/",
           "gunzip -c #{project.name}-#{project.version}.tar.gz | '#{@tar}' -C '$(tempdir)/SourceDir' --strip-components 1 -xf -",
@@ -204,7 +205,7 @@ class Vanagon
           # the -b flag simply points light to where the SourceDir location is
           # -loc is required for the UI localization it points to the actual localization .wxl
           "cd $(tempdir)/wix/wixobj; \"$$WIX/bin/light.exe\" #{light_flags} -b $$(cygpath -aw $(tempdir)) -loc $$(cygpath -aw $(tempdir)/wix/localization/puppet_en-us.wxl) -out $$(cygpath -aw $(workdir)/output/#{target_dir}/#{msi_package_name(project)}) *.wixobj",
-          ]
+        ]
       end
 
       # Method to derive the msi (Windows Installer) package name for the project.
@@ -213,10 +214,7 @@ class Vanagon
       # @return [String] name of the windows package for this project
       def msi_package_name(project)
         # Decided to use native project version in hope msi versioning doesn't have same resrictions as nuget
-        # SPECIAL NOTE: as a way for us to create two side by side msis for comparison between
-        # pftw and vanagon, we are putting in VANAGON to the filename so the names will
-        # be different. When pftw is deprecated, so should this convention
-        "#{project.name}-#{project.version}.#{project.release}-#{@architecture}_VANAGON.msi"
+        "#{project.name}-#{project.version}.#{project.release}-#{@architecture}.msi"
       end
 
       # Method to derive the package name for the project.
@@ -287,7 +285,7 @@ class Vanagon
           if File.extname(definition.path) == '.ps1'
             commands << %(powershell.exe -NoProfile -ExecutionPolicy Bypass -Command 'iex ((new-object net.webclient).DownloadString(\"#{definition}\"))')
           else
-            commands << %(C:/ProgramData/chocolatey/bin/choco.exe source add -n #{definition.host}-#{definition.path.gsub('/', '-')} -s "#{definition}" --debug || echo "Oops, it seems that you don't have chocolatey installed on this system. Please ensure it's there by adding something like 'plat.add_repository 'https://chocolatey.org/install.ps1'' to your platform definition.")
+            commands << %(C:/ProgramData/chocolatey/bin/choco.exe source add -n #{definition.host}-#{definition.path.tr('/', '-')} -s "#{definition}" --debug || echo "Oops, it seems that you don't have chocolatey installed on this system. Please ensure it's there by adding something like 'plat.add_repository 'https://chocolatey.org/install.ps1'' to your platform definition.")
           end
         else
           raise Vanagon::Error, "Invalid repo specification #{definition}"
@@ -296,16 +294,6 @@ class Vanagon
         commands
       end
 
-      # Get the expected output dir for the windows packages. This allows us to
-      # use some standard tools to ship internally.
-      #
-      # @param target_repo [String] optional repo target for built packages defined
-      #   at the project level
-      # @return [String] relative path to where windows packages should be staged
-      def output_dir(target_repo = "")
-        File.join("windows", target_repo, @architecture)
-      end
-
       # Generate the underlying directory structure of
       # any binary files referenced in services. note that
       # this function does not generate the structure of
@@ -335,12 +323,14 @@ class Vanagon
         # iterate over all paths specified and break each one
         # in to its specific directories. This will generate_wix_dirs
         # an n-ary tree structure matching the specs from the input
-        items.each do |item|
+        items.each_with_index do |item, item_idx|
           # Always start at the beginning
           curr = root
           names = item[:path].split(File::SEPARATOR)
-          names.each do |name|
-            curr = insert_child(curr, name)
+          names.each_with_index do |name, names_idx|
+            # We concat the indexes of each loop to name to ensure the ids of all
+            # elements will be unique.
+            curr = insert_child(curr, name, "#{name}_#{item_idx}_#{names_idx}")
           end
           # at this point, curr will be the top dir, override the id if
           # id exists
@@ -356,9 +346,9 @@ class Vanagon
       # @param [HASH] curr, current object we are on
       # @param [string] name, name of new object we are to search for and
       #                 create if necessary
-      def insert_child(curr, name)
+      def insert_child(curr, name, id)
         #The Id field will default to name, but be overridden later
-        new_obj = { :name => name, :id => name, :elements_to_add => [], :children => [] }
+        new_obj = { :name => name, :id => id, :elements_to_add => [], :children => [] }
         if (child_index = index_of_child(new_obj, curr[:children]))
           curr = curr[:children][child_index]
         else
@@ -374,7 +364,7 @@ class Vanagon
       # @param [string] path string of directory
       # @param [@project] project object
       def strip_and_format_path(path, project)
-        formatted_path = path.gsub(/\\/, "\/")
+        formatted_path = path.tr('\\', '\/')
         path_regex = /\/?SourceDir\/#{project.settings[:base_dir]}\/#{project.settings[:company_id]}\/#{project.settings[:product_id]}\//
         File.dirname(formatted_path.sub(path_regex, ''))
       end
@@ -394,14 +384,14 @@ class Vanagon
         string = ''
         unless root[:children].empty?
           root[:children].each do |child|
-            string += ("<Directory Name=\"#{child[:name]}\" Id=\"#{child[:id]}\">\n")
+            string += "<Directory Name=\"#{child[:name]}\" Id=\"#{child[:id]}\">\n"
             unless child[:elements_to_add].empty?
               child[:elements_to_add].each do |element|
                 string += element
               end
             end
             string += generate_wix_from_graph(child)
-            string += ("</Directory>\n")
+            string += "</Directory>\n"
           end
           return string
         end

data/lib/vanagon/project.rb

@@ -55,7 +55,7 @@ class Vanagon
 
     # Magic getter to retrieve settings in the project
     def method_missing(method, *args)
-      if @settings.has_key?(method)
+      if @settings.key?(method)
         return @settings[method]
       end
     end
@@ -236,7 +236,7 @@ class Vanagon
     # Gets the highest level directories declared by the project
     #
     # @return [Array] the highest level directories that have been declared by the project
-    def get_root_directories
+    def get_root_directories # rubocop:disable Metrics/AbcSize
       dirs = get_directories.map { |dir| dir.path.split('/') }
       dirs.sort! { |dir1, dir2| dir1.length <=> dir2.length }
       ret_dirs = []

data/lib/vanagon/project/dsl.rb

@@ -23,7 +23,7 @@ class Vanagon
       # @param name [String] name of the project
       # @param block [Proc] DSL definition of the project to call
       def project(name, &block)
-        block.call(self)
+        yield(self)
       end
 
       # Accessor for the project.
@@ -49,7 +49,7 @@ class Vanagon
         if attribute_match
           attribute = attribute_match.captures.first
           @project.send(attribute)
-        elsif @project.settings.has_key?(method)
+        elsif @project.settings.key?(method)
           return @project.settings[method]
         else
           super
@@ -129,7 +129,7 @@ class Vanagon
       #
       # @param ver [String] version of the project
       def version(ver)
-        @project.version = ver.gsub('-', '.')
+        @project.version = ver.tr('-', '.')
       end
 
       # Sets the release for the project. Mainly for use in packaging.

data/lib/vanagon/utilities.rb

@@ -9,7 +9,6 @@ require 'vanagon/extensions/string'
 
 class Vanagon
   module Utilities
-
     # Utility to get the md5 sum of a file
     #
     # @param file [String] file to md5sum
@@ -46,7 +45,7 @@ class Vanagon
     # @raise [RuntimeError, Vanagon::Error] an exception is raised if the
     # action is not supported, or if there is a problem with the http request,
     # or if the response is not JSON
-    def http_request(url, type, payload = {}.to_json, header = nil)
+    def http_request(url, type, payload = {}.to_json, header = nil) # rubocop:disable Metrics/AbcSize
       uri = URI.parse(url)
       http = Net::HTTP.new(uri.host, uri.port)
 
@@ -93,7 +92,7 @@ class Vanagon
     # @return [String] The standard output of the executed command
     # @raise [Vanagon::Error] If the command fails an exception is raised
     def ex(command)
-      ret = `#{command}`
+      ret = %x(#{command})
       unless $?.success?
         raise Vanagon::Error, "'#{command}' did not succeed"
       end
@@ -133,7 +132,7 @@ class Vanagon
       tries.to_i.times do
         Timeout::timeout(timeout.to_i) do
           begin
-            blk.call
+            yield
             return true
           rescue => e
             warn 'An error was encountered evaluating block. Retrying..'

data/resources/rpm/project.spec.erb

@@ -2,11 +2,12 @@
 
 # Turn off the brp-python-bytecompile script
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
+<% if @platform.is_cross_compiled_linux? -%>
 # Disable brp-strip-static-archive, which on EL platforms causes
 # cross-compiled static libs to end up with "no machine" as their
 # architure, breaking builds:
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-strip-static-archive[[:space:]].*$!!g')
-#
+<% end -%>
 
 Name:           <%= @name %>
 Version:        <%= @version %>

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

@@ -8,8 +8,6 @@ describe "Vanagon::Platform::DEB" do
         :os_name                => "ubuntu",
         :os_version             => "10.04",
         :architecture           => "i386",
-        :output_dir             => "deb/lucid/",
-        :output_dir_with_target => "deb/lucid/thing",
         :codename               => "lucid",
       },
       {
@@ -17,44 +15,10 @@ describe "Vanagon::Platform::DEB" do
         :os_name                => "debian",
         :os_version             => "7",
         :architecture           => "amd64",
-        :output_dir             => "deb/wheezy/",
-        :output_dir_with_target => "deb/wheezy/thing",
         :codename               => "wheezy",
       },
     ]
   end
-
-  describe "#output_dir" do
-    it "returns an output dir consistent with the packaging repo" do
-      platforms.each do |plat|
-
-        plat_block = %Q[
-        platform "#{plat[:name]}" do |plat|
-          plat.codename "#{plat[:codename]}"
-        end
-        ]
-
-        cur_plat = Vanagon::Platform::DSL.new(plat[:name])
-        cur_plat.instance_eval(plat_block)
-        expect(cur_plat._platform.output_dir).to eq(plat[:output_dir])
-      end
-    end
-
-    it "adds the target repo in the right place" do
-      platforms.each do |plat|
-
-        plat_block = %Q[
-        platform "#{plat[:name]}" do |plat|
-          plat.codename "#{plat[:codename]}"
-        end
-        ]
-
-        cur_plat = Vanagon::Platform::DSL.new(plat[:name])
-        cur_plat.instance_eval(plat_block)
-        expect(cur_plat._platform.output_dir('thing')).to eq(plat[:output_dir_with_target])
-      end
-    end
-  end
 end
 
 

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

@@ -7,8 +7,6 @@ describe "Vanagon::Platform::RPM" do
         :os_name                => "el",
         :os_version             => "5",
         :architecture           => "i386",
-        :output_dir             => "el/5/products/i386",
-        :output_dir_with_target => "el/5/thing/i386",
         :block                  => %Q[ platform "el-5-i386" do |plat| end ]
       },
       {
@@ -16,8 +14,6 @@ describe "Vanagon::Platform::RPM" do
         :os_name                => "fedora",
         :os_version             => "21",
         :architecture           => "x86_64",
-        :output_dir             => "fedora/21/products/x86_64",
-        :output_dir_with_target => "fedora/21/thing/x86_64",
         :block                  => %Q[ platform "fedora-21-x86_64" do |plat| end ]
       },
       {
@@ -25,8 +21,6 @@ describe "Vanagon::Platform::RPM" do
         :os_name                => "fedora",
         :os_version             => "21",
         :architecture           => "x86_64",
-        :output_dir             => "cisco-wrlinux/7/products/x86_64",
-        :output_dir_with_target => "cisco-wrlinux/7/thing/x86_64",
         :block                  => %Q[ platform "cisco-wrlinux-7-x86_64" do |plat| end ]
       },
     ]
@@ -40,16 +34,6 @@ describe "Vanagon::Platform::RPM" do
         cur_plat.instance_eval(plat[:block])
       end
 
-      describe "#output_dir" do
-        it "returns an output dir consistent with the packaging repo" do
-          expect(cur_plat._platform.output_dir).to eq(plat[:output_dir])
-        end
-
-        it "adds the target repo in the right way" do
-          expect(cur_plat._platform.output_dir('thing')).to eq(plat[:output_dir_with_target])
-        end
-      end
-
       describe '#rpm_defines' do
         it "removes dashes from the dist macro" do
           expected_dist = "--define 'dist .#{cur_plat._platform.os_name.gsub('-', '_')}#{cur_plat._platform.os_version}'"

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

@@ -25,8 +25,6 @@ describe "Vanagon::Platform::Windows" do
       :os_name                => "windows",
       :os_version             => "2012r2",
       :architecture           => "x64",
-      :output_dir             => "windows/x64",
-      :output_dir_with_target => "windows/thing/x64",
       :target_user            => "Administrator",
       :projname               => "test-proj",
       :block                  => %Q[ platform "windows-2012r2-x64" do |plat| plat.servicetype 'windows' end ]
@@ -52,16 +50,6 @@ HERE
         cur_plat.instance_eval(plat[:block])
       end
 
-      describe "#output_dir" do
-        it "returns an output dir consistent with the packaging repo" do
-          expect(cur_plat._platform.output_dir).to eq(plat[:output_dir])
-        end
-
-        it "adds the target repo in the right way" do
-          expect(cur_plat._platform.output_dir('thing')).to eq(plat[:output_dir_with_target])
-        end
-      end
-
       describe '#target_user' do
         it "sets the target_user to 'Administrator'" do
           expect(cur_plat._platform.target_user).to eq(plat[:target_user])
@@ -194,7 +182,7 @@ HERE
             comp.install_service('SourceDir/ProgramFilesFolder/TestID/TestProduct/opt/bin.exe')
             expect(cur_plat._platform.generate_service_bin_dirs([comp._component.service].flatten.compact, proj._project)).to eq( \
 <<-HERE
-<Directory Name="opt" Id="opt">
+<Directory Name="opt" Id="opt_0_0">
 <Directory Id="SERVICETESTBINDIR" />
 </Directory>
 HERE
@@ -210,7 +198,7 @@ HERE
             expect(cur_plat._platform.generate_service_bin_dirs([comp._component.service].flatten.compact, proj._project)).to eq( \
 
 <<-HERE
-<Directory Name="opt" Id="opt">
+<Directory Name="opt" Id="opt_0_0">
 <Directory Id="SERVICETEST2BINDIR" />
 </Directory>
 HERE
@@ -226,8 +214,8 @@ HERE
             expect(cur_plat._platform.generate_service_bin_dirs([comp._component.service].flatten.compact, proj._project)).to eq( \
 
 <<-HERE
-<Directory Name="somedir" Id="somedir">
-<Directory Name="someotherdir" Id="someotherdir">
+<Directory Name="somedir" Id="somedir_0_0">
+<Directory Name="someotherdir" Id="someotherdir_0_1">
 <Directory Id="SERVICETESTBINDIR" />
 </Directory>
 </Directory>
@@ -247,7 +235,7 @@ HERE
             comp2.install_service('SourceDir\\ProgramFilesFolder\\TestID\\TestProduct\\somedir\\bin.exe')
             expect(cur_plat._platform.generate_service_bin_dirs([comp._component.service, comp2._component.service].flatten.compact, proj._project)).to eq( \
 <<-HERE
-<Directory Name="somedir" Id="somedir">
+<Directory Name="somedir" Id="somedir_0_0">
 <Directory Id="SERVICETESTBINDIR" />
 <Directory Id="SERVICETEST2BINDIR" />
 </Directory>
@@ -267,17 +255,17 @@ HERE
             comp3.install_service('SourceDir\\ProgramFilesFolder\\TestID\\TestProduct\\somedir\\oneUpAgain\\twoUpAgain\\bin.exe')
             expect(cur_plat._platform.generate_service_bin_dirs([comp._component.service, comp2._component.service, comp3._component.service].flatten.compact, proj._project)).to eq( \
 <<-HERE
-<Directory Name="somedir" Id="somedir">
-<Directory Name="oneUp" Id="oneUp">
-<Directory Name="twoUp" Id="twoUp">
+<Directory Name="somedir" Id="somedir_0_0">
+<Directory Name="oneUp" Id="oneUp_0_1">
+<Directory Name="twoUp" Id="twoUp_0_2">
 <Directory Id="SERVICETEST1BINDIR" />
 </Directory>
 </Directory>
-<Directory Name="oneUpAgain" Id="oneUpAgain">
-<Directory Name="twoUp" Id="twoUp">
+<Directory Name="oneUpAgain" Id="oneUpAgain_1_1">
+<Directory Name="twoUp" Id="twoUp_1_2">
 <Directory Id="SERVICETEST2BINDIR" />
 </Directory>
-<Directory Name="twoUpAgain" Id="twoUpAgain">
+<Directory Name="twoUpAgain" Id="twoUpAgain_2_2">
 <Directory Id="SERVICETEST3BINDIR" />
 </Directory>
 </Directory>

data/spec/lib/vanagon/platform_spec.rb

@@ -4,22 +4,31 @@ describe "Vanagon::Platform" do
   let(:platforms) do
     [
       {
-        :name         => "debian-6-i386",
-        :os_name      => "debian",
-        :os_version   => "6",
-        :architecture => "i386",
+        :name                   => "debian-6-i386",
+        :os_name                => "debian",
+        :os_version             => "6",
+        :architecture           => "i386",
+        :output_dir             => "debian/6/i386",
+        :output_dir_with_target => "debian/6/thing/i386",
+        :block                  => %Q[ platform "debian-6-i386" do |plat| end ],
       },
       {
-        :name         => "el-5-i386",
-        :os_name      => "el",
-        :os_version   => "5",
-        :architecture => "i386",
+        :name                   => "el-5-i386",
+        :os_name                => "el",
+        :os_version             => "5",
+        :architecture           => "i386",
+        :output_dir             => "el/5/i386",
+        :output_dir_with_target => "el/5/thing/i386",
+        :block                  => %Q[ platform "el-5-i386" do |plat| end ],
       },
       {
-        :name         => "CumulusLinux-2.2-amd64",
-        :os_name      => "CumulusLinux",
-        :os_version   => "2.2",
-        :architecture => "amd64",
+        :name                   => "debian-6-i386",
+        :os_name                => "debian",
+        :os_version             => "6",
+        :architecture           => "i386",
+        :output_dir             => "updated/output",
+        :output_dir_with_target => "updated/output",
+        :block                  => %Q[ platform "debian-6-i386" do |plat| plat.output_dir "updated/output" end ],
       },
     ]
   end
@@ -42,6 +51,24 @@ describe "Vanagon::Platform" do
     end
   end
 
+  describe "#output_dir" do
+    it "returns correct output dir" do
+      platforms.each do |plat|
+        cur_plat = Vanagon::Platform::DSL.new(plat[:name])
+        cur_plat.instance_eval(plat[:block])
+        expect(cur_plat._platform.output_dir).to eq(plat[:output_dir])
+      end
+    end
+
+    it "adds the target repo in the right way" do
+      platforms.each do |plat|
+        cur_plat = Vanagon::Platform::DSL.new(plat[:name])
+        cur_plat.instance_eval(plat[:block])
+        expect(cur_plat._platform.output_dir('thing')).to eq(plat[:output_dir_with_target])
+      end
+    end
+  end
+
   describe "#architecture" do
     it "returns the architecture for the platform" do
       platforms.each do |plat|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
@@ -251,4 +251,3 @@ test_files:
 - spec/lib/vanagon/project_spec.rb
 - spec/lib/vanagon/utilities/shell_utilities_spec.rb
 - spec/lib/vanagon/utilities_spec.rb
-has_rdoc: