benry-cmdopt 2.0.0 → 2.0.2

data/doc/css/style.css

@@ -40,6 +40,10 @@ h3 {
 	font-size: 180%;
 	font-weight: normal;
 }
+h2 > code, h3 > code {
+	color: #39c;
+	font-weight: bold;
+}
 
 
 section.section {
@@ -85,6 +89,10 @@ code {
 	padding: 1px 3px;
 	color: #444;
 }
+h2 > code, h3 > code {
+	border: none;
+	background-color: transparent;
+}
 
 
 dt.bold {

data/lib/benry/cmdopt.rb

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 ###
-### $Release: 2.0.0 $
+### $Release: 2.0.2 $
 ### $Copyright: copyright(c) 2021 kwatch@gmail.com $
 ### $License: MIT License $
 ###
@@ -23,7 +23,7 @@ end
 module Benry::CmdOpt
 
 
-  VERSION = '$Release: 2.0.0 $'.split()[1]
+  VERSION = '$Release: 2.0.2 $'.split()[1]
 
 
   def self.new()
@@ -120,7 +120,7 @@ module Benry::CmdOpt
       #; [!rhhji] raises SchemaError when key is not a Symbol.
       key.nil? || key.is_a?(Symbol)  or
         raise _error("add(#{key.inspect}, #{optdef.inspect}): The first arg should be a Symbol as an option key.")
-      #; [!vq6eq] raises SchemaError when help message is missing."
+      #; [!vq6eq] raises SchemaError when help message is missing.
       desc.nil? || desc.is_a?(String)  or
         raise _error("add(#{key.inspect}, #{optdef.inspect}): Help message required as 3rd argument.")
       #; [!7hi2d] takes command option definition string.

data/test/cmdopt_test.rb

@@ -1471,6 +1471,12 @@ END
         ok {item.value} == 4
       end
 
+      spec "[!tu4k3] returns self." do
+        cmdopt = Benry::CmdOpt.new()
+        x = cmdopt.add(:version, "-v, --version", "version")
+        ok {x}.same?(cmdopt)
+      end
+
     end
 
 
@@ -1569,6 +1575,17 @@ END
         @cmdopt.add(:debug, "-d, --debug[=<LEVEL>]", "debug", type: Integer)
       end
 
+      spec "[!7gc2m] parses command options." do
+        args = ["-d", "x", "y"]
+        @cmdopt.parse(args)
+        ok {args} == ["x", "y"]
+      end
+
+      spec "[!no4xu] returns option values as dict." do
+        args = ["-d", "x"]
+        ok {@cmdopt.parse(args)} == {:debug=>true}
+      end
+
       spec "[!areof] handles only OptionError when block given." do
         errmsg = nil
         errcls = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: benry-cmdopt
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - kwatch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-10 00:00:00.000000000 Z
+date: 2023-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oktest
@@ -36,15 +36,10 @@ files:
 - CHANGES.md
 - MIT-LICENSE
 - README.md
-- Rakefile.rb
 - benry-cmdopt.gemspec
 - doc/benry-cmdopt.html
 - doc/css/style.css
 - lib/benry/cmdopt.rb
-- task/common-task.rb
-- task/package-task.rb
-- task/readme-task.rb
-- task/test-task.rb
 - test/cmdopt_test.rb
 homepage: https://kwatch.github.io/benry-ruby/benry-cmdopt.html
 licenses:

data/Rakefile.rb

@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-PROJECT   = "benry-cmdopt"
-RELEASE   = ENV['RELEASE'] || "0.0.0"
-COPYRIGHT = "copyright(c) 2021 kwatch@gmail.com"
-LICENSE   = "MIT License"
-
-#RUBY_VERSIONS = ["3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4", "2.3"]
-
-Dir.glob('./task/*-task.rb').each {|x| require x }

data/task/common-task.rb

@@ -1,138 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-defined? PROJECT    or abort "PROJECT required."
-defined? RELEASE    or abort "RELEASE required."
-defined? COPYRIGHT  or abort "COPYRIGHT required."
-defined? LICENSE    or abort "LICENSE required."
-
-RELEASE =~ /\A\d+\.\d+\.\d+/  or abort "RELEASE=#{RELEASE}: invalid release number."
-
-
-require 'rake/clean'
-CLEAN << "build"
-CLEAN.concat Dir.glob("#{PROJECT}-*.gem").collect {|x| x.sub(/\.gem$/, '') }
-CLOBBER.concat Dir.glob("#{PROJECT}-*.gem")
-
-
-task :default do
-  sh "rake -T", verbose: false
-end unless Rake::Task.task_defined?(:default)
-
-
-desc "show release guide"
-task :guide do
-  do_guide()
-end
-
-def do_guide()
-  RELEASE != '0.0.0'  or abort "** ERROR: 'RELEASE=X.X.X' required."
-  puts guide_message(PROJECT, RELEASE)
-end
-
-def guide_message(project, release)
-  target = "#{project}-#{release}"
-  tag    = "#{project}-#{release}"
-  puts <<END
-How to release:
-
-  $ git diff .
-  $ git status .
-  $ which ruby
-  $ rake test
-  $ rake test:all
-  $ rake readme:execute			# optional
-  $ rake readme:toc			# optional
-  $ rake package RELEASE=#{release}
-  $ rake package:extract		# confirm files in gem file
-  $ (cd #{target}/data; find . -type f)
-  $ gem install #{target}.gem	# confirm gem package
-  $ gem uninstall #{project}
-  $ gem push #{target}.gem	# publish gem to rubygems.org
-  $ git tag #{tag}		# or: git tag ruby-#{tag}
-  $ git push
-  $ git push --tags
-  $ rake clean
-END
-end
-
-
-desc "create 'README.md' and 'doc/*.html'"
-task :doc do
-  x = PROJECT
-  cd "doc" do
-    sh "../../docs/md2 --md #{x}.mdx > ../README.md"
-    sh "../../docs/md2 #{x}.mdx > #{x}.html"
-  end
-end
-
-desc "copy 'doc/*.html' to '../docs/'"
-task 'doc:export' do
-  RELEASE != '0.0.0'  or abort "** ERROR: 'RELEASE=X.X.X' required."
-  x = PROJECT
-  cp "doc/#{x}.html", "../docs/"
-  edit_file!("../docs/#{x}.html")
-end
-
-
-desc "edit metadata in files"
-task :edit do
-  do_edit()
-end
-
-def do_edit()
-  target_files().each do |fname|
-    edit_file!(fname)
-  end
-end
-
-def target_files()
-  $_target_files ||= begin
-    spec_src = File.read("#{PROJECT}.gemspec", encoding: 'utf-8')
-    spec = eval spec_src
-    spec.name == PROJECT  or
-      abort "** ERROR: '#{PROJECT}' != '#{spec.name}' (project name in gemspec file)"
-    spec.files + Dir.glob("doc/*.mdx")
-  end
-  return $_target_files
-end
-
-def edit_file!(filename, verbose: true)
-  changed = edit_file(filename) do |s|
-    s = s.gsub(/\$Release[:].*?\$/,   "$"+"Release: #{RELEASE} $")
-    s = s.gsub(/\$Copyright[:].*?\$/, "$"+"Copyright: #{COPYRIGHT} $")
-    s = s.gsub(/\$License[:].*?\$/,   "$"+"License: #{LICENSE} $")
-    s
-  end
-  if verbose
-    puts "[C] #{filename}"     if changed
-    puts "[U] #{filename}" unless changed
-  end
-  return changed
-end
-
-def edit_file(filename)
-  File.open(filename, 'rb+') do |f|
-    s1 = f.read()
-    s2 = yield s1
-    if s1 != s2
-      f.rewind()
-      f.truncate(0)
-      f.write(s2)
-      true
-    else
-      false
-    end
-  end
-end
-
-
-desc nil
-task :'relink' do
-  Dir.glob("task/*.rb").each do |x|
-    src = "../" + x
-    next if File.identical?(src, x)
-    rm x
-    ln src, x
-  end
-end

data/task/package-task.rb

@@ -1,72 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-desc "create package (*.gem)"
-task :package do
-  do_package()
-end
-
-def do_package()
-  RELEASE != '0.0.0'  or abort "** ERROR: 'RELEASE=X.X.X' required."
-  ## copy
-  dir = "build"
-  rm_rf dir if File.exist?(dir)
-  mkdir dir
-  target_files().each do |file|
-    dest = File.join(dir, File.dirname(file))
-    mkdir_p dest, :verbose=>false unless File.exist?(dest)
-    cp file, "#{dir}/#{file}"
-  end
-  ## edit
-  Dir.glob("#{dir}/**/*").each do |file|
-    next unless File.file?(file)
-    edit_file!(file, verbose: false)
-  end
-  ## build
-  chdir dir do
-    sh "gem build #{PROJECT}.gemspec"
-  end
-  mv "#{dir}/#{PROJECT}-#{RELEASE}.gem", "."
-  rm_rf dir
-end
-
-
-desc "extract latest gem file"
-task :'package:extract' do
-  do_package_extract()
-end
-
-def do_package_extract()
-  gemfile = Dir.glob("#{PROJECT}-*.gem").sort_by {|x| File.mtime(x) }.last
-  dir = gemfile.sub(/\.gem$/, '')
-  rm_rf dir if File.exist?(dir)
-  mkdir dir
-  mkdir "#{dir}/data"
-  cd dir do
-    sh "tar xvf ../#{gemfile}"
-    sh "gunzip *.gz"
-    cd "data" do
-      sh "tar xvf ../data.tar"
-    end
-  end
-end
-
-
-desc "upload gem file to rubygems.org"
-task :publish do
-  do_publish()
-end
-
-def do_publish()
-  RELEASE != '0.0.0'  or abort "** ERROR: 'RELEASE=X.X.X' required."
-  gemfile = "#{PROJECT}-#{RELEASE}.gem"
-  print "** Are you sure to publish #{gemfile}? [y/N]: "
-  answer = $stdin.gets().strip()
-  if answer.downcase == "y"
-    sh "gem push #{gemfile}"
-    #sh "git tag ruby-#{PROJECT}-#{RELEASE}"
-    sh "git tag #{PROJECT}-#{RELEASE}"
-    sh "#git push"
-    sh "#git push --tags"
-  end
-end

data/task/readme-task.rb

@@ -1,125 +0,0 @@
-# -*- coding: utf-8 -*-
-
-README_FILE      = "README.md"       unless defined? README_FILE
-README_EXTRACT   = /^[Ff]ile: +(\S+)/ unless defined? README_EXTRACT
-README_CODESTART = /^```\w+$/        unless defined? README_CODESTART
-README_CODEEND   = /^```$/           unless defined? README_CODEEND
-README_DESTDIR   = "tmp/readme"      unless defined? README_DESTDIR
-
-require 'rake/clean'
-CLEAN << "README.html"
-
-
-def readme_extract_callback(filename, str)
-  return str
-end
-
-
-namespace :readme do
-
-
-  desc "retrieve scripts from #{README_FILE}"
-  task :retrieve do
-    do_readme_retrieve()
-  end
-
-  def do_readme_retrieve()
-    dir = README_DESTDIR
-    rm_rf dir if File.exist?(dir)
-    mkdir_p dir
-    s = File.read(README_FILE, encoding: 'utf-8')
-    filename = nil
-    buf = nil
-    s.each_line do |line|
-      case line
-      when README_EXTRACT
-        filename = $1
-        next
-      when README_CODESTART
-        if filename
-          buf = []
-        end
-        next
-      when README_CODEEND
-        if filename && buf
-          newfile = "#{dir}/#{filename}"
-          unless File.exist?(File.dirname(newfile))
-            mkdir_p File.dirname(newfile)
-          end
-          str = readme_extract_callback(filename, buf.join())
-          File.write(newfile, str, encoding: 'utf-8')
-          puts "[retrieve] #{newfile}"
-        end
-        filename = nil
-        buf = nil
-        next
-      end
-      #
-      if buf
-        buf << line
-      end
-    end
-  end
-
-
-  desc "execute code in readme file"
-  task :execute => :retrieve do
-    do_readme_execute()
-  end
-
-  def do_readme_execute()
-    Dir.glob(README_DESTDIR+'/**/*.rb').sort.each do |fpath|
-      puts "========================================"
-      sh "ruby -I lib #{fpath}" do end
-    end
-  end
-
-
-  desc "builds table of contents"
-  task :toc do
-    do_readme_toc()
-  end
-
-  def do_readme_toc()
-    url = ENV['README_URL']  or abort "$README_URL required."
-    mkdir "tmp" unless Dir.exist?("tmp")
-    htmlfile = "tmp/README.html"
-    sh "curl -s -o #{htmlfile} #{url}"
-    #rexp = /<h(\d) dir="auto"><a id="(.*?)" class="anchor".*><\/a>(.*)<\/h\1>/
-    rexp = /<h(\d) id="user-content-.*?" dir="auto"><a class="heading-link" href="#(.*?)">(.*)<svg/
-    html_str = File.read(htmlfile, encoding: 'utf-8')
-    buf = []
-    html_str.scan(rexp) do
-      level = $1.to_i
-      id = $2
-      title = $3
-      next if title =~ /Table of Contents/
-      title = title.gsub(/<\/?code>/, '`')
-      anchor = id.sub(/^user-content-/, '')
-      indent = "  " * (level - 1)
-      buf << "#{indent}* <a href=\"##{anchor}\">#{title}</a>\n"
-    end
-    buf.shift() if buf[0] && buf[0] =~ /^\* /
-    toc_str = buf.join()
-    #
-    mdfile = README_FILE
-    changed = File.open(mdfile, "r+", encoding: 'utf-8') do |f|
-      s1 = f.read()
-      s2 = s1.sub(/(<!-- TOC -->\n).*(<!-- \/TOC -->\n)/m) {
-        [$1, toc_str, $2].join("\n")
-      }
-      if s1 != s2
-        f.rewind()
-        f.truncate(0)
-        f.write(s2)
-        true
-      else
-        false
-      end
-    end
-    puts "[changed] #{mdfile}"          if changed
-    puts "[not changed] #{mdfile}"  unless changed
-  end
-
-
-end

data/task/test-task.rb

@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-unless defined?(RUBY_VERSIONS)
-  RUBY_VERSIONS = (
-    if ENV['RUBY_VERSIONS']
-      ENV['RUBY_VERSIONS'].split()
-    else
-      ["3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4", "2.3"]
-    end
-  )
-end
-
-
-desc "run test"
-task :test do
-  do_test()
-end
-
-def do_test()
-  run_test()
-end
-
-def run_test(ruby=nil, &b)
-  run_oktest(ruby, &b)
-end
-
-def run_minitest(ruby=nil, &b)
-  files = File.exist?("test/run_all.rb") \
-          ? ["test/run_all.rb"] \
-          : Dir.glob("test/**/*_test.rb")
-  if ruby
-    sh(ruby, *files, &b)
-  else
-    ruby(*files, &b)
-  end
-end
-
-def run_oktest(ruby=nil, &b)
-  argstr = "-r oktest -e Oktest.main -- test -sp"
-  if ruby
-    sh("#{ruby} #{argstr}", &b)
-  else
-    ruby(argstr, &b)
-  end
-end
-
-
-desc "run test in different ruby versions"
-task :'test:all' do
-  do_test_all()
-end
-
-def do_test_all()
-  ENV['VS_HOME']  or
-    abort "[ERROR] rake test:all: '$VS_HOME' environment var required."
-  vs_home = ENV['VS_HOME'].split(/[:;]/).first
-  ruby_versions = RUBY_VERSIONS
-  test_all(vs_home, ruby_versions)
-end
-
-def test_all(vs_home, ruby_versions)
-  header = proc {|s| "\033[0;36m=============== #{s} ===============\033[0m" }
-  error  = proc {|s| "\033[0;31m** #{s}\033[0m" }
-  comp   = proc {|x, y| x.to_s.split('.').map(&:to_i) <=> y.to_s.split('.').map(&:to_i) }
-  ruby_versions.each do |ver|
-    dir = Dir.glob("#{vs_home}/ruby/#{ver}.*/").sort_by(&comp).last
-    puts ""
-    if dir
-      puts header.("#{ver} (#{dir})")
-      run_test("#{dir}/bin/ruby") do |ok, res|
-        $stderr.puts error.("test failed") unless ok
-      end
-      sleep 0.2
-    else
-      puts header.(ver)
-      $stderr.puts error.("ruby #{ver} not found")
-      sleep 1.0
-    end
-  end
-end