xezat 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44f20fb8c8d53290ca2aa712f0305df3a64fa92b5fd495e74d9c251cea4bd38c
-  data.tar.gz: 43aa81a90789ba5ab3d9c64b7b8aa4b93bf04d96cde0c51ceba7a35238623771
+  metadata.gz: 6bca5b54e336456b6aa2c9cc5af28c2f40c896e536a44df6374ce39dfdab700d
+  data.tar.gz: fce7bb85622494444eb694b0973437b85de48d8ffb3e71cac01e118f08eda012
 SHA512:
-  metadata.gz: fde0d1e68848308d416fe1e06749bfcaec89a558a40454fc8924a0038103ddbbc07db8900894d48b825a21633e112c83ce72899e40133b8766f082749a3a2f12
-  data.tar.gz: 0cbca3957598e70390bdb6c87bddfe94585d5d1afe85b97057158b23dae17a2ab1555c7b63410595417cf996382124e42907dd42f1aa1e43831710f26295184d
+  metadata.gz: 8ccfb592b7c4462ec9b9ffbf71db32e8fa7749ca858760a85c67925ec4b9ba276b264365d8737aa34462f3ac1765580ff783b1815af277e85d6adc03c23c53bc
+  data.tar.gz: 6a2a950848dae1d7cb967555209cb61e78d711659aac02ea6fa85061625ba381845b585d559667fc8e55aa78cba5bcef131b293530895f8a74d0b8b823c07914

data/lib/xezat/command/bump/cygport_dep.rb

@@ -14,8 +14,10 @@ module Xezat
         additional_path = candidate_files.map do |file|
           File.dirname(file)
         end.sort.uniq.join(':')
+        Xezat.logger.debug("    Additional PATH = #{additional_path.gsub(Regexp.new(variables[:D]), '')}")
         command = ['bash', File.expand_path(File.join(DATA_DIR, 'cygport_dep.sh')), cygport]
-        result, error, status = Open3.capture3({ 'PATH' => "#{ENV.fetch('PATH')}:#{additional_path}" }, command.join(' '))
+        result, error, status = Open3.capture3({ 'PATH' => "#{additional_path}:#{ENV.fetch('PATH')}" }, command.join(' '))
+        Xezat.logger.warn("    Stderr = #{error}") unless error.empty?
         raise CygportProcessError, error unless status.success?
 
         result

data/lib/xezat/command/bump/runtime_package.rb

@@ -13,12 +13,29 @@ module Xezat
         runtime_packages = result.gsub(/^.*\*\*\*.*$/, '').split($INPUT_RECORD_SEPARATOR).map(&:lstrip)
         build_requires = variables[:BUILD_REQUIRES].nil? ? [] : variables[:BUILD_REQUIRES].split.map(&:to_sym)
         runtime_packages.delete(pkgs[:'libssl-devel']) if build_requires.include?(:'libssl1.0-devel')
-        runtime_packages.map! { |pkg| pkg == 'python3' ? pkgs[:python39] : pkg }
+        runtime_packages.map! do |pkg|
+          resolve_pseudo(pkg, pkgs)
+        end
         variables[:REQUIRES]&.split&.each do |req|
           runtime_packages << pkgs[req.to_sym]
         end
         runtime_packages.sort.uniq
       end
+
+      private
+
+      def resolve_pseudo(pkg, pkgs)
+        case pkg
+        when 'python3'
+          pkgs[:python39]
+        when 'perl5_036'
+          pkgs[:perl_base]
+        when 'ruby_32'
+          pkgs[:ruby]
+        else
+          pkg
+        end
+      end
     end
   end
 end

data/lib/xezat/command/bump/src_uri.rb

@@ -9,9 +9,9 @@ module Xezat
       def get_src_uri(variables, cygclasses = CygclassManager.new)
         Xezat.logger.debug('  Collect SRC_URI')
         cygclasses.vcs.each do |vcs|
-          next unless variables.key?("_#{vcs}_CYGCLASS_".intern)
+          next unless variables.key?(:"_#{vcs}_CYGCLASS_")
 
-          src_uri_key = "#{vcs.to_s.upcase}_URI".intern
+          src_uri_key = :"#{vcs.to_s.upcase}_URI"
           return variables[src_uri_key].split if variables.key?(src_uri_key)
         end
         variables[:SRC_URI].split

data/lib/xezat/command/init.rb

@@ -65,7 +65,7 @@ module Xezat
           vcs_class = cygclass
         end
         vcs_prefix = vcs_class.to_s.upcase if vcs_class
-        vcs_uri = "#{vcs_prefix}_URI".intern
+        vcs_uri = :"#{vcs_prefix}_URI"
         {
           :HOMEPAGE => original_template_variables[:HOMEPAGE],
           vcs_uri => original_template_variables[vcs_uri]

data/lib/xezat/command/validate/config.rb

@@ -7,24 +7,18 @@ module Xezat
   module Command
     class Validate
       def validate_config(variables, gcc_version)
-        configs = Dir.glob(File.join(variables[:D], '/usr/bin/*-config'))
-        configs.each do |config|
-          basename = File.basename(config)
-          Xezat.logger.debug("    #{basename} found")
+        Dir.glob(File.join(variables[:D], '/usr/bin/*-config')).each do |config|
+          Xezat.logger.debug("    #{File.basename(config)} found")
 
-          result, _, status = Open3.capture3("#{config} --cflags")
-          if status.success?
-            Xezat.logger.debug("      cflags = #{result.strip}")
-          else
-            Xezat.logger.warn('       cflags not supported')
+          begin
+            executable?(config)
+          rescue StandardError
+            next
           end
 
-          result, _, status = Open3.capture3("#{config} --cxxflags")
-          if status.success?
-            Xezat.logger.debug("      cxxflags = #{result.strip}")
-          else
-            Xezat.logger.warn('       cxxflags not supported')
-          end
+          validate_modversion(config, variables)
+          validate_cflags(config)
+          validate_cxxflags(config)
 
           result, _, status = Open3.capture3("#{config} --libs")
           if status.success?
@@ -35,6 +29,45 @@ module Xezat
           end
         end
       end
+
+      private
+
+      def executable?(config)
+        Open3.capture3(config.to_s)
+      rescue StandardError => e
+        Xezat.logger.warn("       #{config} not executable: #{e}")
+        raise e
+      end
+
+      def validate_modversion(config, variables)
+        result, _, status = Open3.capture3("#{config} --version")
+        if status.success?
+          modversion = result.strip
+          Xezat.logger.debug("      modversion = #{modversion}")
+          pv = variables[:PV][0].gsub(/\+.+$/, '')
+          Xezat.logger.error("        modversion differs from $PN = #{pv}") unless modversion == pv
+        else
+          Xezat.logger.warn('       modversion not supported')
+        end
+      end
+
+      def validate_cflags(config)
+        result, _, status = Open3.capture3("#{config} --cflags")
+        if status.success?
+          Xezat.logger.debug("      cflags = #{result.strip}")
+        else
+          Xezat.logger.warn('       cflags not supported')
+        end
+      end
+
+      def validate_cxxflags(config)
+        result, _, status = Open3.capture3("#{config} --cxxflags")
+        if status.success?
+          Xezat.logger.debug("      cxxflags = #{result.strip}")
+        else
+          Xezat.logger.warn('       cxxflags not supported')
+        end
+      end
     end
   end
 end

data/lib/xezat/command/validate/license.rb

@@ -19,6 +19,9 @@ module Xezat
         license_uri = vars[:LICENSE_URI]
         if license_uri.nil? || license_uri.empty?
           Xezat.logger.warn('     LICENSE_URI is not defined')
+        elsif license_uri.start_with?('https://', 'http://')
+          Xezat.logger.debug("    LICENSE_URI = #{license_uri}")
+          livecheck(license_uri)
         elsif File.exist?(File.join(vars[:S], license_uri))
           Xezat.logger.debug("    LICENSE_URI = #{license_uri}")
         else

data/lib/xezat/command/validate.rb

@@ -63,17 +63,8 @@ module Xezat
       end
 
       def validate_homepage(homepage)
-        response = Net::HTTP.get_response(URI.parse(homepage))
-        code = response.code
-        if code == '200'
-          Xezat.logger.debug("    code = #{code}")
-        else
-          Xezat.logger.error("    code = #{code}")
-        end
-      rescue OpenSSL::SSL::SSLError => e
-        raise e unless @options[:ignore]
-
-        Xezat.logger.warn('    Ignore SSLError')
+        Xezat.logger.debug("    HOMEPAGE = #{homepage}")
+        livecheck(homepage)
       end
 
       def validate_build_requires(build_requires, pkgs)
@@ -113,6 +104,22 @@ module Xezat
           end
         end
       end
+
+      private
+
+      def livecheck(url)
+        response = Net::HTTP.get_response(URI.parse(url))
+        code = response.code
+        if code == '200'
+          Xezat.logger.debug("      code = #{code}")
+        else
+          Xezat.logger.error("      code = #{code}")
+        end
+      rescue OpenSSL::SSL::SSLError => e
+        raise e unless @options[:ignore]
+
+        Xezat.logger.warn('      Ignore SSLError')
+      end
     end
   end
 end

data/lib/xezat/detector/automake.rb

@@ -10,23 +10,10 @@ module Xezat
           %i[_cmake_CYGCLASS_ _meson_CYGCLASS_ _ninja_CYGCLASS_].include?(key)
         end.nil?
 
-        cygautoreconf = false
-        File.foreach(File.join(variables[:top], variables[:cygportfile])) do |line|
-          if line.index('cygautoreconf')
-            cygautoreconf = true
-            return true
-          end
-        end
-
-        unless cygautoreconf
-          File.foreach(File.join(variables[:top], variables[:cygportfile])) do |line|
-            return false if line.index('src_compile')
-          end
-        end
-
         Find.find(variables[:S]) do |file|
           return true if file.end_with?('.am')
         end
+
         false
       end
     end

data/lib/xezat/detector/docbook2X.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'find'
+
+module Xezat
+  module Detector
+    class Docbook2x
+      def detect(variables)
+        Find.find(variables[:S]) do |file|
+          next unless file.end_with?("#{File::SEPARATOR}configure.ac", "#{File::SEPARATOR}configure.in")
+
+          File.foreach(file) do |line|
+            return true if line.include?('docbook2x-man')
+          end
+        end
+        false
+      end
+    end
+  end
+end

data/lib/xezat/detector/gettext-devel.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Xezat
+  module Detector
+    class GettextDevel
+      def detect(variables)
+        Find.find(variables[:S]) do |file|
+          next unless file.end_with?("#{File::SEPARATOR}configure.ac", "#{File::SEPARATOR}configure.in")
+
+          File.foreach(file) do |line|
+            return true if /AM_GNU_GETTEXT|AM_ICONV|AC_GGZ_INTL/.match?(line.lstrip)
+          end
+        end
+        false
+      end
+    end
+  end
+end

data/lib/xezat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Xezat
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/xezat.gemspec

@@ -24,18 +24,18 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 3.2.2'
 
   spec.add_runtime_dependency 'facets', '>= 3.1.0'
-  spec.add_runtime_dependency 'github-linguist', '>= 7.26.0'
-  spec.add_runtime_dependency 'pkg-config', '>= 1.5.2'
+  spec.add_runtime_dependency 'github-linguist', '>= 7.28.0'
+  spec.add_runtime_dependency 'pkg-config', '>= 1.5.6'
   spec.add_runtime_dependency 'spdx', '>= 4.1.3'
   spec.add_runtime_dependency 'thor', '>= 1.2.2'
   spec.add_runtime_dependency 'thor-zsh_completion', '>= 0.1.10'
 
-  spec.add_development_dependency 'bundler', '>= 1.15.3'
-  spec.add_development_dependency 'fasterer', '>= 0.10.1'
+  spec.add_development_dependency 'bundler', '>= 2.4.10'
+  spec.add_development_dependency 'fasterer', '>= 0.11.0'
   spec.add_development_dependency 'rake', '>= 13.0'
   spec.add_development_dependency 'rspec', '>= 3.12.0'
-  spec.add_development_dependency 'rubocop', '>= 1.54.1'
-  spec.add_development_dependency 'rubocop-performance', '>= 1.18.0'
+  spec.add_development_dependency 'rubocop', '>= 1.59.0'
+  spec.add_development_dependency 'rubocop-performance', '>= 1.20.1'
   spec.add_development_dependency 'simplecov-cobertura', '>= 2.1.0'
 
   spec.metadata['rubygems_mfa_required'] = 'true'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xezat
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Daisuke Fujimura (fd0)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-09 00:00:00.000000000 Z
+date: 2023-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.26.0
+        version: 7.28.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.26.0
+        version: 7.28.0
 - !ruby/object:Gem::Dependency
   name: pkg-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: spdx
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.3
+        version: 2.4.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.3
+        version: 2.4.10
 - !ruby/object:Gem::Dependency
   name: fasterer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.54.1
+        version: 1.59.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.54.1
+        version: 1.59.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.20.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.20.1
 - !ruby/object:Gem::Dependency
   name: simplecov-cobertura
   requirement: !ruby/object:Gem::Requirement
@@ -246,7 +246,9 @@ files:
 - lib/xezat/detector/automake.rb
 - lib/xezat/detector/boost.m4.rb
 - lib/xezat/detector/cmake.rb
+- lib/xezat/detector/docbook2X.rb
 - lib/xezat/detector/gengetopt.rb
+- lib/xezat/detector/gettext-devel.rb
 - lib/xezat/detector/gnulib.rb
 - lib/xezat/detector/gobject-introspection.rb
 - lib/xezat/detector/halibut.rb