xezat 0.2.2 → 0.3.0

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 File.read(makefile_am).include?('pkgconfig_DATA')
+            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'
@@ -17,20 +18,26 @@ module Xezat
 
     if File.exist?(cache_file) && File.ctime(cache_file) > File.ctime(cygport)
       Xezat.logger.debug('    Read cache for variables')
-      return YAML.safe_load(File.open(cache_file), [Symbol]).each do |k, v|
+      return YAML.safe_load(File.open(cache_file), symbolize_names: true, permitted_classes: [Symbol]).each do |k, v|
         v.strip! if v.respond_to?(:strip) && k != :DESCRIPTION
       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, symbolize_names: true, permitted_classes: [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:, 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.3.0'
 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

@@ -21,22 +21,22 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.6.4'
+  spec.required_ruby_version = '>= 3.2.2'
 
   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 'thor', '>= 0.20.3'
-  spec.add_runtime_dependency 'thor-zsh_completion', '>= 0.1.9'
+  spec.add_runtime_dependency 'github-linguist', '>= 7.26.0'
+  spec.add_runtime_dependency 'pkg-config', '>= 1.5.2'
+  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.9.0'
+  spec.add_development_dependency 'fasterer', '>= 0.10.1'
   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 'simplecov', '>= 0.21.2'
+  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 'simplecov-cobertura', '>= 2.1.0'
 
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xezat
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Daisuke Fujimura (fd0)
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2023-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -30,56 +30,70 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.13.0
+        version: 7.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.13.0
+        version: 7.26.0
 - !ruby/object:Gem::Dependency
   name: pkg-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: spdx
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: thor-zsh_completion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.1.10
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,70 +142,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.12.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: rspec_junit_formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.54.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.54.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.18.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: simplecov-cobertura
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 2.1.0
 description: xezat helps you win at cygport.
 email:
 - booleanlabel@gmail.com
@@ -200,8 +200,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".fasterer.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
@@ -232,6 +232,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 +259,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,28 +273,28 @@ 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:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -299,15 +302,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.4
+      version: 3.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: xezat helps you win at cygport.
 test_files: []