From 3756042224f8cadfa7d6c9e8a6e5917dd7689d5b Mon Sep 17 00:00:00 2001 From: Oriol Gual Date: Thu, 9 Feb 2023 20:13:26 +0100 Subject: [PATCH] Update to Ruby 3.2 and cleaning up --- .ruby-version | 2 +- .tool-versions | 1 + Gemfile | 1 - README.markdown | 6 ++---- bin/spinach | 2 +- features/support/env.rb | 13 ------------- lib/spinach/version.rb | 2 +- spinach.gemspec | 5 +---- test/test_helper.rb | 13 ------------- 9 files changed, 7 insertions(+), 38 deletions(-) create mode 100644 .tool-versions diff --git a/.ruby-version b/.ruby-version index 860487ca..944880fa 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.1 +3.2.0 diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 00000000..40b87ee4 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +ruby 3.2.1 diff --git a/Gemfile b/Gemfile index a437db1c..eee660c8 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,6 @@ source 'http://rubygems.org' # Specify your gem's dependencies in spinach.gemspec gemspec -gem 'coveralls', require: false gem 'pry-byebug', platforms: [:ruby] group :docs do diff --git a/README.markdown b/README.markdown index e6ecf9b0..35bf92d1 100644 --- a/README.markdown +++ b/README.markdown @@ -2,8 +2,6 @@ [![Gem Version](https://badge.fury.io/rb/spinach.svg)](https://badge.fury.io/rb/spinach) ![Tests](https://github.com/codegram/spinach/workflows/Tests/badge.svg) -[![Coverage Status](https://coveralls.io/repos/codegram/spinach/badge.png?branch=master)](https://coveralls.io/r/codegram/spinach) -![](https://ruby-gem-downloads-badge.herokuapp.com/rails) Spinach is a high-level BDD framework that leverages the expressive [Gherkin language][gherkin] (used by [Cucumber][cucumber]) to help you define @@ -17,7 +15,7 @@ Conceived as an alternative to Cucumber, here are some of its design goals: - Step reusability: In case you want to reuse steps across features, you can always wrap those in plain ol' Ruby modules. -Spinach is tested against Ruby MRI **2.4, 2.5, 2.6 and 2.7** as well as **latest JRuby 9000**. +Spinach is tested against Ruby MRI **2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2** as well as **JRuby **. ## Getting started @@ -380,7 +378,7 @@ You can easily contribute to Spinach. Its codebase is simple and ## License -MIT (Expat) License. Copyright 2011-2016 [Codegram Technologies](http://codegram.com) +MIT (Expat) License. Copyright 2011-2023 [Codegram Technologies](http://codegram.com) [gherkin]: http://github.com/codegram/gherkin-ruby [cucumber]: http://github.com/cucumber/cucumber diff --git a/bin/spinach b/bin/spinach index 64d06115..0507f5f1 100755 --- a/bin/spinach +++ b/bin/spinach @@ -1,7 +1,7 @@ #!/usr/bin/env ruby begin - require "bundler/setup" + require "bundler/setup" rescue LoadError end diff --git a/features/support/env.rb b/features/support/env.rb index 54e65c86..2af817fe 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -1,19 +1,6 @@ require 'minitest/autorun' require 'minitest/spec' require_relative 'filesystem' -require 'simplecov' - -if ENV['CI'] && !defined?(Rubinius) - require 'coveralls' - SimpleCov.formatter = Coveralls::SimpleCov::Formatter - require 'simplecov' - - SimpleCov.start do - add_filter '/test/' - add_filter '/features/' - end -end - Spinach.hooks.after_scenario do |scenario| FileUtils.rm_rf(Filesystem.dirs) diff --git a/lib/spinach/version.rb b/lib/spinach/version.rb index 35e1fe57..6f338487 100644 --- a/lib/spinach/version.rb +++ b/lib/spinach/version.rb @@ -1,4 +1,4 @@ module Spinach # Spinach version. - VERSION = "0.11.0" + VERSION = "0.12.0" end diff --git a/spinach.gemspec b/spinach.gemspec index 781b1def..331cfa41 100644 --- a/spinach.gemspec +++ b/spinach.gemspec @@ -3,8 +3,7 @@ require File.expand_path('../lib/spinach/version', __FILE__) Gem::Specification.new do |gem| gem.authors = ["Josep Jaume Rey", "Josep M. Bach", "Oriol Gual", "Marc Divins Castellvi"] - gem.email = ["info@codegram.com", "josep.m.bach@gmail.com", - "oriolgual@gmail.com", "josepjaume@gmail.com", "marcdivc@gmail.com"] + gem.email = ["josep.m.bach@gmail.com", "oriolgual@gmail.com", "josepjaume@gmail.com", "marcdivc@gmail.com"] gem.description = %q{Spinach is a BDD framework on top of gherkin} gem.summary = %q{Spinach is a BDD framework on top of gherkin} gem.homepage = "http://github.com/codegram/spinach" @@ -12,13 +11,11 @@ Gem::Specification.new do |gem| gem.add_runtime_dependency 'gherkin-ruby', '>= 0.3.2' gem.add_runtime_dependency 'colorize' - gem.add_runtime_dependency 'json' gem.add_development_dependency 'rake' gem.add_development_dependency 'mocha', "~> 1.5.0" gem.add_development_dependency 'sinatra' gem.add_development_dependency 'capybara' gem.add_development_dependency 'pry' - gem.add_development_dependency 'simplecov' gem.add_development_dependency 'rspec' gem.add_development_dependency 'minitest', '< 5.0' gem.add_development_dependency 'fakefs', ">= 0.5.2" diff --git a/test/test_helper.rb b/test/test_helper.rb index bb61f17a..2464cc59 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,16 +1,3 @@ -require 'simplecov' -require 'coveralls' - -SimpleCov.formatter = Coveralls::SimpleCov::Formatter -if ENV['CI'] && !defined?(Rubinius) - require 'simplecov' - - SimpleCov.start do - add_filter '/test/' - add_filter '/features/' - end -end - require 'minitest/autorun' require 'minitest/spec' require 'mocha/minitest'