From f9efe24f781a87dd149d5ae4e9ed966f7c8d65b8 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sun, 25 Oct 2020 16:44:57 -0700 Subject: [PATCH 1/8] 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 7b21b6e..90d64a6 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-rdfa/compare/ +[PDD]: https://unlicense.org/#unlicensing-contributions +[pr]: https://github.com/ruby-rdf/rdf/compare/ diff --git a/README.md b/README.md index 90e7244..402efa6 100755 --- a/README.md +++ b/README.md @@ -448,7 +448,9 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo list in the the `README`. Alphabetical order applies. * 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 @@ -465,7 +467,7 @@ see or the accompanying [UNLICENSE](UNLICENSE) file. [RDF.rb]: https://rubygems.org/gems/rdf [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 [RDFa 1.1 Core]: https://www.w3.org/TR/2012/REC-rdfa-core-20120607/ "RDFa 1.1 Core" [RDFa Lite 1.1]: https://www.w3.org/TR/2012/REC-rdfa-lite-20120607/ "RDFa Lite 1.1" [XHTML+RDFa 1.1]: https://www.w3.org/TR/2012/REC-xhtml-rdfa-20120607/ "XHTML+RDFa 1.1" From 99909ccd10f752811beaf580a267c2b168a98f7f Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 21 Nov 2020 13:02:26 -0800 Subject: [PATCH 2/8] Run CI on ruby-head. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 55c863b..a9004fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,12 @@ rvm: - 2.5 - 2.6 - 2.7 + - ruby-head - jruby cache: bundler sudo: false matrix: allow_failures: - rvm: jruby + - rvm: ruby-head dist: trusty From 9aaa1e34f95c0dbf46f0f314448ea55093a0eda0 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sun, 20 Dec 2020 15:00:09 -0800 Subject: [PATCH 3/8] Run CI on GitHub. --- .github/workflows/ci.yml | 43 ++++++++++++++++++++++++++++++++++++++++ README.md | 6 +++--- rdf-rdfa.gemspec | 6 +++--- 3 files changed, 49 insertions(+), 6 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..4e6b704 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,43 @@ +# 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 + BUNDLE_GEMFILE: "${{ matrix.gemfile }}" + strategy: + fail-fast: false + matrix: + ruby: + - 2.4 + - 2.5 + - 2.6 + - 2.7 + - ruby-head + #- jruby # No Nokogumbo on JRuby + gemfile: + - Gemfile + - Gemfile-pure + 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 402efa6..591a941 100755 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -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. # RDF::RDFa reader/writer [RDFa][RDFa 1.1 Core] parser for RDF.rb. [![Gem Version](https://badge.fury.io/rb/rdf-rdfa.png)](https://badge.fury.io/rb/rdf-rdfa) -[![Build Status](https://travis-ci.org/ruby-rdf/rdf-rdfa.png?branch=master)](https://travis-ci.org/ruby-rdf/rdf-rdfa) -[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-rdfa/badge.svg)](https://coveralls.io/r/ruby-rdf/rdf-rdfa) +[![Build Status](https://github.com/ruby-rdf/rdf-rdfa/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf-rdfa/actions?query=workflow%3ACI) +[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-rdfa/badge.svg)](https://coveralls.io/github/ruby-rdf/rdf-rdfa) +[![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf) ## DESCRIPTION RDF::RDFa is an RDFa reader and writer for Ruby using the [RDF.rb][RDF.rb] library suite. diff --git a/rdf-rdfa.gemspec b/rdf-rdfa.gemspec index 8c16df5..113dab6 100755 --- a/rdf-rdfa.gemspec +++ b/rdf-rdfa.gemspec @@ -23,13 +23,13 @@ Gem::Specification.new do |gem| gem.add_runtime_dependency 'rdf', '~> 3.1', '>= 3.1.2' gem.add_runtime_dependency 'rdf-vocab', '~> 3.1', '>= 3.1.5' - gem.add_runtime_dependency 'haml', '~> 5.1' + gem.add_runtime_dependency 'haml', '~> 5.2' gem.add_runtime_dependency 'rdf-xsd', '~> 3.1' gem.add_runtime_dependency 'rdf-aggregate-repo', '~> 3.1' gem.add_runtime_dependency 'htmlentities', '~> 4.3' gem.add_development_dependency 'json-ld', '~> 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 'rdf-spec', '~> 3.1' gem.add_development_dependency 'rdf-turtle', '~> 3.1' @@ -38,7 +38,7 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'rdf-tabular', '~> 3.1' gem.add_development_dependency 'rdf-rdfxml', '~> 3.1' gem.add_development_dependency 'sparql', '~> 3.1' - gem.add_development_dependency 'yard' , '~> 0.9.20' + gem.add_development_dependency 'yard' , '~> 0.9' gem.post_install_message = nil end From 2ab2f3d5994e6023adc6bd63376ad20771aeadaf Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sun, 20 Dec 2020 15:02:31 -0800 Subject: [PATCH 4/8] Update job name with gemfile from matrix. --- .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 4e6b704..06675f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: jobs: tests: - name: Ruby ${{ matrix.ruby }} + name: Ruby ${{ matrix.ruby }} ${{ matrix.gemfile }} if: "contains(github.event.commits[0].message, '[ci skip]') == false" runs-on: ubuntu-latest env: From c4b7ea4939410951d0d9ce3ec0b251cea9b5fa6c Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sun, 20 Dec 2020 15:04:46 -0800 Subject: [PATCH 5/8] Don't build on ruby-head until net-http-persistent updated. --- .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 06675f7..9862107 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - 2.5 - 2.6 - 2.7 - - ruby-head + #- ruby-head # Until net-http-persistent updated #- jruby # No Nokogumbo on JRuby gemfile: - Gemfile From 4313b0b05d54206df00919457e2da662a69684a6 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Mon, 18 Jan 2021 17:29:37 -0800 Subject: [PATCH 6/8] Add coveralls configuration. --- .coveralls.yml | 1 + .github/workflows/ci.yml | 3 ++- Gemfile | 2 +- README.md | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 .coveralls.yml diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 0000000..2f57e4e --- /dev/null +++ b/.coveralls.yml @@ -0,0 +1 @@ +repo_token: Yru5qnQnb3gwAJQk2jg83tkdo1LBkiWu1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9862107..6cb531d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,8 @@ jobs: - 2.5 - 2.6 - 2.7 - #- ruby-head # Until net-http-persistent updated + - 3.0 + - ruby-head # Until net-http-persistent updated #- jruby # No Nokogumbo on JRuby gemfile: - Gemfile diff --git a/Gemfile b/Gemfile index 9f31e8f..db16c2d 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ gemspec gem "rdf", github: "ruby-rdf/rdf", branch: "develop" gem "rdf-spec", github: "ruby-rdf/rdf-spec", branch: "develop" gem "rdf-xsd", github: "ruby-rdf/rdf-xsd", branch: "develop" -gem "nokogiri", '~> 1.8' +gem "nokogiri", '~> 1.10' gem "nokogumbo", '~> 2.0' gem 'equivalent-xml', '~> 0.5' diff --git a/README.md b/README.md index 591a941..0b8c813 100755 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Gem Version](https://badge.fury.io/rb/rdf-rdfa.png)](https://badge.fury.io/rb/rdf-rdfa) [![Build Status](https://github.com/ruby-rdf/rdf-rdfa/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf-rdfa/actions?query=workflow%3ACI) -[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-rdfa/badge.svg)](https://coveralls.io/github/ruby-rdf/rdf-rdfa) +[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-rdfa/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/rdf-rdfa?branch=develop) [![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf) ## DESCRIPTION From ed50f2ad6ff45c0f42769f5ea547725a50a9f37f Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 6 Mar 2021 12:46:39 -0800 Subject: [PATCH 7/8] Update dependencies. --- Gemfile | 3 +-- Gemfile-pure | 9 --------- rdf-rdfa.gemspec | 5 ++--- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index db16c2d..709c5e7 100644 --- a/Gemfile +++ b/Gemfile @@ -25,9 +25,8 @@ group :development, :test do end group :test do - gem 'simplecov', platforms: :mri + gem 'simplecov', '~> 0.16', platforms: :mri gem 'coveralls', '~> 0.8', platforms: :mri - gem 'psych', platforms: [:mri, :rbx] end group :debug do diff --git a/Gemfile-pure b/Gemfile-pure index 82d6545..6c50d05 100644 --- a/Gemfile-pure +++ b/Gemfile-pure @@ -20,15 +20,6 @@ group :development, :test do gem 'sparql', github: "ruby-rdf/sparql", branch: "develop" gem 'sparql-client', github: "ruby-rdf/sparql-client", branch: "develop" gem 'sxp', github: "dryruby/sxp.rb", branch: "develop" - - # Until version >= 3.4.2 with support for Ruby 2.6 - gem "webmock", git: "https://github.com/bblimke/webmock" -end - -group :test do - gem 'simplecov', require: false - gem 'coveralls', require: false - gem 'psych', platforms: [:mri, :rbx] end group :debug do diff --git a/rdf-rdfa.gemspec b/rdf-rdfa.gemspec index 113dab6..75f5bc0 100755 --- a/rdf-rdfa.gemspec +++ b/rdf-rdfa.gemspec @@ -21,8 +21,8 @@ Gem::Specification.new do |gem| gem.required_ruby_version = '>= 2.4' gem.requirements = [] - gem.add_runtime_dependency 'rdf', '~> 3.1', '>= 3.1.2' - gem.add_runtime_dependency 'rdf-vocab', '~> 3.1', '>= 3.1.5' + gem.add_runtime_dependency 'rdf', '~> 3.1', '>= 3.1.12' + gem.add_runtime_dependency 'rdf-vocab', '~> 3.1', '>= 3.1.11' gem.add_runtime_dependency 'haml', '~> 5.2' gem.add_runtime_dependency 'rdf-xsd', '~> 3.1' gem.add_runtime_dependency 'rdf-aggregate-repo', '~> 3.1' @@ -33,7 +33,6 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'rspec-its', '~> 1.3' gem.add_development_dependency 'rdf-spec', '~> 3.1' gem.add_development_dependency 'rdf-turtle', '~> 3.1' - gem.add_development_dependency 'rdf-vocab', '~> 3.1' gem.add_development_dependency 'rdf-isomorphic', '~> 3.1' gem.add_development_dependency 'rdf-tabular', '~> 3.1' gem.add_development_dependency 'rdf-rdfxml', '~> 3.1' From 27a2ca0f913488cb54d6912ab9866d11a8af72d8 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 6 Mar 2021 13:02:28 -0800 Subject: [PATCH 8/8] Version 3.1.3. --- Gemfile | 4 ++-- VERSION | 2 +- rdf-rdfa.gemspec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 709c5e7..8de2085 100644 --- a/Gemfile +++ b/Gemfile @@ -5,8 +5,8 @@ gemspec gem "rdf", github: "ruby-rdf/rdf", branch: "develop" gem "rdf-spec", github: "ruby-rdf/rdf-spec", branch: "develop" gem "rdf-xsd", github: "ruby-rdf/rdf-xsd", branch: "develop" -gem "nokogiri", '~> 1.10' -gem "nokogumbo", '~> 2.0' +gem "nokogiri", '~> 1.10', platforms: [:mri, :jruby] +gem "nokogumbo", '~> 2.0', platforms: :mri gem 'equivalent-xml', '~> 0.5' group :development, :test do diff --git a/VERSION b/VERSION index ef538c2..ff365e0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.2 +3.1.3 diff --git a/rdf-rdfa.gemspec b/rdf-rdfa.gemspec index 75f5bc0..88e7e91 100755 --- a/rdf-rdfa.gemspec +++ b/rdf-rdfa.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |gem| gem.required_ruby_version = '>= 2.4' gem.requirements = [] - gem.add_runtime_dependency 'rdf', '~> 3.1', '>= 3.1.12' + gem.add_runtime_dependency 'rdf', '~> 3.1', '>= 3.1.13' gem.add_runtime_dependency 'rdf-vocab', '~> 3.1', '>= 3.1.11' gem.add_runtime_dependency 'haml', '~> 5.2' gem.add_runtime_dependency 'rdf-xsd', '~> 3.1'