xezat 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 971a71dc0eae6338466af60e22d6cce153514be903f36ce3b8466cbe8e197f8d
-  data.tar.gz: 97ec5d3fd7386ae4022dc488e8fd1bb239629e91a54b606347fca99c3128378c
+  metadata.gz: 631c0baddcd33f64246b3f98a73a979d523c1c8115803baf3006a70346779b71
+  data.tar.gz: 930b2a86f48ddad910120670ebbc4b75c9e34acddff350dd99023d3c6838b003
 SHA512:
-  metadata.gz: a092f71a8b3f282c2d48dc736df3fc6081d8c1ec23bbb5de81f05db9a8e58e45eca00f193819e67d6680ff7c2ec8dcb0bd59c2fdafb16be47a2562669d6e5856
-  data.tar.gz: 7dda61ff0a0a7234486f085705b8bd2f0f2e19af108c8eb8c1696f224a66a33534069ffd159d76047dd4e31dd13dee32095d5795bdc054e9af744b05a9e4bb85
+  metadata.gz: e536d5924cb08642b47743742c314c595887a212e87927ca9d080f1aa52997d5c25dcbb930202e031fe2289f08a24fdfb39cfe71d2e4253d6d97933f75ad9108
+  data.tar.gz: 9aae07b58ecfc7e87dc4e274ceadf9772d8c0a06161448bd2e74173c72fcc4fef103e02d4ed83c3073c5b17db15aec86e290daad7b5719ddd01b49ad7f82be4f

data/exe/xezat

@@ -5,7 +5,6 @@ Encoding.default_external = 'UTF-8'
 
 self_file =
   if File.symlink?(__FILE__)
-    require 'pathname'
     Pathname.new(__FILE__).realpath
   else
     __FILE__

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

@@ -15,7 +15,7 @@ module Xezat
           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]
+        command = ['bash', File.expand_path(File.join(DATA_DIR, 'cygport.sh')), cygport, 'dep']
         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?

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

@@ -26,11 +26,11 @@ module Xezat
 
       def resolve_pseudo(pkg, pkgs)
         case pkg
-        when 'python3'
-          pkgs[:python39]
-        when 'perl5_036'
+        when /^python3\s*/
+          pkgs[:python3]
+        when /^perl5_0\d{2}$/
           pkgs[:perl_base]
-        when 'ruby_32'
+        when /^ruby_\d{2}$/
           pkgs[:ruby]
         else
           pkg

data/lib/xezat/command/dist.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'xezat'
+require 'xezat/config'
+require 'xezat/variables'
+
+module Xezat
+  class NoDistDirectoryError < StandardError
+  end
+
+  module Command
+    class Dist
+      include Xezat
+
+      def initialize(options, cygport)
+        @options = options
+        @cygport = cygport
+      end
+
+      def execute
+        Xezat.logger.debug('Start distributing')
+        vars = variables(@cygport)
+
+        noop = @options[:noop]
+        verbose = @options[:noop] || @options[:verbose]
+
+        arch = vars[:ARCH]
+        release_dir = File.expand_path(File.join(get_dist_directory(@options), arch, 'release'))
+        pkg_dir = File.expand_path(File.join(release_dir, vars[:PN]))
+        dist_dir = File.expand_path(File.join(vars[:distdir], vars[:PN]))
+
+        if Dir.exist?(pkg_dir)
+          Xezat.logger.warn("  Package directory already exists : #{pkg_dir} (skip)")
+        else
+          Xezat.logger.debug("  Copy package to release directory : #{pkg_dir}")
+          FileUtils.cp_r(dist_dir, release_dir, noop:, verbose:)
+        end
+
+        Xezat.logger.debug('End distributing')
+      end
+
+      def get_dist_directory(options)
+        conf = config(options[:config])
+        dist_dir = conf['xezat']['distdir'] || options[:distdir]
+        raise NoDistDirectoryError if dist_dir.nil?
+
+        Xezat.logger.debug("  Dist directory: #{dist_dir}")
+        dist_dir
+      end
+    end
+  end
+end

data/lib/xezat/command/prep.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'open3'
+require 'xezat'
+require 'xezat/variables'
+
+module Xezat
+  module Command
+    class Prep
+      include Xezat
+
+      def initialize(options, cygport)
+        @options = options
+        @cygport = cygport
+      end
+
+      def execute
+        Xezat.logger.debug('Start prep')
+        invoke_cygport_command('fetch')
+        invoke_cygport_command('prep')
+        copy_readme_if_exists
+        Xezat.logger.debug('End prep')
+      end
+
+      private
+
+      def invoke_cygport_command(command)
+        Xezat.logger.debug("  Execute cygport #{command}")
+        script = File.expand_path(File.join(DATA_DIR, 'cygport.sh'))
+        output = +''
+        Open3.popen2e("bash #{script} #{@cygport} #{command}") do |_stdin, stdout_err, wait_thr|
+          stdout_err.each_line do |line|
+            $stdout.print(line)
+            $stdout.flush
+            output << line
+          end
+          raise CygportProcessError, output unless wait_thr.value.success?
+        end
+      end
+
+      def copy_readme_if_exists
+        vars = variables(@cygport)
+        cygport_dir = File.dirname(File.expand_path(@cygport))
+        readme_source = File.expand_path('README', cygport_dir)
+        readme_dest = File.expand_path('README', vars[:C])
+
+        return unless File.exist?(readme_source)
+
+        Xezat.logger.debug("  Copy README from #{readme_source} to #{readme_dest}")
+        FileUtils.cp(readme_source, readme_dest)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'xezat'
+
+module Xezat
+  module Command
+    class Validate
+      def validate_appstream_path(variables)
+        legacy_dir = File.join(variables[:D], '/usr/share/appdata')
+        Dir.glob('*', base: legacy_dir).each do |file|
+          Xezat.logger.error("    #{file} is in the legacy AppStream path /usr/share/appdata, move it to /usr/share/metainfo")
+        end
+      end
+    end
+  end
+end

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

@@ -30,10 +30,23 @@ module Xezat
         end
       end
 
+      EXECUTABLE_TIMEOUT = 5
+
       private
 
       def executable?(config)
-        Open3.capture3(config.to_s)
+        Open3.popen3(config.to_s) do |stdin, stdout, stderr, wait_thr|
+          stdin.close
+          out_reader = Thread.new { stdout.read }
+          err_reader = Thread.new { stderr.read }
+          unless wait_thr.join(EXECUTABLE_TIMEOUT)
+            Process.kill(:KILL, wait_thr.pid)
+            wait_thr.join
+            raise "#{config} timed out after #{EXECUTABLE_TIMEOUT}s"
+          end
+          out_reader.join
+          err_reader.join
+        end
       rescue StandardError => e
         Xezat.logger.warn("       #{config} not executable: #{e}")
         raise e

data/lib/xezat/command/validate.rb

@@ -2,6 +2,7 @@
 
 require 'net/http'
 require 'uri'
+require 'xezat/command/validate/appstream'
 require 'xezat/command/validate/config'
 require 'xezat/command/validate/license'
 require 'xezat/command/validate/pkgconfig'
@@ -47,6 +48,9 @@ module Xezat
         Xezat.logger.debug('  Validate *-config')
         validate_config(vars, gcc_version)
 
+        Xezat.logger.debug('  Validate AppStream path')
+        validate_appstream_path(vars)
+
         Xezat.logger.debug('End validating')
       end
 

data/lib/xezat/detector/gnome-common.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Xezat
+  module Detector
+    class GnomeCommon
+      def detect?(variables)
+        variables.key?(:_gnome2_CYGCLASS_)
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ require 'find'
 
 module Xezat
   module Detector
-    class Python39Docutils
+    class Python3Docutils
       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/python3.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'find'
+
+module Xezat
+  module Detector
+    class Python3
+      def detect?(variables)
+        return true if Dir.glob(File.join(variables[:D], 'usr', 'lib', 'python3.*')).any? { |dir| File.directory?(dir) }
+
+        Find.find(variables[:D]) do |file|
+          next unless file.end_with?('.py')
+
+          first_line = File.readlines(file).first
+          return true if %r{^#!\s*/usr/bin/env\s*python(3(\.\d+)?)?\s*$}.match?(first_line)
+          return true if %r{^#!\s*/usr/bin/python(3(\.\d+)?)?\s*$}.match?(first_line)
+        end
+        false
+      end
+    end
+  end
+end

data/lib/xezat/detectors.rb

@@ -27,9 +27,9 @@ module Xezat
           Xezat.logger.debug("      #{name} ... no")
         end
       end
-      if tools.include?(:python27) && (tools.include?(:python36) || tools.include?(:python37))
-        Xezat.logger.debug('    Remove python27 because of detecting python3x')
-        tools.delete(:python27)
+      if tools.include?(:libtool) && tools.include?(:cmake)
+        Xezat.logger.debug('    Remove libtool because of detecting cmake')
+        tools.delete(:libtool)
       end
       tools
     end

data/lib/xezat/main.rb

@@ -62,6 +62,15 @@ module Xezat
       Command::Port.new(options, cygport).execute
     end
 
+    desc 'dist cygport', 'Copy dist directory to release directory'
+    option :noop, type: :boolean, aliases: '-n', desc: 'dry run'
+    option :distdir, type: :string, aliases: '-d', desc: 'specify dist directory'
+
+    def dist(cygport)
+      require 'xezat/command/dist'
+      Command::Dist.new(options, cygport).execute
+    end
+
     desc 'validate cygport', 'Validate files'
     option :ignore, type: :boolean, aliases: '-i', desc: 'ignore error'
 
@@ -76,5 +85,12 @@ module Xezat
       require 'xezat/command/announce'
       Command::Announce.new(nil, cygport).execute
     end
+
+    desc 'prep cygport', 'Fetch and prepare sources'
+
+    def prep(cygport)
+      require 'xezat/command/prep'
+      Command::Prep.new(options, cygport).execute
+    end
   end
 end

data/lib/xezat/version.rb

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

data/share/xezat/categories.yaml

@@ -4,14 +4,12 @@
 - archive
 - audio
 - base
-- benchmark
 - comm
 - database
 - debug
 - devel
 - doc
 - editors
-- emulators
 - games
 - gnome
 - graphics

data/share/xezat/compilers.yaml

@@ -22,8 +22,8 @@ Fortran Free Form:
   - gcc-core
 Lex:
   package: flex
-Lua:
-  package: lua
+#Lua:
+#  package: lua
 #Objective-C:
 #  package: gcc-objc
 #  dependencies:
@@ -34,11 +34,11 @@ Lua:
 #  dependencies:
 #  - binutils
 #  - gcc-core
-Protocol Buffer:
-  package: libprotobuf-devel
-Ragel:
-  package: ragel
-Vala:
-  package: vala
+#Protocol Buffer:
+#  package: libprotobuf-devel
+#Ragel:
+#  package: ragel
+#Vala:
+#  package: vala
 Yacc:
   package: bison

data/share/xezat/cygport.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+export LANG=C
+
+source ${CYGPORT:-/usr/bin/cygport} $*

data/xezat.gemspec

@@ -40,12 +40,13 @@ 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 = '>= 3.2.2'
+  spec.required_ruby_version = '>= 4.0.5'
 
   spec.add_dependency 'bashvar', '>= 0.1.1'
   spec.add_dependency 'colorize', '>= 1.1.0'
   spec.add_dependency 'facets', '>= 3.1.0'
   spec.add_dependency 'github-linguist', '>= 9.1.0'
+  spec.add_dependency 'logger', '>= 1.6.0'
   spec.add_dependency 'pkg-config', '>= 1.6.1'
   spec.add_dependency 'spdx', '>= 4.1.5'
   spec.add_dependency 'thor', '>= 1.2.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xezat
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Daisuke Fujimura (fd0)
@@ -65,6 +65,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 9.1.0
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: pkg-config
   requirement: !ruby/object:Gem::Requirement
@@ -244,11 +258,14 @@ files:
 - lib/xezat/command/bump/src_uri.rb
 - lib/xezat/command/bump/tool.rb
 - lib/xezat/command/debug.rb
+- lib/xezat/command/dist.rb
 - lib/xezat/command/doctor.rb
 - lib/xezat/command/generate.rb
 - lib/xezat/command/init.rb
 - lib/xezat/command/port.rb
+- lib/xezat/command/prep.rb
 - lib/xezat/command/validate.rb
+- lib/xezat/command/validate/appstream.rb
 - lib/xezat/command/validate/config.rb
 - lib/xezat/command/validate/license.rb
 - lib/xezat/command/validate/pkgconfig.rb
@@ -268,6 +285,7 @@ files:
 - lib/xezat/detector/font-util.rb
 - lib/xezat/detector/gengetopt.rb
 - lib/xezat/detector/gettext-devel.rb
+- lib/xezat/detector/gnome-common.rb
 - lib/xezat/detector/gnulib.rb
 - lib/xezat/detector/gobject-introspection.rb
 - lib/xezat/detector/halibut.rb
@@ -277,12 +295,8 @@ files:
 - lib/xezat/detector/meson.rb
 - lib/xezat/detector/nasm.rb
 - lib/xezat/detector/ninja.rb
-- lib/xezat/detector/python27.rb
-- lib/xezat/detector/python36.rb
-- lib/xezat/detector/python37.rb
-- lib/xezat/detector/python38.rb
-- lib/xezat/detector/python39-docutils.rb
-- lib/xezat/detector/python39.rb
+- lib/xezat/detector/python3-docutils.rb
+- lib/xezat/detector/python3.rb
 - lib/xezat/detector/roundup.rb
 - lib/xezat/detector/waf.rb
 - lib/xezat/detector/xorg-util-macros.rb
@@ -300,7 +314,7 @@ files:
 - share/xezat/bashvar.sh
 - share/xezat/categories.yaml
 - share/xezat/compilers.yaml
-- share/xezat/cygport_dep.sh
+- share/xezat/cygport.sh
 - share/xezat/languages.yaml
 - share/xezat/repository/bitbucket.yaml
 - share/xezat/repository/github.yaml
@@ -327,14 +341,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.2
+      version: 4.0.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: xezat helps you win at cygport.
 test_files: []

data/lib/xezat/detector/python27.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'find'
-
-module Xezat
-  module Detector
-    class Python27
-      def detect?(variables)
-        return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python2.7'))
-
-        Find.find(variables[:D]) do |file|
-          next unless file.end_with?('.py')
-
-          first_line = File.readlines(file).first
-          return true if %r{^#!\s*/usr/bin/env\s*python2\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/env\s*python2.7\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/python2\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/python2.7\s*$}.match?(first_line)
-        end
-        false
-      end
-    end
-  end
-end

data/lib/xezat/detector/python36.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'find'
-
-module Xezat
-  module Detector
-    class Python36
-      def detect?(variables)
-        return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python3.6'))
-
-        Find.find(variables[:D]) do |file|
-          next unless file.end_with?('.py')
-
-          first_line = File.readlines(file).first
-          return true if %r{^#!\s*/usr/bin/env\s*python3.6\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/python3.6\s*$}.match?(first_line)
-        end
-        false
-      end
-    end
-  end
-end

data/lib/xezat/detector/python37.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'find'
-
-module Xezat
-  module Detector
-    class Python37
-      def detect?(variables)
-        return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python3.7'))
-
-        Find.find(variables[:D]) do |file|
-          next unless file.end_with?('.py')
-
-          first_line = File.readlines(file).first
-          return true if %r{^#!\s*/usr/bin/env\s*python3.7\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/python3.7\s*$}.match?(first_line)
-        end
-        false
-      end
-    end
-  end
-end

data/lib/xezat/detector/python38.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'find'
-
-module Xezat
-  module Detector
-    class Python38
-      def detect?(variables)
-        return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python3.8'))
-
-        Find.find(variables[:D]) do |file|
-          next unless file.end_with?('.py')
-
-          first_line = File.readlines(file).first
-          return true if %r{^#!\s*/usr/bin/env\s*python3.8\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/python3.8\s*$}.match?(first_line)
-        end
-        false
-      end
-    end
-  end
-end

data/lib/xezat/detector/python39.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require 'find'
-
-module Xezat
-  module Detector
-    class Python39
-      def detect?(variables)
-        return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python3.9'))
-
-        Find.find(variables[:D]) do |file|
-          next unless file.end_with?('.py')
-
-          first_line = File.readlines(file).first
-          return true if %r{^#!\s*/usr/bin/env\s*python\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/env\s*python3\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/env\s*python3.9\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/python\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/python3\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/python3.9\s*$}.match?(first_line)
-        end
-        false
-      end
-    end
-  end
-end

data/share/xezat/cygport_dep.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export LANG=C
-
-source ${CYGPORT:-/usr/bin/cygport} $* dep