New Upstream Release - ruby-qr4r
Ready changes
Summary
Merged new upstream version: 0.6.2 (was: 0.6.1).
Diff
diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 7113fe4..0000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: 2.1
-orbs:
- ruby: circleci/ruby@1.1.2
-
-jobs:
- build:
- docker:
- - image: circleci/ruby:2.6.3-stretch-node
- executor: ruby/default
- steps:
- - checkout
- - ruby/install-deps
- - run:
- name: Run unit tests using Rake
- command: |
- RAILS_ENV=test bundle exec rake test
- - store_test_results:
- path: test/reports
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
new file mode 100644
index 0000000..2a8d8a7
--- /dev/null
+++ b/.github/workflows/ruby.yml
@@ -0,0 +1,24 @@
+# This workflow uses actions that are not certified by GitHub. They are
+# provided by a third-party and are governed by separate terms of service,
+# privacy policy, and support documentation.
+#
+# This workflow will install a prebuilt Ruby version, install dependencies, and
+# run tests and linters.
+name: "Ruby CI"
+on:
+ push:
+ branches: [ '**' ]
+jobs:
+ ruby-test:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v3
+ - name: Ruby setup
+ uses: ruby/setup-ruby@v1
+ with:
+ bundler-cache: true
+ - name: Lint
+ run: bundle exec rubocop
+ - name: Test
+ run: bundle exec rake test
diff --git a/Gemfile.lock b/Gemfile.lock
index b127f59..d8d4523 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,40 +1,42 @@
PATH
remote: .
specs:
- qr4r (0.6.1)
+ qr4r (0.6.2)
mojo_magick (~> 0.6.5)
- rqrcode_core (~> 0.1)
+ rqrcode_core (~> 1.0)
GEM
remote: https://rubygems.org/
specs:
ast (2.4.2)
- minitest (5.14.4)
- mojo_magick (0.6.5)
- parallel (1.20.1)
- parser (3.0.1.0)
+ json (2.6.3)
+ minitest (5.18.0)
+ mojo_magick (0.6.7)
+ parallel (1.23.0)
+ parser (3.2.2.0)
ast (~> 2.4.1)
- rainbow (3.0.0)
- rake (13.0.3)
- regexp_parser (2.1.1)
+ rainbow (3.1.1)
+ rake (13.0.6)
+ regexp_parser (2.8.0)
rexml (3.2.5)
- rqrcode_core (0.2.0)
- rubocop (0.93.1)
+ rqrcode_core (1.2.0)
+ rubocop (1.50.2)
+ json (~> 2.3)
parallel (~> 1.10)
- parser (>= 2.7.1.5)
+ parser (>= 3.2.0.0)
rainbow (>= 2.2.2, < 4.0)
- regexp_parser (>= 1.8)
- rexml
- rubocop-ast (>= 0.6.0)
+ regexp_parser (>= 1.8, < 3.0)
+ rexml (>= 3.2.5, < 4.0)
+ rubocop-ast (>= 1.28.0, < 2.0)
ruby-progressbar (~> 1.7)
- unicode-display_width (>= 1.4.0, < 2.0)
- rubocop-ast (1.4.1)
- parser (>= 2.7.1.5)
- rubocop-performance (1.10.2)
- rubocop (>= 0.90.0, < 2.0)
+ unicode-display_width (>= 2.4.0, < 3.0)
+ rubocop-ast (1.28.0)
+ parser (>= 3.2.1.0)
+ rubocop-performance (1.17.1)
+ rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
- ruby-progressbar (1.11.0)
- unicode-display_width (1.7.0)
+ ruby-progressbar (1.13.0)
+ unicode-display_width (2.4.2)
PLATFORMS
ruby
@@ -43,8 +45,8 @@ DEPENDENCIES
minitest (~> 5.14)
qr4r!
rake (~> 13.0)
- rubocop (~> 0.93)
+ rubocop (~> 1.0)
rubocop-performance (~> 1.8)
BUNDLED WITH
- 2.1.4
+ 2.2.33
diff --git a/debian/changelog b/debian/changelog
index 0508caf..a74346b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-qr4r (0.6.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Thu, 17 Aug 2023 16:10:41 -0000
+
ruby-qr4r (0.6.1-1) unstable; urgency=medium
* New upstream version 0.6.1
diff --git a/debian/patches/simplify_test_init.patch b/debian/patches/simplify_test_init.patch
index 20f8067..afb625f 100644
--- a/debian/patches/simplify_test_init.patch
+++ b/debian/patches/simplify_test_init.patch
@@ -2,8 +2,10 @@ Description: simply load the lib from the test suite without relative path
Author: Cédric Boutillier <boutil@debian.org>
Last-Update: 2023-02-06
---- a/test/qr4r_test.rb
-+++ b/test/qr4r_test.rb
+Index: ruby-qr4r.git/test/qr4r_test.rb
+===================================================================
+--- ruby-qr4r.git.orig/test/qr4r_test.rb
++++ ruby-qr4r.git/test/qr4r_test.rb
@@ -1,5 +1,5 @@
require "minitest/autorun"
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "init"))
diff --git a/examples/generate_qr4r.rb b/examples/generate_qr4r.rb
index 0464415..f12d5d3 100755
--- a/examples/generate_qr4r.rb
+++ b/examples/generate_qr4r.rb
@@ -1,8 +1,6 @@
#!/usr/bin/env ruby
-
require "qr4r"
require "optparse"
-require "ostruct"
class CmdlineOpts
@opts = nil
@@ -11,8 +9,16 @@ class CmdlineOpts
attr_reader :options
+ class Options
+ attr_accessor :format, :border, :pixel_size, :verbose
+
+ def to_h
+ { format: format, border: border, pixel_size: pixel_size, verbose: verbose }
+ end
+ end
+
def initialize(args)
- @options = OpenStruct.new
+ @options = Options.new
@options.format = "gif"
@options.border = 0
@options.pixel_size = 10
@@ -46,8 +52,8 @@ class CmdlineOpts
"Size for each qrcode pixel") do |px|
@options.pixel_size = px.to_i
end
- opts.on("-v", "--[no-]verbose", "Be verbose") do |_v|
- @options.verbose = V
+ opts.on("-v", "--[no-]verbose", "Be verbose") do |v|
+ @options.verbose = v
end
# No argument, shows at tail. This will print an options summary.
@@ -82,5 +88,5 @@ else
puts " and format #{options.format}"
end
- Qr4r.encode(to_encode, outfile, cmd_options.options.marshal_dump)
+ Qr4r.encode(to_encode, outfile, cmd_options.options.to_h)
end
diff --git a/lib/qr4r/version.rb b/lib/qr4r/version.rb
index a6d01f6..3da0ed6 100644
--- a/lib/qr4r/version.rb
+++ b/lib/qr4r/version.rb
@@ -1,3 +1,3 @@
module Qr4r
- VERSION = "0.6.1".freeze
+ VERSION = "0.6.2".freeze
end
diff --git a/qr4r.gemspec b/qr4r.gemspec
index e7db00e..8bac058 100644
--- a/qr4r.gemspec
+++ b/qr4r.gemspec
@@ -16,13 +16,13 @@ Gem::Specification.new do |s|
s.rubyforge_project = "qr4r"
s.files = `git ls-files`.split("\n")
- s.test_files = `git ls-files -- {test,features}/*`.split("\n")
s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
s.require_paths = ["lib"]
s.add_dependency("mojo_magick", "~> 0.6.5")
- s.add_dependency("rqrcode_core", "~> 0.1")
+ s.add_dependency("rqrcode_core", "~> 1.0")
s.add_development_dependency("minitest", "~> 5.14")
s.add_development_dependency("rake", "~> 13.0")
- s.add_development_dependency("rubocop", "~> 0.93")
+ s.add_development_dependency("rubocop", "~> 1.0")
s.add_development_dependency("rubocop-performance", "~> 1.8")
+ s.metadata["rubygems_mfa_required"] = "true"
end
diff --git a/test/qr4r_test.rb b/test/qr4r_test.rb
index a411d47..404093d 100644
--- a/test/qr4r_test.rb
+++ b/test/qr4r_test.rb
@@ -31,8 +31,8 @@ class Qr4rTest < MiniTest::Test
# assert that it worked
assert File.exist?(f)
r = MojoMagick.get_image_size(f.path)
- assert r[:height] == 33 * 3 + 20
- assert r[:width] == 33 * 3 + 20
+ assert r[:height] == (33 * 3) + 20
+ assert r[:width] == (33 * 3) + 20
end
def test_encode_with_pixel_size
More details
Historical runs
- unsatisfied-apt-dependencies: Unsatisfied APT dependencies: ruby-rqrcode-core:amd64 (>= 1.0)
- quilt-patch-out-of-date: Quilt patch fix_tests.patch no longer applies
- quilt-patch-out-of-date: Quilt patch fix_tests.patch no longer applies
- quilt-refresh-error: An error occurred refreshing quilt patch fix_tests.patch: Applying patch debian/patches/fix_tests.patch patching file test/qr4r_test.rb Hunk #1 FAILED at 1 (different line endings). 1 out of 1 hunk FAILED -- rejects in file test/qr4r_test.rb Patch debian/patches/fix_tests.patch does not apply (enforce with -f)