Skip to content

Commit

Permalink
Merge tag 'infra_updates_210324' into develop
Browse files Browse the repository at this point in the history
Updates to test infrastructure.
  • Loading branch information
janlindblom committed Mar 21, 2024
2 parents 737c6c8 + e42662c commit bf58441
Show file tree
Hide file tree
Showing 8 changed files with 66 additions and 68 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

*.gemspec text eol=lf
*.yml text eol=lf
18 changes: 0 additions & 18 deletions .github/workflows/dependency-review.yml

This file was deleted.

4 changes: 3 additions & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ on:
push:
branches:
- master
- main
- develop
pull_request:
branches:
- master
- main

jobs:
build:
Expand All @@ -34,9 +36,9 @@ jobs:
strategy:
matrix:
ruby-version:
- '2.6'
- '3.1'
- '3.2'
- '3.3'
steps:
- uses: actions/checkout@v3

Expand Down
71 changes: 37 additions & 34 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,52 +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 = ["[email protected]"]
s.authors = ['Jan Lindblom']
s.email = ['[email protected]']

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 == '.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"
s.add_development_dependency "rspec", "~> 3"
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-cobertura", "~> 2.1"
s.add_development_dependency "rspec_junit_formatter", "~> 0.6"
s.add_development_dependency "rubocop", "~> 1"
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|
Expand All @@ -55,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

Expand All @@ -67,4 +70,4 @@ RuboCop::RakeTask.new(:rubocop) do |task|
task.fail_on_error = false
end

task :default => :spec
task default: :spec
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.10
1.0.11
27 changes: 14 additions & 13 deletions quadtree.gemspec
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
# -*- encoding: utf-8 -*-
# stub: quadtree 1.0.10 ruby lib
# stub: quadtree 1.0.11 ruby lib

Gem::Specification.new do |s|
s.name = "quadtree".freeze
s.version = "1.0.10"
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 = "2023-01-20"
s.date = "2024-03-19"
s.email = ["[email protected]".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)
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
Expand All @@ -24,25 +25,25 @@ Gem::Specification.new do |s|

if s.respond_to? :add_runtime_dependency then
s.add_development_dependency(%q<bundler>.freeze, ["~> 2"])
s.add_development_dependency(%q<rake>.freeze, ["~> 13"])
s.add_development_dependency(%q<rspec>.freeze, ["~> 3"])
s.add_development_dependency(%q<rake>.freeze, ["~> 13.1"])
s.add_development_dependency(%q<rspec>.freeze, ["~> 3.13"])
s.add_development_dependency(%q<pry>.freeze, ["~> 0.14"])
s.add_development_dependency(%q<yard>.freeze, ["~> 0.9"])
s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.21"])
s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.22"])
s.add_development_dependency(%q<simplecov-cobertura>.freeze, ["~> 2.1"])
s.add_development_dependency(%q<rspec_junit_formatter>.freeze, ["~> 0.6"])
s.add_development_dependency(%q<rubocop>.freeze, ["~> 1"])
s.add_development_dependency(%q<rubocop>.freeze, ["~> 1.62"])
s.add_runtime_dependency(%q<version>.freeze, ["~> 1"])
else
s.add_dependency(%q<bundler>.freeze, ["~> 2"])
s.add_dependency(%q<rake>.freeze, ["~> 13"])
s.add_dependency(%q<rspec>.freeze, ["~> 3"])
s.add_dependency(%q<rake>.freeze, ["~> 13.1"])
s.add_dependency(%q<rspec>.freeze, ["~> 3.13"])
s.add_dependency(%q<pry>.freeze, ["~> 0.14"])
s.add_dependency(%q<yard>.freeze, ["~> 0.9"])
s.add_dependency(%q<simplecov>.freeze, ["~> 0.21"])
s.add_dependency(%q<simplecov>.freeze, ["~> 0.22"])
s.add_dependency(%q<simplecov-cobertura>.freeze, ["~> 2.1"])
s.add_dependency(%q<rspec_junit_formatter>.freeze, ["~> 0.6"])
s.add_dependency(%q<rubocop>.freeze, ["~> 1"])
s.add_dependency(%q<rubocop>.freeze, ["~> 1.62"])
s.add_dependency(%q<version>.freeze, ["~> 1"])
end
end
7 changes: 7 additions & 0 deletions tea.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# https://tea.xyz/what-is-this-file
---
version: 1.0.0
codeOwners:
- '0x35cA065597a76F6f0bEe270854C36e9c6bEc3D03'
quorum: 1

0 comments on commit bf58441

Please sign in to comment.