New Upstream Snapshot - roodi
Ready changes
Summary
Merged new upstream version: 5.0.0+git20210211.1.0d4e7e1 (was: 5.0.0).
Resulting package
Built on 2022-10-21T22:14 (took 3m18s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots roodi
Lintian Result
Diff
diff --git a/.travis.yml b/.travis.yml
index a5a71b8..8abd2f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,4 @@
language: ruby
rvm:
- - 1.9.2
- - 1.9.3
- - 2.0.0
- - 2.1.2
- - jruby-19mode # JRuby in 1.9 mode
+ - 2.7.2
+ - 3.0.0
diff --git a/Gemfile b/Gemfile
index c6a7d1e..25b1ea0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,6 @@ source "https://rubygems.org"
gemspec
-gem "rake"
-gem "rspec", "~> 2.14.1"
-gem 'coveralls', :require => false
+gem "rake", "~> 12.3.1"
+gem "rspec", "~> 3.8.0"
+gem 'coveralls', "~> 0.8.22", :require => false
diff --git a/History.md b/History.md
index aa13f75..a57d8bf 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,7 @@
+# 5.0.0
+* The syntax to specify a config file is now '-c=FILE' or '--config=FILE', not '-config=FILE'
+* Added the command line parameters -v/--version and -h/--help
+
# 4.0.0
* Send args to roodi_task will make it easier to add custom configuration (breaking backwards compatibility)
diff --git a/README.md b/README.md
index 742d080..8ee7728 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# roodi
-[![Build Status](https://travis-ci.org/roodi/roodi.png?branch=master)](https://travis-ci.org/roodi/roodi)
+[![Build Status](https://travis-ci.com/roodi/roodi.svg?branch=master)](https://travis-ci.com/roodi/roodi)
[![Coverage Status](https://coveralls.io/repos/roodi/roodi/badge.png?branch=master)](https://coveralls.io/r/roodi/roodi?branch=master)
## Description
diff --git a/debian/changelog b/debian/changelog
index 3829ce3..b8ebcbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+roodi (5.0.0+git20210211.1.0d4e7e1-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+ * Drop patch fix_outdated_test.patch, present upstream.
+ * Drop patch case_syntax.patch, present upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk> Fri, 21 Oct 2022 22:12:45 -0000
+
roodi (5.0.0-5) unstable; urgency=medium
* Team upload
diff --git a/debian/patches/case_syntax.patch b/debian/patches/case_syntax.patch
deleted file mode 100644
index ba4eaa1..0000000
--- a/debian/patches/case_syntax.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: colon syntax in case/when deprecated
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=980582
-Author: Cédric Boutillier <boutil@debian.org>
-Last-Update: 2021-02-10
-Forwarded: https://github.com/roodi/roodi/pull/40
-
---- a/spec/roodi/checks/case_missing_else_check_spec.rb
-+++ b/spec/roodi/checks/case_missing_else_check_spec.rb
-@@ -8,7 +8,7 @@
- it "should accept case statements that do have an else" do
- content = <<-END
- case foo
-- when "bar": "ok"
-+ when "bar" then "ok"
- else "good"
- end
- END
-@@ -20,8 +20,8 @@
- it "should reject case statements that do have an else" do
- content = <<-END
- case foo
-- when "bar": "ok"
-- when "bar": "bad"
-+ when "bar" then "ok"
-+ when "bar" then "bad"
- end
- END
- @roodi.check_content(content)
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index bfcb77f..11cc686 100644
--- a/debian/patches/debian-changes
+++ b/debian/patches/debian-changes
@@ -9,8 +9,10 @@ Debian patch.
For full commit history and separated commits, see the packaging Git
repository.
---- roodi-5.0.0.orig/bin/roodi
-+++ roodi-5.0.0/bin/roodi
+Index: roodi.git/bin/roodi
+===================================================================
+--- roodi.git.orig/bin/roodi
++++ roodi.git/bin/roodi
@@ -1,7 +1,5 @@
#!/usr/bin/env ruby
@@ -19,8 +21,10 @@ repository.
require 'roodi'
---- roodi-5.0.0.orig/bin/roodi-describe
-+++ roodi-5.0.0/bin/roodi-describe
+Index: roodi.git/bin/roodi-describe
+===================================================================
+--- roodi.git.orig/bin/roodi-describe
++++ roodi.git/bin/roodi-describe
@@ -1,6 +1,5 @@
#!/usr/bin/env ruby
@@ -28,8 +32,10 @@ repository.
require 'roodi'
roodi = Roodi::Core::Runner.new
---- roodi-5.0.0.orig/lib/roodi/core/runner.rb
-+++ roodi-5.0.0/lib/roodi/core/runner.rb
+Index: roodi.git/lib/roodi/core/runner.rb
+===================================================================
+--- roodi.git.orig/lib/roodi/core/runner.rb
++++ roodi.git/lib/roodi/core/runner.rb
@@ -8,6 +8,7 @@ require 'roodi/core/sexp'
module Roodi
module Core
@@ -47,8 +53,10 @@ repository.
end
def project_config
---- roodi-5.0.0.orig/spec/spec_helper.rb
-+++ roodi-5.0.0/spec/spec_helper.rb
+Index: roodi.git/spec/spec_helper.rb
+===================================================================
+--- roodi.git.orig/spec/spec_helper.rb
++++ roodi.git/spec/spec_helper.rb
@@ -1,6 +1,6 @@
$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
require 'roodi'
diff --git a/debian/patches/fix_outdated_test.patch b/debian/patches/fix_outdated_test.patch
deleted file mode 100644
index 181c604..0000000
--- a/debian/patches/fix_outdated_test.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: [PATCH] fix outdated test
-Origin: https://github.com/roodi/roodi/pull/39/commits/e0a37d6394f14571d771eae7db2edf75d4037695
-Applied-Upstream: https://github.com/roodi/roodi/commit/4c7faecf6b6405f8908be6bb90cf083b95ee3144
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=907149
-Author: Dave Aronson <davearonson@users.noreply.github.com>
-Date: Tue, 30 Oct 2018 15:56:19 -0400
-Reviewed-by: Cédric Boutillier <boutil@debian.org>
-
-
----
- spec/roodi/checks/empty_rescue_body_check_spec.rb | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/spec/roodi/checks/empty_rescue_body_check_spec.rb
-+++ b/spec/roodi/checks/empty_rescue_body_check_spec.rb
-@@ -206,7 +206,10 @@
- @roodi.check_content(content)
- errors = @roodi.errors
- errors.should_not be_empty
-- errors[0].to_s.should match(/dummy-file.rb:[5] - Rescue block should not be empty./)
-+ # OLDER versions of Ruby apparently report this as file.rb:[5]
-+ # (at least, I ass-u-me that's how the old version of this test passed!),
-+ # and LATER ones as file.rb:3 (at least, 2.3.0 does).
-+ errors[0].to_s.should match(/dummy-file.rb:(\[5\]|3) - Rescue block should not be empty./)
- end
-
- end
diff --git a/debian/patches/series b/debian/patches/series
index 885dbd5..e28281e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
debian-changes
-fix_outdated_test.patch
use_file_from_spec.patch
-case_syntax.patch
yaml_unsafe_load.patch
diff --git a/debian/patches/use_file_from_spec.patch b/debian/patches/use_file_from_spec.patch
index ff8e9f8..477daf0 100644
--- a/debian/patches/use_file_from_spec.patch
+++ b/debian/patches/use_file_from_spec.patch
@@ -5,9 +5,11 @@ Forwarded: not-needed
Author: Cédric Boutillier <boutil@debian.org>
Last-Update: 2019-01-02
---- a/spec/roodi/core/runner_spec.rb
-+++ b/spec/roodi/core/runner_spec.rb
-@@ -15,7 +15,7 @@
+Index: roodi.git/spec/roodi/core/runner_spec.rb
+===================================================================
+--- roodi.git.orig/spec/roodi/core/runner_spec.rb
++++ roodi.git/spec/roodi/core/runner_spec.rb
+@@ -15,7 +15,7 @@ describe Roodi::Core::Runner do
end
it "checks that one file" do
diff --git a/debian/patches/yaml_unsafe_load.patch b/debian/patches/yaml_unsafe_load.patch
index a3c9f09..a9be607 100644
--- a/debian/patches/yaml_unsafe_load.patch
+++ b/debian/patches/yaml_unsafe_load.patch
@@ -9,9 +9,11 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1019606
Author: Cédric Boutillier <boutil@debian.org>
Last-Update: 2022-10-19
---- a/lib/roodi/core/runner.rb
-+++ b/lib/roodi/core/runner.rb
-@@ -132,7 +132,7 @@
+Index: roodi.git/lib/roodi/core/runner.rb
+===================================================================
+--- roodi.git.orig/lib/roodi/core/runner.rb
++++ roodi.git/lib/roodi/core/runner.rb
+@@ -132,7 +132,7 @@ module Roodi
end
def load_config(config_file)
diff --git a/metadata.yml b/metadata.yml
deleted file mode 100644
index 8d80550..0000000
--- a/metadata.yml
+++ /dev/null
@@ -1,155 +0,0 @@
---- !ruby/object:Gem::Specification
-name: roodi
-version: !ruby/object:Gem::Version
- version: 5.0.0
-platform: ruby
-authors:
-- Marty Andrews
-- Peter Evjan
-autorequire:
-bindir: bin
-cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
- name: ruby_parser
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: 3.2.2
- - - "~>"
- - !ruby/object:Gem::Version
- version: '3.2'
- type: :runtime
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: 3.2.2
- - - "~>"
- - !ruby/object:Gem::Version
- version: '3.2'
-description: Roodi parses your Ruby code and warns you about design issues you have
- based on the checks that is has configured
-email: hello@peterevjan.com
-executables:
-- roodi
-- roodi-describe
-extensions: []
-extra_rdoc_files: []
-files:
-- ".gitignore"
-- ".travis.yml"
-- Gemfile
-- History.md
-- Manifest.txt
-- README.md
-- Rakefile
-- bin/roodi
-- bin/roodi-describe
-- lib/roodi.rb
-- lib/roodi/checks.rb
-- lib/roodi/checks/abc_metric_method_check.rb
-- lib/roodi/checks/assignment_in_conditional_check.rb
-- lib/roodi/checks/case_missing_else_check.rb
-- lib/roodi/checks/check.rb
-- lib/roodi/checks/class_line_count_check.rb
-- lib/roodi/checks/class_name_check.rb
-- lib/roodi/checks/class_variable_check.rb
-- lib/roodi/checks/control_coupling_check.rb
-- lib/roodi/checks/core_method_override_check.rb
-- lib/roodi/checks/cyclomatic_complexity_block_check.rb
-- lib/roodi/checks/cyclomatic_complexity_check.rb
-- lib/roodi/checks/cyclomatic_complexity_method_check.rb
-- lib/roodi/checks/empty_rescue_body_check.rb
-- lib/roodi/checks/for_loop_check.rb
-- lib/roodi/checks/line_count_check.rb
-- lib/roodi/checks/method_line_count_check.rb
-- lib/roodi/checks/method_name_check.rb
-- lib/roodi/checks/module_line_count_check.rb
-- lib/roodi/checks/module_name_check.rb
-- lib/roodi/checks/name_check.rb
-- lib/roodi/checks/npath_complexity_check.rb
-- lib/roodi/checks/npath_complexity_method_check.rb
-- lib/roodi/checks/parameter_number_check.rb
-- lib/roodi/core.rb
-- lib/roodi/core/checking_visitor.rb
-- lib/roodi/core/error.rb
-- lib/roodi/core/parser.rb
-- lib/roodi/core/runner.rb
-- lib/roodi/core/sexp.rb
-- lib/roodi/version.rb
-- lib/roodi_task.rb
-- roodi.gemspec
-- roodi.yml
-- spec/roodi/checks/abc_metric_method_check_spec.rb
-- spec/roodi/checks/assignment_in_conditional_check_spec.rb
-- spec/roodi/checks/case_missing_else_check_spec.rb
-- spec/roodi/checks/class_line_count_check_spec.rb
-- spec/roodi/checks/class_name_check_spec.rb
-- spec/roodi/checks/class_variable_check_spec.rb
-- spec/roodi/checks/control_coupling_check_spec.rb
-- spec/roodi/checks/core_method_override_check_spec.rb
-- spec/roodi/checks/cyclomatic_complexity_block_check_spec.rb
-- spec/roodi/checks/cyclomatic_complexity_method_check_spec.rb
-- spec/roodi/checks/empty_rescue_body_check_spec.rb
-- spec/roodi/checks/for_loop_check_spec.rb
-- spec/roodi/checks/method_line_count_check_spec.rb
-- spec/roodi/checks/method_name_check_spec.rb
-- spec/roodi/checks/module_line_count_check_spec.rb
-- spec/roodi/checks/module_name_check_spec.rb
-- spec/roodi/checks/npath_complexity_method_check_spec.rb
-- spec/roodi/checks/parameter_number_check_spec.rb
-- spec/roodi/core/runner_spec.rb
-- spec/roodi/roodi.yml
-- spec/roodi_task_spec.rb
-- spec/spec_helper.rb
-homepage: http://github.com/roodi/roodi
-licenses:
-- MIT
-metadata: {}
-post_install_message:
-rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
-requirements: []
-rubyforge_project:
-rubygems_version: 2.4.5
-signing_key:
-specification_version: 4
-summary: Roodi stands for Ruby Object Oriented Design Inferometer
-test_files:
-- spec/roodi/checks/abc_metric_method_check_spec.rb
-- spec/roodi/checks/assignment_in_conditional_check_spec.rb
-- spec/roodi/checks/case_missing_else_check_spec.rb
-- spec/roodi/checks/class_line_count_check_spec.rb
-- spec/roodi/checks/class_name_check_spec.rb
-- spec/roodi/checks/class_variable_check_spec.rb
-- spec/roodi/checks/control_coupling_check_spec.rb
-- spec/roodi/checks/core_method_override_check_spec.rb
-- spec/roodi/checks/cyclomatic_complexity_block_check_spec.rb
-- spec/roodi/checks/cyclomatic_complexity_method_check_spec.rb
-- spec/roodi/checks/empty_rescue_body_check_spec.rb
-- spec/roodi/checks/for_loop_check_spec.rb
-- spec/roodi/checks/method_line_count_check_spec.rb
-- spec/roodi/checks/method_name_check_spec.rb
-- spec/roodi/checks/module_line_count_check_spec.rb
-- spec/roodi/checks/module_name_check_spec.rb
-- spec/roodi/checks/npath_complexity_method_check_spec.rb
-- spec/roodi/checks/parameter_number_check_spec.rb
-- spec/roodi/core/runner_spec.rb
-- spec/roodi/roodi.yml
-- spec/roodi_task_spec.rb
-- spec/spec_helper.rb
diff --git a/spec/roodi/checks/case_missing_else_check_spec.rb b/spec/roodi/checks/case_missing_else_check_spec.rb
index 29aa7a1..1c626ab 100644
--- a/spec/roodi/checks/case_missing_else_check_spec.rb
+++ b/spec/roodi/checks/case_missing_else_check_spec.rb
@@ -8,7 +8,7 @@ describe Roodi::Checks::CaseMissingElseCheck do
it "should accept case statements that do have an else" do
content = <<-END
case foo
- when "bar": "ok"
+ when "bar" then "ok"
else "good"
end
END
@@ -20,8 +20,8 @@ describe Roodi::Checks::CaseMissingElseCheck do
it "should reject case statements that do have an else" do
content = <<-END
case foo
- when "bar": "ok"
- when "bar": "bad"
+ when "bar" then "ok"
+ when "bar" then "bad"
end
END
@roodi.check_content(content)
diff --git a/spec/roodi/checks/empty_rescue_body_check_spec.rb b/spec/roodi/checks/empty_rescue_body_check_spec.rb
index 6db0faa..e1b9b87 100644
--- a/spec/roodi/checks/empty_rescue_body_check_spec.rb
+++ b/spec/roodi/checks/empty_rescue_body_check_spec.rb
@@ -206,7 +206,10 @@ describe Roodi::Checks::EmptyRescueBodyCheck do
@roodi.check_content(content)
errors = @roodi.errors
errors.should_not be_empty
- errors[0].to_s.should match(/dummy-file.rb:[5] - Rescue block should not be empty./)
+ # OLDER versions of Ruby apparently report this as file.rb:[5]
+ # (at least, I ass-u-me that's how the old version of this test passed!),
+ # and LATER ones as file.rb:3 (at least, 2.3.0 does).
+ errors[0].to_s.should match(/dummy-file.rb:(\[5\]|3) - Rescue block should not be empty./)
end
end
Debdiff
File lists identical (after any substitutions)
No differences were encountered in the control files