vanagon 0.5.7 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b66b1395018a77daddbcfcaddc29f0b19481e5a
-  data.tar.gz: 959fb7d6e6248d02942ba0b287f39f65bc738883
+  metadata.gz: eb77baf3c8dca42c4cec74d3a31c74af63ee37df
+  data.tar.gz: 32949fe6e83be1972bc91057b5a522b116de0bc2
 SHA512:
-  metadata.gz: 4dcf74dd3a0c51d821906d3e4be702040878db7f563600f9fae257c7731fabcc2db81fcc32f23a0a04d0d649b37d3ec45a1b2d10f36521201dec3ec8715337b8
-  data.tar.gz: 105fce81c259facb92659190ae9f458e9962f9f34dd1107adf61b11bd864a3b942ba0e5f373f70d97c2e416e3b412999c042de9dee1ac80b7aee347172ee416d
+  metadata.gz: e2a8b0411fc595f95b40c8f63229f73ed4324f9712c9c04dab01340a95fa27246e305cc0d44b7a7c7b7b2a5725ac6991971607d31eb7313a4953baf60fe7bb98
+  data.tar.gz: 5b6ee385067ff48a3befb3f2d5abc796a3b7589ef389534c2ab3d2a0840a85982f1eca22a3365c2a4f875a1619cc722fc1f7655118c273e47793d63f596d9c28

data/lib/vanagon/component.rb

@@ -10,7 +10,7 @@ class Vanagon
     attr_accessor :name, :version, :source, :url, :configure, :build, :check, :install
     attr_accessor :environment, :extract_with, :dirname, :build_requires, :build_dir
     attr_accessor :settings, :platform, :patches, :requires, :service, :options
-    attr_accessor :directories, :replaces, :provides, :cleanup_source
+    attr_accessor :directories, :replaces, :provides, :conflicts, :cleanup_source
     attr_accessor :sources, :preinstall_actions, :postinstall_actions
     attr_accessor :preremove_actions, :postremove_actions, :license
 
@@ -57,6 +57,7 @@ class Vanagon
       @directories = []
       @replaces = []
       @provides = []
+      @conflicts = []
       @environment = {}
       @sources = []
       @preinstall_actions = []

data/lib/vanagon/component/dsl.rb

@@ -151,6 +151,16 @@ class Vanagon
         @component.provides << OpenStruct.new(:provide => provide, :version => version)
       end
 
+      # Indicates that this component conflicts with another package,
+      # so both cannot be installed at the same time. Conflicts can be
+      # collected and used by the project and package.
+      #
+      # @param pkgname [String] name of the package which conflicts with this component
+      # @param version [String] the version of the package that conflicts with this component
+      def conflicts(pkgname, version = nil)
+        @component.conflicts << OpenStruct.new(:pkgname => pkgname, :version => version)
+      end
+
       # install_service adds the commands to install the various files on
       # disk during the package build and registers the service with the project
       #

data/lib/vanagon/project.rb

@@ -11,7 +11,7 @@ class Vanagon
     attr_accessor :version, :directories, :license, :description, :vendor
     attr_accessor :homepage, :requires, :user, :repo, :noarch, :identifier
     attr_accessor :cleanup, :version_file, :release, :replaces, :provides
-    attr_accessor :bill_of_materials, :retry_count, :timeout
+    attr_accessor :conflicts, :bill_of_materials, :retry_count, :timeout
 
     # Loads a given project from the configdir
     #
@@ -50,6 +50,7 @@ class Vanagon
       @release = "1"
       @replaces = []
       @provides = []
+      @conflicts = []
     end
 
     # Magic getter to retrieve settings in the project
@@ -101,6 +102,21 @@ class Vanagon
       replaces.flatten.uniq
     end
 
+    def has_replaces?
+      !get_replaces.empty?
+    end
+
+    # Collects all of the conflicts for the project and its components
+    def get_conflicts
+      conflicts = @components.flat_map(&:conflicts) + @conflicts
+      # Mash the whole thing down into a flat Array
+      conflicts.flatten.uniq
+    end
+
+    def has_conflicts?
+      !get_conflicts.empty?
+    end
+
     # Grabs a specific service based on which name is passed in
     # note that if the name is wrong or there was no
     # @component.install_service call in the component, this
@@ -127,6 +143,10 @@ class Vanagon
       provides.flatten.uniq
     end
 
+    def has_provides?
+      !get_provides.empty?
+    end
+
     # Collects the preinstall packaging actions for the project and it's components
     # for the specified packaging state
     #
@@ -199,6 +219,10 @@ class Vanagon
       @components.map(&:configfiles).flatten.uniq
     end
 
+    def has_configfiles?
+      !get_configfiles.empty?
+    end
+
     # Collects any directories declared by the project and components
     #
     # @return [Array] the directories in the project and components

data/lib/vanagon/project/dsl.rb

@@ -108,6 +108,16 @@ class Vanagon
         @project.provides << OpenStruct.new(:provide => provide, :version => version)
       end
 
+      # Indicates that this component conflicts with another package,
+      # so both cannot be installed at the same time. Conflicts can be
+      # collected and used by the project and package.
+      #
+      # @param pkgname [String] name of the package which conflicts with this component
+      # @param version [String] the version of the package that conflicts with this component
+      def conflicts(pkgname, version = nil)
+        @project.conflicts << OpenStruct.new(:pkgname => pkgname, :version => version)
+      end
+
       # Sets the version for the project. Mainly for use in packaging.
       #
       # @param ver [String] version of the project

data/resources/deb/control.erb

@@ -11,7 +11,7 @@ Architecture: <%= @noarch ? 'all' : 'any' %>
 Section: admin
 Priority: optional
 Replaces: <%= get_replaces.map { |replace| "#{replace.replacement} #{replace.version ? "(<< #{replace.version})" : ""}" }.join(", ") %>
-Conflicts: <%= get_replaces.map { |replace| "#{replace.replacement} #{replace.version ? "(<< #{replace.version})" : ""}" }.join(", ") %>
+Conflicts: <%= get_conflicts.map { |conflict| "#{conflict.pkgname} #{conflict.version ? "(<< #{conflict.version})" : ""}" }.join(", ") %>
 Depends: <%= get_requires.join(", ") %>
 Provides: <%= get_provides.map { |prov| prov.provide }.join(", ") %>
 Description: <%= @description.lines.first.chomp %>

data/resources/osx/postinstall.erb

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+<%- if has_configfiles? -%>
 # Move any new configfiles into place
 <%- get_configfiles.each do |config|
 dest_file = config.path.gsub(/\.pristine$/, '') -%>
@@ -10,7 +11,9 @@ else
   mv '<%= config.path %>' '<%= dest_file %>'
 fi
 <%- end -%>
+<%- end -%>
 
+<%- if has_services? -%>
 if [ -d "/tmp/.<%= @name %>.upgrade" ]; then
 <%- get_services.each do |service| -%>
   if [ -f "/tmp/.<%= @name %>.upgrade/<%= service.name %>" ]; then
@@ -18,6 +21,7 @@ if [ -d "/tmp/.<%= @name %>.upgrade" ]; then
   fi
 <%- end -%>
 fi
+<%- end -%>
 
 <%= File.read("resources/osx/postinstall-extras") if File.exist?("resources/osx/postinstall-extras") %>
 

data/resources/osx/preinstall.erb

@@ -13,6 +13,7 @@ if [ -n "$foundpkg" ]; then
   mkdir -p "/tmp/.<%= @name %>.upgrade"
   chmod 0700 "/tmp/.<%= @name %>.upgrade"
 
+<%- if has_services? -%>
 <%- get_services.each do |service| -%>
   if /bin/launchctl list "<%= service.name %>" &> /dev/null; then
     touch "/tmp/.<%= @name %>.upgrade/<%= service.name %>"
@@ -22,6 +23,8 @@ if [ -n "$foundpkg" ]; then
     /bin/rm "$oldbom"
   fi
 <%- end -%>
+<%- end -%>
 fi
 
+
 <%= File.read("resources/osx/preinstall-extras") if File.exist?("resources/osx/preinstall-extras") %>

data/resources/rpm/project.spec.erb

@@ -48,10 +48,13 @@ Requires: chkconfig
 <%- end -%>
 
 <%- get_replaces.each do |replace| -%>
-Conflicts: <%= replace.replacement %><%= replace.version ? " < #{replace.version}" : "" %>
 Obsoletes: <%= replace.replacement %><%= replace.version ? " < #{replace.version}" : "" %>
 <%- end -%>
 
+<%- get_conflicts.each do |conflict| -%>
+Conflicts: <%= conflict.pkgname %><%= conflict.version ? " < #{conflict.version}" : "" %>
+<%- end -%>
+
 <%- get_provides.each do |prov| -%>
 Provides: <%= prov.provide %><%= prov.version ? " >= #{prov.version}" : "" %>
 <%- end -%>

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

@@ -269,6 +269,23 @@ end" }
     end
   end
 
+  describe '#conflicts' do
+    it 'adds the package conflict to the list of conflicts' do
+      comp = Vanagon::Component::DSL.new('conflicts-test', {}, {})
+      comp.conflicts('thing1')
+      comp.conflicts('thing2')
+      expect(comp._component.conflicts.first.pkgname).to eq('thing1')
+      expect(comp._component.conflicts.last.pkgname).to eq('thing2')
+    end
+
+    it 'supports versioned conflicts' do
+      comp = Vanagon::Component::DSL.new('conflicts-test', {}, {})
+      comp.conflicts('thing1', '1.2.3')
+      expect(comp._component.conflicts.first.pkgname).to eq('thing1')
+      expect(comp._component.conflicts.first.version).to eq('1.2.3')
+    end
+  end
+
   describe '#add_actions' do
     it 'adds the corect preinstall action to the component' do
       comp = Vanagon::Component::DSL.new('action-test', {}, dummy_platform_sysv)

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

@@ -167,6 +167,37 @@ end" }
     end
   end
 
+  describe "#conflicts" do
+    it 'adds the package conflict to the list of conflicts' do
+      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj.instance_eval(project_block)
+      proj.conflicts('thing1')
+      proj.conflicts('thing2')
+      expect(proj._project.get_conflicts.count).to eq(2)
+      expect(proj._project.get_conflicts.first.pkgname).to eq('thing1')
+      expect(proj._project.get_conflicts.last.pkgname).to eq('thing2')
+     end
+
+    it 'supports versioned conflicts' do
+      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj.instance_eval(project_block)
+      proj.conflicts('thing1', '1.2.3')
+      expect(proj._project.get_conflicts.count).to eq(1)
+      expect(proj._project.get_conflicts.first.pkgname).to eq('thing1')
+      expect(proj._project.get_conflicts.first.version).to eq('1.2.3')
+     end
+
+    it 'gets rid of duplicates' do
+      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj.instance_eval(project_block)
+      proj.conflicts('thing1', '1.2.3')
+      proj.conflicts('thing1', '1.2.3')
+      expect(proj._project.get_conflicts.count).to eq(1)
+      expect(proj._project.get_conflicts.first.pkgname).to eq('thing1')
+      expect(proj._project.get_conflicts.first.version).to eq('1.2.3')
+    end
+  end
+
   describe "#component" do
     let(:project_block) {
 "project 'test-fixture' do |proj|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.9
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec