semantic_puppet 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3c25c681bbdc25c5314544df8ef06c0ddbd3757af6a5de7fd7b4999bce88c17
-  data.tar.gz: e930096e61ccc839c6ccdf11a1b93e34db1446cc12f3c1bce5b352a307aced4b
+  metadata.gz: e37126b8cf6e3af3f6fb7f7e98ab38223bfd3466edd4eb1bbd99b20f5f4e22f6
+  data.tar.gz: 3f200910bfea3ee0d551670d3e35f943e3a64e82e3bcf5e280aec8ce29e292a3
 SHA512:
-  metadata.gz: 13fed0e5b789b80a9ed8cb2f1f739d9f77e5d5ebe72a73acd53466c969513f165508c1bd7ce62bfea05cd0f19369f5041992c9e0cf86f17cae3199ec32739fb1
-  data.tar.gz: e6b4d574369a2f8b82fda07e2ba1847d8bece8665f191e92027121a07d81d01c2bd8e6bb273a71eef435c39e86baa75ab204590c3910061f737d14ef81cf5aa4
+  metadata.gz: 16b7f38f0211f02448d3f5bbcd2a880265a8980471cb40d389beb79f85baac2cff960e3a014ab3cf01b74b2b2047e19f7b7a74f6ecb97dc1d9c5230ffd0b2265
+  data.tar.gz: b58ccbd2a4cd948cc53201f9f9bc263e2d3d8b4a91f242849292a16867b156e610822c8adf5485b6b97f265a631963c802dec7e68f2483bd0566781b77848f30

data/.travis.yml

@@ -22,6 +22,7 @@ rvm:
   - "2.5.8"
   - "2.6.6"
   - "2.7.2"
+  - "3.0.0"
   - "jruby-19mode"
 
 jdk:

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.0.4 - 2021-06-08
+- Remove dependency on SortedSet
+- Add Ruby 3.0 to Travis and AppVeyor
+
 ## 1.0.3 - 2021-01-12
 - List failed module install dependencies
 - Add Ruby 2.7 to Travis and AppVeyor

data/appveyor.yml

@@ -6,6 +6,7 @@ environment:
     - RUBY_VERSION: 25-x64
     - RUBY_VERSION: 26-x64
     - RUBY_VERSION: 27-x64
+    - RUBY_VERSION: 30-x64
 matrix:
   fast_finish: true
 install:

data/lib/semantic_puppet/dependency/graph_node.rb

@@ -33,10 +33,10 @@ module SemanticPuppet
       end
 
       # @api internal
-      # @return [{ String => SortedSet<GraphNode> }] the satisfactory
+      # @return [{ String => Array<GraphNode> }] the satisfactory
       #         dependency nodes
       def dependencies
-        @_dependencies ||= Hash.new { |h, k| h[k] = SortedSet.new }
+        @_dependencies ||= Hash.new { |h, k| h[k] = Array.new }
       end
 
       # Adds the given dependency name to the list of dependencies.
@@ -99,11 +99,17 @@ module SemanticPuppet
       end
 
       def << (nodes)
-        Array(nodes).each do |node|
-          next unless dependencies.key?(node.name)
-          if satisfies_dependency?(node)
-            dependencies[node.name] << node
+        Array(nodes).group_by(&:name).each_pair do |name, nodes|
+          changed = false
+          next unless dependencies.key?(name)
+
+          nodes.each do |node|
+            if satisfies_dependency?(node)
+              dependencies[name] << node
+              changed = true
+            end
           end
+          dependencies[name].sort! if changed
         end
 
         return self

data/lib/semantic_puppet/gem_version.rb

@@ -1,3 +1,3 @@
 module SemanticPuppet
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/spec/unit/semantic_puppet/dependency/graph_node_spec.rb

@@ -68,6 +68,16 @@ describe SemanticPuppet::Dependency::GraphNode do
       subject << bar3
       expect(Array(subject.dependencies['bar'])).to be_empty
     end
+
+    it 'sorts once the dependencies for a specific node' do
+      expect(subject.dependencies['bar']).to receive(:sort!).once
+      subject << [bar1, bar2]
+    end
+
+    it 'sorts the dependencies for each addition to the same node' do
+      expect(subject.dependencies['bar']).to receive(:sort!).twice
+      subject << bar1 << bar2
+    end
   end
 
   describe '#satisfied' do

data/spec/unit/semantic_puppet/dependency_spec.rb

@@ -42,7 +42,10 @@ describe SemanticPuppet::Dependency do
     context 'with one source' do
       let(:source) { double('Source', :priority => 0) }
 
-      before { SemanticPuppet::Dependency.add_source(source) }
+      before do
+        SemanticPuppet::Dependency.clear_sources
+        SemanticPuppet::Dependency.add_source(source)
+      end
 
       it 'queries the source for release information' do
         expect(source).to receive(:fetch).with('module_name').and_return([])
@@ -90,8 +93,8 @@ describe SemanticPuppet::Dependency do
         )
 
         result = SemanticPuppet::Dependency.query('foo' => '1.0.0', 'bar' => '1.0.0')
-        expect(result.dependencies['foo']).to eql SortedSet.new([ foo ])
-        expect(result.dependencies['bar']).to eql SortedSet.new([ bar ])
+        expect(result.dependencies['foo']).to eql [foo]
+        expect(result.dependencies['bar']).to eql [bar]
       end
 
       it 'populates all returned ModuleReleases with related dependencies' do
@@ -102,9 +105,9 @@ describe SemanticPuppet::Dependency do
         )
 
         result = SemanticPuppet::Dependency.query('foo' => '1.0.0')
-        expect(result.dependencies['foo']).to eql SortedSet.new([ foo ])
-        expect(foo.dependencies['bar']).to eql SortedSet.new([ bar ])
-        expect(bar.dependencies['baz']).to eql SortedSet.new([ baz ])
+        expect(result.dependencies['foo']).to eql [foo]
+        expect(foo.dependencies['bar']).to eql [bar]
+        expect(bar.dependencies['baz']).to eql [baz]
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic_puppet
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake