From fe597a03c798de4de15197100d3e5ffc01aa13d7 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Wed, 6 May 2020 15:40:31 -0700 Subject: [PATCH 01/15] Update documentation and links. --- etc/doap.ttl | 25 +++++++++++++------------ lib/rdf/aggregate_repo/merge_graph.rb | 4 ++-- rdf-aggregate-repo.gemspec | 2 +- spec/aggregate_repo_spec.rb | 14 +++++++------- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/etc/doap.ttl b/etc/doap.ttl index 8c29d86..ca81d5d 100644 --- a/etc/doap.ttl +++ b/etc/doap.ttl @@ -1,3 +1,4 @@ +@base . @prefix rdf: . @prefix rdfs: . @prefix dc: . @@ -7,10 +8,10 @@ @prefix ex: . @prefix xsd: . - a doap:Project, earl:Software ; +<> a doap:Project, earl:Software ; doap:name "RDF::AggregateRepo" ; - doap:homepage ; - doap:license ; + doap:homepage ; + doap:license ; doap:shortdesc "An aggregate RDF::Repository supporting a subset of named graphs and zero or more named graphs mapped to the default graph."@en ; doap:description "A gem extending RDF.rb with SPARQL dataset construction semantics."@en ; doap:created "2013-04-26"^^xsd:date ; @@ -18,16 +19,16 @@ doap:implements ; doap:category , ; - doap:download-page ; + doap:download-page <> ; doap:mailing-list ; - doap:bug-database ; - doap:blog ; - doap:developer ; - doap:maintainer ; - doap:documenter ; - foaf:maker ; + doap:bug-database ; + doap:blog ; + doap:developer ; + doap:maintainer ; + doap:documenter ; + foaf:maker ; dc:title "RDF::AggregateRepo"@en ; dc:description "A gem extending RDF.rb with SPARQL dataset construction semantics."@en ; dc:date "2013-04-26"^^xsd:date ; - dc:creator ; - dc:isPartOf . + dc:creator ; + dc:isPartOf . diff --git a/lib/rdf/aggregate_repo/merge_graph.rb b/lib/rdf/aggregate_repo/merge_graph.rb index 37e084e..7b64885 100644 --- a/lib/rdf/aggregate_repo/merge_graph.rb +++ b/lib/rdf/aggregate_repo/merge_graph.rb @@ -40,8 +40,8 @@ class MergeGraph ## # Create a new aggregation instance. # - # @param [RDF::Resource] :graph_name - # @param [RDF::Resource] :name alias for :graph_name + # @param [RDF::Resource] graph_name + # @param [RDF::Resource] name alias for `graph_name` # @yield merger # @yieldparam [RDF::MergeGraph] self # @yieldreturn [void] ignored diff --git a/rdf-aggregate-repo.gemspec b/rdf-aggregate-repo.gemspec index d37b72d..50027bb 100755 --- a/rdf-aggregate-repo.gemspec +++ b/rdf-aggregate-repo.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |gem| gem.date = File.mtime('VERSION').strftime('%Y-%m-%d') gem.name = 'rdf-aggregate-repo' - gem.homepage = 'http://ruby-rdf.github.com/rdf-aggregate-repo' + gem.homepage = 'http://github.com/ruby-rdf/rdf-aggregate-repo' gem.license = 'Unlicense' gem.summary = 'An aggregate RDF::Repository supporting a subset of named graphs and zero or more named graphs mapped to the default graph.' gem.description = %(A gem extending RDF.rb with SPARQL dataset construction semantics.) diff --git a/spec/aggregate_repo_spec.rb b/spec/aggregate_repo_spec.rb index 619ec48..b8b7e0a 100644 --- a/spec/aggregate_repo_spec.rb +++ b/spec/aggregate_repo_spec.rb @@ -76,23 +76,23 @@ context "with specific named entities" do let(:repo) {RDF::Repository.new {|r| RDF::Spec.quads.each {|s| r << s}}} - let(:gkellogg) {RDF::Graph(graph_name: "http://greggkellogg.net/foaf#me", data: repo)} - let(:bendiken) {RDF::Graph(graph_name: "http://ar.to/#self", data: repo)} - let(:bhuga) {RDF::Graph(graph_name: "http://bhuga.net/#ben", data: repo)} + let(:gkellogg) {RDF::Graph(graph_name: "https://greggkellogg.net/foaf#me", data: repo)} + let(:bendiken) {RDF::Graph(graph_name: "https://ar.to/#self", data: repo)} + let(:bhuga) {RDF::Graph(graph_name: "https://bhuga.net/#ben", data: repo)} before(:each) do r = repo @dataset = RDF::AggregateRepo.new do source r - default RDF::URI("http://greggkellogg.net/foaf#me") - named RDF::URI("http://ar.to/#self") - named RDF::URI("http://bhuga.net/#ben") + default RDF::URI("https://greggkellogg.net/foaf#me") + named RDF::URI("https://ar.to/#self") + named RDF::URI("https://bhuga.net/#ben") end end subject {@dataset} it {is_expected.not_to be_empty} its(:count) {is_expected.to eql [gkellogg, bendiken, bhuga].map(&:count).reduce(:+)} - its(:graph_names) {is_expected.to eql [RDF::URI("http://ar.to/#self"), RDF::URI("http://bhuga.net/#ben")]} + its(:graph_names) {is_expected.to eql [RDF::URI("https://ar.to/#self"), RDF::URI("https://bhuga.net/#ben")]} describe "#default_graph" do subject {@dataset.default_graph} its(:count) {is_expected.to eql gkellogg.count} From 74f6d03e3f18dbad7358648af8a4282c3b59180a Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Wed, 20 May 2020 13:45:13 -0700 Subject: [PATCH 02/15] Update URLs to use HTTPS, where possible. --- CONTRIBUTING.md | 8 ++++---- README.md | 26 +++++++++++++------------- UNLICENSE | 2 +- etc/doap.ttl | 10 +++++----- lib/rdf/aggregate_repo/merge_graph.rb | 2 +- rdf-aggregate-repo.gemspec | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 62f0eae..d30955e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ Community contributions are essential for keeping Ruby RDF great. We want to kee This repository uses [Git Flow](https://github.com/nvie/gitflow) to manage development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration. -* create or respond to an issue on the [Github Repository](http://github.com/ruby-rdf/rdf-aggregate-repo/issues) +* create or respond to an issue on the [Github Repository](https://github.com/ruby-rdf/rdf-aggregate-repo/issues) * Fork and clone the repo: `git clone git@github.com:your-username/rdf-aggregate-repo.git` * Install bundle: @@ -30,7 +30,7 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to manage devel of thumb, additions larger than about 15 lines of code), we need an explicit [public domain dedication][PDD] on record from you. -[YARD]: http://yardoc.org/ -[YARD-GS]: http://rubydoc.info/docs/yard/file/docs/GettingStarted.md -[PDD]: http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html +[YARD]: https://yardoc.org/ +[YARD-GS]: https://rubydoc.info/docs/yard/file/docs/GettingStarted.md +[PDD]: https://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html [pr]: https://github.com/ruby-rdf/rdf-aggregate-repo/compare/ diff --git a/README.md b/README.md index fc789d4..f93bb99 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ An aggregate RDF::Dataset supporting a subset of named graphs and zero or more named graphs mapped to the default graph. -[![Gem Version](https://badge.fury.io/rb/rdf-aggregate-repo.png)](http://badge.fury.io/rb/rdf-aggregate-repo) -[![Build Status](https://travis-ci.org/ruby-rdf/rdf-aggregate-repo.png?branch=master)](http://travis-ci.org/ruby-rdf/rdf-aggregate-repo) +[![Gem Version](https://badge.fury.io/rb/rdf-aggregate-repo.png)](https://badge.fury.io/rb/rdf-aggregate-repo) +[![Build Status](https://travis-ci.org/ruby-rdf/rdf-aggregate-repo.png?branch=master)](https://travis-ci.org/ruby-rdf/rdf-aggregate-repo) ## Description @@ -13,7 +13,7 @@ Maps named graphs from one or more `RDF::Queryable` instances into a single data require 'rdf' require 'rdf/nquads' - repo = RDF::Repository.load("http://ruby-rdf.github.com/rdf/etc/doap.nq") + repo = RDF::Repository.load("https://ruby-rdf.github.com/rdf/etc/doap.nq") # Instantiate a new aggregate repo based on an existing repo aggregate = RDF::AggregateRepo.new(repo) @@ -22,23 +22,23 @@ Maps named graphs from one or more `RDF::Queryable` instances into a single data aggregate.add_default(false) # Use a single named graph - aggregate.add_named(RDF::URI("http://greggkellogg.net/foaf#me")) + aggregate.add_named(RDF::URI("https://greggkellogg.net/foaf#me")) # Retrieve all contexts - aggreggate.contexts.to_a #=> [RDF::URI("http://greggkellogg.net/foaf#me")] + aggreggate.contexts.to_a #=> [RDF::URI("https://greggkellogg.net/foaf#me")] ## Dependencies -* [Ruby](http://ruby-lang.org/) (>= 2.4) +* [Ruby](https://ruby-lang.org/) (>= 2.4) * [RDF.rb][] (~> 3.1) ## Mailing List -* +* ## Author -* [Gregg Kellogg](http://github.com/gkellogg) - +* [Gregg Kellogg](https://github.com/gkellogg) - ## Contributing This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration. @@ -61,10 +61,10 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo ## License This is free and unencumbered public domain software. For more information, -see or the accompanying {file:UNLICENSE} file. +see or the accompanying {file:UNLICENSE} file. -[RDF.rb]: http://ruby-rdf.github.com/ +[RDF.rb]: https://ruby-rdf.github.com/ [RDF Datasets]: https://www.w3.org/TR/rdf11-concepts/#dfn-rdf-dataset -[YARD]: http://yardoc.org/ -[YARD-GS]: http://rubydoc.info/docs/yard/file/docs/GettingStarted.md -[PDD]: http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html +[YARD]: https://yardoc.org/ +[YARD-GS]: https://rubydoc.info/docs/yard/file/docs/GettingStarted.md +[PDD]: https://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html diff --git a/UNLICENSE b/UNLICENSE index 68a49da..efb9808 100644 --- a/UNLICENSE +++ b/UNLICENSE @@ -21,4 +21,4 @@ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -For more information, please refer to +For more information, please refer to diff --git a/etc/doap.ttl b/etc/doap.ttl index ca81d5d..09cd03d 100644 --- a/etc/doap.ttl +++ b/etc/doap.ttl @@ -11,16 +11,16 @@ <> a doap:Project, earl:Software ; doap:name "RDF::AggregateRepo" ; doap:homepage ; - doap:license ; + doap:license ; doap:shortdesc "An aggregate RDF::Repository supporting a subset of named graphs and zero or more named graphs mapped to the default graph."@en ; doap:description "A gem extending RDF.rb with SPARQL dataset construction semantics."@en ; doap:created "2013-04-26"^^xsd:date ; doap:programming-language "Ruby" ; - doap:implements ; - doap:category , - ; + doap:implements ; + doap:category , + ; doap:download-page <> ; - doap:mailing-list ; + doap:mailing-list ; doap:bug-database ; doap:blog ; doap:developer ; diff --git a/lib/rdf/aggregate_repo/merge_graph.rb b/lib/rdf/aggregate_repo/merge_graph.rb index 7b64885..f4c2df3 100644 --- a/lib/rdf/aggregate_repo/merge_graph.rb +++ b/lib/rdf/aggregate_repo/merge_graph.rb @@ -18,7 +18,7 @@ module RDF # name false # end # - # @see http://www.w3.org/TR/rdf11-mt/#dfn-merge + # @see https://www.w3.org/TR/rdf11-mt/#dfn-merge class MergeGraph include RDF::Value include RDF::Countable diff --git a/rdf-aggregate-repo.gemspec b/rdf-aggregate-repo.gemspec index 50027bb..246ee7c 100755 --- a/rdf-aggregate-repo.gemspec +++ b/rdf-aggregate-repo.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |gem| gem.date = File.mtime('VERSION').strftime('%Y-%m-%d') gem.name = 'rdf-aggregate-repo' - gem.homepage = 'http://github.com/ruby-rdf/rdf-aggregate-repo' + gem.homepage = 'https://github.com/ruby-rdf/rdf-aggregate-repo' gem.license = 'Unlicense' gem.summary = 'An aggregate RDF::Repository supporting a subset of named graphs and zero or more named graphs mapped to the default graph.' gem.description = %(A gem extending RDF.rb with SPARQL dataset construction semantics.) From ce7b79da474a8d0bf108557ac328a2a337b28b64 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 30 May 2020 12:58:12 -0700 Subject: [PATCH 03/15] Update doap:license (again) to https://unlicense.org/1.0/. --- etc/doap.ttl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/doap.ttl b/etc/doap.ttl index 09cd03d..a20f444 100644 --- a/etc/doap.ttl +++ b/etc/doap.ttl @@ -11,7 +11,7 @@ <> a doap:Project, earl:Software ; doap:name "RDF::AggregateRepo" ; doap:homepage ; - doap:license ; + doap:license ; doap:shortdesc "An aggregate RDF::Repository supporting a subset of named graphs and zero or more named graphs mapped to the default graph."@en ; doap:description "A gem extending RDF.rb with SPARQL dataset construction semantics."@en ; doap:created "2013-04-26"^^xsd:date ; From 5c559141b1d53b9742163b9ea2e05b291f694d84 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sun, 25 Oct 2020 16:40:14 -0700 Subject: [PATCH 04/15] Update PDD info in the README. --- CONTRIBUTING.md | 8 +++++--- README.md | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d30955e..bb363f9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,9 +28,11 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to manage devel enough, be assured we will eventually add you in there. * Do note that in order for us to merge any non-trivial changes (as a rule of thumb, additions larger than about 15 lines of code), we need an - explicit [public domain dedication][PDD] on record from you. + explicit [public domain dedication][PDD] on record from you, + which you will be asked to agree to on the first commit to a repo within the organization. + Note that the agreement applies to all repos in the [Ruby RDF](https://github.com/ruby-rdf/) organization. [YARD]: https://yardoc.org/ [YARD-GS]: https://rubydoc.info/docs/yard/file/docs/GettingStarted.md -[PDD]: https://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html -[pr]: https://github.com/ruby-rdf/rdf-aggregate-repo/compare/ +[PDD]: https://unlicense.org/#unlicensing-contributions +[pr]: https://github.com/ruby-rdf/rdf/compare/ diff --git a/README.md b/README.md index f93bb99..27eb4bd 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,9 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo enough, be assured we will eventually add you in there. * Do note that in order for us to merge any non-trivial changes (as a rule of thumb, additions larger than about 15 lines of code), we need an - explicit [public domain dedication][PDD] on record from you. + explicit [public domain dedication][PDD] on record from you, + which you will be asked to agree to on the first commit to a repo within the organization. + Note that the agreement applies to all repos in the [Ruby RDF](https://github.com/ruby-rdf/) organization. ## License @@ -67,4 +69,4 @@ see or the accompanying {file:UNLICENSE} file. [RDF Datasets]: https://www.w3.org/TR/rdf11-concepts/#dfn-rdf-dataset [YARD]: https://yardoc.org/ [YARD-GS]: https://rubydoc.info/docs/yard/file/docs/GettingStarted.md -[PDD]: https://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html +[PDD]: https://unlicense.org/#unlicensing-contributions From c9a251feb071376b42856aa029fd51aaa55a0646 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sun, 20 Dec 2020 13:38:07 -0800 Subject: [PATCH 05/15] Run CI using GitHub Actions. --- .github/workflows/ci.yml | 39 ++++++++++++++++++++++++++++++++++++++ README.md | 4 +++- rdf-aggregate-repo.gemspec | 4 ++-- 3 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..439ab42 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,39 @@ +# This workflow runs continuous CI across different versions of ruby on all branches and pull requests to develop. + +name: CI +on: + push: + branches: [ '**' ] + pull_request: + branches: [ develop ] + workflow_dispatch: + +jobs: + tests: + name: Ruby ${{ matrix.ruby }} + if: "contains(github.event.commits[0].message, '[ci skip]') == false" + runs-on: ubuntu-latest + env: + CI: true + strategy: + fail-fast: false + matrix: + ruby: + - 2.4 + - 2.5 + - 2.6 + - 2.7 + - ruby-head # Commented out until net-http-persistent is updaated + - jruby + steps: + - name: Clone repository + uses: actions/checkout@v2 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + - name: Install dependencies + run: bundle install --jobs 4 --retry 3 + - name: Run tests + run: bundle exec rspec spec + diff --git a/README.md b/README.md index 27eb4bd..58dacb4 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,9 @@ An aggregate RDF::Dataset supporting a subset of named graphs and zero or more named graphs mapped to the default graph. [![Gem Version](https://badge.fury.io/rb/rdf-aggregate-repo.png)](https://badge.fury.io/rb/rdf-aggregate-repo) -[![Build Status](https://travis-ci.org/ruby-rdf/rdf-aggregate-repo.png?branch=master)](https://travis-ci.org/ruby-rdf/rdf-aggregate-repo) +[![Build Status](https://github.com/ruby-rdf/rdf-aggregate-repo/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf-aggregate-repo/actions?query=workflow%3ACI) +[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-aggregate-repo/badge.svg)](https://coveralls.io/github/ruby-rdf/rdf-aggregate-repo) +[![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf) ## Description diff --git a/rdf-aggregate-repo.gemspec b/rdf-aggregate-repo.gemspec index 246ee7c..666c446 100755 --- a/rdf-aggregate-repo.gemspec +++ b/rdf-aggregate-repo.gemspec @@ -23,9 +23,9 @@ Gem::Specification.new do |gem| gem.add_runtime_dependency 'rdf', '~> 3.1' gem.add_development_dependency 'rdf-spec', '~> 3.1' gem.add_development_dependency 'rdf-turtle', '~> 3.1' - gem.add_development_dependency 'rspec', '~> 3.9' + gem.add_development_dependency 'rspec', '~> 3.10' gem.add_development_dependency 'rspec-its', '~> 1.3' - gem.add_development_dependency 'yard', '~> 0.9.20' + gem.add_development_dependency 'yard', '~> 0.9' gem.post_install_message = nil end From 241a06729c46fccd1bd4248e96001a07024eae6d Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sun, 20 Dec 2020 13:57:04 -0800 Subject: [PATCH 06/15] Add coveralls support. --- .coveralls.yml | 1 + Gemfile | 2 ++ spec/spec_helper.rb | 15 +++++++++++++++ 3 files changed, 18 insertions(+) create mode 100644 .coveralls.yml diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 0000000..814feb3 --- /dev/null +++ b/.coveralls.yml @@ -0,0 +1 @@ +repo_token: YOp34g46QSPvbNL8LTcDmoXuuK69HOOxe diff --git a/Gemfile b/Gemfile index 04c814b..97f70cf 100644 --- a/Gemfile +++ b/Gemfile @@ -16,5 +16,7 @@ group :debug do end group :test do + gem 'simplecov', platforms: :mri + gem 'coveralls', '~> 0.8', platforms: :mri gem "rake" end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 8483662..dee0242 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -11,3 +11,18 @@ ruby: lambda {|version| RUBY_VERSION.to_s !~ /^#{version}/}, } end + +begin + require 'simplecov' + require 'coveralls' + SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([ + SimpleCov::Formatter::HTMLFormatter, + Coveralls::SimpleCov::Formatter + ]) + SimpleCov.start do + add_filter "/spec/" + end + Coveralls.wear! +rescue LoadError => e + STDERR.puts "Coverage Skipped: #{e.message}" +end From c83f4f154c2c345effbe6419ab378e35d33d7798 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Mon, 18 Jan 2021 14:00:50 -0800 Subject: [PATCH 07/15] Run CI on Ruby 3.0 and update DOAP and other doc. --- .github/workflows/ci.yml | 3 ++- README.md | 2 +- etc/doap.ttl | 7 ++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 439ab42..0e1a059 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,8 @@ jobs: - 2.5 - 2.6 - 2.7 - - ruby-head # Commented out until net-http-persistent is updaated + - 3.0 + - ruby-head - jruby steps: - name: Clone repository diff --git a/README.md b/README.md index 58dacb4..d2e6070 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ An aggregate RDF::Dataset supporting a subset of named graphs and zero or more n [![Gem Version](https://badge.fury.io/rb/rdf-aggregate-repo.png)](https://badge.fury.io/rb/rdf-aggregate-repo) [![Build Status](https://github.com/ruby-rdf/rdf-aggregate-repo/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf-aggregate-repo/actions?query=workflow%3ACI) -[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-aggregate-repo/badge.svg)](https://coveralls.io/github/ruby-rdf/rdf-aggregate-repo) +[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-aggregate-repo/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/rdf-aggregate-repo?branch=develop) [![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf) ## Description diff --git a/etc/doap.ttl b/etc/doap.ttl index a20f444..59ce46c 100644 --- a/etc/doap.ttl +++ b/etc/doap.ttl @@ -12,8 +12,8 @@ doap:name "RDF::AggregateRepo" ; doap:homepage ; doap:license ; - doap:shortdesc "An aggregate RDF::Repository supporting a subset of named graphs and zero or more named graphs mapped to the default graph."@en ; - doap:description "A gem extending RDF.rb with SPARQL dataset construction semantics."@en ; + doap:description "An aggregate RDF::Repository supporting a subset of named graphs and zero or more named graphs mapped to the default graph."@en ; + doap:shortdesc "RDF::AggregateRepo extends RDF.rb with SPARQL dataset construction semantics."@en ; doap:created "2013-04-26"^^xsd:date ; doap:programming-language "Ruby" ; doap:implements ; @@ -27,8 +27,5 @@ doap:maintainer ; doap:documenter ; foaf:maker ; - dc:title "RDF::AggregateRepo"@en ; - dc:description "A gem extending RDF.rb with SPARQL dataset construction semantics."@en ; - dc:date "2013-04-26"^^xsd:date ; dc:creator ; dc:isPartOf . From bc4c5b9d773c694da80c6108764759e97048d708 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Tue, 10 Aug 2021 03:58:24 -0700 Subject: [PATCH 08/15] Update CI for coveralls. --- .github/workflows/ci.yml | 10 +++++++--- .travis.yml | 16 ---------------- Gemfile | 5 +++-- spec/spec_helper.rb | 10 +++++++++- 4 files changed, 19 insertions(+), 22 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e1a059..93dabbe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,11 +15,11 @@ 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 @@ -36,5 +36,9 @@ jobs: - name: Install dependencies run: bundle install --jobs 4 --retry 3 - name: Run tests - run: bundle exec rspec spec - + run: 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 deleted file mode 100644 index 83a126b..0000000 --- a/.travis.yml +++ /dev/null @@ -1,16 +0,0 @@ -language: ruby -script: "bundle exec rspec spec" -env: - - CI=true -rvm: - - 2.4 - - 2.5 - - 2.6 - - 2.7 - - jruby -cache: bundler -sudo: false -matrix: - allow_failures: - - rvm: jruby -dist: trusty diff --git a/Gemfile b/Gemfile index 97f70cf..e1d1e23 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,8 @@ group :debug do end group :test do - gem 'simplecov', platforms: :mri - gem 'coveralls', '~> 0.8', platforms: :mri + gem 'simplecov', '~> 0.21', platforms: :mri + gem 'simplecov-lcov', '~> 0.8', platforms: :mri + gem 'coveralls', platforms: :mri gem "rake" end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index dee0242..dd1385a 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -14,10 +14,18 @@ begin require 'simplecov' + require 'simplecov-lcov' require 'coveralls' + + 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 "/spec/" From 9e27d93c5b127add46b97c88ccb8c37a66a48c9d Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Tue, 10 Aug 2021 03:59:56 -0700 Subject: [PATCH 09/15] Don't 'wear' coveralls. --- spec/spec_helper.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index dd1385a..f3f5fb8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -30,7 +30,6 @@ SimpleCov.start do add_filter "/spec/" end - Coveralls.wear! rescue LoadError => e STDERR.puts "Coverage Skipped: #{e.message}" end From c6d4813a19d04452eeba8e3466036b4eaafb954e Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Wed, 11 Aug 2021 12:31:37 -0700 Subject: [PATCH 10/15] Remove explicit dependency on coveralls gem. --- Gemfile | 1 - spec/spec_helper.rb | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e1d1e23..ea94e75 100644 --- a/Gemfile +++ b/Gemfile @@ -18,6 +18,5 @@ end group :test do gem 'simplecov', '~> 0.21', platforms: :mri gem 'simplecov-lcov', '~> 0.8', platforms: :mri - gem 'coveralls', platforms: :mri gem "rake" end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f3f5fb8..64dadb8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,4 @@ require "bundler/setup" -require 'rdf/aggregate_repo' require 'rdf/spec' require 'rdf/spec/matchers' @@ -15,7 +14,6 @@ begin require 'simplecov' require 'simplecov-lcov' - require 'coveralls' SimpleCov::Formatter::LcovFormatter.config do |config| #Coveralls is coverage by default/lcov. Send info results @@ -33,3 +31,5 @@ rescue LoadError => e STDERR.puts "Coverage Skipped: #{e.message}" end + +require 'rdf/aggregate_repo' From e372b991b5c07a782e6dca5514a0f8bf295660d1 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Tue, 26 Oct 2021 11:29:14 -0700 Subject: [PATCH 11/15] Update CI. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93dabbe..650bdc4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: - name: Install dependencies run: bundle install --jobs 4 --retry 3 - name: Run tests - run: bundle exec rspec spec || $ALLOW_FAILURES + 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'" From a752f98daae1f625bcc298c282f36afa8995f061 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Tue, 7 Dec 2021 09:16:17 -0800 Subject: [PATCH 12/15] Update documentation and version sync for 3.2. --- README.md | 4 ++-- VERSION | 2 +- rdf-aggregate-repo.gemspec | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d2e6070..ddc3ad0 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,8 @@ Maps named graphs from one or more `RDF::Queryable` instances into a single data ## Dependencies -* [Ruby](https://ruby-lang.org/) (>= 2.4) -* [RDF.rb][] (~> 3.1) +* [Ruby](https://ruby-lang.org/) (>= 2.6) +* [RDF.rb][] (~> 3.2) ## Mailing List diff --git a/VERSION b/VERSION index fd2a018..944880f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.0 +3.2.0 diff --git a/rdf-aggregate-repo.gemspec b/rdf-aggregate-repo.gemspec index 666c446..208c51e 100755 --- a/rdf-aggregate-repo.gemspec +++ b/rdf-aggregate-repo.gemspec @@ -18,10 +18,10 @@ Gem::Specification.new do |gem| gem.files = %w(AUTHORS README.md UNLICENSE VERSION etc/doap.ttl) + Dir.glob('lib/**/*.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' - gem.add_development_dependency 'rdf-spec', '~> 3.1' + gem.add_runtime_dependency 'rdf', '~> 3.2' + gem.add_development_dependency 'rdf-spec', '~> 3.2' gem.add_development_dependency 'rdf-turtle', '~> 3.1' gem.add_development_dependency 'rspec', '~> 3.10' gem.add_development_dependency 'rspec-its', '~> 1.3' From 524d269f910ea382b3cce87393b6d748795054b4 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Tue, 7 Dec 2021 09:18:57 -0800 Subject: [PATCH 13/15] No CI on Ruby 2.5. --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 650bdc4..17d9303 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,6 @@ jobs: fail-fast: false matrix: ruby: - - 2.5 - 2.6 - 2.7 - 3.0 From a924e5c716e4d79800a146c3059d1e30ed70951b Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Mon, 13 Dec 2021 14:44:50 -0800 Subject: [PATCH 14/15] Sync more gem versions. --- rdf-aggregate-repo.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdf-aggregate-repo.gemspec b/rdf-aggregate-repo.gemspec index 208c51e..94329ab 100755 --- a/rdf-aggregate-repo.gemspec +++ b/rdf-aggregate-repo.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |gem| gem.requirements = [] gem.add_runtime_dependency 'rdf', '~> 3.2' gem.add_development_dependency 'rdf-spec', '~> 3.2' - gem.add_development_dependency 'rdf-turtle', '~> 3.1' + gem.add_development_dependency 'rdf-turtle', '~> 3.2' gem.add_development_dependency 'rspec', '~> 3.10' gem.add_development_dependency 'rspec-its', '~> 1.3' gem.add_development_dependency 'yard', '~> 0.9' From e3ae6152858d08fdabd1c1bb814491cf83549bd3 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sun, 26 Dec 2021 22:36:41 -0800 Subject: [PATCH 15/15] CI on Ruby 3.1. --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17d9303..a056292 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,7 @@ jobs: - 2.6 - 2.7 - 3.0 + - 3.1 - ruby-head - jruby steps: