xezat 0.3.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19e1eef962e59cf81c84a69ea321838d0b0542952073b429cb0f9af0d8cd7dd3
-  data.tar.gz: 88a9a875473d8e11ab01651393740b06af772b9c1f7ce18e9e3fc74909971b1b
+  metadata.gz: eb4e15ff6a5eab549ec2a89d711b6d81ec7a4e05656ecf59524cc472746dfe6c
+  data.tar.gz: 3f2c68eee2a3699adb2c2796bac9a988708bd8395b3e83f4ecd449b09e768c1b
 SHA512:
-  metadata.gz: cf83fa1fbc96dfd22a07d64c974fc3d279cd00a3021315d18948011d44354624d8e426c88bdd654bd63c27a63b01ece6f47a842ed9cba54fb77cf50fa1d754d2
-  data.tar.gz: b4132baf3892fccce8e9b19f6701751878be50a74e08551cc601c921a1ccfe25f3b29f7730d160a7cda93c51306a95ba47e4234ce99a84754b40b4849a50f5e6
+  metadata.gz: 1750d00392ebe3232b98098803aee8ea6d45f661de0c754e63b3ee4ee149fe9fd9e6309015c7645f2e4936a26c09110139a84da41f46d9416c25c8b5978c8497
+  data.tar.gz: 508ef5825975aa6bbaa48c58d9b7f957215f190c4747f73ccdec88f6d93d09bf0fca26c24049910d14cf505aae99e4f16472c5f313eb5f8b3b2d59dbf908184c

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/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/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/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
 
@@ -58,8 +62,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/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/variables.rb

@@ -3,14 +3,12 @@
 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, var2yaml_fetcher: nil)
+  def variables(cygport)
     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,48 +21,13 @@ module Xezat
       end
     end
 
-    result = if var2yaml_fetcher
-               var2yaml_fetcher.call(cygport)
-             else
-               execute_var2yaml(cygport)
-             end
-
-    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))
-    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
+      f.write(YAML.dump(vars))
     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
+    vars
   end
 end

data/lib/xezat/version.rb

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

data/share/xezat/bashvar.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/bash
+
+bashvar()
+{
+  compgen -v | while read var; do declare -p "$var"; done
+}
+
+source ${CYGPORT:-/usr/bin/cygport} $* bashvar

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/share/xezat/template/README.erb

@@ -2,6 +2,7 @@
 ------------------------------------------
 <%= variables[:DESCRIPTION] -%>
 
+
 Runtime requirements:
 <% info[:runtimes].each { |runtime| -%>
   <%= runtime %>

data/xezat.gemspec

@@ -40,11 +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.3.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Daisuke Fujimura (fd0)
@@ -9,6 +9,20 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bashvar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -51,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
@@ -217,6 +245,7 @@ files:
 - README.md
 - exe/xezat
 - lib/xezat.rb
+- lib/xezat/bashvar.rb
 - lib/xezat/command/announce.rb
 - lib/xezat/command/bump.rb
 - lib/xezat/command/bump/changelog.rb
@@ -229,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
@@ -253,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
@@ -282,9 +315,10 @@ files:
 - lib/xezat/variables.rb
 - lib/xezat/version.rb
 - share/xezat/autoconf-archive.yml
+- 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
@@ -298,7 +332,6 @@ files:
 - share/xezat/template/pkgconfig/Makefile.am
 - share/xezat/template/pkgconfig/cmake.erb
 - share/xezat/template/pkgconfig/pkgconfig.erb
-- share/xezat/var2yaml.sh
 - xezat.gemspec
 homepage: https://github.com/fd00/xezat
 licenses:
@@ -312,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

data/share/xezat/var2yaml.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-var2yaml()
-{
-	for var in `compgen -A variable`
-	do
-		[ $var = 'BASH_COMMAND' ] && continue
-		[ $var = 'COMP_WORDBREAKS' ] && continue
-		[ $var = 'HOMEPATH' ] && continue
-		[ $var = 'PERL_MB_OPT' ] && continue
-		[ $var = 'PSModulePath' ] && continue
-		[ $var = '_cygport_orig_env' ] && continue
-		[[ ${!var} =~ ^[A-Za-z]:.* ]] && continue
-		
-		echo -n :$var:
-		if [[ `declare -p $var` =~ "declare -a" ]]
-		then
-			echo
-			x=`printf '${!%s[@]}' $var`
-			eval "keys=$x"
-			for key in $keys
-			do
-				x=`printf '${%s[%s]}' $var $key`
-				eval "value=$x"
-				echo "  -" '"'$value'"'
-			done
-		else
-			echo ' "'`echo "${!var}" | sed -e "s/\\n/ /g"`'"'
-		fi
-	done
-}
-
-source ${CYGPORT:-/usr/bin/cygport} $* var2yaml