semantic_puppet 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3c25c681bbdc25c5314544df8ef06c0ddbd3757af6a5de7fd7b4999bce88c17
-  data.tar.gz: e930096e61ccc839c6ccdf11a1b93e34db1446cc12f3c1bce5b352a307aced4b
+  metadata.gz: eea2dc5798bc6407fce6be5c6b5eccac1c6ed181c95e8ee3bcf28f35b42d99a9
+  data.tar.gz: 7c28901b6e803c210a14164945fb81a2525f66d536dcffc472c7392b00217bd6
 SHA512:
-  metadata.gz: 13fed0e5b789b80a9ed8cb2f1f739d9f77e5d5ebe72a73acd53466c969513f165508c1bd7ce62bfea05cd0f19369f5041992c9e0cf86f17cae3199ec32739fb1
-  data.tar.gz: e6b4d574369a2f8b82fda07e2ba1847d8bece8665f191e92027121a07d81d01c2bd8e6bb273a71eef435c39e86baa75ab204590c3910061f737d14ef81cf5aa4
+  metadata.gz: 93345ca72b239f08ce44b76fa2019831681f5e23c83bb5287191d2e754fc8dd451a76559803200970b778be8b03a91e5ca73c6114d651392036372e3c7c65a1a
+  data.tar.gz: 1b0c0670a773a76bc13c1cae7ab782f8b71ac984d480e8e22c45588d1eb40f507e8d91d898d80ddd7e78d4422f5a671b4c2555a7b4f93543eed6e2f8340a271c

data/.github/workflows/mend.yaml

@@ -0,0 +1,35 @@
+---
+name: Mend Monitor
+on:
+  push:
+    branches:
+      - main
+jobs:
+  mend_monitor:
+    if: ${{ github.repository_owner == 'puppetlabs' }}
+    runs-on: ubuntu-latest
+    name: Mend Monitor
+    steps:
+      - name: Checkout current PR
+        uses: actions/checkout@v3
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+      - name: Create lock
+        run: bundle lock
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Download Mend
+        run: curl -o wss-unified-agent.jar https://unified-agent.s3.amazonaws.com/wss-unified-agent.jar
+      - name: Run Mend
+        run: java -jar wss-unified-agent.jar
+        env:
+          WS_APIKEY: ${{ secrets.MEND_API_KEY }}
+          WS_WSS_URL: https://saas-eu.whitesourcesoftware.com/agent
+          WS_USERKEY: ${{ secrets.MEND_TOKEN }}
+          WS_PRODUCTNAME: Puppet Agent
+          WS_PROJECTNAME: ${{ github.event.repository.name }}
+

data/.github/workflows/rspec_tests.yaml

@@ -0,0 +1,40 @@
+---
+name: RSpec test
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  rspec_tests:
+    name: ${{ matrix.cfg.os }}(ruby ${{ matrix.cfg.ruby }})
+    strategy:
+      matrix:
+        cfg:
+          - {os: ubuntu-20.04, ruby: '2.7'}
+          - {os: ubuntu-20.04, ruby: '3.0'}
+          - {os: ubuntu-20.04, ruby: '3.2'}
+          - {os: ubuntu-20.04, ruby: 'jruby-9.4.2'}
+          - {os: windows-2019, ruby: '2.7'}
+          - {os: windows-2019, ruby: '3.0'}
+          - {os: windows-2019, ruby: '3.2'}
+
+    runs-on: ${{ matrix.cfg.os }}
+    steps:
+      - name: Checkout current PR
+        uses: actions/checkout@v3
+
+      - name: Install ruby version ${{ matrix.cfg.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.cfg.ruby }}
+
+      - name: Update rubygems and install gems
+        run: |
+          gem update --system --silent --no-document
+          bundle config set without packaging
+          bundle install --jobs 4 --retry 3
+      
+      - run: bundle exec rake spec

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.1.0 - 2023-04-10
+- Fix unsatisfiable if resolve() fails ([ekohl](https://github.com/ekohl))
+- Move from travis/appveyor to GitHub actions ([AriaXLi](https://github.com/AriaXLi))
+- Add Ruby 3.2 testing ([mhashizume](https://github.com/mhashizume))
+
+## 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/CODEOWNERS

@@ -1 +1 @@
-* @puppetlabs/forge-team @puppetlabs/platform-core
+* @puppetlabs/phoenix

data/README.md

@@ -19,8 +19,7 @@ This library is used by a number of Puppet Labs projects, including
 Requirements
 ------------
 
-Semantic_puppet will work on several ruby versions, including 1.9.3,
-2.0.0, 2.1.9 and 2.4.1. Please see the exact matrix in `.travis.yml`.
+semantic_puppet will work on Ruby version 2.7 and greater.
 
 No gem/library requirements.
 

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/dependency.rb

@@ -73,7 +73,7 @@ module SemanticPuppet
     # @param graph [Graph] the root of a dependency graph
     # @return [Array<ModuleRelease>] the list of releases to act on
     def resolve(graph)
-      @module_dependencies, @satisfieds = nil
+      @module_dependencies = @satisfieds = nil
 
       catch :next do
         return walk(graph, graph.dependencies.dup)
@@ -120,6 +120,8 @@ module SemanticPuppet
       name = dependencies.keys.sort.first
       deps = dependencies.delete(name)
 
+      @module_dependencies |= [name]
+
       # ... (and stepping over it if we've seen it before) ...
       unless (deps & considering).empty?
         return walk(graph, dependencies, *considering)
@@ -127,8 +129,6 @@ module SemanticPuppet
 
       # ... we'll iterate through the list of possible versions in order.
       preferred_releases(deps).reverse_each do |dep|
-        @module_dependencies |= [name]
-
         # We should skip any releases that violate any module's constraints.
         unless [graph, *considering].all? { |x| x.satisfies_constraints?(dep) }
           next

data/lib/semantic_puppet/gem_version.rb

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

data/semantic_puppet.gemspec

@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Dependencies
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.7.0'
 
   s.add_development_dependency "json", "~> 1.8.3" if RUBY_VERSION < '2.0'
   s.add_development_dependency "rake"

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
 
@@ -244,6 +247,16 @@ describe SemanticPuppet::Dependency do
           expect { foo('1.1.0') }.to raise_exception with_message
           expect { foo('1.1.0') }.to raise_exception /\bfoo\b/
         end
+
+        it 'sets unsatisfiable' do
+          add_source_modules('foo', %w[ 1.1.0 ], 'bar' => '1.x')
+          add_source_modules('bar', %w[ 0.0.1 0.1.0-a 0.1.0 ])
+
+          with_message = /Could not find satisfying releases/
+          expect { foo('1.1.0') }.to raise_exception with_message
+
+          expect(SemanticPuppet::Dependency.unsatisfiable).to eq('foo')
+        end
       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.1.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2023-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -102,9 +102,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/mend.yaml"
+- ".github/workflows/rspec_tests.yaml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CODEOWNERS
@@ -112,7 +113,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- appveyor.yml
 - lib/semantic_puppet.rb
 - lib/semantic_puppet/dependency.rb
 - lib/semantic_puppet/dependency/graph.rb
@@ -145,14 +145,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Useful tools for working with Semantic Versions.

data/.travis.yml

@@ -1,28 +0,0 @@
----
-language: ruby
-
-cache: bundler
-
-before_install:
-  - bundle -v
-  - rm Gemfile.lock || true
-  - gem update --system
-  - gem update bundler
-  - gem --version
-  - bundle -v
-
-script: "bundle exec rspec --color --format documentation spec/unit"
-
-notifications:
-  email: false
-
-sudo: false
-
-rvm:
-  - "2.5.8"
-  - "2.6.6"
-  - "2.7.2"
-  - "jruby-19mode"
-
-jdk:
-  - openjdk8

data/appveyor.yml

@@ -1,19 +0,0 @@
-version: 1.0.1.{build}
-clone_depth: 10
-image: Visual Studio 2019
-environment:
-  matrix:
-    - RUBY_VERSION: 25-x64
-    - RUBY_VERSION: 26-x64
-    - RUBY_VERSION: 27-x64
-matrix:
-  fast_finish: true
-install:
-  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - bundle install --jobs 4 --retry 2
-build: off
-test_script:
-  - ruby -v
-  - gem -v
-  - bundle -v
-  - bundle exec rspec --format documentation --color spec/unit