xezat 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bca5b54e336456b6aa2c9cc5af28c2f40c896e536a44df6374ce39dfdab700d
-  data.tar.gz: fce7bb85622494444eb694b0973437b85de48d8ffb3e71cac01e118f08eda012
+  metadata.gz: 19e1eef962e59cf81c84a69ea321838d0b0542952073b429cb0f9af0d8cd7dd3
+  data.tar.gz: 88a9a875473d8e11ab01651393740b06af772b9c1f7ce18e9e3fc74909971b1b
 SHA512:
-  metadata.gz: 8ccfb592b7c4462ec9b9ffbf71db32e8fa7749ca858760a85c67925ec4b9ba276b264365d8737aa34462f3ac1765580ff783b1815af277e85d6adc03c23c53bc
-  data.tar.gz: 6a2a950848dae1d7cb967555209cb61e78d711659aac02ea6fa85061625ba381845b585d559667fc8e55aa78cba5bcef131b293530895f8a74d0b8b823c07914
+  metadata.gz: cf83fa1fbc96dfd22a07d64c974fc3d279cd00a3021315d18948011d44354624d8e426c88bdd654bd63c27a63b01ece6f47a842ed9cba54fb77cf50fa1d754d2
+  data.tar.gz: b4132baf3892fccce8e9b19f6701751878be50a74e08551cc601c921a1ccfe25f3b29f7730d160a7cda93c51306a95ba47e4234ce99a84754b40b4849a50f5e6

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/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

@@ -10,7 +10,7 @@ require 'yaml'
 require 'xezat'
 
 module Xezat
-  def variables(cygport)
+  def variables(cygport, var2yaml_fetcher: nil)
     cygport_dir = File.dirname(File.absolute_path(cygport))
     cache_file = File.expand_path(File.join(cygport_dir, "#{File.basename(cygport, '.cygport')}.#{Etc.uname[:machine]}.yml"))
 
@@ -23,9 +23,11 @@ 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 = if var2yaml_fetcher
+               var2yaml_fetcher.call(cygport)
+             else
+               execute_var2yaml(cygport)
+             end
 
     result.gsub!(/^.*\*\*\*.*$/, '')
 
@@ -55,4 +57,14 @@ module Xezat
       lineno += 1
     end
   end
+
+  private
+
+  def execute_var2yaml(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
+  end
 end

data/lib/xezat/version.rb

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

data/lib/xezat.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'colorize'
 require 'logger'
 
 module Xezat
@@ -14,7 +15,15 @@ module Xezat
   end
   Xezat.logger = Logger.new($stdout)
   Xezat.logger.formatter = proc { |severity, datetime, _progname, message|
-    "#{datetime}: [#{severity}] #{message}\n"
+    format = "#{datetime}: [#{severity}] #{message}\n"
+    case severity
+    when 'ERROR'
+      format.colorize(:red)
+    when 'WARN'
+      format.colorize(:yellow)
+    else
+      format
+    end
   }
 
   class CygportProcessError < StandardError