xezat 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19e1eef962e59cf81c84a69ea321838d0b0542952073b429cb0f9af0d8cd7dd3
-  data.tar.gz: 88a9a875473d8e11ab01651393740b06af772b9c1f7ce18e9e3fc74909971b1b
+  metadata.gz: 971a71dc0eae6338466af60e22d6cce153514be903f36ce3b8466cbe8e197f8d
+  data.tar.gz: 97ec5d3fd7386ae4022dc488e8fd1bb239629e91a54b606347fca99c3128378c
 SHA512:
-  metadata.gz: cf83fa1fbc96dfd22a07d64c974fc3d279cd00a3021315d18948011d44354624d8e426c88bdd654bd63c27a63b01ece6f47a842ed9cba54fb77cf50fa1d754d2
-  data.tar.gz: b4132baf3892fccce8e9b19f6701751878be50a74e08551cc601c921a1ccfe25f3b29f7730d160a7cda93c51306a95ba47e4234ce99a84754b40b4849a50f5e6
+  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/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/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.4.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/template/README.erb

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

data/xezat.gemspec

@@ -42,6 +42,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 3.2.2'
 
+  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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xezat
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.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
@@ -217,6 +231,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
@@ -282,6 +297,7 @@ 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
@@ -298,7 +314,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:

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