tetra 2.0.9 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5db5ea75f9c82a90663fa954a76755a89c747ba0650dbc61a871ed2efebaf5cd
-  data.tar.gz: 8c1489dbf9d42d1ababad948ccc4d7a87973d5036045b6e8836011c178f8a74c
+  metadata.gz: 44bc9f5ff042bf65fddacc23815cc68ec600a00ea27434b44af4bd548f459296
+  data.tar.gz: c1fcab0d1c9495ae6bba7fd22031627dbedfe0aa21a1837dc054ad2b9ec478dc
 SHA512:
-  metadata.gz: bbf33e5dd0da6aafcfc838827c2e254df11c7cee95851884440d41a9dd288a5d503ccb355d2158cad80dc0886a00a0846bea80958e9fc6cdc68a07ee7531efb2
-  data.tar.gz: aba9f7940b23a830be803f723f381461b4bca72515c5800b2eabc2e9797ff9af423c47dd55accb60361761fad65fd1505d220b2db685baa466880511fa2cf71f
+  metadata.gz: 67088cf14db8bd5ce2b488feb99878f142eed9630e66afce9cbaf8e19f706fbfe978f5fdfd9ed24a187b226d1649b86a015ded57926464cc22bb17625d3d8a9e
+  data.tar.gz: e7c38c4d2cd8182e9b9f9c0d35598b52f1a2a92cb1dec35c3fcb1bc79573acd5aa13aff220c0611768bf341cd51a2ce1e697cf3717ffb72c833758bda3d3ca50

data/CONTRIBUTING.md

@@ -4,9 +4,8 @@
 
 To develop tetra, you will need:
 
-* to install Bundler and Ruby development headers. On SUSE distros, use
-  `sudo zypper install ruby3.4-rubygem-bundler ruby3.4-devel`;
-* to get development dependencies: `bundle install`;
+* to install Bundler and Ruby development headers.
+* to get development dependencies: `bundle install`.
 
 To install a development version of tetra use:
 
@@ -14,20 +13,51 @@ To install a development version of tetra use:
 sudo rake install
 ```
 
-To run tests, simply run `rake` or `bundle exec rake`. Please note that tests are divided into fine
-(more similar to unit tests) and coarse (more similar to integration tests).
+## Tests
+
+To run tests, simply run `rake` or `bundle exec rake` which runs the full set of tests.
+
+> [!NOTE]
+> Tests are divided into fine (more similar to unit tests) and coarse (more similar to integration tests).
+
+```bash
+# only run fine tests
+bundle exec rspec spec/lib/fine/*
+
+# only run coarse tests
+bundle exec rspec spec/lib/coarse/*
+
+# run all coarse tests with and show example names
+bundle exec rspec spec/lib/coarse/* --format documentation
+
+# only run selected tests
+bundle exec rspec spec/lib/coarse/version_spec.rb
+```
 
 ## Coding style
 
 We use RuboCop to enforce a certain coding style for Ruby. With every Pull request and push, RuboCop checks the coding
-style and reports any errors.
+style and reports any errors. You can do this locally by simple executing `rubocop` if you have RuboCop installed. For
+the exact RuboCop version used, take a look at `tetra.gemspec`.
 
 ## New features
 
 In case you want to add new features, please be aware to also add the necessary fine grained or coarse grained tests
 for it.
 
-## Release
+## Maintainers
+
+### Release
+
+This is an example for the version number 2.0.9.
 
-Install gem-release: `gem install gem-release`
-Bump a patch version: `gem bump -v patch -p -t -r`
+1. Install release helper gem `gem install gem-release`
+1. Bump the version in `lib/tetra/version.rb`
+1. Regenerate `Gemfile.lock` with `bundle install`
+1. Build the gem with `gem build tetra.gemspec`
+1. Run the local tests with `rake`
+1. Add both files and commit them
+1. Tag new version: `git tag -am "tag v2.0.9" v2.0.9`
+1. Push to master: `git push upstream` and `git push --tags upstream`
+1. (Optional: Take a look at the GitHub Action tests)
+1. Release the gem on [rubygems.org](https://rubygems.org): `gem release --pretend` and `gem release`

data/README.md

@@ -1,7 +1,10 @@
-[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/6678/badge)](https://www.bestpractices.dev/projects/6678)
-[![Tests](https://github.com/uyuni-project/tetra/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/uyuni-project/tetra/actions/workflows/test.yml)
+[![Fine tests](https://github.com/uyuni-project/tetra/actions/workflows/test_fine.yml/badge.svg)](https://github.com/uyuni-project/tetra/actions/workflows/test_fine.yml)
+[![Coarse tests](https://github.com/uyuni-project/tetra/actions/workflows/test_coarse.yml/badge.svg)](https://github.com/uyuni-project/tetra/actions/workflows/test_coarse.yml)
+[![RuboCop](https://github.com/uyuni-project/tetra/actions/workflows/rubocop.yml/badge.svg)](https://github.com/uyuni-project/tetra/actions/workflows/rubocop.yml)
 [![codecov](https://codecov.io/github/uyuni-project/tetra/branch/master/graph/badge.svg?token=iLBGZqGXwa)](https://codecov.io/github/uyuni-project/tetra)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=uyuni-project_tetra&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=uyuni-project_tetra)
+[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/6678/badge)](https://www.bestpractices.dev/projects/6678)
+[![OpenSSF Baseline](https://www.bestpractices.dev/projects/6678/baseline)](https://www.bestpractices.dev/projects/6678)
 
 # tetra – builds RPMs for Java software
 
@@ -14,7 +17,7 @@ See [MOTIVATION.md](MOTIVATION.md) for further information.
 
 ## Prerequisites
 
-- [Ruby 3.2](https://www.ruby-lang.org) or later;
+- [Ruby 3.4](https://www.ruby-lang.org) or later;
 - [git](https://git-scm.com) with your credentials set in `~/.gitconfig` (name and email);
 - some basic Unix commands: `bash`, `unzip`, `tar`;
 - a JDK > 8 that can compile whatever software you need to package;

data/bin/tetra

@@ -6,9 +6,7 @@
 # Copyright 2015 Silvio Moioli <moio@suse.de>
 
 # Add lib/ to load path if running from a git clone (dev mode)
-if File.exist?(File.join(__dir__, "..", ".git"))
-  $LOAD_PATH.unshift(File.join(__dir__, "..", "lib"))
-end
+$LOAD_PATH.unshift(File.join(__dir__, "..", "lib")) if File.exist?(File.join(__dir__, "..", ".git"))
 
 begin
   require "tetra"

data/lib/tetra/constants.rb

@@ -2,7 +2,7 @@
 
 # base module for tetra
 module Tetra
-  CCOLLECTIONS = "commons-collections4-4.5.0-M2-src".freeze
+  CCOLLECTIONS = "commons-collections4-4.5.0-M2-src"
   CHUNK_SEPARATOR_VERSION_MATCHER = /[.\-_ ~,]/ # Constant regex for splitting version chunks
   LICENSE_MAP_PATH = File.join(__dir__, "data", "license_map.yml").freeze
   LICENSE_MAPPINGS = {

data/lib/tetra/facades/ant.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Tetra
   # encapsulates tetra-specific Ant commandline options
   class Ant

data/lib/tetra/facades/bash.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Tetra
   # runs Bash with tetra-specific options
   class Bash
@@ -44,7 +45,7 @@ module Tetra
             # The 'bash -c' flag normally takes a single string, so we must be careful.
             # Ideally, passing it as a single array element ["bash", ..., "-c", command]
             # is handled safely by ProcessRunner if it uses exec/system/spawn.
-            run(["bash", "--rcfile", bashrc_file.path, "-i", "-c", command])
+            run(["bash", "--rcfile", bashrc_file.path, "-i", "-c", command], echo: false, stdin_data: nil)
             [command]
           else
             # Interactive mode

data/lib/tetra/facades/git.rb

@@ -17,11 +17,9 @@ module Tetra
     # inits a repo
     def init
       Dir.chdir(@directory) do
-        if Dir.exist?(".git")
-          fail GitAlreadyInitedError
-        else
-          git_cmd("init")
-        end
+        raise GitAlreadyInitedError if Dir.exist?(".git")
+
+        git_cmd("init")
       end
     end
 
@@ -127,14 +125,12 @@ module Tetra
                   "-L", "previously generated",
                   "-L", "user edited")
         rescue ExecutionFailed => e
-          if e.status > 0
-            conflict_count = e.status
-          else
-            raise e
-          end
+          raise e unless e.status.positive?
+
+          conflict_count = e.status
         ensure
           # Clean up the temporary file
-          File.delete(temp_old_version) if File.exist?(temp_old_version)
+          FileUtils.rm_f(temp_old_version)
         end
         conflict_count
       end
@@ -167,12 +163,12 @@ module Tetra
         # This streams stdout from git directly to stdin of xz without loading
         # data into Ruby memory (which could be big).
         git_command = ["git", "archive", "--format=tar", id, "--", directory]
-        xz_command  = ["xz", "-9e"]
+        xz_command  = ["xz", "-6", "-T0"]
 
         statuses = Open3.pipeline(git_command, xz_command, out: destination_path)
 
         unless statuses.all?(&:success?)
-          fail ExecutionFailed.new(
+          raise ExecutionFailed.new(
             "git archive pipeline failed (exit codes: #{statuses.map(&:exitstatus)})",
             statuses.last.exitstatus
           )
@@ -193,11 +189,11 @@ module Tetra
 
     # Automatically passes "git" as the first argument in an Array.
     def git_cmd(*args)
-      run(["git"] + args)
+      run(["git"] + args, echo: false, stdin_data: nil)
     end
 
     def git_cmd_with_stdin(stdin_data, *args)
-      run(["git"] + args, false, stdin_data)
+      run(["git"] + args, echo: false, stdin_data: stdin_data)
     end
   end
 

data/lib/tetra/facades/mvn.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Tetra
   # encapsulates tetra-specific Maven commandline options
   class Mvn
@@ -19,7 +20,7 @@ module Tetra
         "--strict-checksums"
       ]
 
-      "#{executable} #{options.join(' ')}"
+      "#{executable} #{options.join(" ")}"
     end
   end
 end

data/lib/tetra/facades/process_runner.rb

@@ -8,64 +8,21 @@ module Tetra
     # runs a noninteractive executable and returns its output as a string
     # raises ExecutionFailed if the exit status is not 0
     # optionally echoes the executable's output/error to standard output/error
-    def run(commandline, echo = false, stdin_data = nil)
+    def run(commandline, echo: false, stdin_data: nil)
       log.debug "running `#{commandline}`"
 
-      # Prepare buffers to capture output
       out_buffer = StringIO.new
       err_buffer = StringIO.new
-      exit_status = nil
       # Flatten handles nested arrays, Compact removes nils
       cmd_args = Array(commandline).flatten.compact.map(&:to_s)
 
-      Open3.popen3(*cmd_args) do |stdin, stdout, stderr, wait_thr|
-        # 1. Handle Input (if any)
-        stdin.write(stdin_data) if stdin_data
-        stdin.close # Close stdin so the process knows input is finished
-
-        # Use threads to read stdout and stderr simultaneously.
-        readers = []
-
-        readers << Thread.new do
-          stdout.each_line do |line|
-            print line if echo       # Echo to real STDOUT if requested
-            out_buffer << line       # Capture to memory
-          end
-        end
-
-        readers << Thread.new do
-          stderr.each_line do |line|
-            $stderr.print line if echo # Echo to real STDERR if requested
-            err_buffer << line         # Capture to memory
-          end
-        end
-
-        # Wait for reading to finish
-        readers.each(&:join)
-
-        # Get the exit code
-        exit_status = wait_thr.value
-      end
-
-      # Check for failure
-      unless exit_status.success?
-        # Extract strings from buffers
-        out = out_buffer.string
-        err = err_buffer.string
-
-        log.warn("`#{commandline}` failed with status #{exit_status.exitstatus}")
-
-        if !out.empty? || !err.empty?
-          log.warn("Output follows:")
-          log.warn(out) unless out.empty?
-          log.warn(err) unless err.empty?
-        end
+      exit_status = spawn_and_capture(cmd_args, stdin_data, echo, out_buffer, err_buffer)
 
-        fail ExecutionFailed.new(commandline, exit_status.exitstatus, out, err)
-      end
+      out = out_buffer.string
+      err = err_buffer.string
+      raise_execution_failed(commandline, exit_status, out, err) unless exit_status.success?
 
-      # Return the standard output
-      out_buffer.string
+      out
     end
 
     # runs an interactive executable in a subshell
@@ -78,16 +35,55 @@ module Tetra
 
       log.debug "`#{command}` exited with success #{success}"
 
-      fail ExecutionFailed.new(command, $CHILD_STATUS.exitstatus, nil, nil) unless success
+      raise ExecutionFailed.new(command, $CHILD_STATUS.exitstatus, nil, nil) unless success
+    end
+
+    private
+
+    # spawns commandline, writing stdin and reading stdout/stderr concurrently
+    # (writing stdin to completion before draining stdout/stderr can deadlock
+    # if the child fills its output pipe buffer before consuming all of stdin)
+    # returns the resulting Process::Status
+    def spawn_and_capture(cmd_args, stdin_data, echo, out_buffer, err_buffer)
+      Open3.popen3(*cmd_args) do |stdin, stdout, stderr, wait_thr|
+        threads = [
+          Thread.new { write_stdin(stdin, stdin_data) },
+          Thread.new { pipe_to_buffer(stdout, out_buffer, echo ? $stdout : nil) },
+          Thread.new { pipe_to_buffer(stderr, err_buffer, echo ? $stderr : nil) }
+        ]
+        threads.each(&:join)
+
+        wait_thr.value
+      end
+    end
+
+    def write_stdin(stdin, stdin_data)
+      stdin.write(stdin_data) if stdin_data
+      stdin.close # Close stdin so the process knows input is finished
+    end
+
+    def pipe_to_buffer(io, buffer, echo_io)
+      io.each_line do |line|
+        echo_io&.print(line)
+        buffer << line
+      end
+    end
+
+    def raise_execution_failed(commandline, exit_status, out, err)
+      log.warn("`#{commandline}` failed with status #{exit_status.exitstatus}")
+      if !out.empty? || !err.empty?
+        log.warn("Output follows:")
+        log.warn(out) unless out.empty?
+        log.warn(err) unless err.empty?
+      end
+
+      raise ExecutionFailed.new(commandline, exit_status.exitstatus, out, err)
     end
   end
 
   # raised when a command returns a non-zero status
   class ExecutionFailed < StandardError
-    attr_reader :commandline
-    attr_reader :status
-    attr_reader :out
-    attr_reader :err
+    attr_reader :commandline, :status, :out, :err
 
     def initialize(commandline, status, out, err)
       @commandline = commandline

data/lib/tetra/facades/tar.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Tetra
   # encapsulates tar
   class Tar
@@ -7,7 +8,7 @@ module Tetra
     # decompresses a file in a target directory
     def decompress(tarfile, directory)
       # Use Array format to prevent shell injection.
-      result = run(["tar", "xvf", tarfile, "--directory", directory])
+      result = run(["tar", "xvf", tarfile, "--directory", directory], echo: false, stdin_data: nil)
 
       result&.strip
     end

data/lib/tetra/facades/unzip.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Tetra
   # encapsulates unzip
   class Unzip
@@ -7,7 +8,7 @@ module Tetra
     # decompresses a file in a target directory
     def decompress(zipfile, directory)
       # Use Array execution to prevent shell injection
-      result = run(["unzip", zipfile, "-d", directory])
+      result = run(["unzip", zipfile, "-d", directory], echo: false, stdin_data: nil)
 
       result&.strip
     end

data/lib/tetra/maven_website.rb

@@ -10,8 +10,8 @@ module Tetra
     include Logging
 
     # API Constants
-    SEARCH_API = "https://search.maven.org/solrsearch/select".freeze
-    DOWNLOAD_API = "https://repo1.maven.org/maven2".freeze
+    SEARCH_API = "https://search.maven.org/solrsearch/select"
+    DOWNLOAD_API = "https://repo1.maven.org/maven2"
 
     def search_by_sha1(sha1)
       search(q: "1:\"#{sha1}\"")
@@ -77,14 +77,16 @@ module Tetra
         when Net::HTTPSuccess
           response.body
         when Net::HTTPRedirection
-          location = response["location"]
+          # Location may be relative (RFC 7231); resolve it against the
+          # current URI so relative redirects don't crash Net::HTTP.start.
+          location = (uri + response["location"]).to_s
           log.info("Redirected to #{location}")
           # Recursive call to follow redirect (params are usually part of the new URL)
           fetch(location, {}, limit - 1)
         when Net::HTTPNotFound
-          fail NotFoundOnMavenWebsiteError
+          raise NotFoundOnMavenWebsiteError
         else
-          fail "Remote error: #{response.code} #{response.message}"
+          raise "Remote error: #{response.code} #{response.message}"
         end
       rescue Net::OpenTimeout, Net::ReadTimeout, SocketError, Errno::ECONNRESET => e
         if (retries += 1) <= 3

data/lib/tetra/packages/scriptable.rb

@@ -13,7 +13,7 @@ module Tetra
           "cd #{project.latest_dry_run_directory}"
         ] + generate_aliases(project) + project.build_script_lines
 
-        new_content = script_lines.join("\n") + "\n"
+        new_content = "#{script_lines.join("\n")}\n"
 
         result_dir = File.join(project.packages_dir, project.name)
         FileUtils.mkdir_p(result_dir)
@@ -44,8 +44,5 @@ module Tetra
 
       cmds
     end
-
-    # Alias for backward compatibility if other classes call 'aliases'
-    alias aliases generate_aliases
   end
 end

data/lib/tetra/pom_getter.rb

@@ -23,7 +23,9 @@ module Tetra
       log.debug("Attempting unpack of #{file} to find a POM")
       begin
         Zip::File.foreach(file) do |entry|
-          # Security check (Zip Slip)
+          # Defense in depth against malicious entry names. Note this method
+          # never extracts entries to disk (only reads pom.xml into memory),
+          # so Zip Slip path traversal is not actually reachable here.
           next if entry.name.include?("..") || entry.name.start_with?("/")
 
           # PERFORMANCE: end_with? is much faster than Regexp for simple suffixes
@@ -55,7 +57,7 @@ module Tetra
 
         if found_doc
           log.info("pom.xml for #{file} found on search.maven.org for sha1 #{sha1} " \
-                   "(#{found_doc['g']}:#{found_doc['a']}:#{found_doc['v']})")
+                   "(#{found_doc["g"]}:#{found_doc["a"]}:#{found_doc["v"]})")
 
           group_id, artifact_id, version = site.get_maven_id_from(found_doc)
           return site.download_pom(group_id, artifact_id, version), :found_via_sha1

data/lib/tetra/project.rb

@@ -31,11 +31,9 @@ module Tetra
     # finds the project directory up in the tree, like git does
     def self.find_project_dir(starting_dir)
       result = starting_dir
-      while project?(result) == false && result != "/"
-        result = File.expand_path("..", result)
-      end
+      result = File.expand_path("..", result) while project?(result) == false && result != "/"
 
-      fail NoProjectDirectoryError, starting_dir if result == "/"
+      raise NoProjectDirectoryError, starting_dir if result == "/"
 
       result
     end
@@ -61,7 +59,7 @@ module Tetra
     def dry_running?
       latest_comment = @git.latest_comment("tetra: dry-run-")
       # MODERNIZATION: Use match? instead of =~
-      !latest_comment.nil? && !latest_comment.match?(/tetra: dry-run-finished/)
+      !latest_comment.nil? && !latest_comment.include?("tetra: dry-run-finished")
     end
 
     # ends a dry-run assuming a successful build:
@@ -127,7 +125,7 @@ module Tetra
 
         previous_id = @git.latest_id(generated_comment)
 
-        File.open(path, "w") { |io| io.write(new_content) }
+        File.write(path, new_content)
         log.debug "committing new content: #{comment}"
         @git.commit_file(path, whole_comment)
 
@@ -136,7 +134,7 @@ module Tetra
           conflict_count = @git.merge_with_id(path, "#{path}.tetra_user_edited", previous_id)
           File.delete("#{path}.tetra_user_edited")
 
-          @git.commit_file(path, "User changes merged back") if conflict_count == 0
+          @git.commit_file(path, "User changes merged back") if conflict_count.zero?
 
           return conflict_count
         end
@@ -145,10 +143,8 @@ module Tetra
     end
 
     # runs a block from the project directory or a subdirectory
-    def from_directory(subdirectory = "")
-      Dir.chdir(File.join(@full_path, subdirectory)) do
-        yield
-      end
+    def from_directory(subdirectory = "", &)
+      Dir.chdir(File.join(@full_path, subdirectory), &)
     end
 
     # returns the latest dry run start directory
@@ -159,18 +155,16 @@ module Tetra
     # returns a list of files produced during the last dry-run
     def produced_files
       @git.latest_comment("tetra: dry-run-finished")
-        .split("\n")
-        .map { |line| line[%r{^tetra: file-changed: src/(.+)$}, 1] }
-        .compact
-        .sort
+          .split("\n")
+          .filter_map { |line| line[%r{^tetra: file-changed: src/(.+)$}, 1] }
+          .sort
     end
 
     def build_script_lines
       @git.latest_comment("tetra: dry-run-finished")
-        .split("\n")
-        .map { |line| line[/^tetra: build-script-line: (.+)$/, 1] }
-        .compact
-        .sort
+          .split("\n")
+          .filter_map { |line| line[/^tetra: build-script-line: (.+)$/, 1] }
+          .sort
     end
 
     # archives a tarball of kit/ in packages/
@@ -216,8 +210,8 @@ module Tetra
 
           # Calculate relative path for symlink
           link_target = Pathname.new(new_location)
-                        .relative_path_from(Pathname.new(file).dirname)
-                        .to_s
+                                .relative_path_from(Pathname.new(file).dirname)
+                                .to_s
 
           File.symlink(link_target, file)
           result << [file, new_location]
@@ -234,6 +228,7 @@ module Tetra
 
     def initialize(directory)
       @directory = directory
+      super("Not a tetra project directory: #{directory}")
     end
   end
 end

data/lib/tetra/project_initer.rb

@@ -27,7 +27,7 @@ module Tetra
       end
 
       # inits a new project directory structure
-      def init(dir, include_bundled_software = true)
+      def init(dir, include_bundled_software: true)
         Dir.mkdir(dir)
 
         # Avoid Dir.chdir(dir). Use absolute paths instead.

data/lib/tetra/ui/change_sources_subcommand.rb

@@ -5,7 +5,7 @@ module Tetra
   class ChangeSourcesSubcommand < Tetra::Subcommand
     parameter "[SOURCE_ARCHIVE]", "new source tarball or zipfile"
     parameter "[MESSAGE]", "a short change description", default: "Sources changed"
-    option %w(-n --no-archive), :flag, "use current src/ contents instead of an archive (see SPECIAL_CASES.md)",
+    option %w[-n --no-archive], :flag, "use current src/ contents instead of an archive (see SPECIAL_CASES.md)",
            default: false
 
     def execute
@@ -17,19 +17,19 @@ module Tetra
 
         project = Tetra::Project.new(".")
         ensure_dry_running(:is_not_in_progress, project) do
-          if !no_archive?
+          if no_archive?
+            # CASE 2: Updating from manual changes in src/
+            project.commit_sources(message, true)
+
+            puts "New sources committed."
+            puts "Please copy source archive(s) corresponding to src/ in packages/ before proceeding."
+          else
             # CASE 1: Updating from a new archive file
             full_archive_path = File.expand_path(source_archive)
             project.commit_source_archive(full_archive_path, message)
 
             puts "New sources committed."
             puts "Please delete any stale source archives from packages/ before proceeding."
-          else
-            # CASE 2: Updating from manual changes in src/
-            project.commit_sources(message, true)
-
-            puts "New sources committed."
-            puts "Please copy source archive(s) corresponding to src/ in packages/ before proceeding."
           end
         end
       end

data/lib/tetra/ui/generate_all_subcommand.rb

@@ -3,7 +3,7 @@
 module Tetra
   # tetra generate-all
   class GenerateAllSubcommand < Tetra::Subcommand
-    option %w(-f --filter), "FILTER", "filter files to be installed by this package spec", default: "*.jar"
+    option %w[-f --filter], "FILTER", "filter files to be installed by this package spec", default: "*.jar"
     parameter "[POM]", "a package pom file path", default: "pom.xml"
 
     def execute

data/lib/tetra/ui/generate_spec_subcommand.rb

@@ -3,7 +3,7 @@
 module Tetra
   # tetra generate-spec
   class GenerateSpecSubcommand < Tetra::Subcommand
-    option %w(-f --filter), "FILTER", "filter files to be installed by this spec", default: "*.jar"
+    option %w[-f --filter], "FILTER", "filter files to be installed by this spec", default: "*.jar"
     parameter "[POM]", "a pom file path", default: "pom.xml"
 
     def execute

data/lib/tetra/ui/get_pom_subcommand.rb

@@ -15,14 +15,11 @@ module Tetra
           path, status = pom_getter.get_pom(name)
 
           if path
-            text_status = case status
-                          when :found_in_jar
-                            "was inside the jar"
-                          when :found_via_sha1
-                            "found by sha1 search from search.maven.org"
-                          when :found_via_heuristic
-                            "found by heuristic search from search.maven.org"
-                          end
+            text_status = {
+              found_in_jar: "was inside the jar",
+              found_via_sha1: "found by sha1 search from search.maven.org",
+              found_via_heuristic: "found by heuristic search from search.maven.org"
+            }[status]
 
             puts "#{format_path(path, project)} written, #{text_status}"
           else

data/lib/tetra/ui/init_subcommand.rb

@@ -5,7 +5,7 @@ module Tetra
   class InitSubcommand < Tetra::Subcommand
     parameter "PACKAGE_NAME", "name of the package to create"
     parameter "[SOURCE_ARCHIVE]", "source tarball or zipfile"
-    option %w(-n --no-archive), :flag, "create a project without a source archive (see SPECIAL_CASES.md)",
+    option %w[-n --no-archive], :flag, "create a project without a source archive (see SPECIAL_CASES.md)",
            default: false
 
     def execute
@@ -16,9 +16,7 @@ module Tetra
         end
 
         # Ensure the file exists if provided
-        if source_archive && !File.readable?(source_archive)
-          signal_usage_error "#{source_archive} is not a file or it is not readable."
-        end
+        signal_usage_error "#{source_archive} is not a file or it is not readable." if source_archive && !File.readable?(source_archive)
 
         Tetra::Project.init(package_name)
         project = Tetra::Project.new(package_name)

data/lib/tetra/ui/subcommand.rb

@@ -25,15 +25,15 @@ module Tetra
 
     # maps verbosity options to log level
     def configure_log_level(verbose, very_verbose, very_very_verbose)
-      if very_very_verbose
-        log.level = ::Logger::DEBUG
-      elsif very_verbose
-        log.level = ::Logger::INFO
-      elsif verbose
-        log.level = ::Logger::WARN
-      else
-        log.level = ::Logger::ERROR
-      end
+      log.level = if very_very_verbose
+                    ::Logger::DEBUG
+                  elsif very_verbose
+                    ::Logger::INFO
+                  elsif verbose
+                    ::Logger::WARN
+                  else
+                    ::Logger::ERROR
+                  end
     end
 
     # override default option parsing to pass options to other commands
@@ -89,15 +89,15 @@ module Tetra
     def checking_exceptions
       yield
     rescue Errno::EACCES, Errno::ENOENT, Errno::EEXIST => e
-      $stderr.puts e
+      warn e
     rescue Tetra::NoProjectDirectoryError => e
-      $stderr.puts "#{e.directory} is not a tetra project directory, see \"tetra init\""
+      warn "#{e.directory} is not a tetra project directory, see \"tetra init\""
     rescue Tetra::GitAlreadyInitedError
-      $stderr.puts "This directory is already a tetra project"
+      warn "This directory is already a tetra project"
     rescue Tetra::ExecutionFailed => e
-      $stderr.puts "Failed to run `#{e.commandline}` (exit status #{e.status})"
+      warn "Failed to run `#{e.commandline}` (exit status #{e.status})"
     rescue Interrupt
-      $stderr.puts "Execution interrupted by the user"
+      warn "Execution interrupted by the user"
     end
 
     private

data/lib/tetra/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
+
 # base module for tetra
 module Tetra
-  VERSION = "2.0.9"
+  VERSION = "2.0.10"
 end

data/lib/tetra/version_matcher.rb

@@ -28,7 +28,7 @@ module Tetra
     def best_match(my_version, their_versions)
       return nil if their_versions.nil? || their_versions.empty?
 
-      log.debug("version comparison: #{my_version} vs #{their_versions.join(', ')}")
+      log.debug("version comparison: #{my_version} vs #{their_versions.join(", ")}")
 
       my_chunks = my_version.split(Tetra::CHUNK_SEPARATOR_VERSION_MATCHER)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tetra
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.10
 platform: ruby
 authors:
 - Dominik Gedon
@@ -70,14 +70,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: text
   requirement: !ruby/object:Gem::Requirement
@@ -92,132 +92,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.4'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.13'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.86'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.86'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.26'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.26'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.9.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.22'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.22'
-- !ruby/object:Gem::Dependency
-  name: simplecov-cobertura
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
 description: |
   Tetra simplifies the creation of spec files and archives
   to distribute Java projects in RPM format.
@@ -2045,7 +1919,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/uyuni-project/tetra/issues
-  homepage_uri: https://github.com/uyuni-project/tetra
+  homepage_uri: https://rubygems.org/gems/tetra
   source_code_uri: https://github.com/uyuni-project/tetra
   rubygems_mfa_required: 'true'
   allowed_push_host: https://rubygems.org
@@ -2057,14 +1931,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.11
+rubygems_version: 4.0.17
 specification_version: 4
 summary: A tool to package Java projects
 test_files: []