Finish 3.2.0

gkellogg · gkellogg · commit 46ab36db28a8 · 2021-12-29T13:36:10.000-08:00
diff --git a/.coveralls.yml b/.coveralls.yml
@@ -0,0 +1 @@
+repo_token: 9oh3FPpJIPhz4dxqpNINA5HWXXdFwuW32
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,15 +22,15 @@ jobs:
     runs-on: ubuntu-latest
     env:
       CI: true
+      ALLOW_FAILURES: ${{ endsWith(matrix.ruby, 'head') }}
     strategy:
       fail-fast: false
       matrix:
         ruby:
-          - 2.4
-          - 2.5
           - 2.6
           - 2.7
           - 3.0
+          - 3.1
           - ruby-head
           - jruby
     steps:
@@ -43,5 +43,9 @@ jobs:
       - name: Install dependencies
         run: bundle install --jobs 4 --retry 3
       - name: Run tests
-        run: bundle exec rspec spec
- 
+        run: ruby --version; bundle exec rspec spec || $ALLOW_FAILURES
+      - name: Coveralls GitHub Action
+        uses: coverallsapp/github-action@v1.1.2
+        if: "matrix.ruby == '3.0'"
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.travis.yml b/.travis.yml
diff --git a/Gemfile b/Gemfile
@@ -10,6 +10,6 @@ group :debug do
 end
 
 group :development, :test do
-  gem 'simplecov', require: false,  platforms: :mri
-  gem 'coveralls', require: false, platforms: :mri
+  gem 'simplecov', '~> 0.21',  platforms: :mri
+  gem 'simplecov-lcov', '~> 0.8',  platforms: :mri
 end
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ and shared examples for Ruby projects that use RDF.rb and RSpec.
 
 [![Gem Version](https://badge.fury.io/rb/rdf-spec.png)](https://badge.fury.io/rb/rdf-spec)
 [![Build Status](https://github.com/ruby-rdf/rdf-spec/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf-spec/actions?query=workflow%3ACI)
-[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-spec/badge.svg)](https://coveralls.io/github/ruby-rdf/rdf-spec)
+[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-spec/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/rdf-spec?branch=develop)
 [![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
 
 ## Documentation
@@ -30,8 +30,8 @@ Note that in most cases, if the instance is empty and mutable, the appropriate s
 
 ## Dependencies
 
-* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.0)
-* [RSpec](https://rubygems.org/gems/rspec) (~> 3.7)
+* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.2)
+* [RSpec](https://rubygems.org/gems/rspec) (~> 3.10)
 
 ## Installation
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.1.2
+3.2.0
diff --git a/etc/doap.ttl b/etc/doap.ttl
@@ -1,58 +1,28 @@
-@base         <https://rubygems.org/gems/rdf> .
+@base         <https://rubygems.org/gems/rdf-spec> .
 @prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix dc:   <http://purl.org/dc/terms/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix doap: <http://usefulinc.com/ns/doap#> .
 
 <> a doap:Project ;
-  doap:name          "RDF.rb" ;
-  doap:homepage      <https://rubygems.org/gems/rdf> ;
+  doap:name          "RDF::Spec" ;
+  doap:homepage      <https://rubygems.org/gems/rdf-spec> ;
   doap:license       <https://unlicense.org/1.0/> ;
-  doap:shortdesc     "A Ruby library for working with Resource Description Framework (RDF) data."@en ;
-  doap:description   "RDF.rb is a pure-Ruby library for working with Resource Description Framework (RDF) data."@en ;
-  doap:created       "2007-10-23" ;
+  doap:shortdesc     "RSpec extensions for RDF.rb."@en ;
+  doap:description   "RDF.rb extension that provides RSpec matchers and shared examples for RDF objects."@en ;
+  doap:created       "2007-02-03" ;
   doap:programming-language "Ruby" ;
   doap:category      <http://dbpedia.org/resource/Resource_Description_Framework>,
                      <http://dbpedia.org/resource/Ruby_(programming_language)> ;
-  doap:implements    <http://www.w3.org/TR/rdf11-concepts/>,
-                     <http://www.w3.org/TR/n-quads/>,
-                     <http://www.w3.org/TR/n-triples/> ;
-  doap:download-page <https://rubygems.org/gems/rdf/> ;
-  doap:bug-database  <https://github.com/ruby-rdf/rdf/issues> ;
+  doap:download-page <> ;
+  doap:bug-database  <https://github.com/ruby-rdf/rdf-spec/issues> ;
   doap:blog          <https://ar.to/>, <https://greggkellogg.net/> ;
   doap:developer     <https://ar.to/#self>, <https://bhuga.net/#ben>, <https://greggkellogg.net/foaf#me> ;
   doap:maintainer    <https://greggkellogg.net/foaf#me> ;
-  doap:documenter    <https://ar.to/#self>, <https://bhuga.net/#ben>, <https://greggkellogg.net/foaf#me> ;
-  doap:helper        [a foaf:Person ;
-                      foaf:name "Călin Ardelean" ;
-                      foaf:mbox_sha1sum "274bd18402fc773ffc0606996aa1fb90b603aa29"] ;
-  doap:helper        [a foaf:Person ;
-                      foaf:name "Danny Gagne" ;
-                      foaf:mbox_sha1sum "6de43e9cf7de53427fea9765706703e4d957c17b"] ;
-  doap:helper        [a foaf:Person ;
-                      foaf:name "Joey Geiger" ;
-                      foaf:mbox_sha1sum "f412d743150d7b27b8468d56e69ca147917ea6fc"] ;
-  doap:helper        [a foaf:Person ;
-                      foaf:name "Fumihiro Kato" ;
-                      foaf:mbox_sha1sum "d31fdd6af7a279a89bf09fdc9f7c44d9d08bb930"] ;
-  doap:helper        [a foaf:Person ;
-                      foaf:name "Naoki Kawamukai" ;
-                      foaf:mbox_sha1sum "5bdcd8e2af4f5952aaeeffbdd371c41525ec761d"] ;
-  doap:helper        [a foaf:Person ;
-                      foaf:name "Hellekin O. Wolf" ;
-                      foaf:mbox_sha1sum "c69f3255ff0639543cc5edfd8116eac8df16fab8"] ;
-  doap:helper        [a foaf:Person ;
-                      foaf:name "John Fieber" ;
-                      foaf:mbox_sha1sum "f7653fc1ac0e82ebb32f092389bd5fc728eaae12"] ;
-  doap:helper        [a foaf:Person ;
-                      foaf:name "Keita Urashima" ;
-                      foaf:mbox_sha1sum "2b4247b6fd5bb4a1383378f325784318680d5ff9"] ;
-  doap:helper        [a foaf:Person ;
-                      foaf:name "Pius Uzamere" ;
-                      foaf:mbox_sha1sum "bedbbf2451e5beb38d59687c0460032aff92cd3c"] ;
-  foaf:maker         <https://ar.to/#self> ;
-  dc:creator         <https://ar.to/#self> .
+  doap:documenter    <https://greggkellogg.net/foaf#me> ;
+  foaf:maker         <https://greggkellogg.net/foaf#me> ;
+  dc:creator         <https://greggkellogg.net/foaf#me> .
 
 <https://ar.to/#self> a foaf:Person ;
   foaf:name          "Arto Bendiken" ;
@@ -67,6 +37,7 @@
   foaf:mbox_sha1sum  "dbf45f4ffbd27b67aa84f02a6a31c144727d10af" ;
   foaf:homepage      <https://bhuga.net/> .
 
+
 <https://greggkellogg.net/foaf#me> a foaf:Person ;
   foaf:name          "Gregg Kellogg" ;
   foaf:mbox          <mailto:gregg@greggkellogg.net> ;
diff --git a/lib/rdf/spec/inspects.rb b/lib/rdf/spec/inspects.rb
@@ -3,7 +3,9 @@
 
 class RDF::Literal
   def inspect
-    "\"#{escape(value)}\" R:L:(#{self.class.to_s.match(/([^:]*)$/)})"
+    klass = self.class.to_s.match(/([^:]*)$/).to_s
+    dt = self.datatype
+    "\"#{escape(value)}\"#{('@' + self.language.to_s) if self.language?} R:L:(#{klass == 'Literal' && dt ? dt : klass})"
   end
 end
 
diff --git a/lib/rdf/spec/literal.rb b/lib/rdf/spec/literal.rb
@@ -5,6 +5,7 @@
 # include the examples for `RDF::Literal`, `RDF::Literal validation`,
 # `RDF::Literal canonicalization`, and `RDF::Literal lookup`.
 
+# @private
 shared_examples 'RDF::Literal' do |value, datatype_uri|
   include_examples 'RDF::Literal with datatype and grammar', value, datatype_uri
   include_examples 'RDF::Literal equality', value, value
diff --git a/lib/rdf/spec/matchers.rb b/lib/rdf/spec/matchers.rb
@@ -1,5 +1,5 @@
 require 'rspec/matchers' # @see https://rubygems.org/gems/rspec
-require 'awesome_print'
+require 'amazing_print'
 
 module RDF; module Spec
   ##
@@ -273,7 +273,7 @@ def io_name
         @info = if (info.id rescue false)
           info
         elsif info.is_a?(Logger)
-          Info.new(logger: info)
+          Info.new({logger: info})
         elsif info.is_a?(Hash)
           Info.new(info[:id], info[:logger], info[:action], info[:result], info[:format], info[:base], info[:prefixes])
         else
diff --git a/rdf-spec.gemspec b/rdf-spec.gemspec
@@ -18,15 +18,15 @@ Gem::Specification.new do |gem|
   gem.files              = %w(AUTHORS CREDITS README.md UNLICENSE VERSION) + Dir.glob('etc/*') + Dir.glob('lib/**/*.rb') + Dir.glob('spec/*.rb')
   gem.require_paths      = %w(lib)
 
-  gem.required_ruby_version      = '>= 2.4'
+  gem.required_ruby_version      = '>= 2.6'
   gem.requirements               = []
-  gem.add_runtime_dependency     'rdf',             '~> 3.1', '>= 3.1.8'
-  gem.add_runtime_dependency     'awesome_print',   '~> 1.8'
-  gem.add_runtime_dependency     'rdf-isomorphic',  '~> 3.1'
-  gem.add_runtime_dependency     'rspec',           '~> 3.9'
+  gem.add_runtime_dependency     'rdf',             '~> 3.2'
+  gem.add_runtime_dependency     'amazing_print',   '~> 1.4'
+  gem.add_runtime_dependency     'rdf-isomorphic',  '~> 3.2'
+  gem.add_runtime_dependency     'rspec',           '~> 3.10'
   gem.add_runtime_dependency     'rspec-its',       '~> 1.3'
   gem.add_runtime_dependency     'rexml',           '~> 3.2'  # For Webmock
-  gem.add_runtime_dependency     'webmock',         '~> 3.7'
+  gem.add_runtime_dependency     'webmock',         '~> 3.14'
   gem.add_development_dependency 'yard' ,           '~> 0.9'
   gem.post_install_message        = nil
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -2,10 +2,17 @@
 require 'rdf'
 begin
   require 'simplecov'
-  require 'coveralls'
+  require 'simplecov-lcov'
+
+  SimpleCov::Formatter::LcovFormatter.config do |config|
+    #Coveralls is coverage by default/lcov. Send info results
+    config.report_with_single_file = true
+    config.single_report_path = 'coverage/lcov.info'
+  end
+
   SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
     SimpleCov::Formatter::HTMLFormatter,
-    Coveralls::SimpleCov::Formatter
+    SimpleCov::Formatter::LcovFormatter
   ])
   SimpleCov.start do
     add_filter "matchers.rb"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+repo_token: 9oh3FPpJIPhz4dxqpNINA5HWXXdFwuW32`