xezat 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 971a71dc0eae6338466af60e22d6cce153514be903f36ce3b8466cbe8e197f8d
-  data.tar.gz: 97ec5d3fd7386ae4022dc488e8fd1bb239629e91a54b606347fca99c3128378c
+  metadata.gz: eb4e15ff6a5eab549ec2a89d711b6d81ec7a4e05656ecf59524cc472746dfe6c
+  data.tar.gz: 3f2c68eee2a3699adb2c2796bac9a988708bd8395b3e83f4ecd449b09e768c1b
 SHA512:
-  metadata.gz: a092f71a8b3f282c2d48dc736df3fc6081d8c1ec23bbb5de81f05db9a8e58e45eca00f193819e67d6680ff7c2ec8dcb0bd59c2fdafb16be47a2562669d6e5856
-  data.tar.gz: 7dda61ff0a0a7234486f085705b8bd2f0f2e19af108c8eb8c1696f224a66a33534069ffd159d76047dd4e31dd13dee32095d5795bdc054e9af744b05a9e4bb85
+  metadata.gz: 1750d00392ebe3232b98098803aee8ea6d45f661de0c754e63b3ee4ee149fe9fd9e6309015c7645f2e4936a26c09110139a84da41f46d9416c25c8b5978c8497
+  data.tar.gz: 508ef5825975aa6bbaa48c58d9b7f957215f190c4747f73ccdec88f6d93d09bf0fca26c24049910d14cf505aae99e4f16472c5f313eb5f8b3b2d59dbf908184c

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'
+        when /^python3\s*/
           pkgs[:python39]
-        when 'perl5_036'
+        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/detectors.rb

@@ -31,6 +31,10 @@ module Xezat
         Xezat.logger.debug('    Remove python27 because of detecting python3x')
         tools.delete(:python27)
       end
+      if tools.include?(:libtool) && tools.include?(:cmake)
+        Xezat.logger.debug('    Remove libtool because of detecting cmake')
+        tools.delete(:libtool)
+      end
       tools
     end
   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.5.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/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.5.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
@@ -300,7 +318,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 +345,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/share/xezat/cygport_dep.sh

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