vanagon 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd0b8d155b61fe71dc4b21216f3cd8674734c790
-  data.tar.gz: b3b1554b32d14049b08eb56c89206f9b71e120ff
+  metadata.gz: d9ab396670efad7619b917bf141a6663f46b263c
+  data.tar.gz: 434efe6733bca07c8784502bb4d4191cd0af42cb
 SHA512:
-  metadata.gz: f9646e8ab2503dfe9433e91f25af53c2a7debcadb276d9d4338a4f8ff11749a3125f7ec04a007c855bf7e6a5b9878e5bba9227fb42e2aa73d14e9d8e9bcf5462
-  data.tar.gz: 945246b7da4cc69b58a919c6f91df69db236e9be28039c7b1c0e78acf90e2b285c268b3730204a03050026901a4f890245fec9e89918098026fa6067eaf8ff47
+  metadata.gz: 1a0b2555e93cc7f808b53f58ce5d2a98709e99ebb1775ccaeaf9c8625d7255793e3f4179673ff567816982c8a952b5477bcde76e4056b654854e59014906f53e
+  data.tar.gz: 5b4be2a7a70c6452ad19cca584488b7e9eb77f03504d310b68fd934b53b3a8eb67167af5dc625f3cd4242c4a7e219f7b732f70917398f3848d122bee7d3fa883

data/lib/vanagon/platform/deb.rb

@@ -7,6 +7,7 @@ class Vanagon
       # @return [Array] list of commands required to build a debian package for the given project from a tarball
       def generate_package(project)
         target_dir = project.repo ? output_dir(project.repo) : output_dir
+        pkg_arch_opt = project.noarch ? "" : "-a #{@architecture}"
         ["mkdir -p output/#{target_dir}",
         "mkdir -p $(tempdir)/#{project.name}-#{project.version}",
         "cp #{project.name}-#{project.version}.tar.gz $(tempdir)/#{project.name}_#{project.version}.orig.tar.gz",
@@ -14,7 +15,7 @@ class Vanagon
         "cp -pr debian $(tempdir)/#{project.name}-#{project.version}",
         "gunzip -c #{project.name}-#{project.version}.tar.gz | '#{@tar}' -C '$(tempdir)/#{project.name}-#{project.version}' --strip-components 1 -xf -",
         "sed -i 's/\ /?/g' $(tempdir)/#{project.name}-#{project.version}/debian/install",
-        "(cd $(tempdir)/#{project.name}-#{project.version}; debuild --no-lintian -uc -us)",
+        "(cd $(tempdir)/#{project.name}-#{project.version}; debuild --no-lintian #{pkg_arch_opt} -uc -us)",
         "cp $(tempdir)/*.deb ./output/#{target_dir}"]
       end
 

data/lib/vanagon/platform/windows.rb

@@ -163,9 +163,25 @@ class Vanagon
       # @return [Array] list of commands required to build an msi package for the given project from a tarball
       def generate_msi_package(project)
         target_dir = project.repo ? output_dir(project.repo) : output_dir
-        cg_name = "ProductComponentGroup"
-        wix_extensions =  "-ext WiXUtilExtension -ext WixUIExtension"
-        candle_flags =  "-dPlatform=#{@architecture} -arch #{@architecture} #{wix_extensions}"
+        wix_extensions = "-ext WiXUtilExtension -ext WixUIExtension"
+        # Heat command documentation at: http://wixtoolset.org/documentation/manual/v3/overview/heat.html
+        #   dir <directory> - Traverse directory to find all sub-files and directories.
+        #   -ke             - Keep Empty directories
+        #   -cg             - Component Group Name
+        #   -gg             - Generate GUIDS now
+        #   -srd            - Suppress root element generation, we want to reference one of the default root elements
+        #                     INSTALLDIR or APPDATADIR in the directorylist.wxs file, not a newly generated one.
+        #   -sreg           - Suppress registry harvesting.
+        #   -dr             - Root DirectoryRef to point all components to
+        #   -var            - Replace "SourceDir" in the @source attributes of all components with a preprocessor variable
+        app_heat_flags = " -dr INSTALLDIR -v -ke -indent 2 -cg AppComponentGroup -gg -srd -t wix/filter.xslt -sreg -var var.AppSourcePath "
+        app_source_path = "SourceDir/#{project.settings[:base_dir]}/#{project.settings[:company_id]}/#{project.settings[:product_id]}"
+        appdata_heat_flags = "  -dr APPDATADIR -v -ke -indent 2 -cg AppDataComponentGroup -gg -srd -t wix/filter.xslt -sreg -var var.AppDataSourcePath "
+        appdata_source_path = "SourceDir/CommonAppDataFolder/#{project.settings[:company_id]}"
+        # Candle.exe preprocessor vars are required due to the above double run of heat.exe, both runs of heat use
+        # preprocessor variables
+        candle_preprocessor = "-dAppSourcePath=\"#{app_source_path}\" -dAppDataSourcePath=\"#{appdata_source_path}\""
+        candle_flags = "-dPlatform=#{@architecture} -arch #{@architecture} #{wix_extensions}"
         # Enable verbose mode for the moment (will be removed for production)
         # localisation flags to be added
         light_flags = "-v -cultures:en-us #{wix_extensions}"
@@ -174,22 +190,17 @@ class Vanagon
           "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 -",
-          # Run the Heat command in a single pass
-          # Heat command documentation at: http://wixtoolset.org/documentation/manual/v3/overview/heat.html
-          #   dir <directory> - Traverse directory to find all sub-files and directories.
-          #   -ke             - Keep Empty directories
-          #   -cg             - Component Group Name
-          #   -gg             - Generate GUIDS now
-          #   -srd            - Suppress root element generation, we want to reference the default root element
-          #                     TARGETDIR in the project.wxs file, not a newly generated one.
-          #   -sreg           - Suppress registry harvesting.
-          "cd $(tempdir); \"$$WIX/bin/heat.exe\" dir SourceDir -v -ke -indent 2 -cg #{cg_name} -gg -srd -t wix/filter.xslt -sreg -out wix/#{project.name}-harvest.wxs",
+          "cd $(tempdir); \"$$WIX/bin/heat.exe\" dir #{app_source_path} #{app_heat_flags} -out wix/#{project.name}-harvest-app.wxs",
+          "cd $(tempdir); \"$$WIX/bin/heat.exe\" dir #{appdata_source_path} #{appdata_heat_flags}  -out wix/#{project.name}-harvest-programdata.wxs",
           # Apply Candle command to all *.wxs files - generates .wixobj files in wix directory.
           # cygpath conversion is necessary as candle is unable to handle posix path specs
-          "cd $(tempdir)/wix/wixobj; for wix_file in `find $(tempdir)/wix -name \'*.wxs\'`; do \"$$WIX/bin/candle.exe\" #{candle_flags} $$(cygpath -aw $$wix_file) || exit 1; done",
+          # the preprocessor variables AppDataSourcePath and ApplicationSourcePath are required due to the -var input to the heat
+          # runs listed above.
+          "cd $(tempdir)/wix/wixobj; for wix_file in `find $(tempdir)/wix -name \'*.wxs\'`; do \"$$WIX/bin/candle.exe\" #{candle_flags} #{candle_preprocessor} $$(cygpath -aw $$wix_file) || exit 1; done",
           # run all wix objects through light to produce the msi
           # the -b flag simply points light to where the SourceDir location is
-          "cd $(tempdir)/wix/wixobj; \"$$WIX/bin/light.exe\" #{light_flags} -b $$(cygpath -aw $(tempdir)) -out $$(cygpath -aw $(workdir)/output/#{target_dir}/#{msi_package_name(project)}) *.wixobj",
+          # -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
 
@@ -289,35 +300,47 @@ class Vanagon
         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
+      # the installation directory, only the structure above it.
+      #
+      # @param services, list of all services in a project
+      # @param project, actual project we are creating the directory structure for
+      def generate_service_bin_dirs(services, project)
+        # All service files will need a directory reference
+        items = services.map do |svc|
+          {
+            :path => strip_and_format_path(svc.service_file, project),
+            :element_to_add => "<Directory Id=\"#{svc.bindir_id}\" />\n"
+          }
+        end
+        generate_wix_dirs(items)
+      end
+
       # Generate correctly formatted wix elements that match the
-      # structure of the directory input
+      # structure of the itemized input
       #
-      # @param services, Array of components services
-      # and optionally:
+      # @param items
       # @return [string] correctly formatted wix element string
-      def generate_wix_dirs(services)
-        directories = []
-        services.map { |svc| directories.push({ :path => svc.service_file, :bindir_id => svc.bindir_id }) }
+      def generate_wix_dirs(items)
         # root refers to the root of an n-ary tree (which we are about to make)
         root = { :children => [] }
         # 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
-        directories.each do |dir|
+        items.each do |item|
           # Always start at the beginning
           curr = root
-          names = strip_path(dir[:path])
-          # The last entry in this list will be the actual file,
-          # which we do not want, we only want it's base path
-          names.pop
+          names = item[:path].split(File::SEPARATOR)
           names.each do |name|
             curr = insert_child(curr, name)
           end
           # at this point, curr will be the top dir, override the id if
           # id exists
-          curr[:bindir_ids].push(dir[:bindir_id])
+          curr[:elements_to_add].push(item[:element_to_add])
         end
-        return generate_wix_from_graph(root)
+        generate_wix_from_graph(root)
       end
 
       # insert a new object with the name "name" if it doesn't already
@@ -329,43 +352,34 @@ class Vanagon
       #                 create if necessary
       def insert_child(curr, name)
         #The Id field will default to name, but be overridden later
-        new_obj = { :name => name, :id => name, :bindir_ids => [], :children => [] }
-        if (child_index = includes_child(new_obj, curr[:children]))
+        new_obj = { :name => name, :id => name, :elements_to_add => [], :children => [] }
+        if (child_index = index_of_child(new_obj, curr[:children]))
           curr = curr[:children][child_index]
         else
           curr[:children].push(new_obj)
           curr = new_obj
         end
-        return curr
+        curr
       end
 
-      # strip and split the directory path into single names
+      # strip the leading install root and the filename from the service path
+      # and replace any \ with /
+      #
       # @param [string] path string of directory
-      def strip_path(path)
-        if path.include?("/") || path.include?("\\")
-          # The regex in the last part of this if warrants some
-          # explanation. Specifically it matches any combinations
-          # of any letters, then the : char, then finally either
-          # the char / or the char \. it's meant to parse out drive
-          # roots on windows
-          if path.start_with?("/") || path.start_with?("\\") || path.start_with?("SourceDir") || path =~ (/([A-Za-z])*\:(\/|\\)/)
-            path = path.sub(/\/|\\|([A-Za-z])*\:(\/|\\)|(\/|\\)?(SourceDir)(\/|\\)?/, '')
-          end
-          names = path.split(/\/|\\/)
-        end
-        return names
+      # @param [@project] project object
+      def strip_and_format_path(path, project)
+        formatted_path = path.gsub(/\\/, "\/")
+        path_regex = /\/?SourceDir\/#{project.settings[:base_dir]}\/#{project.settings[:company_id]}\/#{project.settings[:product_id]}\//
+        File.dirname(formatted_path.sub(path_regex, ''))
       end
 
       # Find if child element is the same as one of
       # the old_children elements, return that child
-      def includes_child(new_child, old_children)
-        old_children.each_with_index do |curr_old_child, index|
-          return index if curr_old_child[:name] == new_child[:name]
-        end unless old_children.empty?
-        return nil
+      def index_of_child(new_child, old_children)
+        return nil if old_children.empty?
+        old_children.index { |child| child[:name] == new_child[:name] }
       end
 
-
       # Recursively generate wix element structure
       #
       # @param root, the (empty) root of an n-ary tree containing the
@@ -375,9 +389,9 @@ class Vanagon
         unless root[:children].empty?
           root[:children].each do |child|
             string += ("<Directory Name=\"#{child[:name]}\" Id=\"#{child[:id]}\">\n")
-            unless child[:bindir_ids].empty?
-              child[:bindir_ids].each do |bindir_id|
-                string += ("<Directory Id=\"#{bindir_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)
@@ -385,7 +399,7 @@ class Vanagon
           end
           return string
         end
-        return ''
+        string
       end
 
       # Constructor. Sets up some defaults for the windows platform and calls the parent constructor

data/resources/osx/postinstall.erb

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-foundpkg=`/usr/sbin/pkgutil --volume "$3" --pkgs=<%= @identifier-%>.<%= @name -%>`
-
 # Move any new configfiles into place
 <%- get_configfiles.each do |config|
 dest_file = config.path.gsub(/\.pristine$/, '') -%>
@@ -13,12 +11,17 @@ else
 fi
 <%- end -%>
 
-# If we appear to be in an upgrade load services.
-
-if [ -n "$foundpkg" ]; then
+if [ -d "/tmp/.<%= @name %>.upgrade" ]
 <%- get_services.each do |service| -%>
-  /bin/launchctl load -F "<%= service.service_file %>"
+  if [ -f "/tmp/.<%= @name %>.upgrade/<%= service.name %>" ]
+    /bin/launchctl load -F "<%= service.service_file %>"
+  fi
 <%- end -%>
 fi
 
 <%= File.read("resources/osx/postinstall-extras") if File.exist?("resources/osx/postinstall-extras") %>
+
+# Cleanup after ourselves
+if [ -e "/tmp/.<%= @name %>.upgrade" ]
+  rm -rf "/tmp/.<%= @name %>.upgrade"
+fi

data/resources/osx/preinstall.erb

@@ -1,16 +1,24 @@
 #!/bin/bash
 
-# If we appear to be in an upgrade unload services.
+# Cleanup previous operations
+if [ -e "/tmp/.<%= @name %>.upgrade" ]
+  rm -rf "/tmp/.<%= @name %>.upgrade"
+fi
 
+# If we appear to be in an upgrade unload services.
 foundpkg=`/usr/sbin/pkgutil --volume "$3" --pkgs=<%= @identifier-%>.<%= @name -%>`
 oldbom="/usr/share/doc/<%= @name %>/bill-of-materials"
 
 if [ -n "$foundpkg" ]; then
+  mkdir -p "/tmp/.<%= @name %>.upgrade"
+  chmod 0700 "/tmp/.<%= @name %>.upgrade"
+
 <%- get_services.each do |service| -%>
   if /bin/launchctl list "<%= service.name %>" &> /dev/null; then
+    touch "/tmp/.<%= @name %>.upgrade/<%= service.name %>"
     /bin/launchctl unload "<%= service.service_file %>"
   fi
-  if [ -f "$oldbom"]; then
+  if [ -f "$oldbom" ]; then
     /bin/rm "$oldbom"
   fi
 <%- end -%>

data/resources/windows/wix/componentgroup.wxs.erb

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="windows-1252"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+  <!-- Default component groups that are to be included in this project.
+       This can be copied in the project specific area to add additional component groups.
+
+       Note that a number of the groups below are "pseudo-groups" that are necessary to
+       force the Wix Linker (light) to include fragments (e.g. FragmentProperties).
+
+       A UI reference is can also be included in the project specific area if required.
+       Otherwise, the project will default here to using the minimal UI (WixUI_Minimal). -->
+
+  <Fragment>
+    <ComponentGroup Id="MainComponentGroup">
+      <!-- We can add all components by referencing this one thing -->
+      <ComponentGroupRef Id="AppComponentGroup" />
+      <ComponentGroupRef Id="AppDataComponentGroup" />
+      <ComponentGroupRef Id="RegistryComponentGroup" />
+      <%- get_services.each do |service| -%>
+      <ComponentGroupRef Id="<%= service.component_group_id %>" />
+      <%- end -%>
+      <!-- All of these Include refs are expected to be present -->
+      <ComponentGroupRef Id="FragmentProperties" />
+      <ComponentGroupRef Id="FragmentSequences" />
+      <ComponentGroupRef Id="FragmentCustomActions" />
+    </ComponentGroup>
+
+    <UI>
+      <UIRef Id="WixUI_Minimal"/>
+    </UI>
+
+  </Fragment>
+</Wix>

data/resources/windows/wix/directorylist.wxs.erb

@@ -1,9 +1,17 @@
 <?xml version='1.0' encoding='windows-1252'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
   <Fragment>
     <DirectoryRef Id='TARGETDIR'>
-      <%= @platform.generate_wix_dirs(self.get_services) %>
+      <Directory Id="<%= settings[:base_dir] %>" >
+        <Directory Id="<%= settings[:company_id] %>" Name="<%= settings[:company_name] %>">
+          <Directory Id='INSTALLDIR' Name="<%= settings[:product_id] %>">
+          <%= @platform.generate_service_bin_dirs(self.get_services, self) %>
+          </Directory>
+        </Directory>
+      </Directory>
+      <Directory Id="CommonAppDataFolder" Name="CommonAppData">
+        <Directory Id="APPDATADIR" Name="<%= settings[:company_id] %>"/>
+      </Directory>
     </DirectoryRef>
   </Fragment>
 </Wix>

data/resources/windows/wix/filter.xslt.erb

@@ -13,9 +13,15 @@
   </xsl:template>
   <!-- Filter out all Service File Executables from the Harvest (heat) run as these are specified in the transformed service.components.wxs file -->
   <!-- The list of component service files are collected in an array so that a set of unique names can be extracted -->
+  <!-- we have to substitue the SourceDir\\etc. etc. for $(var.ProjectSourcePath) in order to facilitate heat -->
+  <!--   being run in two different places, specifically it no longer runs from SourceDir so we needed to pass -->
+  <!--   in ProjectSourcePath to the heat runs. Thus when this filter does its work the source attribute will -->
+  <!--   look like $(var.ProjectSourcePath)/puppet/bin/rubyw.exe for example, not  -->
+  <!--   SourceDir/Program64FilesFolder/Puppet/puppet/bin/ruby.exe -->
   <%- service_files = Array.new -%>
   <%- get_services.each do |service| -%>
-    <%- service_files << service.service_file -%>
+
+    <%- service_files << service.service_file.sub("SourceDir\\#{self.settings[:base_dir]}\\#{self.settings[:company_id]}\\#{self.settings[:product_id]}", "$(var.AppSourcePath)") -%>
   <%- end -%>
   <%- service_files.uniq.each do |service_file| -%>
     <xsl:template match="wix:Component[wix:File[@Source='<%= service_file %>']]" />

data/resources/windows/wix/project.wxs.erb

@@ -17,26 +17,18 @@
       Compressed="yes"
       Platform="<%= @platform.architecture %>" />
 
-      <!--  We are discussing a MAINT PR to move the componentfilegroup to seperate file 
-            This would allow project to specify additional fragments if needed -->
+    <!-- We will use DirectoryRef at the project level to hook in the project directory structure -->
+    <Directory Id='TARGETDIR' Name='SourceDir' />
 
     <MajorUpgrade AllowDowngrades="yes" />
     <Media Id="1" Cabinet="<%= settings[:product_id] %>.cab" EmbedCab="yes" CompressionLevel="high" />
 
-    <Feature Id="<%= settings[:product_id] %>Runtime" Title="<%= settings[:product_id] %> Runtime" Level="1">
-      <!-- We can add all components by referencing this one thing -->
-      <ComponentGroupRef Id="ProductComponentGroup" />
-      <ComponentGroupRef Id="RegistryComponentGroup" />
-      <%- get_services.each do |service| -%>
-      <ComponentGroupRef Id="<%= service.component_group_id %>" />
-      <%- end -%>
-      <!-- All of these Include refs are expected to be present -->
-      <ComponentGroupRef Id="FragmentProperties" />
-      <ComponentGroupRef Id="FragmentSequences" />
-      <ComponentGroupRef Id="FragmentCustomActions" />
+    <Feature
+      Id="<%= settings[:product_id] %>Runtime"
+      Title="<%= settings[:product_id] %> Runtime"
+      Level="1">
+      <ComponentGroupRef Id="MainComponentGroup" />
     </Feature>
-    <!-- We will use DirectoryRef at the project level to hook in the project directory structure -->
-    <Directory Id='TARGETDIR' Name='SourceDir' />
 
   </Product>
 </Wix>

data/resources/windows/wix/registryEntries.wxs.erb

@@ -1,15 +1,44 @@
 <?xml version='1.0' encoding='windows-1252'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+  <!--
+    Registry Entries
+    This is a suggested set of entries that can be used to record the Installation Directory for upgrade installs.
+    Any definitions in this will be over-ridden if the same file name is used in the Product Specific resouces directory.
+  -->
   <Fragment>
     <ComponentGroup Id="RegistryComponentGroup">
-        <Component Id="RegistryEntriesArchitectureDependent" Directory="TARGETDIR" Guid="E6D5AF4F-ACC4-4D11-AFCE-299A9ED2152C" Win64="<%= settings[:win64] %>" Permanent="yes">
-          <RegistryKey Root="HKLM" Key="SOFTWARE\<%= settings[:company_name] %>\<%= settings[:product_name] %>" ForceCreateOnInstall="yes" >
-            <RegistryValue Type="integer" Value="0"/>
+        <Component
+          Id="RegistryEntriesArchitectureDependent"
+          Directory="TARGETDIR"
+          Guid="*"
+          Win64="<%= settings[:win64] %>"
+          Permanent="yes">
+
+          <RegistryKey
+            Root="HKLM"
+            Key="SOFTWARE\<%= settings[:company_name] %>\<%= settings[:product_name] %>"
+            ForceCreateOnInstall="yes" >
+
+            <RegistryValue
+              Type="integer"
+              Value="0"/>
             <%- if @platform.architecture == "x64" -%>
-            <RegistryValue Name="RememberedInstallDir" Type="string" Value="[INSTALLDIR_X86]" />
-            <RegistryValue Name="RememberedInstallDir64" Type="string" Value="[INSTALLDIR]" KeyPath="yes" />
+              <RegistryValue
+                Name="RememberedInstallDir"
+                Type="string"
+                Value="[INSTALLDIR_X86]" />
+              <RegistryValue
+                Name="RememberedInstallDir64"
+                Type="string"
+                Value="[INSTALLDIR]"
+                KeyPath="yes" />
             <%- else %>
-            <RegistryValue Name="RememberedInstallDir" Type="string" Value="[INSTALLDIR]"  KeyPath="yes" />
+              <RegistryValue
+                Name="RememberedInstallDir"
+                Type="string"
+                Value="[INSTALLDIR]"
+                KeyPath="yes" />
             <%- end -%>
           </RegistryKey>
         </Component>

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

@@ -38,8 +38,15 @@ describe "Vanagon::Platform::Windows" do
       let(:platform) { plat }
       let(:cur_plat) { Vanagon::Platform::DSL.new(plat[:name]) }
       let (:project_block) {
-"project 'test-fixture' do |proj|
-end" }
+<<-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
+        }
 
       before do
         cur_plat.instance_eval(plat[:block])
@@ -171,10 +178,12 @@ end" }
         describe "generate_wix_dirs" do
 
           it "returns one directory with install_service defaults" do
+            proj = Vanagon::Project::DSL.new('test-fixture', {}, [])
+            proj.instance_eval(project_block)
             cur_plat.instance_eval(plat[:block])
             comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
-            comp.install_service('/opt/bin.exe')
-            expect(cur_plat._platform.generate_wix_dirs([comp._component.service].flatten.compact)).to eq( \
+            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 Id="SERVICETESTBINDIR" />
@@ -184,10 +193,13 @@ HERE
           end
 
           it "returns one directory with non-default name" do
+            proj = Vanagon::Project::DSL.new('test-fixture', {}, [])
+            proj.instance_eval(project_block)
             cur_plat.instance_eval(plat[:block])
             comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
-            comp.install_service('/opt/bin.exe', nil, "service-test-2")
-            expect(cur_plat._platform.generate_wix_dirs([comp._component.service].flatten.compact)).to eq( \
+            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">
 <Directory Id="SERVICETEST2BINDIR" />
@@ -197,56 +209,36 @@ HERE
           end
 
           it "returns nested directory correctly with \\" do
+            proj = Vanagon::Project::DSL.new('test-fixture', {}, [])
+            proj.instance_eval(project_block)
             cur_plat.instance_eval(plat[:block])
             comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
-            comp.install_service('root\\programfiles\\bin.exe')
-            expect(cur_plat._platform.generate_wix_dirs([comp._component.service].flatten.compact)).to eq( \
-<<-HERE
-<Directory Name="root" Id="root">
-<Directory Name="programfiles" Id="programfiles">
-<Directory Id="SERVICETESTBINDIR" />
-</Directory>
-</Directory>
-HERE
-            )
-          end
+            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( \
 
-          it "removes any drive roots" do
-            cur_plat.instance_eval(plat[:block])
-            comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
-            comp.install_service('C:\\programfiles\\bin.exe')
-            expect(cur_plat._platform.generate_wix_dirs([comp._component.service].flatten.compact)).to eq( \
 <<-HERE
-<Directory Name="programfiles" Id="programfiles">
+<Directory Name="somedir" Id="somedir">
+<Directory Name="someotherdir" Id="someotherdir">
 <Directory Id="SERVICETESTBINDIR" />
 </Directory>
-HERE
-            )
-          end
-
-          it "removes SourceDir" do
-            cur_plat.instance_eval(plat[:block])
-            comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
-            comp.install_service('SourceDir\\programfiles\\bin.exe')
-            expect(cur_plat._platform.generate_wix_dirs([comp._component.service].flatten.compact)).to eq( \
-<<-HERE
-<Directory Name="programfiles" Id="programfiles">
-<Directory Id="SERVICETESTBINDIR" />
 </Directory>
 HERE
             )
           end
 
 
+
           it "adds a second directory for the same input but different components" do
+            proj = Vanagon::Project::DSL.new('test-fixture', {}, [])
+            proj.instance_eval(project_block)
             cur_plat.instance_eval(plat[:block])
             comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
-            comp.install_service('/programfiles/bin.exe')
+            comp.install_service('SourceDir\\ProgramFilesFolder\\TestID\\TestProduct\\somedir\\bin.exe')
             comp2 = Vanagon::Component::DSL.new('service-test-2', {}, cur_plat._platform)
-            comp2.install_service('/programfiles/bin.exe')
-            expect(cur_plat._platform.generate_wix_dirs([comp._component.service, comp2._component.service].flatten.compact)).to eq( \
+            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="programfiles" Id="programfiles">
+<Directory Name="somedir" Id="somedir">
 <Directory Id="SERVICETESTBINDIR" />
 <Directory Id="SERVICETEST2BINDIR" />
 </Directory>
@@ -255,16 +247,18 @@ HERE
           end
 
           it "returns correctly formatted multiple nested directories" do
+            proj = Vanagon::Project::DSL.new('test-fixture', {}, [])
+            proj.instance_eval(project_block)
             cur_plat.instance_eval(plat[:block])
-            comp1 = Vanagon::Component::DSL.new('service-test1', {}, cur_plat._platform)
-            comp1.install_service('/opt/oneUp/twoUp/bin.exe')
-            comp2 = Vanagon::Component::DSL.new('service-test2', {}, cur_plat._platform)
-            comp2.install_service('/opt/oneUpAgain/twoUp/bin.exe')
-            comp3 = Vanagon::Component::DSL.new('service-test3', {}, cur_plat._platform)
-            comp3.install_service('/opt/oneUpAgain/twoUpAgain/bin.exe')
-            expect(cur_plat._platform.generate_wix_dirs([comp1._component.service, comp2._component.service, comp3._component.service].flatten.compact)).to eq( \
+            comp = Vanagon::Component::DSL.new('service-test-1', {}, cur_plat._platform)
+            comp.install_service('SourceDir\\ProgramFilesFolder\\TestID\\TestProduct\\somedir\\oneUp\\twoUp\\bin.exe')
+            comp2 = Vanagon::Component::DSL.new('service-test-2', {}, cur_plat._platform)
+            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="opt" Id="opt">
+<Directory Name="somedir" Id="somedir">
 <Directory Name="oneUp" Id="oneUp">
 <Directory Name="twoUp" Id="twoUp">
 <Directory Id="SERVICETEST1BINDIR" />

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -132,6 +132,7 @@ files:
 - resources/windows/nuget/chocolateyInstall.ps1
 - resources/windows/nuget/chocolateyUninstall.ps1
 - resources/windows/nuget/project.nuspec.erb
+- resources/windows/wix/componentgroup.wxs.erb
 - resources/windows/wix/directorylist.wxs.erb
 - resources/windows/wix/filter.xslt.erb
 - resources/windows/wix/project.wxs.erb
@@ -157,7 +158,6 @@ files:
 - spec/lib/vanagon/component/source/http_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/driver_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
 - spec/lib/vanagon/engine/hardware_spec.rb
@@ -196,36 +196,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.5
 signing_key: 
 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/vanagon/common/pathname_spec.rb
+- spec/lib/vanagon/utilities_spec.rb
+- spec/lib/vanagon/platform_spec.rb
+- spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
 - spec/lib/vanagon/common/user_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/common/pathname_spec.rb
+- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
+- spec/lib/vanagon/platform/deb_spec.rb
+- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/platform/rpm_spec.rb
 - spec/lib/vanagon/component/source/http_spec.rb
+- spec/lib/vanagon/component/source/git_spec.rb
+- spec/lib/vanagon/component/dsl_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/driver_spec.rb
-- spec/lib/vanagon/engine/base_spec.rb
-- spec/lib/vanagon/engine/docker_spec.rb
-- spec/lib/vanagon/engine/hardware_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
 - spec/lib/vanagon/engine/local_spec.rb
+- spec/lib/vanagon/engine/docker_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
+- spec/lib/vanagon/engine/hardware_spec.rb
+- spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/optparse_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform_spec.rb
-- spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/vanagon/project_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
-has_rdoc: 
+- spec/lib/makefile_spec.rb