From 87d3d2d0f204eea79dcec5ed5abb003d11ed6568 Mon Sep 17 00:00:00 2001 From: Jan Lindblom Date: Tue, 19 Mar 2024 20:50:51 +0200 Subject: [PATCH 1/4] Updating requirements. --- .editorconfig | 2 +- .gitattributes | 3 +++ Rakefile | 11 ++++++----- VERSION | 2 +- quadtree.gemspec | 24 ++++++++++++------------ 5 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 .gitattributes diff --git a/.editorconfig b/.editorconfig index 45f460f..004d27e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,7 +3,7 @@ root = true [*] indent_style = space indent_size = 2 -end_of_line = crlf +end_of_line = lf charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..95412a8 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ + +*.gemspec text eol=lf +*.yml text eol=lf diff --git a/Rakefile b/Rakefile index 7023d57..ae8c64f 100644 --- a/Rakefile +++ b/Rakefile @@ -29,7 +29,8 @@ spec = Gem::Specification.new do |s| f == ".gitlab-ci.yml" || f == ".rubocop.yml" || f == ".rubocop_todo.yml" || - f == "Jenkinsfile" + f == "Jenkinsfile" || + f == "tea.yaml" end s.bindir = "exe" s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) } @@ -38,14 +39,14 @@ spec = Gem::Specification.new do |s| s.required_ruby_version = '>= 2.6.0' s.add_development_dependency "bundler", "~> 2" - s.add_development_dependency "rake", "~> 13" - s.add_development_dependency "rspec", "~> 3" + s.add_development_dependency "rake", "~> 13.1" + s.add_development_dependency "rspec", "~> 3.13" s.add_development_dependency "pry", "~> 0.14" s.add_development_dependency "yard", "~> 0.9" - s.add_development_dependency "simplecov", "~> 0.21" + s.add_development_dependency "simplecov", "~> 0.22" s.add_development_dependency "simplecov-cobertura", "~> 2.1" s.add_development_dependency "rspec_junit_formatter", "~> 0.6" - s.add_development_dependency "rubocop", "~> 1" + s.add_development_dependency "rubocop", "~> 1.62" s.add_runtime_dependency "version", "~> 1" end diff --git a/VERSION b/VERSION index 7ee7020..90fe88b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.10 +1.0.11a diff --git a/quadtree.gemspec b/quadtree.gemspec index 75d780f..7879d29 100644 --- a/quadtree.gemspec +++ b/quadtree.gemspec @@ -1,21 +1,21 @@ # -*- encoding: utf-8 -*- -# stub: quadtree 1.0.10 ruby lib +# stub: quadtree 1.0.11a ruby lib Gem::Specification.new do |s| s.name = "quadtree".freeze - s.version = "1.0.10" + s.version = "1.0.11a" s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version= s.require_paths = ["lib".freeze] s.authors = ["Jan Lindblom".freeze] s.bindir = "exe".freeze - s.date = "2023-01-20" + s.date = "2024-03-19" s.email = ["janlindblom@fastmail.fm".freeze] s.files = ["CODE_OF_CONDUCT.md".freeze, "Gemfile".freeze, "LICENSE.txt".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "lib/quadtree.rb".freeze, "lib/quadtree/axis_aligned_bounding_box.rb".freeze, "lib/quadtree/point.rb".freeze, "lib/quadtree/quadtree.rb".freeze, "lib/quadtree/unknown_type_error.rb".freeze, "lib/quadtree/version.rb".freeze, "quadtree.gemspec".freeze] s.homepage = "https://github.com/janlindblom/ruby-quadtree".freeze s.licenses = ["MIT".freeze] s.required_ruby_version = Gem::Requirement.new(">= 2.6.0".freeze) - s.rubygems_version = "3.3.26".freeze + s.rubygems_version = "3.2.33".freeze s.summary = "Quadtrees in Ruby.".freeze if s.respond_to? :specification_version then @@ -24,25 +24,25 @@ Gem::Specification.new do |s| if s.respond_to? :add_runtime_dependency then s.add_development_dependency(%q.freeze, ["~> 2"]) - s.add_development_dependency(%q.freeze, ["~> 13"]) - s.add_development_dependency(%q.freeze, ["~> 3"]) + s.add_development_dependency(%q.freeze, ["~> 13.1"]) + s.add_development_dependency(%q.freeze, ["~> 3.13"]) s.add_development_dependency(%q.freeze, ["~> 0.14"]) s.add_development_dependency(%q.freeze, ["~> 0.9"]) - s.add_development_dependency(%q.freeze, ["~> 0.21"]) + s.add_development_dependency(%q.freeze, ["~> 0.22"]) s.add_development_dependency(%q.freeze, ["~> 2.1"]) s.add_development_dependency(%q.freeze, ["~> 0.6"]) - s.add_development_dependency(%q.freeze, ["~> 1"]) + s.add_development_dependency(%q.freeze, ["~> 1.62"]) s.add_runtime_dependency(%q.freeze, ["~> 1"]) else s.add_dependency(%q.freeze, ["~> 2"]) - s.add_dependency(%q.freeze, ["~> 13"]) - s.add_dependency(%q.freeze, ["~> 3"]) + s.add_dependency(%q.freeze, ["~> 13.1"]) + s.add_dependency(%q.freeze, ["~> 3.13"]) s.add_dependency(%q.freeze, ["~> 0.14"]) s.add_dependency(%q.freeze, ["~> 0.9"]) - s.add_dependency(%q.freeze, ["~> 0.21"]) + s.add_dependency(%q.freeze, ["~> 0.22"]) s.add_dependency(%q.freeze, ["~> 2.1"]) s.add_dependency(%q.freeze, ["~> 0.6"]) - s.add_dependency(%q.freeze, ["~> 1"]) + s.add_dependency(%q.freeze, ["~> 1.62"]) s.add_dependency(%q.freeze, ["~> 1"]) end end From 6b852054524fdd52f1a6f3c121cee4542b9b7a10 Mon Sep 17 00:00:00 2001 From: Jan Lindblom Date: Tue, 19 Mar 2024 20:59:11 +0200 Subject: [PATCH 2/4] Updated requirements. --- Rakefile | 72 +++++++++++++++++++++++++----------------------- VERSION | 2 +- quadtree.gemspec | 7 +++-- 3 files changed, 42 insertions(+), 39 deletions(-) diff --git a/Rakefile b/Rakefile index ae8c64f..954e353 100644 --- a/Rakefile +++ b/Rakefile @@ -1,53 +1,55 @@ -lib = File.expand_path("../lib", __FILE__) +lib = File.expand_path('lib', __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) -require "rake/version_task" -require "bundler/gem_tasks" -require "rspec/core/rake_task" -require "yard" -require "yard/rake/yardoc_task" +require 'rake/version_task' +require 'bundler/gem_tasks' +require 'rspec/core/rake_task' +require 'yard' +require 'yard/rake/yardoc_task' require 'rubocop/rake_task' -require "quadtree" +require 'quadtree' RSpec::Core::RakeTask.new(:spec) spec = Gem::Specification.new do |s| - s.name = "quadtree" + s.name = 'quadtree' s.version = Quadtree::VERSION - s.authors = ["Jan Lindblom"] - s.email = ["janlindblom@fastmail.fm"] + s.authors = ['Jan Lindblom'] + s.email = ['janlindblom@fastmail.fm'] - s.summary = %q{Quadtrees in Ruby.} - s.homepage = "https://github.com/janlindblom/ruby-quadtree" - s.license = "MIT" + s.summary = 'Quadtrees in Ruby.' + s.homepage = 'https://github.com/janlindblom/ruby-quadtree' + s.metadata['homepage_uri'] = s.homepage + s.metadata['source_code_uri'] = 'https://github.com/janlindblom/ruby-quadtree' + s.license = 'MIT' s.files = `git ls-files -z`.split("\x0").reject do |f| f.match(%r{^(bin|test|spec|features|.github)/}) || - f == ".gitignore" || - f == ".editorconfig" || - f == ".rspec" || - f == ".gitlab-ci.yml" || - f == ".rubocop.yml" || - f == ".rubocop_todo.yml" || - f == "Jenkinsfile" || - f == "tea.yaml" + f == '.gitignore' || + f == '.editorconfig' || + f == '.rspec' || + f == '.gitlab-ci.yml' || + f == '.rubocop.yml' || + f == '.rubocop_todo.yml' || + f == 'Jenkinsfile' || + f == 'tea.yaml' end - s.bindir = "exe" + s.bindir = 'exe' s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) } - s.require_paths = ["lib"] + s.require_paths = ['lib'] s.required_ruby_version = '>= 2.6.0' - s.add_development_dependency "bundler", "~> 2" - s.add_development_dependency "rake", "~> 13.1" - s.add_development_dependency "rspec", "~> 3.13" - s.add_development_dependency "pry", "~> 0.14" - s.add_development_dependency "yard", "~> 0.9" - s.add_development_dependency "simplecov", "~> 0.22" - s.add_development_dependency "simplecov-cobertura", "~> 2.1" - s.add_development_dependency "rspec_junit_formatter", "~> 0.6" - s.add_development_dependency "rubocop", "~> 1.62" - s.add_runtime_dependency "version", "~> 1" + s.add_development_dependency 'bundler', '~> 2' + s.add_development_dependency 'rake', '~> 13.1' + s.add_development_dependency 'rspec', '~> 3.13' + s.add_development_dependency 'pry', '~> 0.14' + s.add_development_dependency 'yard', '~> 0.9' + s.add_development_dependency 'simplecov', '~> 0.22' + s.add_development_dependency 'simplecov-cobertura', '~> 2.1' + s.add_development_dependency 'rspec_junit_formatter', '~> 0.6' + s.add_development_dependency 'rubocop', '~> 1.62' + s.add_runtime_dependency 'version', '~> 1' end Rake::VersionTask.new do |task| @@ -56,7 +58,7 @@ Rake::VersionTask.new do |task| end YARD::Rake::YardocTask.new do |t| - t.files = ['lib/**/*.rb'] + t.files = ['lib/**/*.rb'] t.stats_options = ['--list-undoc'] end @@ -68,4 +70,4 @@ RuboCop::RakeTask.new(:rubocop) do |task| task.fail_on_error = false end -task :default => :spec +task default: :spec diff --git a/VERSION b/VERSION index 90fe88b..4a83f81 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.11a +1.0.11 diff --git a/quadtree.gemspec b/quadtree.gemspec index 7879d29..7a4d887 100644 --- a/quadtree.gemspec +++ b/quadtree.gemspec @@ -1,17 +1,18 @@ # -*- encoding: utf-8 -*- -# stub: quadtree 1.0.11a ruby lib +# stub: quadtree 1.0.11 ruby lib Gem::Specification.new do |s| s.name = "quadtree".freeze - s.version = "1.0.11a" + s.version = "1.0.11" s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version= + s.metadata = { "homepage_uri" => "https://github.com/janlindblom/ruby-quadtree", "source_code_uri" => "https://github.com/janlindblom/ruby-quadtree" } if s.respond_to? :metadata= s.require_paths = ["lib".freeze] s.authors = ["Jan Lindblom".freeze] s.bindir = "exe".freeze s.date = "2024-03-19" s.email = ["janlindblom@fastmail.fm".freeze] - s.files = ["CODE_OF_CONDUCT.md".freeze, "Gemfile".freeze, "LICENSE.txt".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "lib/quadtree.rb".freeze, "lib/quadtree/axis_aligned_bounding_box.rb".freeze, "lib/quadtree/point.rb".freeze, "lib/quadtree/quadtree.rb".freeze, "lib/quadtree/unknown_type_error.rb".freeze, "lib/quadtree/version.rb".freeze, "quadtree.gemspec".freeze] + s.files = [".gitattributes".freeze, "CODE_OF_CONDUCT.md".freeze, "Gemfile".freeze, "LICENSE.txt".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "lib/quadtree.rb".freeze, "lib/quadtree/axis_aligned_bounding_box.rb".freeze, "lib/quadtree/point.rb".freeze, "lib/quadtree/quadtree.rb".freeze, "lib/quadtree/unknown_type_error.rb".freeze, "lib/quadtree/version.rb".freeze, "quadtree.gemspec".freeze] s.homepage = "https://github.com/janlindblom/ruby-quadtree".freeze s.licenses = ["MIT".freeze] s.required_ruby_version = Gem::Requirement.new(">= 2.6.0".freeze) From 58fa51b0f058ad72155e3fb9e3a93ee285638771 Mon Sep 17 00:00:00 2001 From: Jan Lindblom Date: Thu, 21 Mar 2024 18:08:59 +0200 Subject: [PATCH 3/4] Adding tea constitution file. --- tea.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 tea.yaml diff --git a/tea.yaml b/tea.yaml new file mode 100644 index 0000000..4e2ebca --- /dev/null +++ b/tea.yaml @@ -0,0 +1,7 @@ +# https://tea.xyz/what-is-this-file +--- +version: 1.0.0 +codeOwners: + - '0x35cA065597a76F6f0bEe270854C36e9c6bEc3D03' +quorum: 1 + From e42662c7f85e45fb4b71c4801b2e9715e21ee1f2 Mon Sep 17 00:00:00 2001 From: Jan Lindblom Date: Thu, 21 Mar 2024 18:18:21 +0200 Subject: [PATCH 4/4] Updating Github action, won't test on 2.6 any longer. --- .github/workflows/dependency-review.yml | 18 ------------------ .github/workflows/ruby.yml | 4 +++- 2 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 .github/workflows/dependency-review.yml diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml deleted file mode 100644 index 840c3a3..0000000 --- a/.github/workflows/dependency-review.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: 'Dependency Review' -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - -permissions: - contents: read - -jobs: - dependency-review: - runs-on: ubuntu-latest - steps: - - name: 'Checkout Repository' - uses: actions/checkout@v3 - - name: 'Dependency Review' - uses: actions/dependency-review-action@v2 diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 60d9e61..07c2699 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -4,10 +4,12 @@ on: push: branches: - master + - main - develop pull_request: branches: - master + - main jobs: build: @@ -34,9 +36,9 @@ jobs: strategy: matrix: ruby-version: - - '2.6' - '3.1' - '3.2' + - '3.3' steps: - uses: actions/checkout@v3