vanagon 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2788b73738b58776aa0bafc6d4739fc90be798bc
-  data.tar.gz: 3613f68d912a5825df9466d7f2434c6862aa46f3
+  metadata.gz: 2b66b1395018a77daddbcfcaddc29f0b19481e5a
+  data.tar.gz: 959fb7d6e6248d02942ba0b287f39f65bc738883
 SHA512:
-  metadata.gz: bce0bcaed54e907d75df0d746f5865680ce0533e87b1f028506cab511ca2735c2743a89f16f51e8ace3e0e09964aa8936e4337b0e0f84f0fb13a573b5a960425
-  data.tar.gz: a76b088fd7c56a0bced77dfb5189059b68a3b6a144e806071a4116e0a6725666c1fd1a101b6b27f95e6d05e12a4e5f84ebf5c947a132734c8a680828fff2112f
+  metadata.gz: 4dcf74dd3a0c51d821906d3e4be702040878db7f563600f9fae257c7731fabcc2db81fcc32f23a0a04d0d649b37d3ec45a1b2d10f36521201dec3ec8715337b8
+  data.tar.gz: 105fce81c259facb92659190ae9f458e9962f9f34dd1107adf61b11bd864a3b942ba0e5f373f70d97c2e416e3b412999c042de9dee1ac80b7aee347172ee416d

data/README.md

@@ -182,10 +182,12 @@ wheezy and build my project against it.
 For more detailed examples of the DSLs available, please see the
 [examples](https://github.com/puppetlabs/vanagon/tree/master/examples) directory and the YARD documentation for vanagon.
 
-Maintainers
+## Maintainers
 ---
 The Release Engineering team at Puppet Labs
 
-Support
----
-Please log tickets and issues at our [Issue Tracker](https://tickets.puppetlabs.com/browse/CPR). In addition there is an active #puppet-dev channel on Freenode.
+Maintainer: Michael Stahnke <stahnma@puppetlabs.com>
+
+Please log tickets and issues at our [Issue Tracker](https://tickets.puppetlabs.com/browse/CPR). Set compononent to Vanagon.
+
+In addition there is an active #puppet-dev channel on Freenode.

data/lib/vanagon/platform/windows.rb

@@ -176,22 +176,25 @@ class Vanagon
         #   -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_preprocessor = "-dAppSourcePath=\"#{app_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}"
+        # "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 $(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 -",
+          "mkdir -p $(tempdir)/#{misc_dir}",
+          # Need to use awk here to convert to DOS format so that notepad can display file correctly.
+          "awk 'sub(\"$$\", \"\\r\")' $(tempdir)/SourceDir/bill-of-materials > $(tempdir)/#{misc_dir}/versions.txt",
           "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
           # the preprocessor variables AppDataSourcePath and ApplicationSourcePath are required due to the -var input to the heat
@@ -210,7 +213,10 @@ 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
-        "#{project.name}-#{project.version}.#{project.release}-#{@architecture}.msi"
+        # 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"
       end
 
       # Method to derive the package name for the project.
@@ -406,7 +412,7 @@ class Vanagon
       # and strip off any non-digit characters.\
       #
       # @param [string] version, the original version number
-      def windows_style_version(version)
+      def wix_product_version(version)
         version.split("\.").first(3).collect { |value| value.gsub(/[^0-9]/, '') }.join("\.")
       end
 

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

@@ -9,9 +9,6 @@
           </Directory>
         </Directory>
       </Directory>
-      <Directory Id="CommonAppDataFolder" Name="CommonAppData">
-        <Directory Id="APPDATADIR" Name="<%= settings[:company_id] %>"/>
-      </Directory>
     </DirectoryRef>
   </Fragment>
 </Wix>

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

@@ -6,7 +6,7 @@
     Name="<%= settings[:product_name] %>"
     Language="1033"
     Codepage="1252"
-    Version="<%= @platform.windows_style_version(@version) %>"
+    Version="<%= @platform.wix_product_version(@version) %>"
     Manufacturer="<%= settings[:company_name] %>" >
 
     <Package

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

@@ -68,13 +68,13 @@ HERE
         end
       end
 
-      describe '#windows_style_version' do
+      describe '#wix_product_version' do
         it "returns first three digits only" do
-          expect(cur_plat._platform.windows_style_version("1.0.0.1")).to eq("1.0.0")
+          expect(cur_plat._platform.wix_product_version("1.0.0.1")).to eq("1.0.0")
         end
 
         it "returns only numbers" do
-          expect(cur_plat._platform.windows_style_version("1.0.g0")).to eq("1.0.0")
+          expect(cur_plat._platform.wix_product_version("1.0.g0")).to eq("1.0.0")
         end
       end
       describe '#generate_msi_packaging_artifacts' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -196,34 +196,35 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+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.
 test_files:
-- 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/makefile_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/common/user_spec.rb
 - spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/engine/local_spec.rb
+- spec/lib/vanagon/component/source/git_spec.rb
+- spec/lib/vanagon/component/source/http_spec.rb
+- spec/lib/vanagon/component/source_spec.rb
+- spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
-- spec/lib/vanagon/engine/pooler_spec.rb
 - spec/lib/vanagon/engine/hardware_spec.rb
-- spec/lib/vanagon/engine/base_spec.rb
+- spec/lib/vanagon/engine/local_spec.rb
+- spec/lib/vanagon/engine/pooler_spec.rb
 - spec/lib/vanagon/optparse_spec.rb
-- spec/lib/makefile_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: