librarianp 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01ebdbe74e4883d9dbd1b042307b395f5d62bc69bb0e4a49f002438bcd62cbc2
-  data.tar.gz: a0b41c7ed1dc96c41bbd2a290ff08b7aef31c1de39a12fca3a768861e6951ff9
+  metadata.gz: '04836272b4b555a30bf10f2650b9fffe3345cbcebe2571b2abfb6dfcf2a0386c'
+  data.tar.gz: cfdf93c57b0e642752b522ed10023f3d34cdddc8332124d766951e356c786ea3
 SHA512:
-  metadata.gz: cc33792de21cfa8b351a3098bdfbfb659c08a8aa369e5e29f4a3ddf6ea3384d878293b959294c4fefdae59b59e9c8207a004d9e42a444804f4fb362867a6d515
-  data.tar.gz: 3d21e30a41fe594c6255f80d07595ea07b46e18ec352f8340bffa19d1031c30fd0c4890810e88a5f2cc3ce650c8a9587a2eb15d3a21d5dbe9748f3fb0ee5d002
+  metadata.gz: c04b6ea8c05639eba4ecbb67eb24800c1061b9c3fcb57046b73d131c4f9fb0618432325815be4e361697eeac23c5a45de8e33ce77ecc6873feb402397cd9c164
+  data.tar.gz: 4f93488d213e11c2d64140df7b01b5fb557ed14d5a11f6745213c0f468f9d4502c4b65f2eb88a207f01fcdac73c46e22b8b1c3b7a01a3350257e5bcb2014bf66

data/.github/workflows/release.yml

@@ -0,0 +1,32 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'voxpupuli'
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Ruby 3.0
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+        env:
+          BUNDLE_WITHOUT: release
+      - name: Build gem
+        run: gem build *.gemspec
+      - name: Publish gem to rubygems.org
+        run: gem push *.gem
+        env:
+          GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_AUTH_TOKEN }}'
+      - name: Setup GitHub packages access
+        run: |
+          mkdir -p ~/.gem
+          echo ":github: Bearer ${{ secrets.GITHUB_TOKEN }}" >> ~/.gem/credentials
+          chmod 0600 ~/.gem/credentials
+      - name: Publish gem to GitHub packages
+        run: gem push --key github --host https://rubygems.pkg.github.com/${{ github.repository_owner }} *.gem

data/.github/workflows/test.yml

@@ -0,0 +1,29 @@
+name: Test
+
+on:
+  - pull_request
+  - push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "2.4"
+          - "2.5"
+          - "2.6"
+          - "2.7"
+          - "3.0"
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rake spec
+      - name: Verify gem builds
+        run: gem build *.gemspec

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.1.0
+
+* Support Ruby 3
+
 ## 1.0.0
 
 * Require Ruby 2.4+

data/Gemfile

@@ -2,5 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in librarian.gemspec
 gemspec
-
-gem "rubysl", :platforms => %w[rbx]

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/librarian/dsl.rb

@@ -79,14 +79,14 @@ module Librarian
       Receiver.new(target)
     end
 
-    def run(specfile = nil, sources = [])
+    def run(specfile = nil, sources = [], &block)
       specfile, sources = nil, specfile if specfile.kind_of?(Array) && sources.empty?
 
       Target.new(self).tap do |target|
         target.precache_sources(sources)
         debug_named_source_cache("Pre-Cached Sources", target)
 
-        specfile ||= Proc.new if block_given?
+        specfile ||= block if block_given?
 
         if specfile.kind_of?(Pathname) and !File.exists?(specfile)
           debug { "Specfile #{specfile} not found, using defaults" } unless specfile.nil?

data/librarianp.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = '~> 2.4'
+  gem.required_ruby_version = '>= 2.4', '< 4'
 
   gem.add_dependency "thor", "~> 1.0"
 

data/spec/unit/lockfile/parser_spec.rb

@@ -57,8 +57,7 @@ module Librarian
       it "should give a dependency with the expected requirement" do
         dependency = resolution.dependencies.first
 
-        # Note: it must be this order because this order is lexicographically sorted.
-        expect(dependency.requirement.to_s).to eq "~> 1.1, != 1.2.6"
+        expect(dependency.requirement).to eq Librarian::Dependency::Requirement.new(["~> 1.1", "!= 1.2.6"])
       end
 
       it "should give a dependency wth the expected source" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarianp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jay Feldblum
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -89,9 +89,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/release.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -199,17 +200,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.4'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: A Framework for Bundlers.

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-rvm:
-  - '2.4'
-  - '2.5'
-  - '2.6'
-deploy:
-  provider: rubygems
-  api_key:
-    secure: "HkdoYaLek2mCT+e7pW0pHMLiIuikUMihfqzspltzmN673HBvMCMZqk4sIm4b3Zi+RMtNTb4dnMxxhehKyyzF88UIRHqV9OUPT3LQLE/BgHThxLD1+CSbVS1SZKY7UfTIcqW3/otORBCI5YAXiycEnRFIe2R/S3n0c/gD9dBcobg="
-  gem: librarianp
-  on:
-    tags: true
-    rvm: '2.6'