vanagon 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c9f345fa7806fdbe0b1cf43676acd3549f10ff7
-  data.tar.gz: d8e6a4740b1a1e914d7b788b745caea008823204
+  metadata.gz: 79f3affb2f2797cad077ac7341d99cc2f613dd96
+  data.tar.gz: 4a90613f59d7e96c9015e61ff0200404f063fb3d
 SHA512:
-  metadata.gz: 69d1ff1c24e3c71daf49454fa9a3bcdaf5faeb4caf611c4859106828e0e4e91f18337bd41500a0a9a56693f48f7ccff49fedd585678210fc8ebe6d43768ca15a
-  data.tar.gz: 1dd4036ebfa52ec377234567a91c9e838e01e63a262b56d480646b89b0562296cd8e3ca9d64783565b0e1f13c940636c2e276da7b1561eb348aa4f7784c02fac
+  metadata.gz: 0f6b28cd90a8917063035914d5a094ce123aad6991aa721df89bab0c8bd9251e9aafbe924c5253b9c1ea8a6d046fa20149870b448496d126a0d354dd7ebee925
+  data.tar.gz: 6bc644ee0a223cebe705c0c43d7e69cc4de66b099dc05cfb436967298d21b194b320cb9d385e7beafb9132737eedd945268a93b7b8a75b45540940fdeae3a3c2

data/README.md

@@ -73,8 +73,13 @@ Build machines should be cleaned between builds.
 #### Flagged arguments (can be anywhere in the command)
 
 ##### -w DIR, --workdir DIR
-Specifies a directory where the sources should be placed and builds performed.
-Defaults to a temporary directory created with Ruby's Dir.mktmpdir.
+Specifies a directory on the local host where the sources should be placed and builds performed.
+Defaults to a temporary directory created with Ruby's `Dir.mktmpdir` method.
+
+##### --remote_dir
+Explicitly specify a directory on the remote target to place sources and perform
+builds. Components can then be rebuilt manually on the build host for faster iteration. Sources may not be correctly updated if this directory already exists.
+Defaults to a temporary directory created by running `mktemp -d` on the remote target.
 
 ##### -c DIR, --configdir DIR
 Specifies where project configuration is found. Defaults to $pwd/configs.

data/bin/build

@@ -2,7 +2,7 @@
 load File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "vanagon.rb"))
 
 optparse = Vanagon::OptParse.new("#{File.basename(__FILE__)} <project-name> <platform-name> [<target>] [options]",
-                                 [:workdir, :configdir, :engine, :preserve, :verbose, :skipcheck, :only_build])
+                                 [:workdir, :configdir, :engine, :preserve, :verbose, :skipcheck, :only_build, :remote_workdir])
 options = optparse.parse! ARGV
 
 project = ARGV[0]

data/lib/vanagon/component/dsl.rb

@@ -230,14 +230,14 @@ class Vanagon
       # upgrade if it has been modified
       #
       # @param file [String] name of the configfile
-      def configfile(file)
+      def configfile(file, mode: nil, owner: nil, group: nil)
         # I AM SO SORRY
         @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")
+          @component.add_file Vanagon::Common::Pathname.configfile("#{file}.pristine", mode: mode, owner: owner, group: group)
         else
-          @component.add_file Vanagon::Common::Pathname.configfile(file)
+          @component.add_file Vanagon::Common::Pathname.configfile(file, mode: mode, owner: owner, group: group)
         end
       end
 
@@ -245,9 +245,9 @@ class Vanagon
       #
       # @param source [String] path to the configfile to copy
       # @param target [String] path to the desired target of the configfile
-      def install_configfile(source, target)
-        install_file(source, target)
-        configfile(target)
+      def install_configfile(source, target, mode: '0644', owner: nil, group: nil)
+        install_file(source, target, mode: mode, owner: owner, group: group)
+        configfile(target, mode: mode, owner: owner, group: group)
       end
 
       # link will add a command to the install to create a symlink from source to target

data/lib/vanagon/driver.rb

@@ -10,10 +10,10 @@ require 'logger'
 class Vanagon
   class Driver
     include Vanagon::Utilities
-    attr_accessor :platform, :project, :target, :workdir, :verbose, :preserve
+    attr_accessor :platform, :project, :target, :workdir, :remote_workdir, :verbose, :preserve
     attr_accessor :timeout, :retry_count
 
-    def initialize(platform, project, options = { workdir: nil, configdir: nil, target: nil, engine: nil, components: nil, skipcheck: false, verbose: false, preserve: false, only_build: nil }) # rubocop:disable Metrics/AbcSize
+    def initialize(platform, project, options = { workdir: nil, configdir: nil, target: nil, engine: nil, components: nil, skipcheck: false, verbose: false, preserve: false, only_build: nil, remote_workdir: nil }) # rubocop:disable Metrics/AbcSize
       @verbose = options[:verbose]
       @preserve = options[:preserve]
       @workdir = options[:workdir] || Dir.mktmpdir
@@ -31,6 +31,8 @@ class Vanagon
       filter_out_components(only_build) if only_build
       loginit('vanagon_hosts.log')
 
+      @remote_workdir = options[:remote_workdir]
+
       load_engine(engine, @platform, target)
     rescue LoadError => e
       raise Vanagon::Error.wrap(e, "Could not load the desired engine '#{engine}'")
@@ -63,7 +65,7 @@ class Vanagon
 
     def load_engine_object(engine_type, platform, target)
       require "vanagon/engine/#{engine_type}"
-      @engine = Object::const_get("Vanagon::Engine::#{camelize(engine_type)}").new(platform, target)
+      @engine = Object::const_get("Vanagon::Engine::#{camelize(engine_type)}").new(platform, target, remote_workdir: remote_workdir)
     rescue
       fail "No such engine '#{camelize(engine_type)}'"
     end

data/lib/vanagon/engine/always_be_scheduling.rb

@@ -66,7 +66,7 @@ class Vanagon
     # $ build_host_info puppet-agent aix-5.3-ppc --engine always_be_scheduling
     # {"name":"aix-53-ppc","engine":"always_be_scheduling"}
     class AlwaysBeScheduling < Base
-      def initialize(platform, target)
+      def initialize(platform, target, **opts)
         super
 
         Vanagon::Driver.logger.debug "AlwaysBeScheduling engine invoked."

data/lib/vanagon/engine/base.rb

@@ -6,11 +6,12 @@ class Vanagon
     class Base
       attr_accessor :target, :remote_workdir
 
-      def initialize(platform, target = nil)
+      def initialize(platform, target = nil, **opts)
         @platform = platform
         @required_attributes = ["ssh_port"]
         @target = target if target
         @target_user = @platform.target_user
+        @remote_workdir_path = opts[:remote_workdir]
       end
 
       # Get the engine name
@@ -57,7 +58,15 @@ class Vanagon
       end
 
       def get_remote_workdir
-        @remote_workdir ||= dispatch("mktemp -d -p /var/tmp 2>/dev/null || mktemp -d -t 'tmp'", true)
+        unless @remote_workdir
+          if @remote_workdir_path
+            dispatch("mkdir -p #{@remote_workdir_path}", true)
+            @remote_workdir = @remote_workdir_path
+          else
+            @remote_workdir = dispatch("mktemp -d -p /var/tmp 2>/dev/null || mktemp -d -t 'tmp'", true)
+          end
+        end
+        @remote_workdir
       end
 
       def ship_workdir(workdir)

data/lib/vanagon/engine/docker.rb

@@ -5,7 +5,7 @@ class Vanagon
     class Docker < Base
       # Both the docker_image and the docker command itself are required for
       # the docker engine to work
-      def initialize(platform, target = nil)
+      def initialize(platform, target = nil, **opts)
         super
 
         @docker_cmd = Vanagon::Utilities.find_program_on_path('docker')

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) # rubocop:disable Metrics/AbcSize
+      def initialize(platform, target = nil, **opts) # rubocop:disable Metrics/AbcSize
         super
 
         @ami = @platform.aws_ami

data/lib/vanagon/engine/hardware.rb

@@ -49,7 +49,7 @@ class Vanagon
         @lockman.unlock(@target, VANAGON_LOCK_USER)
       end
 
-      def initialize(platform, target)
+      def initialize(platform, target, **opts)
         super
 
         Vanagon::Driver.logger.debug "Hardware engine invoked."

data/lib/vanagon/engine/local.rb

@@ -5,7 +5,7 @@ require 'vanagon/errors'
 class Vanagon
   class Engine
     class Local < Base
-      def initialize(platform, target = nil)
+      def initialize(platform, target = nil, **opts)
         # local engine can't be used with a target
         super(platform, 'local machine')
 

data/lib/vanagon/engine/pooler.rb

@@ -7,7 +7,7 @@ class Vanagon
       attr_reader :token
 
       # The vmpooler_template is required to use the pooler engine
-      def initialize(platform, target = nil)
+      def initialize(platform, target = nil, **opts)
         super
 
         @pooler = "http://vmpooler.delivery.puppetlabs.net"

data/lib/vanagon/optparse.rb

@@ -4,6 +4,7 @@ class Vanagon
   class OptParse
     FLAGS = {
         :workdir => ['-w DIR', '--workdir DIR', "Working directory where build source should be put (defaults to a tmpdir)"],
+        :remote_workdir => ['--remote_workdir DIR', "Working directory where build source should be put on the remote host (defaults to a tmpdir)"],
         :configdir => ['-c', '--configdir DIR', 'Configs dir (defaults to $pwd/configs)'],
         :target => ['-t HOST', '--target HOST', 'Configure a target machine for build and packaging (defaults to grabbing one from the pooler)'],
         :engine => ['-e ENGINE', '--engine ENGINE', "A custom engine to use (defaults to the pooler) [base, local, docker, pooler currently supported]"],

data/lib/vanagon/platform.rb

@@ -10,6 +10,7 @@ class Vanagon
     attr_accessor :os_name
     attr_accessor :os_version
     attr_accessor :codename # this is Debian/Ubuntu specific
+    attr_writer   :dist # most likely to be used by rpm
 
     # The name of the sort of package type that a given platform expects,
     # e.g. msi, rpm,
@@ -216,6 +217,15 @@ class Vanagon
       @output_dir ||= File.join(@os_name, @os_version, target_repo, @architecture)
     end
 
+    # Get the value of @dist, or derive it from the value of @os_name and @os_version.
+    # This is relatively RPM specific but '#codename' is defined in Platform, and that's
+    # just as Deb/Ubuntu specific. All of the accessors in the top-level Platform
+    # namespace should be refactored, but #dist will live here for now.
+    # @return [String] the %dist name that RPM will use to build new RPMs
+    def dist
+      @dist ||= @os_name.tr('-', '_') + @os_version
+    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/dsl.rb

@@ -132,6 +132,13 @@ class Vanagon
         @platform.cross_compiled = cxx_flag
       end
 
+      # define an explicit Dist for the platform (most likely used for RPM platforms)
+      #
+      # @param dist_string [String] the value to use for .dist when building RPMs
+      def dist(dist_string)
+        @platform.dist = dist_string
+      end
+
       # Set the path to rpmbuild for the platform
       #
       # @param rpmbuild_cmd [String] Full path to rpmbuild with arguments to be used by default

data/lib/vanagon/platform/rpm.rb

@@ -44,7 +44,7 @@ class Vanagon
         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.tr('-', '_')}#{@os_version}' )
+        defines << %(--define 'dist .#{dist}')
       end
 
       def add_repository(definition) # rubocop:disable Metrics/AbcSize

data/resources/Makefile.erb

@@ -13,14 +13,14 @@ file-list-before-build:
 <%- if dirnames.empty? -%>
 	touch file-list-before-build
 <%- else -%>
-	(<%= @platform.find %> -L "<%= dirnames.join('" "') %>" 2>/dev/null || <%= @platform.find %> "<%= dirnames.join('" "') %>" -follow 2>/dev/null) | <%= "xargs -I[] cygpath --mixed --long-name --absolute [] |" if @platform.is_windows? %> <%= @platform.sort %> | uniq > file-list-before-build
+	(<%= @platform.find %> -H "<%= dirnames.join('" "') %>" 2>/dev/null || <%= @platform.find %> "<%= dirnames.join('" "') %>" 2>/dev/null) | <%= "xargs -I[] cygpath --mixed --long-name --absolute [] |" if @platform.is_windows? %> <%= @platform.sort %> | uniq > file-list-before-build
 <%- end -%>
 
 file-list-after-build: <%= @components.map {|comp| comp.name }.join(" ") %>
 <%- if dirnames.empty? -%>
 	touch file-list-after-build
 <%- else -%>
-	(<%= @platform.find %> -L "<%= dirnames.join('" "') %>" 2>/dev/null || <%= @platform.find %> "<%= dirnames.join('" "') %>" -follow 2>/dev/null) | <%= "xargs -I[] cygpath --mixed --long-name --absolute [] |" if @platform.is_windows? %> <%= @platform.sort %> | uniq > file-list-after-build
+	(<%= @platform.find %> -H "<%= dirnames.join('" "') %>" 2>/dev/null || <%= @platform.find %> "<%= dirnames.join('" "') %>" 2>/dev/null) | <%= "xargs -I[] cygpath --mixed --long-name --absolute [] |" if @platform.is_windows? %> <%= @platform.sort %> | uniq > file-list-after-build
 <%- end -%>
 
 <%= @name %>-<%= @version %>.tar.gz: file-list <%= @cleanup ? 'cleanup-components' : '' %>

data/resources/rpm/project.spec.erb

@@ -142,7 +142,7 @@ install -d %{buildroot}
 
 # Here we turn all dirs in the file-list into %dir entries to avoid duplicate files
 for entry in `cat %{SOURCE1}`; do
-  if [ -n "$entry" -a -d "$entry" ]; then
+  if [ -n "$entry" -a -d "$entry" -a ! -L "$entry" ]; then
     PATH=/opt/freeware/bin:$PATH sed -i "s|^\($entry\)\$|%dir \1|g" %{SOURCE1}
   fi
 done

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

@@ -587,7 +587,14 @@ end" }
         it 'adds the file to the configfiles list' do
           comp = Vanagon::Component::DSL.new('install-config-file-test', {}, platform)
           comp.install_configfile('thing1', 'place/to/put/thing1')
-          expect(comp._component.configfiles).to include(Vanagon::Common::Pathname.configfile('place/to/put/thing1'))
+          expect(comp._component.configfiles).to include(Vanagon::Common::Pathname.configfile('place/to/put/thing1', mode: '0644'))
+          expect(comp._component.files).not_to include(Vanagon::Common::Pathname.file('place/to/put/thing1'))
+        end
+
+        it 'sets owner, group, and mode for the configfiles' do
+          comp = Vanagon::Component::DSL.new('install-config-file-test', {}, platform)
+          comp.install_configfile('thing1', 'place/to/put/thing1', owner: 'bob', group: 'timmy', mode: '0022')
+          expect(comp._component.configfiles).to include(Vanagon::Common::Pathname.configfile('place/to/put/thing1', mode: '0022', group: 'timmy', owner: 'bob'))
           expect(comp._component.files).not_to include(Vanagon::Common::Pathname.file('place/to/put/thing1'))
         end
       end
@@ -617,7 +624,7 @@ end" }
         it 'adds the file to the configfiles list' do
           comp = Vanagon::Component::DSL.new('install-config-file-test', {}, platform)
           comp.install_configfile('thing1', 'place/to/put/thing1')
-          expect(comp._component.configfiles).to include(Vanagon::Common::Pathname.configfile('place/to/put/thing1.pristine'))
+          expect(comp._component.configfiles).to include(Vanagon::Common::Pathname.configfile('place/to/put/thing1.pristine', mode: '0644'))
           expect(comp._component.configfiles).not_to include(Vanagon::Common::Pathname.file('place/to/put/thing1'))
         end
       end

data/spec/lib/vanagon/driver_spec.rb

@@ -13,6 +13,9 @@ describe 'Vanagon::Driver' do
     END
   end
 
+  let(:explicit_workdir){ Dir.mktmpdir }
+  let(:explicit_remote_workdir){ Dir.mktmpdir }
+
   def eval_platform(name, definition)
     plat = Vanagon::Platform::DSL.new(name)
     plat.instance_eval(definition)
@@ -27,6 +30,22 @@ describe 'Vanagon::Driver' do
   end
 
   describe 'when resolving build host info' do
+    it 'uses an expicitly specified workdir if provided' do
+      derived = create_driver(redhat)
+      explicit = create_driver(redhat, workdir: explicit_workdir)
+
+      expect(explicit.workdir).to eq(explicit_workdir)
+      expect(explicit.workdir).not_to eq(derived.workdir)
+    end
+
+    it 'uses an expicitly specified remote workdir if provided' do
+      derived = create_driver(redhat)
+      explicit = create_driver(redhat, remote_workdir: explicit_remote_workdir)
+
+      expect(explicit.remote_workdir).to eq(explicit_remote_workdir)
+      expect(explicit.remote_workdir).not_to eq(derived.remote_workdir)
+    end
+
     it 'returns the vmpooler_template using the pooler engine' do
       info = create_driver(redhat).build_host_info
 

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

@@ -1,43 +1,35 @@
 require 'vanagon/platform'
 
-describe "Vanagon::Platform::RPM" do
-  platforms =[
-      {
-        :name                   => "el-5-i386",
-        :os_name                => "el",
-        :os_version             => "5",
-        :architecture           => "i386",
-        :block                  => %Q[ platform "el-5-i386" do |plat| end ]
-      },
-      {
-        :name                   => "fedora-21-x86_64",
-        :os_name                => "fedora",
-        :os_version             => "21",
-        :architecture           => "x86_64",
-        :block                  => %Q[ platform "fedora-21-x86_64" do |plat| end ]
-      },
-      {
-        :name                   => "cisco-wrlinux-7-x86_64",
-        :os_name                => "fedora",
-        :os_version             => "21",
-        :architecture           => "x86_64",
-        :block                  => %Q[ platform "cisco-wrlinux-7-x86_64" do |plat| end ]
-      },
-    ]
+describe 'Vanagon::Platform::RPM' do
+  platforms = [
+    { name: 'el-5-i386' },
+    { name: 'fedora-21-x86_64', dist: 'f21' },
+    { name: 'cisco-wrlinux-7-x86_64' }
+  ]
 
-  platforms.each do |plat|
-    context "on #{plat[:name]} we should behave ourselves" do
-      let(:platform) { plat }
-      let(:cur_plat) { Vanagon::Platform::DSL.new(plat[:name]) }
+  platforms.each do |platform|
+    context "defines RPM-based platform attributes for #{platform[:name]}" do
+      subject {
+        plat = Vanagon::Platform::DSL.new(platform[:name])
+        plat.instance_eval(%(platform("#{platform[:name]}") { |plat| }))
+        plat._platform.dist = platform[:dist]
+        plat._platform
+      }
 
-      before do
-        cur_plat.instance_eval(plat[:block])
-      end
+      let(:derived_dist) { subject.os_name.tr('-', '_') + subject.os_version }
+      let(:dist) { platform[:dist] || derived_dist }
+      let(:defined_dist) { "--define 'dist .#{dist}'" }
 
       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}'"
-          expect(cur_plat._platform.rpm_defines).to include(expected_dist)
+        it "includes the expected 'dist' defines" do
+          expect(subject.rpm_defines).to include(defined_dist)
+        end
+      end
+
+      describe "#dist" do
+        it "uses explicit values when available" do
+          expect(subject.dist).to eq(derived_dist) unless platform[:dist]
+          expect(subject.dist).to eq(dist)
         end
       end
     end

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

@@ -1,8 +1,8 @@
+require 'tmpdir'
 require 'vanagon/platform'
 require 'vanagon/project'
 require 'vanagon/common'
 
-
 # These constants are defined for the purpose of the project/generic file merge tests
 # to point these directories to test areas under the /tmp directory.
 # This allows individual test cases to be specified accurately.
@@ -10,7 +10,7 @@ require 'vanagon/common'
 # data structures are not available under the test conditions causing failures in the
 # ERB template translation
 
-WORK_BASE = "/tmp/vanwintest"
+WORK_BASE = Dir.mktmpdir
 VANAGON_ROOT = "#{WORK_BASE}/generic"
 PROJ_ROOT = "#{WORK_BASE}/project"
 WORKDIR = "#{WORK_BASE}/workdir"
@@ -36,14 +36,14 @@ describe "Vanagon::Platform::Windows" do
       let(:platform) { plat }
       let(:cur_plat) { Vanagon::Platform::DSL.new(plat[:name]) }
       let (:project_block) {
-<<-HERE
-        project 'test-fixture' do |proj|
-          proj.setting(:company_name, "Test Name")
-          proj.setting(:company_id, "TestID")
-          proj.setting(:product_id, "TestProduct")
-          proj.setting(:base_dir, "ProgramFilesFolder")
-        end
-HERE
+        <<-HERE.undent
+          project 'test-fixture' do |proj|
+            proj.setting(:company_name, "Test Name")
+            proj.setting(:company_id, "TestID")
+            proj.setting(:product_id, "TestProduct")
+            proj.setting(:base_dir, "ProgramFilesFolder")
+          end
+        HERE
         }
 
       before do
@@ -180,13 +180,14 @@ HERE
             cur_plat.instance_eval(plat[:block])
             comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
             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_0_0">
-<Directory Id="SERVICETESTBINDIR" />
-</Directory>
-HERE
-            )
+            expect(cur_plat._platform.generate_service_bin_dirs([comp._component.service].flatten.compact, proj._project))
+              .to eq(
+                <<-HERE.undent
+                  <Directory Name="opt" Id="opt_0_0">
+                  <Directory Id="SERVICETESTBINDIR" />
+                  </Directory>
+                HERE
+              )
           end
 
           it "returns one directory with non-default name" do
@@ -195,14 +196,14 @@ HERE
             cur_plat.instance_eval(plat[:block])
             comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
             comp.install_service('SourceDir/ProgramFilesFolder/TestID/TestProduct/opt/bin.exe', nil, "service-test-2")
-            expect(cur_plat._platform.generate_service_bin_dirs([comp._component.service].flatten.compact, proj._project)).to eq( \
-
-<<-HERE
-<Directory Name="opt" Id="opt_0_0">
-<Directory Id="SERVICETEST2BINDIR" />
-</Directory>
-HERE
-            )
+            expect(cur_plat._platform.generate_service_bin_dirs([comp._component.service].flatten.compact, proj._project))
+              .to eq(
+                <<-HERE.undent
+                  <Directory Name="opt" Id="opt_0_0">
+                  <Directory Id="SERVICETEST2BINDIR" />
+                  </Directory>
+                HERE
+              )
           end
 
           it "returns nested directory correctly with \\" do
@@ -211,16 +212,16 @@ HERE
             cur_plat.instance_eval(plat[:block])
             comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
             comp.install_service('SourceDir\\ProgramFilesFolder\\TestID\\TestProduct\\somedir\\someotherdir\\bin.exe')
-            expect(cur_plat._platform.generate_service_bin_dirs([comp._component.service].flatten.compact, proj._project)).to eq( \
-
-<<-HERE
-<Directory Name="somedir" Id="somedir_0_0">
-<Directory Name="someotherdir" Id="someotherdir_0_1">
-<Directory Id="SERVICETESTBINDIR" />
-</Directory>
-</Directory>
-HERE
-            )
+            expect(cur_plat._platform.generate_service_bin_dirs([comp._component.service].flatten.compact, proj._project))
+              .to eq(
+                <<-HERE.undent
+                  <Directory Name="somedir" Id="somedir_0_0">
+                  <Directory Name="someotherdir" Id="someotherdir_0_1">
+                  <Directory Id="SERVICETESTBINDIR" />
+                  </Directory>
+                  </Directory>
+                HERE
+              )
           end
 
 
@@ -233,14 +234,15 @@ HERE
             comp.install_service('SourceDir\\ProgramFilesFolder\\TestID\\TestProduct\\somedir\\bin.exe')
             comp2 = Vanagon::Component::DSL.new('service-test-2', {}, cur_plat._platform)
             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_0_0">
-<Directory Id="SERVICETESTBINDIR" />
-<Directory Id="SERVICETEST2BINDIR" />
-</Directory>
-HERE
-            )
+            expect(cur_plat._platform.generate_service_bin_dirs([comp._component.service, comp2._component.service].flatten.compact, proj._project))
+              .to eq(
+                <<-HERE.undent
+                  <Directory Name="somedir" Id="somedir_0_0">
+                  <Directory Id="SERVICETESTBINDIR" />
+                  <Directory Id="SERVICETEST2BINDIR" />
+                  </Directory>
+                HERE
+              )
           end
 
           it "returns correctly formatted multiple nested directories" do
@@ -253,25 +255,26 @@ HERE
             comp2.install_service('SourceDir\\ProgramFilesFolder\\TestID\\TestProduct\\somedir\\oneUpAgain\\twoUp\\bin.exe')
             comp3 = Vanagon::Component::DSL.new('service-test-3', {}, cur_plat._platform)
             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_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_1_1">
-<Directory Name="twoUp" Id="twoUp_1_2">
-<Directory Id="SERVICETEST2BINDIR" />
-</Directory>
-<Directory Name="twoUpAgain" Id="twoUpAgain_2_2">
-<Directory Id="SERVICETEST3BINDIR" />
-</Directory>
-</Directory>
-</Directory>
-HERE
-            )
+            expect(cur_plat._platform.generate_service_bin_dirs([comp._component.service, comp2._component.service, comp3._component.service].flatten.compact, proj._project))
+              .to eq(
+                <<-HERE.undent
+                  <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_1_1">
+                  <Directory Name="twoUp" Id="twoUp_1_2">
+                  <Directory Id="SERVICETEST2BINDIR" />
+                  </Directory>
+                  <Directory Name="twoUpAgain" Id="twoUpAgain_2_2">
+                  <Directory Id="SERVICETEST3BINDIR" />
+                  </Directory>
+                  </Directory>
+                  </Directory>
+                HERE
+              )
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git