vanagon 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9ab396670efad7619b917bf141a6663f46b263c
-  data.tar.gz: 434efe6733bca07c8784502bb4d4191cd0af42cb
+  metadata.gz: fcd5e7e5f1f39f1955e66d77c281857454889a32
+  data.tar.gz: e8c58b0be17f84d4c3c589ddadc99375e05b5bb3
 SHA512:
-  metadata.gz: 1a0b2555e93cc7f808b53f58ce5d2a98709e99ebb1775ccaeaf9c8625d7255793e3f4179673ff567816982c8a952b5477bcde76e4056b654854e59014906f53e
-  data.tar.gz: 5b4be2a7a70c6452ad19cca584488b7e9eb77f03504d310b68fd934b53b3a8eb67167af5dc625f3cd4242c4a7e219f7b732f70917398f3848d122bee7d3fa883
+  metadata.gz: 2989af2711e652f63fa38ef1a47789c6873b8e9646d95724d2e35e2b53849067d9cd555650386c9bd34dc9debadf530253da7f0ccef3d09a1f56d0b7fd9dbf25
+  data.tar.gz: 18da216b1b93412c6271433db131928a625168b1345e2a2817538f6ee45da86fc96a9bec0217098d1b08ac26d8738a40ae954ce4b7e8d336785106a03412cad6

data/lib/vanagon/platform/deb.rb

@@ -7,7 +7,6 @@ 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",
@@ -15,7 +14,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 #{pkg_arch_opt} -uc -us)",
+        "(cd $(tempdir)/#{project.name}-#{project.version}; debuild --no-lintian -uc -us)",
         "cp $(tempdir)/*.deb ./output/#{target_dir}"]
       end
 

data/lib/vanagon/platform/windows.rb

@@ -402,6 +402,14 @@ class Vanagon
         string
       end
 
+      # Grab only the first three values from the version input
+      # and strip off any non-digit characters.\
+      #
+      # @param [string] version, the original version number
+      def windows_style_version(version)
+        version.split("\.").first(3).collect { |value| value.gsub(/[^0-9]/, '') }.join("\.")
+      end
+
       # Constructor. Sets up some defaults for the windows platform and calls the parent constructor
       #
       # Mingw varies on where it is installed based on architecture. We want to use which ever is on the system.

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

@@ -68,6 +68,15 @@ HERE
         end
       end
 
+      describe '#windows_style_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")
+        end
+
+        it "returns only numbers" do
+          expect(cur_plat._platform.windows_style_version("1.0.g0")).to eq("1.0.0")
+        end
+      end
       describe '#generate_msi_packaging_artifacts' do
         before(:each) do
           # Create Workdir and temp root directory

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Puppet Labs