xezat 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bca5b54e336456b6aa2c9cc5af28c2f40c896e536a44df6374ce39dfdab700d
-  data.tar.gz: fce7bb85622494444eb694b0973437b85de48d8ffb3e71cac01e118f08eda012
+  metadata.gz: 971a71dc0eae6338466af60e22d6cce153514be903f36ce3b8466cbe8e197f8d
+  data.tar.gz: 97ec5d3fd7386ae4022dc488e8fd1bb239629e91a54b606347fca99c3128378c
 SHA512:
-  metadata.gz: 8ccfb592b7c4462ec9b9ffbf71db32e8fa7749ca858760a85c67925ec4b9ba276b264365d8737aa34462f3ac1765580ff783b1815af277e85d6adc03c23c53bc
-  data.tar.gz: 6a2a950848dae1d7cb967555209cb61e78d711659aac02ea6fa85061625ba381845b585d559667fc8e55aa78cba5bcef131b293530895f8a74d0b8b823c07914
+  metadata.gz: a092f71a8b3f282c2d48dc736df3fc6081d8c1ec23bbb5de81f05db9a8e58e45eca00f193819e67d6680ff7c2ec8dcb0bd59c2fdafb16be47a2562669d6e5856
+  data.tar.gz: 7dda61ff0a0a7234486f085705b8bd2f0f2e19af108c8eb8c1696f224a66a33534069ffd159d76047dd4e31dd13dee32095d5795bdc054e9af744b05a9e4bb85

data/README.md

@@ -1,39 +1,59 @@
 # Xezat
 
 [![Actions](https://github.com/fd00/xezat/actions/workflows/ruby.yml/badge.svg)](https://github.com/fd00/xezat/)
+[![Gem Version](https://badge.fury.io/rb/xezat.svg)](https://badge.fury.io/rb/xezat)
 
-xezat helps you win at cygport.
+Xezat is a helper tool for your daily packaging tasks with [Cygport](httpss://cygwin.com/cygport/).
 
-## Installation
+## Features
 
-Add this line to your application's Gemfile:
+Xezat provides the following subcommands through the `xezat` command:
 
-```ruby
-gem 'xezat'
-```
+*   `init`: Interactively generates a new `cygport` file.
+*   `bump`: Bumps the package version and updates the `README` file.
+*   `validate`: Validates that the `cygport` file and related files adhere to conventions.
+*   `port`: Copies the `cygport` to a Git repository.
+*   `announce`: Generates a template for ITP (Intent to Package) or `cygport` update announcements.
+*   `doctor`: Checks your system for potential problems.
+*   `generate`: Generates development files used by `cygport`.
+*   `debug`: Assists in debugging `cygport` files.
 
-And then execute:
+You can check the details of each command with `xezat <command> --help`.
 
-    $ bundle
+## Installation
 
-Or install it yourself as:
+Install the gem:
 
-    $ gem install xezat
+```bash
+gem install xezat
+```
 
 ## Usage
 
-TODO: Write usage instructions here
+### 1. Creating a new package
+
+```bash
+xezat init foo.cygport
+```
 
-## Development
+### 2. Bumping the version
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+```bash
+xezat bump foo.cygport
+```
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+### 3. Validating the package
+
+```bash
+xezat validate foo.cygport
+```
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/fd00/xezat.
+Bug reports and pull requests are welcome on GitHub at [https://github.com/fd00/xezat](https://github.com/fd00/xezat).
+
+This project utilizes Google Gemini for development assistance.
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/xezat/bashvar.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'bashvar'
+require 'open3'
+require 'xezat'
+
+module Xezat
+  def bashvar(cygport)
+    command = ['bash', File.expand_path(File.join(DATA_DIR, 'bashvar.sh')), cygport]
+    result, error, status = Open3.capture3(command.join(' '))
+    raise CygportProcessError, error unless status.success?
+
+    BashVar.parse(result, symbolize_names: true)
+  end
+end

data/lib/xezat/command/generate.rb

@@ -13,6 +13,15 @@ module Xezat
         require 'xezat/generator/pkgconfig'
         Generator::Pkgconfig.new(options, cygport).generate
       end
+
+      desc 'cmake cygport', 'Generate CMakeLists.txt'
+      option :overwrite, type: :boolean, aliases: '-o', desc: 'overwrite CMakeLists.txt'
+      option :srcdir, type: :string, aliases: '-s', desc: 'relative path to CMakeLists.txt'
+
+      def cmake(cygport)
+        require 'xezat/generator/cmake'
+        Generator::CMake.new(options, cygport).generate
+      end
     end
   end
 end

data/lib/xezat/command/validate.rb

@@ -58,8 +58,10 @@ module Xezat
 
       def validate_category(category)
         categories_file = File.expand_path(File.join(DATA_DIR, 'categories.yaml'))
-        Xezat.logger.error("    Category is invalid : #{category}") unless
-          YAML.safe_load(File.open(categories_file), symbolize_names: true, permitted_classes: [Symbol]).include?(category.downcase)
+        valid_categories = YAML.safe_load(File.open(categories_file), symbolize_names: true, permitted_classes: [Symbol])
+        category.split.each do |cat|
+          Xezat.logger.error("    Category is invalid : #{cat}") unless valid_categories.include?(cat.downcase)
+        end
       end
 
       def validate_homepage(homepage)

data/lib/xezat/detector/asciidoc.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Asciidoc
-      def detect(variables)
+      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/detector/autoconf-archive.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Xezat
+  module Detector
+    class AutoconfArchive
+      def detect?(variables)
+        return false unless variables.keys.index do |key|
+          %i[_cmake_CYGCLASS_ _meson_CYGCLASS_ _ninja_CYGCLASS_].include?(key)
+        end.nil?
+
+        autoconf_archive_file = File.expand_path(File.join(DATA_DIR, 'autoconf-archive.yml'))
+        autoconf_archive_macros = YAML.safe_load(File.open(autoconf_archive_file), symbolize_names: true, permitted_classes: [Symbol])
+
+        Find.find(variables[:S]) do |file|
+          next unless file.end_with?("#{File::SEPARATOR}configure.ac", "#{File::SEPARATOR}configure.in")
+
+          autoconf_archive_macros.each do |macro|
+            File.foreach(file) do |line|
+              return true if line.scrub.strip.start_with?(macro)
+            end
+          end
+        end
+        false
+      end
+    end
+  end
+end

data/lib/xezat/detector/autoconf.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Autoconf
-      def detect(variables)
+      def detect?(variables)
         return false unless variables.keys.index do |key|
           %i[_cmake_CYGCLASS_ _meson_CYGCLASS_ _ninja_CYGCLASS_].include?(key)
         end.nil?

data/lib/xezat/detector/automake.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Automake
-      def detect(variables)
+      def detect?(variables)
         return false unless variables.keys.index do |key|
           %i[_cmake_CYGCLASS_ _meson_CYGCLASS_ _ninja_CYGCLASS_].include?(key)
         end.nil?

data/lib/xezat/detector/boost.m4.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class BoostM4
-      def detect(variables)
+      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/detector/cmake.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Cmake
-      def detect(variables)
+      def detect?(variables)
         variables.key?(:_cmake_CYGCLASS_)
       end
     end

data/lib/xezat/detector/docbook2X.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Docbook2x
-      def detect(variables)
+      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/detector/font-util.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'find'
+
+module Xezat
+  module Detector
+    class FontUtil
+      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.start_with?('XORG_FONT_MACROS_VERSION')
+          end
+        end
+        false
+      end
+    end
+  end
+end

data/lib/xezat/detector/gengetopt.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Gengetopt
-      def detect(variables)
+      def detect?(variables)
         Find.find(variables[:S]) do |file|
           return true if file.end_with?('.ggo', '.ggo.in')
         end

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

@@ -3,12 +3,12 @@
 module Xezat
   module Detector
     class GettextDevel
-      def detect(variables)
+      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)
+            return true if /AM_GNU_GETTEXT|AM_ICONV|AC_GGZ_INTL/.match?(line.scrub.lstrip)
           end
         end
         false

data/lib/xezat/detector/gnulib.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Gnulib
-      def detect(variables)
+      def detect?(variables)
         File.foreach(File.join(variables[:top], variables[:cygportfile])) do |line|
           return true if line.index('gnulib-tools')
         end

data/lib/xezat/detector/gobject-introspection.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class GobjectIntrospection
-      def detect(variables)
+      def detect?(variables)
         File.directory?(File.join(variables[:D], 'usr', 'lib', 'girepository-1.0'))
       end
     end

data/lib/xezat/detector/halibut.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Halibut
-      def detect(variables)
+      def detect?(variables)
         Find.find(variables[:S]) do |file|
           return true if file.end_with?('.but')
         end

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

@@ -3,7 +3,7 @@
 module Xezat
   module Detector
     class Libqt5coreDevel
-      def detect(variables)
+      def detect?(variables)
         variables.key?(:_qt5_qmake_CYGCLASS_)
       end
     end

data/lib/xezat/detector/libtool.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Libtool
-      def detect(variables)
+      def detect?(variables)
         Find.find(variables[:S]) do |file|
           return true if file.end_with?("#{File::SEPARATOR}ltmain.sh")
         end

data/lib/xezat/detector/make.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Make
-      def detect(variables)
+      def detect?(variables)
         Find.find(variables[:B]) do |file|
           return true if file.end_with?("#{File::SEPARATOR}Makefile", "#{File::SEPARATOR}makefile")
         end

data/lib/xezat/detector/meson.rb

@@ -3,7 +3,7 @@
 module Xezat
   module Detector
     class Meson
-      def detect(variables)
+      def detect?(variables)
         variables.key?(:_meson_CYGCLASS_)
       end
     end

data/lib/xezat/detector/nasm.rb

@@ -3,7 +3,7 @@
 module Xezat
   module Detector
     class Nasm
-      def detect(variables)
+      def detect?(variables)
         if variables.key?(:_meson_CYGCLASS_)
           File.foreach(File.join(variables[:S], 'meson.build')) do |line|
             return true if line.include?("find_program('nasm')")

data/lib/xezat/detector/ninja.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Ninja
-      def detect(variables)
+      def detect?(variables)
         return true if variables.key?(:_meson_CYGCLASS_)
 
         Find.find(variables[:B]) do |file|

data/lib/xezat/detector/python27.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Python27
-      def detect(variables)
+      def detect?(variables)
         return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python2.7'))
 
         Find.find(variables[:D]) do |file|

data/lib/xezat/detector/python36.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Python36
-      def detect(variables)
+      def detect?(variables)
         return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python3.6'))
 
         Find.find(variables[:D]) do |file|

data/lib/xezat/detector/python37.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Python37
-      def detect(variables)
+      def detect?(variables)
         return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python3.7'))
 
         Find.find(variables[:D]) do |file|

data/lib/xezat/detector/python38.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Python38
-      def detect(variables)
+      def detect?(variables)
         return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python3.8'))
 
         Find.find(variables[:D]) do |file|

data/lib/xezat/detector/python39-docutils.rb

@@ -5,12 +5,12 @@ require 'find'
 module Xezat
   module Detector
     class Python39Docutils
-      def detect(variables)
+      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.strip.start_with?('AC_CHECK_PROG') && line.index('rst2man').is_a?(Integer)
+            return true if line.scrub.strip.start_with?('AC_CHECK_PROG') && line.index('rst2man').is_a?(Integer)
           end
         end
         if variables.key?(:_meson_CYGCLASS_)

data/lib/xezat/detector/python39.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Python39
-      def detect(variables)
+      def detect?(variables)
         return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python3.9'))
 
         Find.find(variables[:D]) do |file|

data/lib/xezat/detector/roundup.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Roundup
-      def detect(variables)
+      def detect?(variables)
         File.foreach(File.join(variables[:top], variables[:cygportfile])) do |line|
           return true if line.index('roundup')
         end

data/lib/xezat/detector/waf.rb

@@ -3,7 +3,7 @@
 module Xezat
   module Detector
     class Waf
-      def detect(variables)
+      def detect?(variables)
         if variables.key?(:_waf_CYGCLASS_)
           Find.find(variables[:S]) do |file|
             return false if file.end_with?("#{File::SEPARATOR}waf")

data/lib/xezat/detector/xorg-util-macros.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'find'
+
+module Xezat
+  module Detector
+    class XorgUtilMacros
+      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.start_with?('XORG_MACROS_VERSION')
+          end
+        end
+        false
+      end
+    end
+  end
+end

data/lib/xezat/detectors.rb

@@ -20,7 +20,7 @@ module Xezat
       @detectors.each do |name, detector|
         if variables[:PN].intern == name
           Xezat.logger.debug("      #{name} ... no (self)")
-        elsif detector.detect(variables)
+        elsif detector.detect?(variables)
           tools << name
           Xezat.logger.debug("      #{name} ... yes")
         else

data/lib/xezat/generator/cmake.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'xezat/generator'
+require 'xezat/variables'
+
+module Xezat
+  module Generator
+    class CMake
+      include Xezat
+
+      def initialize(options, cygport)
+        @options = options
+        @cygport = cygport
+      end
+
+      def generate
+        Xezat.logger.debug('Start CMakeLists.txt generation')
+        vars = variables(@cygport)
+        generate_cmakelists(vars, @options)
+        Xezat.logger.debug('End CMakeLists.txt generation')
+      end
+
+      def generate_cmakelists(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}")
+
+        cmakelists = File.expand_path(File.join(srcdir, 'CMakeLists.txt'))
+        raise UnregeneratableConfigurationError, 'CMakeLists.txt already exists' if File.exist?(cmakelists) && !options['overwrite']
+
+        Xezat.logger.debug('  Generate CMakeLists.txt')
+
+        File.atomic_write(cmakelists) do |f|
+          f.write(get_cmakelists(variables))
+        end
+      end
+
+      def get_cmakelists(variables)
+        erb = File.expand_path(File.join(TEMPLATE_DIR, 'cmake', 'cmake.erb'))
+        ERB.new(File.readlines(erb).join(nil), trim_mode: '%-').result(binding)
+      end
+    end
+  end
+end

data/lib/xezat/generator/pkgconfig.rb

@@ -3,12 +3,10 @@
 require 'English'
 require 'facets/file/atomic_open'
 require 'facets/file/atomic_write'
+require 'xezat/generator'
 require 'xezat/variables'
 
 module Xezat
-  class UnregeneratableConfigurationError < StandardError
-  end
-
   class AutotoolsFileNotFoundError < StandardError
   end
 
@@ -51,7 +49,7 @@ module Xezat
       end
 
       def get_pkg_config(variables)
-        erb = File.expand_path(File.join(TEMPLATE_DIR, 'pkgconfig.erb'))
+        erb = File.expand_path(File.join(TEMPLATE_DIR, 'pkgconfig', 'pkgconfig.erb'))
         ERB.new(File.readlines(erb).join(nil), trim_mode: '%-').result(binding)
       end
 
@@ -72,7 +70,7 @@ module Xezat
       end
 
       def get_cmakelists(variables)
-        erb = File.expand_path(File.join(TEMPLATE_DIR, 'cmake.erb'))
+        erb = File.expand_path(File.join(TEMPLATE_DIR, 'pkgconfig', 'cmake.erb'))
         ERB.new(File.readlines(erb).join(nil), trim_mode: '%-').result(binding)
       end
 
@@ -84,7 +82,7 @@ module Xezat
         configure_ac = File.expand_path(File.join(srcdir, 'configure.in')) unless File.exist?(configure_ac)
         raise AutotoolsFileNotFoundError unless File.exist?(configure_ac)
 
-        original_ac = File.read(configure_ac)
+        original_ac = File.read(configure_ac).scrub
 
         if /#{pn}.pc/.match?(original_ac)
           Xezat.logger.debug("  Not rewrite #{configure_ac}")
@@ -104,7 +102,7 @@ module Xezat
             break
           end
 
-          commands_am = File.read(File.expand_path(File.join(TEMPLATE_DIR, 'Makefile.am')))
+          commands_am = File.read(File.expand_path(File.join(TEMPLATE_DIR, 'pkgconfig', 'Makefile.am')))
           File.atomic_open(makefile_am, 'a') do |fm|
             fm.write(commands_am)
           end

data/lib/xezat/generator.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Xezat
+  class UnregeneratableConfigurationError < StandardError
+  end
+end

data/lib/xezat/main.rb

@@ -8,6 +8,7 @@ require 'xezat/version'
 module Xezat
   class Main < Thor
     include ZshCompletion::Command
+
     class_option :config, type: :string, aliases: '-c', desc: 'specify config', default: CONFIG_FILE
     class_option :help, type: :boolean, aliases: '-h', desc: 'help message'
 

data/lib/xezat/variables.rb

@@ -3,11 +3,9 @@
 require 'English'
 require 'etc'
 require 'facets/file/atomic_write'
-require 'facets/string/word_wrap'
-require 'open3'
-require 'uri'
 require 'yaml'
 require 'xezat'
+require 'xezat/bashvar'
 
 module Xezat
   def variables(cygport)
@@ -23,36 +21,13 @@ module Xezat
       end
     end
 
-    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!(/^.*\*\*\*.*$/, '')
-
-    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)
+    vars = bashvar(cygport)
 
     File.atomic_write(cache_file) do |f|
       Xezat.logger.debug('    Write cache for variables')
-      f.write(YAML.dump(variables))
+      f.write(YAML.dump(vars))
     end
 
-    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
+    vars
   end
 end

data/lib/xezat/version.rb

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