xezat 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6183648a65f69a1fc1c1a85779066ba529614681aeb56fa78979ba9d9536c625
-  data.tar.gz: 20589012624b3e1690014d2b03ad2dda3fe01c464f5c3fb03223572a856a8dc4
+  metadata.gz: 0053db8d2a6f202e9aa40b7454f00f8ced3fdacd2c174944bec6c02a2ae106c4
+  data.tar.gz: 5abd0d6bd506b6a44ca306675e7b37b81d8834ff12d1165f47ad2c100ec87fcb
 SHA512:
-  metadata.gz: e94a00970240eb104ba88a2126a4fbd04d97820977a383a0498e584b3373b69e8dd98260c30cb59853e36f792949c5fa527a910345b19582ea1332541f2b2a48
-  data.tar.gz: b01a34f4cc54b8967e765045048d8759612de6653602c0833ff6b252b8302563ea286fcfde36eefb4d1ab58f623a3c32f299aedb5b741aef681363840f719e63
+  metadata.gz: eb736dd2128a11b7b249db02e58732b54578085808f3e8d4ad36cfa74741ae2583194e3337b810d82e2a048cf9f7a893e9df1941d589e8953de270abe1799196
+  data.tar.gz: f8a26d86744acd8391b21c89db39afe00a880bf26b2660de5fc51d04ccae070a0e2761f650dea28c32a38cfc4b757f739b7baf4cad74aad5a480a4585e89e2dd

data/.rubocop.yml

@@ -12,7 +12,7 @@ Layout/LineLength:
   Max: 160
 
 Metrics/AbcSize:
-  Max: 40
+  Max: 45
 Metrics/BlockLength:
   Exclude:
     - '*.gemspec'

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

@@ -7,8 +7,8 @@ module Xezat
     class Bump
       def get_compilers(languages, _variables)
         Xezat.logger.debug('  Collect compilers')
-        compiler_file = File.expand_path(File.join(DATA_DIR, 'compilers.json'))
-        compiler_candidates = JSON.parse(File.read(compiler_file))
+        compiler_file = File.expand_path(File.join(DATA_DIR, 'compilers.yaml'))
+        compiler_candidates = YAML.safe_load(File.open(compiler_file), [Symbol])
         compilers = []
         languages.uniq.each do |language|
           next unless compiler_candidates.key?(language)

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

@@ -14,8 +14,8 @@ module Xezat
         additional_path = candidate_files.map do |file|
           File.dirname(file)
         end.sort.uniq.join(':')
-        command = ['bash', File.expand_path(File.join(DATA_DIR, 'invoke_cygport_dep.sh')), cygport]
-        result, error, status = Open3.capture3({ 'PATH' => "#{ENV['PATH']}:#{additional_path}" }, command.join(' '))
+        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(' '))
         raise CygportProcessError, error unless status.success?
 
         result

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

@@ -8,17 +8,42 @@ require 'xezat/command/bump/tool'
 module Xezat
   module Command
     class Bump
-      def get_development_packages(variables, packages)
+      def get_development_packages(variables, packages, runtimes, pkg2files)
         Xezat.logger.debug('  Collect development packages')
         compilers = get_compilers(get_languages(variables[:S]), variables)
         tools = get_tools(variables)
         build_requires = variables[:BUILD_REQUIRES].nil? ? [] : variables[:BUILD_REQUIRES].split.map(&:to_sym)
-        development_packages = (compilers + tools + build_requires + [:cygport]).uniq.sort
-        development_packages.delete(:'libssl-devel') if development_packages.include?(:'libssl1.0-devel')
+        development_packages = (compilers + tools + build_requires + [:cygport]).uniq
+
+        resolve_development_package(development_packages)
+
+        # Check gcc-gfortran
+        if runtimes.grep(/^libgfortran/).empty?
+          delete_fortran = true
+          pkg2files.each_value do |files|
+            delete_fortran = false unless files.grep(/\.mod$/).empty?
+          end
+          development_packages.delete(:'gcc-fortran') if delete_fortran
+        end
+
+        development_packages.sort!
+
         development_packages.map! do |package|
-          packages[package] || ''
+          pkg = packages[package]
+          raise "Package #{package} is not installed in your system" if pkg.nil?
+
+          pkg
         end
       end
+
+      def resolve_development_package(development_packages)
+        # Check libssl duplication
+        development_packages.delete(:'libssl-devel') if development_packages.include?(:'libssl1.0-devel')
+
+        # Check lua duplication
+        development_packages.delete(:lua) if development_packages.include?(:'lua5.1-devel')
+        development_packages.delete(:lua) if development_packages.include?(:'luajit-devel')
+      end
     end
   end
 end

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

@@ -8,8 +8,8 @@ module Xezat
     class Bump
       def get_languages(top_src_dir)
         Xezat.logger.debug('  Collect languages')
-        languages_file = File.expand_path(File.join(DATA_DIR, 'languages.json'))
-        languages_candidates = JSON.parse(File.read(languages_file))
+        languages_file = File.expand_path(File.join(DATA_DIR, 'languages.yaml'))
+        languages_candidates = YAML.safe_load(File.open(languages_file), [Symbol])
         languages = []
         Find.find(top_src_dir) do |path|
           next if FileTest.directory?(path)

data/lib/xezat/command/bump.rb

@@ -30,13 +30,12 @@ module Xezat
         vars = variables(@cygport)
         readme_file = File.expand_path(File.join(vars[:C], 'README'))
 
-        info = {
-          src_uri: get_src_uri(vars),
-          runtimes: get_runtime_packages(vars, pkgs, @cygport),
-          developments: get_development_packages(vars, pkgs),
-          files: get_files(vars),
-          changelog: get_changelog(vars, @options, readme_file)
-        }
+        info = {}
+        info[:src_uri] = get_src_uri(vars)
+        info[:runtimes] = get_runtime_packages(vars, pkgs, @cygport)
+        info[:files] = get_files(vars)
+        info[:developments] = get_development_packages(vars, pkgs, info[:runtimes], info[:files])
+        info[:changelog] = get_changelog(vars, @options, readme_file)
 
         Xezat.logger.debug('  Write ChangeLog atomically')
         File.atomic_write(readme_file) do |f|

data/lib/xezat/command/generate.rb

@@ -5,8 +5,9 @@ require 'thor'
 module Xezat
   module Command
     class Generate < Thor
-      desc 'generate pkgconfig cygport', 'Generate *.pc'
+      desc 'pkgconfig cygport', 'Generate *.pc'
       option :overwrite, type: :boolean, aliases: '-o', desc: 'overwrite *.pc'
+      option :srcdir, type: :string, aliases: '-s', desc: 'relative path to Makefile.am / CMakeLists.txt'
 
       def pkgconfig(cygport)
         require 'xezat/generator/pkgconfig'

data/lib/xezat/command/init.rb

@@ -41,10 +41,10 @@ module Xezat
 
       def get_repository_variables(repository)
         if repository
-          repository_file = File.expand_path(File.join(REPOSITORY_DIR, "#{repository}.json"))
+          repository_file = File.expand_path(File.join(REPOSITORY_DIR, "#{repository}.yaml"))
           raise NoSuchRepositoryError, "No such repository: #{template}" unless FileTest.exist?(repository_file) || FileTest.readable?(repository_file)
 
-          JSON.parse(File.read(repository_file), symbolize_names: true)
+          YAML.safe_load(File.open(repository_file), symbolize_names: true)
         else
           {
             HOMEPAGE: '',

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'pkg-config'
+require 'xezat'
+
+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")
+
+          result, _, status = Open3.capture3("#{config} --cflags")
+          if status.success?
+            Xezat.logger.debug("      cflags = #{result.strip}")
+          else
+            Xezat.logger.warn('       cflags not supported')
+          end
+
+          result, _, status = Open3.capture3("#{config} --cxxflags")
+          if status.success?
+            Xezat.logger.debug("      cxxflags = #{result.strip}")
+          else
+            Xezat.logger.warn('       cxxflags not supported')
+          end
+
+          result, _, status = Open3.capture3("#{config} --libs")
+          if status.success?
+            Xezat.logger.debug("      libs = #{result.strip}")
+            validate_libs(variables, result.strip, gcc_version)
+          else
+            Xezat.logger.warn('       libs not supported')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'spdx'
+require 'xezat'
+
+module Xezat
+  module Command
+    class Validate
+      def validate_license(vars)
+        license = vars[:LICENSE]
+        if license.nil? || license.empty?
+          Xezat.logger.warn('     LICENSE is not defined')
+        elsif Spdx.valid?(license)
+          Xezat.logger.debug("    LICENSE = #{license}")
+        else
+          Xezat.logger.error("    LICENSE = #{license} (invalid)")
+        end
+
+        license_uri = vars[:LICENSE_URI]
+        if license_uri.nil? || license_uri.empty?
+          Xezat.logger.warn('     LICENSE_URI is not defined')
+        elsif File.exist?(File.join(vars[:S], license_uri))
+          Xezat.logger.debug("    LICENSE_URI = #{license_uri}")
+        else
+          Xezat.logger.error("    LICENSE_URI = #{license_uri} (not found)")
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'pkg-config'
+require 'xezat'
+
+module Xezat
+  module Command
+    class Validate
+      def validate_pkgconfig(variables, gcc_version)
+        pkgconfig_path = File.join(variables[:D], 'usr', 'lib', 'pkgconfig')
+        PKGConfig.add_path(pkgconfig_path)
+        Dir.glob('*.pc', 0, base: pkgconfig_path).each do |pc|
+          Xezat.logger.debug("    #{pc} found")
+          basename = File.basename(pc, '.pc')
+
+          modversion = PKGConfig.modversion(basename)
+          Xezat.logger.debug("      modversion = #{modversion}")
+          pv = variables[:PV][0].gsub(/\+.+$/, '')
+          Xezat.logger.error("        modversion differs from $PN = #{pv}") unless modversion == pv
+
+          prefix = PKGConfig.variable(basename, 'prefix')
+          if prefix.nil? || prefix.empty? || prefix.eql?('/usr')
+            Xezat.logger.debug("      prefix = #{prefix}")
+          else
+            Xezat.logger.warn("       prefix = #{prefix} (not standard)")
+          end
+
+          Xezat.logger.debug("      cflags = #{PKGConfig.cflags(basename)}")
+
+          libs = PKGConfig.libs(basename)
+          Xezat.logger.debug("      libs = #{libs}")
+          validate_libs(variables, libs, gcc_version)
+        end
+      end
+    end
+  end
+end

data/lib/xezat/command/validate.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
 require 'net/http'
-require 'pkg-config'
 require 'uri'
+require 'xezat/command/validate/config'
+require 'xezat/command/validate/license'
+require 'xezat/command/validate/pkgconfig'
+require 'xezat/cygversion'
 require 'xezat/packages'
 require 'xezat/variables'
 
@@ -21,6 +24,8 @@ module Xezat
         vars = variables(@cygport)
         pkgs = packages
 
+        gcc_version = Cygversion.new(pkgs[:'gcc-core'].gsub(/^gcc-core-/, '')).version.split('.')[0]
+
         Xezat.logger.debug('  Validate .cygport')
         validate_cygport(@cygport)
 
@@ -30,11 +35,17 @@ module Xezat
         Xezat.logger.debug('  Validate homepage')
         validate_homepage(vars[:HOMEPAGE])
 
+        Xezat.logger.debug('  Validate licenses')
+        validate_license(vars)
+
         Xezat.logger.debug('  Validate BUILD_REQUIRES')
         validate_build_requires(vars[:BUILD_REQUIRES], pkgs)
 
         Xezat.logger.debug('  Validate *.pc')
-        validate_pkgconfig(vars)
+        validate_pkgconfig(vars, gcc_version)
+
+        Xezat.logger.debug('  Validate *-config')
+        validate_config(vars, gcc_version)
 
         Xezat.logger.debug('End validating')
       end
@@ -54,9 +65,9 @@ module Xezat
         response = Net::HTTP.get_response(URI.parse(homepage))
         code = response.code
         if code == '200'
-          Xezat.logger.debug("    code = #{response.code}")
+          Xezat.logger.debug("    code = #{code}")
         else
-          Xezat.logger.error("    code = #{response.code}")
+          Xezat.logger.error("    code = #{code}")
         end
       rescue OpenSSL::SSL::SSLError => e
         raise e unless @options[:ignore]
@@ -77,25 +88,8 @@ module Xezat
         end
       end
 
-      def validate_pkgconfig(variables)
-        pkgconfig_path = File.join(variables[:D], 'usr', 'lib', 'pkgconfig')
-        PKGConfig.add_path(pkgconfig_path)
-        Dir.glob('*.pc', 0, base: pkgconfig_path).each do |pc|
-          basename = File.basename(pc, '.pc')
-          Xezat.logger.debug("    #{basename}.pc found")
-          modversion = PKGConfig.modversion(basename)
-          Xezat.logger.debug("      modversion = #{modversion}")
-          pv = variables[:PV][0].gsub(/\+.+$/, '')
-          Xezat.logger.error("        modversion differs from $PN = #{pv}") unless modversion == pv
-          Xezat.logger.debug("      cflags = #{PKGConfig.cflags(basename)}")
-          libs = PKGConfig.libs(basename)
-          Xezat.logger.debug("      libs = #{libs}")
-          validate_libs(variables, libs)
-        end
-      end
-
-      def validate_libs(variables, libs)
-        lib_dirs = [File.join(variables[:D], '/usr/lib'), '/usr/lib', '/usr/lib/w32api', '/usr/lib/gcc/x86_64-pc-cygwin/11']
+      def validate_libs(variables, libs, gcc_version)
+        lib_dirs = [File.join(variables[:D], '/usr/lib'), '/usr/lib', '/usr/lib/w32api', "/usr/lib/gcc/x86_64-pc-cygwin/#{gcc_version}"]
         libs.split do |option|
           if option.start_with?('-l')
             lib_name = option[2, 255] # Assume file length limit

data/lib/xezat/cygversion.rb

@@ -4,6 +4,8 @@ require 'rubygems'
 
 module Xezat
   class Cygversion
+    attr_reader :version
+
     def initialize(str)
       matched = str.match(/(.+)-(.+)/)
       version = matched[1]

data/lib/xezat/detector/cmake.rb

@@ -6,10 +6,7 @@ module Xezat
   module Detector
     class Cmake
       def detect(variables)
-        Find.find(variables[:S]) do |file|
-          return true if file.end_with?("#{File::SEPARATOR}CMakeLists.txt")
-        end
-        false
+        variables.key?(:_cmake_CYGCLASS_)
       end
     end
   end

data/lib/xezat/detector/{python38-docutils.rb → python39-docutils.rb}

@@ -4,7 +4,7 @@ require 'find'
 
 module Xezat
   module Detector
-    class Python38Docutils
+    class Python39Docutils
       def detect(variables)
         Find.find(variables[:S]) do |file|
           next unless file.end_with?("#{File::SEPARATOR}configure.ac", "#{File::SEPARATOR}configure.in")

data/lib/xezat/generator/pkgconfig.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'English'
 require 'facets/file/atomic_open'
 require 'facets/file/atomic_write'
 require 'xezat/variables'
@@ -21,22 +22,29 @@ module Xezat
       end
 
       def generate
+        Xezat.logger.debug('Start package config generation')
         vars = variables(@cygport)
         generate_pkg_config(vars, @options)
 
         if vars[:_cmake_CYGCLASS_]
-          append_commands_to_cmakelists(vars)
+          append_commands_to_cmakelists(vars, @options)
         else
-          append_commands_to_autotools(vars)
+          append_commands_to_autotools(vars, @options)
         end
+        Xezat.logger.debug('End package config generation')
       end
 
       def generate_pkg_config(variables, options)
         srcdir = variables[:CYGCONF_SOURCE] || variables[:CYGCMAKE_SOURCE] || variables[:S]
+        srcdir = File.expand_path(File.join(variables[:S], options['srcdir'])) if options['srcdir']
+        Xezat.logger.debug("  srcdir = #{srcdir}")
+
         pn = variables[:PN]
         pc = File.expand_path(File.join(srcdir, "#{pn}.pc.in"))
         raise UnregeneratableConfigurationError, "#{pn}.pc.in already exists" if File.exist?(pc) && !options['overwrite']
 
+        Xezat.logger.debug('  Generate pc')
+
         File.atomic_write(pc) do |f|
           f.write(get_pkg_config(variables))
         end
@@ -47,10 +55,16 @@ module Xezat
         ERB.new(File.readlines(erb).join(nil), trim_mode: '%-').result(binding)
       end
 
-      def append_commands_to_cmakelists(variables)
+      def append_commands_to_cmakelists(variables, options)
         srcdir = variables[:CYGCMAKE_SOURCE] || variables[:S]
+        srcdir = File.expand_path(File.join(variables[:S], options['srcdir'])) if options['srcdir']
         cmakelists = File.expand_path(File.join(srcdir, 'CMakeLists.txt'))
-        return if %r!DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig!.match?(File.read(cmakelists))
+        if %r!DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig!.match?(File.read(cmakelists))
+          Xezat.logger.debug('  Not rewrite CMakeLists.txt')
+          return
+        end
+
+        Xezat.logger.debug('  Rewrite CMakeLists.txt')
 
         File.atomic_open(cmakelists, 'a') do |f|
           f.write(get_cmakelists(variables))
@@ -62,8 +76,9 @@ module Xezat
         ERB.new(File.readlines(erb).join(nil), trim_mode: '%-').result(binding)
       end
 
-      def append_commands_to_autotools(variables)
+      def append_commands_to_autotools(variables, options)
         srcdir = variables[:CYGCONF_SOURCE] || variables[:S]
+        srcdir = File.expand_path(File.join(variables[:S], options['srcdir'])) if options['srcdir']
         pn = variables[:PN]
         configure_ac = File.expand_path(File.join(srcdir, 'configure.ac'))
         configure_ac = File.expand_path(File.join(srcdir, 'configure.in')) unless File.exist?(configure_ac)
@@ -71,16 +86,23 @@ module Xezat
 
         original_ac = File.read(configure_ac)
 
-        return if /#{pn}.pc/.match?(original_ac)
+        if /#{pn}.pc/.match?(original_ac)
+          Xezat.logger.debug("  Not rewrite #{configure_ac}")
+          return
+        end
+
+        rewritten_ac = original_ac.gsub(/^AC_OUTPUT$/, "AC_CONFIG_FILES([#{pn}.pc])#{$INPUT_RECORD_SEPARATOR}AC_OUTPUT")
 
-        original_ac.gsub!(/(AC_CONFIG_FILES\(\[)/, "\\1#{"#{pn}.pc "}")
-        File.atomic_write(configure_ac) do |fa|
-          fa.write(original_ac)
+        File.atomic_open(configure_ac, 'w') do |fa|
+          fa.write(rewritten_ac)
 
           makefile_am = File.expand_path(File.join(srcdir, 'Makefile.am'))
           raise AutotoolsFileNotFoundError unless File.exist?(makefile_am)
 
-          break if /pkgconfig_DATA/.match?(File.read(makefile_am))
+          if /pkgconfig_DATA/.match?(File.read(makefile_am))
+            Xezat.logger.debug("  Not rewrite #{makefile_am}")
+            break
+          end
 
           commands_am = File.read(File.expand_path(File.join(TEMPLATE_DIR, 'Makefile.am')))
           File.atomic_open(makefile_am, 'a') do |fm|

data/lib/xezat/variables.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'English'
 require 'etc'
 require 'facets/file/atomic_write'
 require 'facets/string/word_wrap'
@@ -22,15 +23,21 @@ module Xezat
       end
     end
 
-    command = ['bash', File.expand_path(File.join(DATA_DIR, 'show_cygport_variable.sh')), cygport]
+    command = ['bash', File.expand_path(File.join(DATA_DIR, 'var2yaml.sh')), cygport]
     result, error, status = Open3.capture3(command.join(' '))
     raise CygportProcessError, error unless status.success?
 
     result.gsub!(/^.*\*\*\*.*$/, '')
 
-    variables = YAML.safe_load(result, [Symbol]).each_value do |v|
-      v.strip! if v.respond_to?(:strip)
+    begin
+      variables = YAML.safe_load(result, [Symbol]).each_value do |v|
+        v.strip! if v.respond_to?(:strip)
+      end
+    rescue Psych::SyntaxError => e
+      print_yaml(result)
+      raise e
     end
+
     variables[:DESCRIPTION].word_wrap!(79)
 
     File.atomic_write(cache_file) do |f|
@@ -40,4 +47,12 @@ module Xezat
 
     variables
   end
+
+  def print_yaml(result)
+    lineno = 1
+    result.split($INPUT_RECORD_SEPARATOR).each do |line|
+      printf '%<lineno>5d | %<line>s%<ls>s', lineno: lineno, line: line, ls: $INPUT_RECORD_SEPARATOR
+      lineno += 1
+    end
+  end
 end

data/lib/xezat/version.rb

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

data/share/xezat/compilers.yaml

@@ -0,0 +1,44 @@
+---
+Bison:
+  package: bison
+C:
+  package: gcc-core
+  dependencies:
+  - binutils
+C++:
+  package: gcc-g++
+  dependencies:
+  - binutils
+  - gcc-core
+Fortran:
+  package: gcc-fortran
+  dependencies:
+  - binutils
+  - gcc-core
+Fortran Free Form:
+  package: gcc-fortran
+  dependencies:
+  - binutils
+  - gcc-core
+Lex:
+  package: flex
+Lua:
+  package: lua
+#Objective-C:
+#  package: gcc-objc
+#  dependencies:
+#  - binutils
+#  - gcc-core
+#Objective-C++:
+#  package: gcc-objc++
+#  dependencies:
+#  - binutils
+#  - gcc-core
+Protocol Buffer:
+  package: libprotobuf-devel
+Ragel:
+  package: ragel
+Vala:
+  package: vala
+Yacc:
+  package: bison

data/share/xezat/languages.yaml

@@ -0,0 +1,11 @@
+---
+".C": C++
+".CXX": C++
+".H": C++
+".HXX": C++
+".c": C
+".cpp": C++
+".cxx": C++
+".h": C
+".hpp": C++
+".hxx": C++

data/share/xezat/repository/bitbucket.yaml

@@ -0,0 +1,4 @@
+---
+HOMEPAGE: https://bitbucket.org/${BITBUCKET_USER}/${PN}
+SRC_URI: https://bitbucket.org/${BITBUCKET_USER}/${PN}/downloads/${P}.tar.gz
+HG_URI: https://bitbucket.org/${BITBUCKET_USER}/${PN}

data/share/xezat/repository/github.yaml

@@ -0,0 +1,4 @@
+---
+HOMEPAGE: https://github.com/${GITHUB_USER}/${PN}
+SRC_URI: https://github.com/${GITHUB_USER}/${PN}/archive/refs/tags/v${PV}.tar.gz
+GIT_URI: https://github.com/${GITHUB_USER}/${PN}.git

data/share/xezat/repository/gnu.yaml

@@ -0,0 +1,3 @@
+---
+HOMEPAGE: https://www.gnu.org/software/${PN}/
+SRC_URI: mirror://gnu/${PN}/${P}.tar.gz

data/share/xezat/repository/savannah.yaml

@@ -0,0 +1,3 @@
+---
+HOMEPAGE: https://www.nongnu.org/${PN}/
+SRC_URI: mirror://savannah/${PN}/${P}.tar.gz

data/share/xezat/repository/sourceforge.yaml

@@ -0,0 +1,5 @@
+---
+HOMEPAGE: https://sourceforge.net/projects/${PN}/
+SRC_URI: mirror://sourceforge/${PN}/${P}.tar.gz
+SVN_URI: svn://svn.code.sf.net/p/${PN}/code
+GIT_URI: git://git.code.sf.net/p/${PN}/code

data/share/xezat/template/cmake.erb

@@ -1,8 +1,6 @@
-if (CYGWIN)
-  set(prefix ${CMAKE_INSTALL_PREFIX})
-  set(exec_prefix ${CMAKE_INSTALL_PREFIX})
-  set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
-  set(includedir ${CMAKE_INSTALL_PREFIX}/include)
-  configure_file(${CMAKE_SOURCE_DIR}/<%= variables[:PN] %>.pc.in ${CMAKE_BINARY_DIR}/<%= variables[:PN] %>.pc @ONLY)
-  install(FILES ${CMAKE_BINARY_DIR}/<%= variables[:PN] %>.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
-endif()
+set(prefix ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix ${CMAKE_INSTALL_PREFIX})
+set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
+set(includedir ${CMAKE_INSTALL_PREFIX}/include)
+configure_file(${CMAKE_SOURCE_DIR}/<%= variables[:PN] %>.pc.in ${CMAKE_BINARY_DIR}/<%= variables[:PN] %>.pc @ONLY)
+install(FILES ${CMAKE_BINARY_DIR}/<%= variables[:PN] %>.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)

data/share/xezat/template/cygport.erb

@@ -6,6 +6,10 @@ CATEGORY="<%= category %>"
 SUMMARY="<%= summary %>"
 DESCRIPTION="<%= description %>"
 
+LICENSE=""
+LICENSE_SPDX="SPDX-License-Identifier: "
+LICENSE_URI="COPYING"
+
 <% cygclasses.each do |cygclass| -%>
 inherit <%= cygclass %>
 <% end -%>

data/share/xezat/{show_cygport_variable.sh → var2yaml.sh}

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-show_cygport_variables()
+var2yaml()
 {
 	for var in `compgen -A variable`
 	do
@@ -8,6 +8,7 @@ show_cygport_variables()
 		[ $var = 'COMP_WORDBREAKS' ] && continue
 		[ $var = 'HOMEPATH' ] && continue
 		[ $var = 'PERL_MB_OPT' ] && continue
+		[ $var = 'PSModulePath' ] && continue
 		[[ ${!var} =~ ^[A-Za-z]:.* ]] && continue
 		
 		echo -n :$var:
@@ -28,4 +29,4 @@ show_cygport_variables()
 	done
 }
 
-source ${CYGPORT:-/usr/bin/cygport} $* show_cygport_variables
+source ${CYGPORT:-/usr/bin/cygport} $* var2yaml

data/xezat.gemspec

@@ -24,18 +24,19 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.6.4'
 
   spec.add_runtime_dependency 'facets', '>= 3.1.0'
-  spec.add_runtime_dependency 'github-linguist', '>= 7.13.0'
-  spec.add_runtime_dependency 'pkg-config', '>= 1.4.5'
+  spec.add_runtime_dependency 'github-linguist', '>= 7.21.0'
+  spec.add_runtime_dependency 'pkg-config', '>= 1.4.7'
+  spec.add_runtime_dependency 'spdx', '>= 4.1.1'
   spec.add_runtime_dependency 'thor', '>= 0.20.3'
   spec.add_runtime_dependency 'thor-zsh_completion', '>= 0.1.9'
 
   spec.add_development_dependency 'bundler', '>= 1.15.3'
-  spec.add_development_dependency 'fasterer', '>= 0.9.0'
+  spec.add_development_dependency 'fasterer', '>= 0.10.0'
   spec.add_development_dependency 'rake', '>= 13.0'
   spec.add_development_dependency 'rspec', '>= 3.9.0'
   spec.add_development_dependency 'rspec_junit_formatter', '<= 0.4.1'
-  spec.add_development_dependency 'rubocop', '>= 1.10.0'
-  spec.add_development_dependency 'rubocop-performance', '>= 1.9.2'
+  spec.add_development_dependency 'rubocop', '>= 1.28.1'
+  spec.add_development_dependency 'rubocop-performance', '>= 1.13.3'
   spec.add_development_dependency 'simplecov', '>= 0.21.2'
 
   spec.metadata['rubygems_mfa_required'] = 'true'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xezat
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Daisuke Fujimura (fd0)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -30,28 +30,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.13.0
+        version: 7.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.13.0
+        version: 7.21.0
 - !ruby/object:Gem::Dependency
   name: pkg-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 1.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 1.4.7
+- !ruby/object:Gem::Dependency
+  name: spdx
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -156,28 +170,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.28.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.28.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.13.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.13.3
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -232,6 +246,9 @@ files:
 - lib/xezat/command/init.rb
 - lib/xezat/command/port.rb
 - lib/xezat/command/validate.rb
+- lib/xezat/command/validate/config.rb
+- lib/xezat/command/validate/license.rb
+- lib/xezat/command/validate/pkgconfig.rb
 - lib/xezat/config.rb
 - lib/xezat/cygchangelog.rb
 - lib/xezat/cygclasses.rb
@@ -256,8 +273,8 @@ files:
 - lib/xezat/detector/python27.rb
 - lib/xezat/detector/python36.rb
 - lib/xezat/detector/python37.rb
-- lib/xezat/detector/python38-docutils.rb
 - lib/xezat/detector/python38.rb
+- lib/xezat/detector/python39-docutils.rb
 - lib/xezat/detector/python39.rb
 - lib/xezat/detector/roundup.rb
 - lib/xezat/detector/waf.rb
@@ -270,21 +287,21 @@ files:
 - lib/xezat/variables.rb
 - lib/xezat/version.rb
 - share/xezat/categories.yaml
-- share/xezat/compilers.json
-- share/xezat/invoke_cygport_dep.sh
-- share/xezat/languages.json
-- share/xezat/repository/bitbucket.json
-- share/xezat/repository/github.json
-- share/xezat/repository/gnu.json
-- share/xezat/repository/savannah.json
-- share/xezat/repository/sourceforge.json
-- share/xezat/show_cygport_variable.sh
+- share/xezat/compilers.yaml
+- share/xezat/cygport_dep.sh
+- share/xezat/languages.yaml
+- share/xezat/repository/bitbucket.yaml
+- share/xezat/repository/github.yaml
+- share/xezat/repository/gnu.yaml
+- share/xezat/repository/savannah.yaml
+- share/xezat/repository/sourceforge.yaml
 - share/xezat/template/Makefile.am
 - share/xezat/template/README.erb
 - share/xezat/template/announce.erb
 - share/xezat/template/cmake.erb
 - share/xezat/template/cygport.erb
 - share/xezat/template/pkgconfig.erb
+- share/xezat/var2yaml.sh
 - xezat.gemspec
 homepage: https://github.com/fd00/xezat
 licenses:
@@ -306,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.11
 signing_key: 
 specification_version: 4
 summary: xezat helps you win at cygport.

data/share/xezat/compilers.json

@@ -1,67 +0,0 @@
-{
-  "Bison": {
-    "package": "bison"
-  },
-  "C": {
-    "package": "gcc-core",
-    "dependencies": [
-      "binutils"
-    ]
-  },
-  "C++": {
-    "package": "gcc-g++",
-    "dependencies": [
-      "binutils",
-      "gcc-core"
-    ]
-  },
-  "Fortran": {
-    "package": "gcc-fortran",
-    "dependencies": [
-      "binutils",
-      "gcc-core"
-    ]
-  },
-  "Fortran Free Form": {
-    "package": "gcc-fortran",
-    "dependencies": [
-      "binutils",
-      "gcc-core"
-    ]
-  },
-  "Lex": {
-    "package": "flex"
-  },
-  "Lua": {
-    "package": "lua"
-  },
-  "Objective-C": {
-    "package": "gcc-objc",
-    "dependencies": [
-      "binutils",
-      "gcc-core"
-    ]
-  },
-  "Objective-C++": {
-    "package": "gcc-objc++",
-    "dependencies": [
-      "binutils",
-      "gcc-core"
-    ]
-  },
-  "Protocol Buffer": {
-    "package": "libprotobuf-devel"
-  },
-  "Ragel": {
-    "package": "ragel"
-  },
-  "Ruby": {
-    "package": "ruby"
-  },
-  "Vala": {
-    "package": "vala"
-  },
-  "Yacc": {
-    "package": "bison"
-  }
-}

data/share/xezat/languages.json

@@ -1,12 +0,0 @@
-{
-  ".C": "C++",
-  ".CXX": "C++",
-  ".H": "C++",
-  ".HXX": "C++",
-  ".c": "C",
-  ".cpp": "C++",
-  ".cxx": "C++",
-  ".h": "C",
-  ".hpp": "C++",
-  ".hxx": "C++"
-}

data/share/xezat/repository/bitbucket.json

@@ -1,5 +0,0 @@
-{
-  "HOMEPAGE": "https://bitbucket.org/${BITBUCKET_USER}/${PN}",
-  "SRC_URI": "https://bitbucket.org/${BITBUCKET_USER}/${PN}/downloads/${P}.tar.gz",
-  "HG_URI": "https://bitbucket.org/${BITBUCKET_USER}/${PN}"
-}

data/share/xezat/repository/github.json

@@ -1,5 +0,0 @@
-{
-  "HOMEPAGE": "https://github.com/${GITHUB_USER}/${PN}",
-  "SRC_URI": "https://github.com/${GITHUB_USER}/${PN}/archive/refs/tags/v${PV}.tar.gz",
-  "GIT_URI": "git://github.com/${GITHUB_USER}/${PN}.git"
-}

data/share/xezat/repository/gnu.json

@@ -1,4 +0,0 @@
-{
-  "HOMEPAGE": "https://www.gnu.org/software/${PN}/",
-  "SRC_URI": "mirror://gnu/${PN}/${P}.tar.gz"
-}

data/share/xezat/repository/savannah.json

@@ -1,4 +0,0 @@
-{
-  "HOMEPAGE": "https://www.nongnu.org/${PN}/",
-  "SRC_URI": "mirror://savannah/${PN}/${P}.tar.gz"
-}

data/share/xezat/repository/sourceforge.json

@@ -1,6 +0,0 @@
-{
-  "HOMEPAGE": "https://sourceforge.net/projects/${PN}/",
-  "SRC_URI": "mirror://sourceforge/${PN}/${P}.tar.gz",
-  "SVN_URI": "svn://svn.code.sf.net/p/${PN}/code",
-  "GIT_URI": "git://git.code.sf.net/p/${PN}/code"
-}