tetra 2.0.7 → 2.0.8

data/lib/tetra/generatable.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 require "erb"
 
@@ -7,12 +7,13 @@ module Tetra
   module Generatable
     # returns the template path
     def template_path
-      File.join(File.dirname(__FILE__), "..", "template")
+      File.join(__dir__, "..", "template")
     end
 
     # generates content from an ERB template and an object binding
     def generate(template_name, object_binding)
-      erb = ERB.new(File.read(File.join(template_path, template_name)), trim_mode: "<>")
+      template_file = File.join(template_path, template_name)
+      erb = ERB.new(File.read(template_file), trim_mode: "<>")
       erb.result(object_binding)
     end
   end

data/lib/tetra/kit.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Tetra
   # encapsulates a Tetra kit directory
@@ -13,12 +13,18 @@ module Tetra
     # returns nil if executable cannot be found
     def find_executable(name)
       @project.from_directory do
-        Find.find("kit") do |path|
-          next unless path =~ %r{(.*bin)/#{name}$} && File.executable?(path)
-          result = Regexp.last_match[1]
+        # The pattern `**/*bin/#{name}` matches:
+        #   - kit/bin/mvn
+        #   - kit/usr/local/bin/ant
+        #   - kit/sbin/service (matches your original regex .*bin)
+        Dir.glob(File.join("kit", "**", "*bin", name)).each do |path|
+          next unless File.executable?(path)
 
-          log.debug("found #{name} executable in #{result}")
-          return result
+          # Your original regex captured the directory part (.*bin)
+          dir = File.dirname(path)
+
+          log.debug("found #{name} executable in #{dir}")
+          return dir
         end
       end
 

data/lib/tetra/license_mapper.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Tetra
+  # Handles mapping raw license names to SPDX identifiers
+  class LicenseMapper
+    class << self
+      def map(raw_name)
+        return "unknown" if raw_name.nil? || raw_name.strip.empty?
+
+        name = raw_name.strip
+        mapping[name] || name
+      end
+
+      def reset!
+        @mapping = nil
+      end
+
+      private
+
+      def mapping
+        @mapping ||= begin
+          load_mapping
+        rescue Errno::ENOENT, Psych::SyntaxError, Psych::DisallowedClass, IOError => e
+          warn "Warning: failed to load license mapping from #{Tetra::LICENSE_MAP_PATH}: #{e.class}: #{e.message}"
+          {}
+        end
+      end
+
+      def load_mapping
+        YAML.safe_load_file(Tetra::LICENSE_MAP_PATH) || {}
+      end
+    end
+  end
+end

data/lib/tetra/logger.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Tetra
   # configures logging for this application
@@ -6,14 +6,17 @@ module Tetra
     include Singleton
     extend Forwardable
 
-    def_delegators :@logger, :debug, :info, :warn, :error, :fatal, :level=
+    def_delegators :@logger, :debug, :info, :warn, :error, :fatal, :level, :level=, :formatter=
 
     def initialize
-      @logger = ::Logger.new(STDERR)
+      @logger = ::Logger.new($stderr)
+
       @logger.datetime_format = "%Y-%m-%d %H:%M "
       @logger.level = ::Logger::ERROR
+
       @logger.formatter = proc do |severity, _datetime, _progname, msg|
-        "#{severity.chars.first}: #{msg}\n"
+        # PERFORMANCE: severity[0] is faster than severity.chars.first (no array allocation)
+        "#{severity[0]}: #{msg}\n"
       end
     end
   end

data/lib/tetra/maven_website.rb

@@ -1,64 +1,101 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
+require "net/http"
+require "uri"
+require "json"
 
 module Tetra
-  # Facade to search.maven.org
+  # Facade to search.maven.org (and central.sonatype.com)
   class MavenWebsite
     include Logging
 
-    # returns a search result object from search.maven.com
-    # searching by a jar sha1 hash
-    # see output format at https://search.maven.org/#api
+    # API Constants
+    SEARCH_API = "https://search.maven.org/solrsearch/select".freeze
+    DOWNLOAD_API = "https://repo1.maven.org/maven2".freeze
+
     def search_by_sha1(sha1)
       search(q: "1:\"#{sha1}\"")
     end
 
-    # returns a search result object from search.maven.com
-    # searching by keyword (name)
-    # see output format at https://search.maven.org/#api
     def search_by_name(name)
       search(q: name)
     end
 
-    # returns a search result object from search.maven.com
-    # searching by Maven's group id and artifact id
-    # see output format at https://search.maven.org/#api
     def search_by_group_id_and_artifact_id(group_id, artifact_id)
       search(q: "g:\"#{group_id}\" AND a:\"#{artifact_id}\"", core: "gav")
     end
 
-    # returns a search result object from search.maven.com
-    # searching by Maven's id (group id, artifact id and version)
-    # see output format at https://search.maven.org/#api
     def search_by_maven_id(group_id, artifact_id, version)
       search(q: "g:\"#{group_id}\" AND a:\"#{artifact_id}\" AND v:\"#{version}\"")
     end
 
-    # returns a search result object from search.maven.com
-    # see input and output format at https://search.maven.org/#api
     def search(params)
-      response = get("https://search.maven.org/solrsearch/select?", params.merge("rows" => "100", "wt" => "json"))
-      json = JSON.parse(response.to_s)
+      # Merge default API parameters
+      full_params = params.merge("rows" => "100", "wt" => "json")
+      response_body = fetch(SEARCH_API, full_params)
+
+      json = JSON.parse(response_body)
       json["response"]["docs"]
     end
 
-    # returns a Maven's triple (artifactId, groupId, version)
-    # from a result object
     def get_maven_id_from(result)
       [result["g"], result["a"], result["v"]]
     end
 
-    # downloads a POM from a search.maven.com search result
     def download_pom(group_id, artifact_id, version)
-      path = "#{group_id.gsub('.', '/')}/#{artifact_id}/#{version}/#{artifact_id}-#{version}.pom"
+      # Use tr instead of gsub for performance (standard Ruby optimization)
+      group_path = group_id.tr(".", "/")
+      path = "#{group_path}/#{artifact_id}/#{version}/#{artifact_id}-#{version}.pom"
+
       log.debug("downloading #{path}...")
-      get("https://repo1.maven.org/maven2/#{path}", {}).to_s
+
+      # We pass empty params because the path contains everything
+      url = "#{DOWNLOAD_API}/#{path}"
+      fetch(url)
     end
 
-    def get(url, params)
-      response = Net::HTTP.get_response(URI.parse(url + URI.encode_www_form(params)))
-      fail NotFoundOnMavenWebsiteError if response.code == "404"
+    private
+
+    # A robust HTTP fetcher with Retries, Timeouts, and Redirect handling
+    def fetch(url_str, params = {}, limit = 5)
+      raise ArgumentError, "HTTP redirect too deep" if limit.zero?
+
+      uri = URI(url_str)
+      uri.query = URI.encode_www_form(params) unless params.empty?
+
+      retries = 0
+      begin
+        response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https") do |http|
+          http.open_timeout = 10 # Wait 10s for connection
+          http.read_timeout = 30 # Wait 30s for data
+
+          request = Net::HTTP::Get.new(uri)
+          http.request(request)
+        end
 
-      response.body
+        case response
+        when Net::HTTPSuccess
+          response.body
+        when Net::HTTPRedirection
+          location = response["location"]
+          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
+        else
+          fail "Remote error: #{response.code} #{response.message}"
+        end
+      rescue Net::OpenTimeout, Net::ReadTimeout, SocketError, Errno::ECONNRESET => e
+        if (retries += 1) <= 3
+          log.warn("Network error: #{e.class} - #{e.message}. Retrying (#{retries}/3)...")
+          sleep(1) # Backoff before retry
+          retry
+        else
+          log.error("Failed to fetch #{url_str} after 3 retries")
+          raise e
+        end
+      end
     end
   end
 

data/lib/tetra/packages/kit_package.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Tetra
   # a packaged set of binary build-time dependencies
@@ -7,18 +7,18 @@ module Tetra
     include Speccable
 
     attr_reader :name
+
+    # Delegation allows accessing project properties directly
     def_delegator :@project, :version
     def_delegator :@project, :name, :project_name
 
     def initialize(project)
       @project = project
-
       @name = "#{project.name}-kit"
     end
 
     def to_spec
-      _to_spec(@project, name, "kit.spec",
-               @project.packages_dir)
+      _to_spec(@project, name, "kit.spec", @project.packages_dir)
     end
   end
 end

data/lib/tetra/packages/package.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Tetra
   # represents a Java project packaged in tetra
@@ -13,7 +13,6 @@ module Tetra
     def_delegator :@project, :src_archive
     def_delegator :@kit, :name, :kit_name
     def_delegator :@kit, :version, :kit_version
-    def_delegator :@pom, :license_name, :license
     def_delegator :@pom, :url
     def_delegator :@pom, :group_id
     def_delegator :@pom, :version
@@ -27,6 +26,37 @@ module Tetra
       @patches = patches.map { |f| File.basename(f) }
     end
 
+    def license
+      Tetra::LicenseMapper.map(@pom.license_name)
+    end
+
+    # Scans for license files in the src/ directory (Issue #12)
+    def license_files
+      @project.from_directory do
+        # Tetra unpacks sources into 'src/', so we search there.
+        # We manually check filenames with Ruby regex to ensure reliable
+        # case-insensitive matching across different OS filesystems (Linux vs macOS).
+
+        candidates = Dir.glob("src/*")
+
+        files = candidates.select do |file|
+          next unless File.file?(file)
+
+          basename = File.basename(file)
+
+          # Match standard license filenames (case insensitive)
+          # Equivalent to: LICENSE*, COPYING*, COPYRIGHT*
+          basename.match?(/^LICENSE/i) ||
+            basename.match?(/^COPYING/i) ||
+            basename.match?(/^COPYRIGHT/i)
+        end
+
+        # Return just the filenames (e.g. "LICENSE") so the spec file
+        # (which runs inside src/ due to %setup -n src) can reference them directly.
+        files.map { |f| File.basename(f) }.uniq.sort
+      end
+    end
+
     def artifact_ids
       @pom.modules.any? ? @pom.modules : [@pom.artifact_id]
     end
@@ -49,12 +79,21 @@ module Tetra
     end
 
     def cleanup_description(raw, max_length)
-      raw
-        .gsub(/[\s]+/, " ")
-        .strip
-        .slice(0..max_length - 1)
-        .sub(/\s\w+$/, "")
-        .sub(/\.+$/, "")
+      return "" if raw.nil? || raw.strip.empty?
+
+      # Normalize spaces (collapse multiple spaces/newlines to single space)
+      clean = raw.gsub(/\s+/, " ").strip
+
+      # Truncate to max_length
+      clean = clean[0, max_length]
+
+      # Remove the last word if it looks cut off (ends in letters, not punctuation)
+      clean = clean.sub(/\s\w+\z/, "")
+
+      # Remove ALL trailing dots efficiently
+      clean = clean.chomp(".") while clean.end_with?(".")
+
+      clean
     end
 
     def to_spec

data/lib/tetra/packages/scriptable.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Tetra
   # generates a package build script from bash_history
@@ -11,13 +11,14 @@ module Tetra
           "set -xe",
           "PROJECT_PREFIX=`readlink -e .`",
           "cd #{project.latest_dry_run_directory}"
-        ] + aliases(project) + project.build_script_lines
+        ] + generate_aliases(project) + project.build_script_lines
 
         new_content = script_lines.join("\n") + "\n"
 
         result_dir = File.join(project.packages_dir, project.name)
         FileUtils.mkdir_p(result_dir)
         result_path = File.join(result_dir, "build.sh")
+
         conflict_count = project.merge_new_content(new_content, result_path, "Build script generated",
                                                    "script")
 
@@ -26,22 +27,25 @@ module Tetra
     end
 
     # setup aliases for adjusted versions of the packaging tools
-    def aliases(project)
+    def generate_aliases(project)
       kit = Tetra::Kit.new(project)
+      cmds = []
 
-      aliases = []
       ant_path = kit.find_executable("ant")
       ant_commandline = Tetra::Ant.commandline("$PROJECT_PREFIX", ant_path)
-      aliases << "alias ant='#{ant_commandline}'"
+      cmds << "alias ant='#{ant_commandline}'"
 
       mvn_path = kit.find_executable("mvn")
       mvn_commandline = Tetra::Mvn.commandline("$PROJECT_PREFIX", mvn_path)
-      aliases << "alias mvn='#{mvn_commandline} -o'"
+      cmds << "alias mvn='#{mvn_commandline} -o'"
 
       gradle_commandline = Tetra::Gradle.commandline("$PROJECT_PREFIX")
-      aliases << "alias gradlew='#{gradle_commandline} --offline'"
+      cmds << "alias gradlew='#{gradle_commandline} --offline'"
 
-      aliases
+      cmds
     end
+
+    # Alias for backward compatibility if other classes call 'aliases'
+    alias aliases generate_aliases
   end
 end

data/lib/tetra/packages/speccable.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Tetra
   # adds methods to generate a spec file from a package object
@@ -13,14 +13,20 @@ module Tetra
       project.from_directory do
         spec_name = "#{name}.spec"
         spec_dir = File.join(destination_dir, name)
+
         FileUtils.mkdir_p(spec_dir)
 
         spec_path = File.join(spec_dir, spec_name)
 
+        # Generate content using the template and current binding
         new_content = generate(template_spec_name, binding)
+
         label = "Spec for #{name} generated"
+
+        # Merge content (handles git operations for conflict resolution)
         conflict_count = project.merge_new_content(new_content, spec_path,
                                                    label, "#{name}-spec")
+
         [spec_path, conflict_count]
       end
     end

data/lib/tetra/pom.rb

@@ -1,59 +1,81 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Tetra
   # encapsulates a pom.xml file
   class Pom
     def initialize(filename)
-      content = File.open(filename).read if filename && File.file?(filename)
+      # ROBUSTNESS: Handle missing file gracefully by initializing empty content
+      content = if filename && File.file?(filename)
+                  File.read(filename)
+                else
+                  "<project></project>"
+                end
       @doc = REXML::Document.new(content)
     end
 
     def group_id
-      @doc.text("project/groupId") || ""
+      xpath_text("project/groupId")
     end
 
     def artifact_id
-      @doc.text("project/artifactId") || ""
+      xpath_text("project/artifactId")
     end
 
     def name
-      @doc.text("project/name") || ""
+      xpath_text("project/name")
     end
 
     def version
-      @doc.text("project/version") || ""
+      xpath_text("project/version")
     end
 
     def description
-      @doc.text("project/description") || ""
+      xpath_text("project/description")
     end
 
     def url
-      @doc.text("project/url") || ""
+      xpath_text("project/url")
     end
 
     def license_name
-      @doc.text("project/licenses/license/name") || ""
+      xpath_text("project/licenses/license/name")
     end
 
     def runtime_dependency_ids
-      @doc.get_elements("project/dependencies/dependency[\
-        not(optional='true') and not(scope='provided') and not(scope='test') and not(scope='system')\
-      ]").map do |element|
-        [element.text("groupId"), element.text("artifactId"), element.text("version")]
+      # CLEANUP: Use standard multi-line string for complex XPath
+      xpath = "project/dependencies/dependency[" \
+              "not(optional='true') and " \
+              "not(scope='provided') and " \
+              "not(scope='test') and " \
+              "not(scope='system')]"
+
+      REXML::XPath.match(@doc, xpath).map do |element|
+        [
+          element.elements["groupId"]&.text,
+          element.elements["artifactId"]&.text,
+          element.elements["version"]&.text
+        ]
       end
     end
 
     def modules
-      @doc.get_elements("project/modules/module").map(&:text)
+      REXML::XPath.match(@doc, "project/modules/module").map(&:text)
     end
 
     def scm_connection
-      @doc.text("project/scm/connection") || ""
+      xpath_text("project/scm/connection")
     end
 
     def scm_url
-      @doc.text("project/scm/url") || ""
+      xpath_text("project/scm/url")
+    end
+
+    private
+
+    # HELPER: REXML does not support doc.text("xpath"), so we wrap the logic here.
+    def xpath_text(path)
+      # Safe navigation (&.) returns nil if node not found; || "" ensures String return
+      REXML::XPath.first(@doc, path)&.text&.strip || ""
     end
   end
 end