From 53699affa56890886f7175b1a331a00baa3bc420 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Mon, 11 Jul 2016 15:20:39 -0700 Subject: [PATCH 01/10] Update minimum ruby version to 2.2.2. See https://github.com/ruby-rdf/rdf/issues/307. --- .travis.yml | 12 +++++------- README.md | 2 +- rdf-trig.gemspec | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0e4c89e..0224f5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,12 @@ script: "bundle exec rspec spec" env: - CI=true rvm: - - 2.0 - - 2.1 - - 2.2.4 - - 2.3.0 - - jruby-9.0.4.0 - - rbx-2 + - 2.2.5 + - 2.3.1 + - jruby-9.0.5.0 + - rbx cache: bundler sudo: false matrix: allow_failures: - - rvm: rbx-2 + - rvm: rbx diff --git a/README.md b/README.md index aa8b0b0..a67dda3 100755 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ There is a new `:stream` option to {RDF::TriG::Writer} which is more efficient f ## Dependencies -* [Ruby](http://ruby-lang.org/) (>= 2.0) +* [Ruby](http://ruby-lang.org/) (>= 2.2.2) * [RDF.rb](http://rubygems.org/gems/rdf) (~> 2.0) * [rdf-turtle](http://rubygems.org/gems/rdf-turtle) (~> 2.0) diff --git a/rdf-trig.gemspec b/rdf-trig.gemspec index 7fd6431..90b7ae4 100755 --- a/rdf-trig.gemspec +++ b/rdf-trig.gemspec @@ -24,7 +24,7 @@ Gem::Specification.new do |gem| gem.test_files = %w() gem.has_rdoc = false - gem.required_ruby_version = '>= 2.0' + gem.required_ruby_version = '>= 2.2.2' gem.requirements = [] gem.add_runtime_dependency 'rdf', '~> 2.0' gem.add_runtime_dependency 'ebnf', '~> 1.0', '>= 1.0.1' From 16682dd9fb4d039f2ec97e2acd7e8dc305232043 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Thu, 28 Jul 2016 11:58:59 -0400 Subject: [PATCH 02/10] Update sxp repo reference in Gemfile. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index cf5f8c8..d3a4cda 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ group :development, :test do gem 'rdf-spec', github: "ruby-rdf/rdf-spec", branch: "develop" gem 'rdf-isomorphic', github: "ruby-rdf/rdf-isomorphic", branch: "develop" gem 'rdf-vocab', github: "ruby-rdf/rdf-vocab", branch: "develop" - gem 'sxp', github: "gkellogg/sxp-ruby", branch: "develop" + gem 'sxp', github: "dryruby/sxp.rb", branch: "develop" gem "redcarpet", platform: :ruby gem 'simplecov', require: false, platform: :mri gem 'coveralls', require: false, platform: :mri From d59f69d71680eb67c19d506deee8242cdceaa11a Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 12 Aug 2016 18:15:39 -0700 Subject: [PATCH 03/10] Remove wirble from Gemfile, as dependency-ci objects that it has no license and it's not really neccessary. --- .travis.yml | 2 +- Gemfile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0224f5a..6f2491f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: rvm: - 2.2.5 - 2.3.1 - - jruby-9.0.5.0 + - jruby-9.1.2.0 - rbx cache: bundler sudo: false diff --git a/Gemfile b/Gemfile index d3a4cda..c057570 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,6 @@ gem 'rdf-turtle', github: "ruby-rdf/rdf-turtle", branch: "develop" gem 'ebnf', github: "gkellogg/ebnf", branch: "develop" group :development do - gem "wirble" gem "byebug", platforms: :mri gem 'psych', platforms: [:mri, :rbx] end From 3c9c8b4cdf55514a635c1bfc4083002386a1e815 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 13 Aug 2016 15:22:22 -0700 Subject: [PATCH 04/10] Change Travis JRuby to default and allow failures. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6f2491f..aeebb3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,11 @@ env: rvm: - 2.2.5 - 2.3.1 - - jruby-9.1.2.0 + - jruby-9 - rbx cache: bundler sudo: false matrix: allow_failures: - rvm: rbx + - rvm: jruby From 218db75f5b058908f175165a61c308c6f706d9f3 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sun, 14 Aug 2016 11:06:05 -0700 Subject: [PATCH 05/10] Fix JRuby version for Travis. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aeebb3e..577ac72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: rvm: - 2.2.5 - 2.3.1 - - jruby-9 + - jruby - rbx cache: bundler sudo: false From 7a9051664a05177b8fc84e3c3dbfea9d23a91d07 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 10 Sep 2016 14:36:52 -0700 Subject: [PATCH 06/10] Add quality to aliased content types. --- dependencyci.yml | 5 +++++ lib/rdf/trig/format.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 dependencyci.yml diff --git a/dependencyci.yml b/dependencyci.yml new file mode 100644 index 0000000..0c67c1b --- /dev/null +++ b/dependencyci.yml @@ -0,0 +1,5 @@ +platform: + Rubygems: + rdf-isomorphic: + tests: + unmaintained: skip \ No newline at end of file diff --git a/lib/rdf/trig/format.rb b/lib/rdf/trig/format.rb index 841b5c4..ca452c6 100644 --- a/lib/rdf/trig/format.rb +++ b/lib/rdf/trig/format.rb @@ -16,7 +16,7 @@ module RDF::TriG # # @see http://www.w3.org/TR/rdf-testcases/#ntriples class Format < RDF::Format - content_type 'application/trig', extension: :trig, alias: 'application/x-trig' + content_type 'application/trig', extension: :trig, alias: 'application/x-trig;q=0.2' content_encoding 'utf-8' reader { RDF::TriG::Reader } From b35a061b10009073a19fb4b2a62accd27e6720b3 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 31 Mar 2017 12:02:18 -0700 Subject: [PATCH 07/10] Use Travis "trusty" build and wildcard Ruby versions. --- .travis.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 577ac72..e1bbdce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,13 +5,15 @@ script: "bundle exec rspec spec" env: - CI=true rvm: - - 2.2.5 - - 2.3.1 - - jruby - - rbx + - 2.2 + - 2.3 + - 2.4 + - jruby-9 + - rbx-3 cache: bundler sudo: false matrix: allow_failures: - - rvm: rbx - - rvm: jruby + - rvm: jruby-9 + - rvm: rbx-3 +dist: trusty From d2d7b59405db7060061649dea95bcbb174983e96 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Mon, 21 Aug 2017 16:19:19 -0600 Subject: [PATCH 08/10] Remove rubyforge reference. Update DOAP. --- etc/doap-nquads.ttl | 6 ++---- etc/earl-nquads.ttl | 2 +- rdf-trig.gemspec | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/etc/doap-nquads.ttl b/etc/doap-nquads.ttl index 9c3b9b7..df73f7a 100644 --- a/etc/doap-nquads.ttl +++ b/etc/doap-nquads.ttl @@ -4,8 +4,6 @@ @prefix dc: . @prefix foaf: . @prefix doap: . -@prefix earl: . -@prefix xsd: . <> a doap:Project ; doap:name "RDF.rb" ; @@ -20,7 +18,7 @@ doap:implements , , ; - doap:download-page ; + doap:download-page ; doap:bug-database ; doap:blog , ; doap:vendor ; @@ -78,4 +76,4 @@ foaf:mbox ; foaf:mbox_sha1sum "35bc44e6d0070e5ad50ccbe0d24403c96af2b9bd" ; foaf:homepage ; - rdfs:isDefinedBy . + rdfs:isDefinedBy . \ No newline at end of file diff --git a/etc/earl-nquads.ttl b/etc/earl-nquads.ttl index 0b520c6..c683875 100644 --- a/etc/earl-nquads.ttl +++ b/etc/earl-nquads.ttl @@ -20,7 +20,7 @@ doap:implements , , ; - doap:download-page ; + doap:download-page ; doap:bug-database ; doap:blog , ; doap:vendor ; diff --git a/rdf-trig.gemspec b/rdf-trig.gemspec index 90b7ae4..884d450 100755 --- a/rdf-trig.gemspec +++ b/rdf-trig.gemspec @@ -10,7 +10,6 @@ Gem::Specification.new do |gem| gem.license = 'Unlicense' gem.summary = "TriG reader/writer for Ruby." gem.description = %q{RDF::TriG is an TriG reader/writer for the RDF.rb library suite.} - gem.rubyforge_project = 'rdf-trig' gem.authors = ['Gregg Kellogg'] gem.email = 'public-rdf-ruby@w3.org' From af687bf9ebf64157e15999a8f7225858734c8d4b Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 25 Nov 2017 13:50:39 -0800 Subject: [PATCH 09/10] Relax dependencies for 3.0 release. --- Gemfile | 16 ++++++++-------- rdf-trig.gemspec | 23 ++++++++++++++--------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index c057570..ef5de3b 100644 --- a/Gemfile +++ b/Gemfile @@ -2,9 +2,9 @@ source "http://rubygems.org" gemspec -gem 'rdf', github: "ruby-rdf/rdf", branch: "develop" -gem 'rdf-turtle', github: "ruby-rdf/rdf-turtle", branch: "develop" -gem 'ebnf', github: "gkellogg/ebnf", branch: "develop" +gem 'rdf', git: "https://github.com/ruby-rdf/rdf", branch: "develop" +gem 'rdf-turtle', git: "https://github.com/ruby-rdf/rdf-turtle", branch: "develop" +gem 'ebnf', git: "https://github.com/gkellogg/ebnf", branch: "develop" group :development do gem "byebug", platforms: :mri @@ -12,11 +12,11 @@ group :development do end group :development, :test do - gem 'json-ld', github: "ruby-rdf/json-ld", branch: "develop" - gem 'rdf-spec', github: "ruby-rdf/rdf-spec", branch: "develop" - gem 'rdf-isomorphic', github: "ruby-rdf/rdf-isomorphic", branch: "develop" - gem 'rdf-vocab', github: "ruby-rdf/rdf-vocab", branch: "develop" - gem 'sxp', github: "dryruby/sxp.rb", branch: "develop" + gem 'json-ld', git: "https://github.com/ruby-rdf/json-ld", branch: "develop" + gem 'rdf-spec', git: "https://github.com/ruby-rdf/rdf-spec", branch: "develop" + gem 'rdf-isomorphic', git: "https://github.com/ruby-rdf/rdf-isomorphic", branch: "develop" + gem 'rdf-vocab', git: "https://github.com/ruby-rdf/rdf-vocab", branch: "develop" + gem 'sxp', git: "https://github.com/dryruby/sxp.rb", branch: "develop" gem "redcarpet", platform: :ruby gem 'simplecov', require: false, platform: :mri gem 'coveralls', require: false, platform: :mri diff --git a/rdf-trig.gemspec b/rdf-trig.gemspec index 884d450..d8f443a 100755 --- a/rdf-trig.gemspec +++ b/rdf-trig.gemspec @@ -25,16 +25,21 @@ Gem::Specification.new do |gem| gem.required_ruby_version = '>= 2.2.2' gem.requirements = [] - gem.add_runtime_dependency 'rdf', '~> 2.0' + #gem.add_runtime_dependency 'rdf', '~> 3.0' + gem.add_runtime_dependency 'rdf', '>= 2.2', '< 4.0' gem.add_runtime_dependency 'ebnf', '~> 1.0', '>= 1.0.1' - gem.add_runtime_dependency 'rdf-turtle', '~> 2.0' - gem.add_development_dependency 'json-ld', '~> 2.0' - gem.add_development_dependency 'rspec', '~> 3.2' - gem.add_development_dependency 'rspec-its', '~> 1.0' - gem.add_development_dependency 'rdf-isomorphic', '~> 2.0' - gem.add_development_dependency 'yard' , '~> 0.8' - gem.add_development_dependency 'rdf-spec', '~> 2.0' - gem.add_development_dependency 'rake', '~> 10' + #gem.add_runtime_dependency 'rdf-turtle', '~> 3.0' + #gem.add_development_dependency 'json-ld', '~> 3.0' + gem.add_runtime_dependency 'rdf-turtle', '>= 2.2', '< 4.0' + gem.add_development_dependency 'json-ld', '>= 2.1', '< 4.0' + gem.add_development_dependency 'rspec', '~> 3.7' + gem.add_development_dependency 'rspec-its', '~> 1.2' + #gem.add_development_dependency 'rdf-isomorphic', '~> 3.0' + gem.add_development_dependency 'rdf-isomorphic', '>= 2.0', '< 4.0' + gem.add_development_dependency 'yard' , '~> 0.9' + #gem.add_development_dependency 'rdf-spec', '~> 3.0' + gem.add_development_dependency 'rdf-spec', '>= 2.2', '< 4.0' + gem.add_development_dependency 'rake', '~> 12.0' gem.post_install_message = nil end From aa6f07ed197bf58b0404355a45628ff393499961 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Thu, 14 Dec 2017 16:02:40 -0800 Subject: [PATCH 10/10] Version 2.2.0. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 227cea2..ccbccc3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0 +2.2.0