vanagon 0.14.3 → 0.15.0

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

@@ -215,6 +215,15 @@ end" }
   end
 
   describe "#provides" do
+    before do
+      allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
+      allow(Vanagon::Driver).to receive(:configdir).and_return(configdir)
+      @el_plat = Vanagon::Platform::DSL.new('el-5-x86_64')
+      @el_plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      @deb_plat = Vanagon::Platform::DSL.new('ubuntu-16.04-amd64')
+      @deb_plat.instance_eval("platform 'ubuntu-16.04-amd64' do |plat| end")
+    end
+
     it 'adds the package provide to the list of provides' do
       proj = Vanagon::Project::DSL.new('test-fixture', {})
       proj.instance_eval(project_block)
@@ -225,27 +234,79 @@ end" }
       expect(proj._project.get_provides.last.provide).to eq('thing2')
     end
 
+    # we don't actually use deb versions for provides at this point, but
+    # testing it works nonetheless
+    it 'supports deb versioned provides' do
+      proj = Vanagon::Project::DSL.new('test-fixture', @deb_plat._platform, [])
+      proj.instance_eval(project_block)
+      proj.provides('thing1', '1.2.3')
+      expect(proj._project.get_provides.count).to eq(1)
+      expect(proj._project.get_provides.first.provide).to eq('thing1')
+      expect(proj._project.get_provides.first.version).to eq('>= 1.2.3')
+    end
+
+    # we don't actually use deb versions for provides at this point, but
+    # testing it works nonetheless
+    it 'munges deb* versions' do
+      operators = {
+        '<' => '<<',
+        '>' => '>>',
+        '<=' => '<=',
+        '>=' => '>=',
+        '=' => '='
+      }
+      operators.each do |initial, munged|
+        proj = Vanagon::Project::DSL.new('test-fixture', @deb_plat._platform, [])
+        proj.instance_eval(project_block)
+        proj.provides('thing1', "#{initial}1.2.3")
+        expect(proj._project.get_provides.count).to eq(1)
+        expect(proj._project.get_provides.first.provide).to eq('thing1')
+        expect(proj._project.get_provides.first.version).to eq("#{munged} 1.2.3")
+      end
+    end
+
+    it 'adds whitespace for rpm versions' do
+      operators=['<','>','<=','>=','=']
+      operators.each do |operator|
+        proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
+        proj.instance_eval(project_block)
+        proj.provides('thing1', "#{operator}1.2.3")
+        expect(proj._project.get_provides.count).to eq(1)
+        expect(proj._project.get_provides.first.provide).to eq('thing1')
+        expect(proj._project.get_provides.first.version).to eq("#{operator} 1.2.3")
+      end
+    end
+
     it 'supports versioned provides' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
       proj.instance_eval(project_block)
       proj.provides('thing1', '1.2.3')
       expect(proj._project.get_provides.count).to eq(1)
       expect(proj._project.get_provides.first.provide).to eq('thing1')
-      expect(proj._project.get_provides.first.version).to eq('1.2.3')
+      expect(proj._project.get_provides.first.version).to eq('>= 1.2.3')
      end
 
     it 'gets rid of duplicates' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
       proj.instance_eval(project_block)
       proj.provides('thing1', '1.2.3')
-      proj.provides('thing1', '1.2.3')
+      proj.provides('thing1', '>=1.2.3')
       expect(proj._project.get_provides.count).to eq(1)
       expect(proj._project.get_provides.first.provide).to eq('thing1')
-      expect(proj._project.get_provides.first.version).to eq('1.2.3')
+      expect(proj._project.get_provides.first.version).to eq('>= 1.2.3')
     end
   end
 
   describe "#replaces" do
+    before do
+      allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
+      allow(Vanagon::Driver).to receive(:configdir).and_return(configdir)
+      @el_plat = Vanagon::Platform::DSL.new('el-5-x86_64')
+      @el_plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      @deb_plat = Vanagon::Platform::DSL.new('ubuntu-16.04-amd64')
+      @deb_plat.instance_eval("platform 'ubuntu-16.04-amd64' do |plat| end")
+    end
+
     it 'adds the package replacement to the list of replacements' do
       proj = Vanagon::Project::DSL.new('test-fixture', {})
       proj.instance_eval(project_block)
@@ -257,26 +318,74 @@ end" }
      end
 
     it 'supports versioned replaces' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
       proj.instance_eval(project_block)
       proj.replaces('thing1', '1.2.3')
       expect(proj._project.get_replaces.count).to eq(1)
       expect(proj._project.get_replaces.first.replacement).to eq('thing1')
-      expect(proj._project.get_replaces.first.version).to eq('1.2.3')
-     end
+      expect(proj._project.get_replaces.first.version).to eq('< 1.2.3')
+    end
 
-    it 'gets rid of duplicates' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+    it 'supports deb versioned replaces' do
+      proj = Vanagon::Project::DSL.new('test-fixture', @deb_plat._platform, [])
       proj.instance_eval(project_block)
       proj.replaces('thing1', '1.2.3')
+      expect(proj._project.get_replaces.count).to eq(1)
+      expect(proj._project.get_replaces.first.replacement).to eq('thing1')
+      expect(proj._project.get_replaces.first.version).to eq('<< 1.2.3')
+    end
+
+    it 'munges deb* versions' do
+      operators = {
+        '<' => '<<',
+        '>' => '>>',
+        '<=' => '<=',
+        '>=' => '>=',
+        '=' => '='
+      }
+      operators.each do |initial, munged|
+        proj = Vanagon::Project::DSL.new('test-fixture', @deb_plat._platform, [])
+        proj.instance_eval(project_block)
+        proj.replaces('thing1', "#{initial}1.2.3")
+        expect(proj._project.get_replaces.count).to eq(1)
+        expect(proj._project.get_replaces.first.replacement).to eq('thing1')
+        expect(proj._project.get_replaces.first.version).to eq("#{munged} 1.2.3")
+      end
+    end
+
+    it 'adds whitespace for rpm versions' do
+      operators=['<','>','<=','>=','=']
+      operators.each do |operator|
+        proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
+        proj.instance_eval(project_block)
+        proj.replaces('thing1', "#{operator}1.2.3")
+        expect(proj._project.get_replaces.count).to eq(1)
+        expect(proj._project.get_replaces.first.replacement).to eq('thing1')
+        expect(proj._project.get_replaces.first.version).to eq("#{operator} 1.2.3")
+      end
+    end
+
+    it 'gets rid of duplicates' do
+      proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
+      proj.instance_eval(project_block)
       proj.replaces('thing1', '1.2.3')
+      proj.replaces('thing1', '<1.2.3')
       expect(proj._project.get_replaces.count).to eq(1)
       expect(proj._project.get_replaces.first.replacement).to eq('thing1')
-      expect(proj._project.get_replaces.first.version).to eq('1.2.3')
+      expect(proj._project.get_replaces.first.version).to eq('< 1.2.3')
     end
   end
 
   describe "#conflicts" do
+    before do
+      allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
+      allow(Vanagon::Driver).to receive(:configdir).and_return(configdir)
+      @el_plat = Vanagon::Platform::DSL.new('el-5-x86_64')
+      @el_plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      @deb_plat = Vanagon::Platform::DSL.new('ubuntu-16.04-amd64')
+      @deb_plat.instance_eval("platform 'ubuntu-16.04-amd64' do |plat| end")
+    end
+
     it 'adds the package conflict to the list of conflicts' do
       proj = Vanagon::Project::DSL.new('test-fixture', {})
       proj.instance_eval(project_block)
@@ -288,22 +397,61 @@ end" }
      end
 
     it 'supports versioned conflicts' do
-      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
       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')
+      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', {})
+    it 'supports deb versioned conflicts' do
+      proj = Vanagon::Project::DSL.new('test-fixture', @deb_plat._platform, [])
       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 'munges deb* versions' do
+      operators = {
+        '<' => '<<',
+        '>' => '>>',
+        '<=' => '<=',
+        '>=' => '>=',
+        '=' => '='
+      }
+      operators.each do |initial, munged|
+        proj = Vanagon::Project::DSL.new('test-fixture', @deb_plat._platform, [])
+        proj.instance_eval(project_block)
+        proj.conflicts('thing1', "#{initial}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("#{munged} 1.2.3")
+      end
+    end
+
+    it 'adds whitespace for rpm versions' do
+      operators=['<','>','<=','>=','=']
+      operators.each do |operator|
+        proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
+        proj.instance_eval(project_block)
+        proj.conflicts('thing1', "#{operator}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("#{operator} 1.2.3")
+      end
+    end
+
+    it 'gets rid of duplicates' do
+      proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
+      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')
+      expect(proj._project.get_conflicts.first.version).to eq('< 1.2.3')
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.15.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -208,8 +208,10 @@ files:
 - spec/lib/vanagon/optparse_spec.rb
 - spec/lib/vanagon/platform/deb_spec.rb
 - spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/platform/osx_spec.rb
 - spec/lib/vanagon/platform/rpm/aix_spec.rb
 - spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/platform/solaris_10_spec.rb
 - spec/lib/vanagon/platform/solaris_11_spec.rb
 - spec/lib/vanagon/platform/windows_spec.rb
 - spec/lib/vanagon/platform_spec.rb
@@ -269,8 +271,10 @@ test_files:
 - spec/lib/vanagon/optparse_spec.rb
 - spec/lib/vanagon/platform/deb_spec.rb
 - spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/platform/osx_spec.rb
 - spec/lib/vanagon/platform/rpm/aix_spec.rb
 - spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/platform/solaris_10_spec.rb
 - spec/lib/vanagon/platform/solaris_11_spec.rb
 - spec/lib/vanagon/platform/windows_spec.rb
 - spec/lib/vanagon/platform_spec.rb