diff --git a/.ruby-version b/.ruby-version index ef538c2..d13e837 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.2 +4.0.6 diff --git a/Gemfile b/Gemfile index 1661771..828242e 100644 --- a/Gemfile +++ b/Gemfile @@ -3,17 +3,14 @@ source "https://rubygems.org" gemspec group :development, :test do - gem 'rspec' # testing framework - gem 'simplecov', require: false + gem 'rspec' gem 'json' - gem 'simplecov_json_formatter' gem 'builder' gem 'rubocop', require: false gem 'rubocop-checkstyle_formatter', require: false gem 'rubocop-rspec', require: false gem 'rubocop-thread_safety' gem 'brakeman' - gem 'coveralls_reborn', '~> 0.27.0', require: false end group :development do diff --git a/Rakefile b/Rakefile index 5e3d3c7..38c754d 100644 --- a/Rakefile +++ b/Rakefile @@ -1,17 +1,17 @@ -require "bundler/setup" +# require "bundler/setup" -APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__) -load "rails/tasks/engine.rake" +# APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__) +# load "rails/tasks/engine.rake" -load "rails/tasks/statistics.rake" +# load "rails/tasks/statistics.rake" require "bundler/gem_tasks" -require "rake/testtask" +# require "rake/testtask" -Rake.add_rakelib 'lib/tasks' +# Rake.add_rakelib 'lib/tasks' -# add rspec rake task -require 'rspec/core/rake_task' -RSpec::Core::RakeTask.new(:spec) -task default: :spec +# # add rspec rake task +# require 'rspec/core/rake_task' +# RSpec::Core::RakeTask.new(:spec) +# task default: :spec diff --git a/lib/ruby_branch_coverage/version.rb b/lib/ruby_branch_coverage/version.rb index 2234f27..9ae9bce 100644 --- a/lib/ruby_branch_coverage/version.rb +++ b/lib/ruby_branch_coverage/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true class RubyBranchCoverage - VERSION = '0.1.7' + VERSION = '1.1.0' end diff --git a/lib/tasks/simplecov.rake b/lib/tasks/simplecov.rake index f00f38f..e6e85ff 100644 --- a/lib/tasks/simplecov.rake +++ b/lib/tasks/simplecov.rake @@ -9,16 +9,16 @@ namespace :simplecov do SimpleCov.start 'rails' do enable_coverage :branch - add_filter '/spec/' - add_filter '/config/' - add_filter '/db/' - add_filter '/vendor/' + skip '/spec/' + skip '/config/' + skip '/db/' + skip '/vendor/' - add_group 'Decorators', 'app/decorators' - add_group 'Forms', 'app/forms' - add_group 'Services', 'app/services' - add_group 'ViewObjects', 'app/view_objects' - add_group 'Batches', 'app/batches' + group 'Decorators', 'app/decorators' + group 'Forms', 'app/forms' + group 'Services', 'app/services' + group 'ViewObjects', 'app/view_objects' + group 'Batches', 'app/batches' merge_timeout 3600 end diff --git a/ruby_branch_coverage.gemspec b/ruby_branch_coverage.gemspec index 75f2c71..6d041ff 100644 --- a/ruby_branch_coverage.gemspec +++ b/ruby_branch_coverage.gemspec @@ -7,12 +7,12 @@ Gem::Specification.new do |s| s.description = 'A program to convert json to xml test coverage format gem' s.authors = ['Suganya'] s.email = ['kuppusamy.suganya@moneyforward.co.jp'] - s.files = Dir["{config,lib}/**/*", "Rakefile"] + s.files = `git ls-files -z`.split("\x0"). + reject { |f| f.match(%r{^(test|spec|features)/}) } s.homepage = - 'https://rubygems.pkg.github.com/moneyforward/ruby_branch_coverage' + 'https://github.com/moneyforward/ruby_branch_coverage' - s.metadata["allowed_push_host"] = 'https://rubygems.pkg.github.com' s.add_development_dependency "rspec-rails" s.add_dependency "rails" - s.add_dependency 'simplecov' + s.add_dependency 'simplecov', '>= 1.0.0' end