vanagon 0.5.10 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 931b3b9e351487626cfc70250f5515612364a25d
-  data.tar.gz: 41efa48f0508c3c030650b13991b7049153f1e56
+  metadata.gz: bd91238696bb5b6eded5bff5caaa11367bdb9a72
+  data.tar.gz: 2b06dab33a59ae1230dadfa8a7173a76f0ae6779
 SHA512:
-  metadata.gz: 3b15f73c6cee6de81dd0b4e0b53d7d72bd1dc02dd4d9eb1e11f5b114dba410828089552fb68db206907514d853d0c5a88d8f43718d3c2ccd7f16e5dabaa9bee2
-  data.tar.gz: 2bb2d911f8046369d1807937e017a56aaff4c0f8ee82ae6a13cfda544765a487158be6e4d9e1be2dad9b4ac762fb7d42f988c575ad01c90f58d9d796f6f5e3f0
+  metadata.gz: 69e00da92f02f69ff0033d860c8f4a597963eafe1a23d207d2db12467090c5ac2cb90e02a28687d21a82cdd6fcaec206b017ab8c24e04398d49bda85837c7991
+  data.tar.gz: ca04ff31f4265f13886605a00402b86955b13468dd42e17284c8020670a971ab1bd8673d2a8255fdef5aaa99799f8fc0c2faeca03dcccb02289c49c042c1c56f

data/lib/vanagon/component/source.rb

@@ -1,6 +1,6 @@
 require 'vanagon/component/source/http'
 require 'vanagon/component/source/git'
-require 'vanagon/component/source/localsource'
+require 'vanagon/component/source/local'
 
 class Vanagon
   class Component
@@ -65,7 +65,7 @@ class Vanagon
                         when /^http/
                           Vanagon::Component::Source::Http.new(self.rewrite(url, 'http'), options[:sum], workdir)
                         when /^file/
-                          Vanagon::Component::Source::LocalSource.new(self.rewrite(url, 'file'), workdir)
+                          Vanagon::Component::Source::Local.new(self.rewrite(url, 'file'), workdir)
                         when /^git/
                           Vanagon::Component::Source::Git.new(self.rewrite(url, 'git'), options[:ref], workdir)
                         else

data/lib/vanagon/component/source/{localsource.rb → local.rb}

@@ -5,7 +5,7 @@ require 'uri'
 class Vanagon
   class Component
     class Source
-      class LocalSource
+      class Local
         include Vanagon::Utilities
         attr_accessor :url, :file, :extension, :workdir, :cleanup
 

data/lib/vanagon/platform/windows.rb

@@ -179,7 +179,7 @@ class Vanagon
         # 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}\" "
-        candle_flags = "-dPlatform=#{@architecture} -arch #{@architecture} #{wix_extensions}"
+        candle_flags = "-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}"

data/lib/vanagon/project/dsl.rb

@@ -230,6 +230,11 @@ class Vanagon
       def bill_of_materials(target)
         @project.bill_of_materials = Vanagon::Common::Pathname.new(target)
       end
+
+      # Counter for the number of times a project should retry a task
+      def retry_count(retry_count)
+        @project.retry_count = retry_count
+      end
     end
   end
 end

data/resources/deb/control.erb

@@ -10,10 +10,19 @@ Package: <%= @name %>
 Architecture: <%= @noarch ? 'all' : 'any' %>
 Section: admin
 Priority: optional
+<%- unless get_replaces.empty? -%>
 Replaces: <%= get_replaces.map { |replace| "#{replace.replacement} #{replace.version ? "(<< #{replace.version})" : ""}" }.join(", ") %>
+Breaks: <%= get_replaces.map { |replace| "#{replace.replacement} #{replace.version ? "(<< #{replace.version})" : ""}" }.join(", ") %>
+<%- end -%>
+<%- unless get_conflicts.empty? -%>
 Conflicts: <%= get_conflicts.map { |conflict| "#{conflict.pkgname} #{conflict.version ? "(<< #{conflict.version})" : ""}" }.join(", ") %>
+<%- end -%>
+<%- unless get_requires.empty? -%>
 Depends: <%= get_requires.join(", ") %>
+<%- end -%>
+<%- unless get_provides.empty? -%>
 Provides: <%= get_provides.map { |prov| prov.provide }.join(", ") %>
+<%- end -%>
 Description: <%= @description.lines.first.chomp %>
  <%= @description.lines[1..-1].join("\s") -%>
  .

data/spec/lib/vanagon/component/source/localsource_spec.rb

@@ -8,7 +8,7 @@ describe "Vanagon::Component::Source::File" do
 
   describe "#fetch" do
     it "puts the source file in to the workdir" do
-      file = Vanagon::Component::Source::LocalSource.new(plaintext_filename, workdir)
+      file = Vanagon::Component::Source::Local.new(plaintext_filename, workdir)
       file.fetch
       expect(File).to exist("#{workdir}/fake_file.txt")
     end
@@ -16,13 +16,13 @@ describe "Vanagon::Component::Source::File" do
 
   describe "#dirname" do
     it "returns the name of the tarball, minus extension for archives" do
-      file = Vanagon::Component::Source::LocalSource.new(tar_filename, workdir)
+      file = Vanagon::Component::Source::Local.new(tar_filename, workdir)
       file.fetch
       expect(file.dirname).to eq("fake_dir")
     end
 
     it "returns the current directory for non-archive files" do
-      file = Vanagon::Component::Source::LocalSource.new(plaintext_filename, workdir)
+      file = Vanagon::Component::Source::Local.new(plaintext_filename, workdir)
       file.fetch
       expect(file.dirname).to eq("./")
     end
@@ -30,9 +30,9 @@ describe "Vanagon::Component::Source::File" do
 
   describe "#get_extension" do
     it "returns the extension for valid extensions" do
-      Vanagon::Component::Source::LocalSource::ARCHIVE_EXTENSIONS.each do |ext|
+      Vanagon::Component::Source::Local::ARCHIVE_EXTENSIONS.each do |ext|
         filename = "#{file_base}#{ext}"
-        file = Vanagon::Component::Source::LocalSource.new(filename, workdir)
+        file = Vanagon::Component::Source::Local.new(filename, workdir)
         file.fetch
         expect(file.get_extension).to eq(ext)
       end

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

@@ -43,7 +43,7 @@ describe "Vanagon::Component::Source" do
     end
 
     it "returns an object of the correct type for file:// urls" do
-      expect(Vanagon::Component::Source.source(file_url, {:sum => sum }, workdir).class).to equal(Vanagon::Component::Source::LocalSource)
+      expect(Vanagon::Component::Source.source(file_url, {:sum => sum }, workdir).class).to equal(Vanagon::Component::Source::Local)
     end
 
     it "applies any rewrite rules before defining an http Source" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.6.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -80,7 +80,7 @@ files:
 - lib/vanagon/component/source.rb
 - lib/vanagon/component/source/git.rb
 - lib/vanagon/component/source/http.rb
-- lib/vanagon/component/source/localsource.rb
+- lib/vanagon/component/source/local.rb
 - lib/vanagon/driver.rb
 - lib/vanagon/engine/base.rb
 - lib/vanagon/engine/docker.rb
@@ -203,7 +203,7 @@ 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.