semantic_puppet 1.0.4 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e37126b8cf6e3af3f6fb7f7e98ab38223bfd3466edd4eb1bbd99b20f5f4e22f6
-  data.tar.gz: 3f200910bfea3ee0d551670d3e35f943e3a64e82e3bcf5e280aec8ce29e292a3
+  metadata.gz: 7eca696bafc0fd31fcab209996686beb644ab5822f0dd1097738b756efa757cb
+  data.tar.gz: 53602f9333cf344a567fcd371e97e1160327991164a5f2bca4927c1cbf372b74
 SHA512:
-  metadata.gz: 16b7f38f0211f02448d3f5bbcd2a880265a8980471cb40d389beb79f85baac2cff960e3a014ab3cf01b74b2b2047e19f7b7a74f6ecb97dc1d9c5230ffd0b2265
-  data.tar.gz: b58ccbd2a4cd948cc53201f9f9bc263e2d3d8b4a91f242849292a16867b156e610822c8adf5485b6b97f265a631963c802dec7e68f2483bd0566781b77848f30
+  metadata.gz: 31e8634019028c678bfb59b7f8ec71fa8d839af8bb9475add780fd330e943246edc4a1cb803dc5e6a270ca4c48229d9fcbaf917d1bc00c9fd5a70b8896e9c91b
+  data.tar.gz: 27f26157df4621ad97687fdcfd6b8f0f69dd4e8c70fbb8f36dd35ec1e129998ce97f374342336607dd12b76833e17393762694ad3b224cad16315b651eee16b0

data/.github/dependabot.yml

@@ -0,0 +1,17 @@
+version: 2
+updates:
+# raise PRs for gem updates
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10
+
+# Maintain dependencies for GitHub Actions
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10

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@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+      - name: Create lock
+        run: bundle lock
+      - uses: actions/setup-java@v4
+        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,37 @@
+---
+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-22.04, ruby: '2.7'}
+          - {os: ubuntu-22.04, ruby: '3.0'}
+          - {os: ubuntu-22.04, ruby: '3.2'}
+          - {os: ubuntu-22.04, ruby: '3.3'}
+          - {os: ubuntu-22.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@v4
+
+      - name: Install ruby version ${{ matrix.cfg.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.cfg.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake spec
+      - name: Verify gem builds
+        run: gem build --verbose *.gemspec

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.1 - 2025-01-07
+
+- Fix method name typo ([joshcooper](https://github.com/joshcooper))
+
+## 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

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.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.4'
+  VERSION = '1.1.1'
 end

data/lib/semantic_puppet/version_range.rb

@@ -398,8 +398,8 @@ module SemanticPuppet
 
       # Merge two ranges so that the result matches the intersection of all matching versions.
       #
-      # @param range [AbastractRange] the range to intersect with
-      # @return [AbastractRange,nil] the intersection between the ranges
+      # @param range [AbstractRange] the range to intersect with
+      # @return [AbstractRange,nil] the intersection between the ranges
       #
       # @api private
       def intersection(range)
@@ -474,7 +474,7 @@ module SemanticPuppet
             excl_end = other.exclude_end?
           else
             max = self.end
-            excl_end = exclude_end && other.exclude_end?
+            excl_end = exclude_end? && other.exclude_end?
           end
 
           MinMaxRange.create(excl_begin ? GtRange.new(min) : GtEqRange.new(min), excl_end ? LtRange.new(max) : LtEqRange.new(max))
@@ -499,7 +499,7 @@ module SemanticPuppet
       # Checks if this matcher accepts a prerelease with the same major, minor, patch triple as the given version. Only matchers
       # where this has been explicitly stated will respond `true` to this method
       #
-      # @return [Boolean] `true` if this matcher accepts a prerelase with the tuple from the given version
+      # @return [Boolean] `true` if this matcher accepts a prerelease with the tuple from the given version
       def test_prerelease?(_)
         false
       end

data/semantic_puppet.gemspec

@@ -20,9 +20,8 @@ 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"
   s.add_development_dependency "rspec"
 

data/spec/unit/semantic_puppet/dependency_spec.rb

@@ -247,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
 

data/spec/unit/semantic_puppet/version_range_spec.rb

@@ -270,6 +270,16 @@ describe SemanticPuppet::VersionRange do
           expect(range.exclude_end?).to be_nil
         end
       end
+
+      context 'prerelease' do
+        test_expressions(
+          [ '>=5.0.1-rc0' || '>=0.5.0' ] => {
+            :to_str   => '>=5.0.1-rc0',
+            :includes => ['5.0.1-rc0', '5.0.1'], # should include 1.0.0
+            :excludes => ['1.0.0', '5.0.0-rc0', '5.0.2-rc0']
+          }
+        )
+      end
     end
 
     context 'invalid expressions' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic_puppet
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.1
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-08 00:00:00.000000000 Z
+date: 2025-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -102,9 +102,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/mend.yaml"
+- ".github/workflows/rspec_tests.yaml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CODEOWNERS
@@ -112,7 +114,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 +146,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.4.22
 signing_key: 
 specification_version: 4
 summary: Useful tools for working with Semantic Versions.

data/.travis.yml

@@ -1,29 +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"
-  - "3.0.0"
-  - "jruby-19mode"
-
-jdk:
-  - openjdk8

data/appveyor.yml

@@ -1,20 +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
-    - RUBY_VERSION: 30-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