cliapp 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b398e8d768022a0d3ecaf12d9e63f1d5ada3a18e14f7fa0dcb737f2ec4b55aaf
-  data.tar.gz: d1ec659812a404e055a0b11b873d118012e4090cd51bffa0f3a9639c3f0478b4
+  metadata.gz: bc36e1395f591344e677cee0ce32742406474c28511b8718d5d19f46e7c44984
+  data.tar.gz: 0f5a532565538aa80be0cb78c65f131d3444ffd8ca8507224a95f76af4ff2406
 SHA512:
-  metadata.gz: 98e18468f041be66b58e3ee92523a35b999dc9396fa4d60d6125a9007830dc410bc7cc1d2d3bae69992cc05de0ff7c2a24512ac3d52a642ef1abbacaf04b6a3e
-  data.tar.gz: 220c43cf0dbf9a2db65bdd5d48a0fd02d6f44c9a3379b05673c670d9116bba780f05ac73e06ef9ac1f883a598f417b2ad6f8450159070e627c7b1c4a5ef9f351
+  metadata.gz: 3efedd274660695eea14e608d33679f71e808aecb04148d30b1c64fc22b1bf0b53666396bc1d57fadc8ed906747150efee754f2662f49dcc79e2a1d54b31cedf
+  data.tar.gz: 500be32f220b0247f131c9844dd94e323eac83cf6675a8a30033fc51e566600451ee523700a224c8940f6456d5ca4a94ef2f7c51cc3fc76684ef50caed90484c

data/README.md

@@ -1,7 +1,7 @@
 CLIApp
 ======
 
-($Version: 0.1.0 $)
+($Version: 0.1.1 $)
 
 CLIApp is a small framework for command-line application.
 If you need to create a CLI app such as Git or Docker, CLIApp is one of the solutions.
@@ -45,7 +45,6 @@ app.global_options({
   :version => [      "--version"   , "print version number"],
   :list    => ["-l", "--list"      , "list action names"],
 })
-APP = app
 
 ## 'hello' action
 app.action("hello", "greeting message", {
@@ -71,17 +70,12 @@ GARBAGE_FILES = []
 PRODUCT_FILES = []
 
 ## main
-def main(argv=ARGV)
-  APP.run(*argv)
-  return 0
+begin
+  app.run(*ARGV)
+  exit 0
 rescue OptionParser::ParseError, CLIApp::ActionError => exc
   $stderr.puts "[ERROR] #{exc.message}"
-  return 1
-end
-
-if __FILE__ == $0
-  status_code = main(ARGV)
-  exit status_code
+  exit 0
 end
 ```
 

data/cliapp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name            = 'cliapp'
-  spec.version         = '$Version: 0.1.0 $'.split()[1]
+  spec.version         = '$Version: 0.1.1 $'.split()[1]
   spec.author          = 'kwatch'
   spec.email           = 'kwatch@gmail.com'
   spec.platform        = Gem::Platform::RUBY
@@ -12,16 +12,18 @@ Gem::Specification.new do |spec|
 A small framework for CLI Applications such as Git, Docker, NPM, etc.
 END
   spec.license         = 'MIT'
-  spec.files           = Dir[*%w[
-                           README.md MIT-LICENSE Rakefile.rb cliapp.gemspec
-                           lib/**/*.rb
-                           test/**/*.rb
-                           task/**/*.rb
-                         ]]
+  spec.files           = Dir[
+                           "README.md", "MIT-LICENSE", "#{spec.name}.gemspec",
+                           #"Rakefile.rb",
+                           #"bin/*",
+                           "lib/**/*.rb",
+                           "test/**/*.rb",
+                           #"task/**/*.rb",
+                         ]
   spec.executables     = []
   spec.bindir          = 'bin'
   spec.require_path    = 'lib'
-  spec.test_files      = Dir['test/**/*_test.rb']
+  spec.test_files      = ['test/all.rb']   # or: Dir['test/**/*_test.rb']
   #spec.extra_rdoc_files = ['README.md', 'CHANGES.md']
 
   spec.required_ruby_version = ">= 2.4"

data/lib/cliapp.rb

@@ -4,7 +4,7 @@
 ##
 ## Command-Line Application Framework
 ##
-## $Version: 0.1.0 $
+## $Version: 0.1.1 $
 ## $Copyright: copyright (c)2014 kwatch@gmail.com $
 ## $License: MIT License $
 ##
@@ -390,7 +390,6 @@ app.global_options({
   :version => [      "--version"   , "print version number"],
   :list    => ["-l", "--list"      , "list action names"],
 })
-APP = app
 
 ## 'hello' action
 app.action("hello", "greeting message", {
@@ -416,15 +415,10 @@ GARBAGE_FILES = []
 PRODUCT_FILES = []
 
 ## main
-def main(argv=ARGV)
-  APP.run(*argv)
-  return 0
+begin
+  app.run(*ARGV)
+  exit 0
 rescue OptionParser::ParseError, CLIApp::ActionError => exc
   $stderr.puts "[ERROR] #{exc.message}"
-  return 1
-end
-
-if __FILE__ == $0
-  status_code = main(ARGV)
-  exit status_code
+  exit 1
 end

data/test/all.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
+require_relative './init'
+
+path = File.dirname(__FILE__)
+Dir.glob(path + '/**/*_test.rb').sort.each do |file|
+  require_relative file.sub(path, '.')
+end
+
+
+if __FILE__ == $0
+  require 'oktest'
+  Oktest.module_eval do
+    remove_const :REPORTER_CLASS
+    const_set :REPORTER_CLASS, Oktest::PlainReporter
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cliapp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - kwatch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-04 00:00:00.000000000 Z
+date: 2024-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oktest
@@ -34,12 +34,10 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
-- Rakefile.rb
 - cliapp.gemspec
 - lib/cliapp.rb
-- task/common-task.rb
-- task/release-task.rb
 - test/action_test.rb
+- test/all.rb
 - test/application_test.rb
 - test/init.rb
 - test/module_test.rb
@@ -68,7 +66,4 @@ signing_key:
 specification_version: 4
 summary: CLI Application Framework
 test_files:
-- test/module_test.rb
-- test/util_test.rb
-- test/action_test.rb
-- test/application_test.rb
+- test/all.rb

data/Rakefile.rb

@@ -1,9 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-PROJECT  = "cliapp"
-SPECFILE = PROJECT + ".gemspec"
-
-RUBY_VERSIONS = %w[3.3 3.2 3.1 3.0 2.7 2.6 2.5 2.4]
-
-Dir.glob("./task/*-task.rb").each {|x| require x }

data/task/common-task.rb

@@ -1,67 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-task :default => :help    # or :test if you like
-
-
-desc "list task names"
-task :help do
-  system "rake -T"
-end
-
-
-desc "show how to release"
-task :howto, [:version] do |t, args|
-  ver = args[:version] || ENV['version'] || "0.0.0"
-  zero_p = ver.end_with?('.0')
-  opt_b = zero_p ? " -b" : ""
-  puts <<"END"
-How to release:
-
-  $ git diff            	# confirm that there is no changes
-  $ rake test
-  $ rake test:all       	# test on Ruby 2.x ~ 3.x
-  $ git checkout#{opt_b} rel-#{ver[0..-3]}	# create or switch to release branch
-  $ vi CHANGES.md       	# if necessary
-  $ git add CHANGES.md       	# if necessary
-  $ git commit -m "Update 'CHANGES.md'"	# if necessary
-  $ git log -1          	# if necessary
-  $ cid=$(git log -1 | awk 'NR==1{print $2}')	# if necessary
-  $ rake prepare[#{ver}] 	# update release number
-  $ git add -u .        	# add changes
-  $ git status -sb .    	# list files in staging area
-  $ git commit -m "Preparation for release #{ver}"
-  $ rake package        	# create a gem package
-  $ rake release[#{ver}]	# upload to rubygems.org
-  $ git push -u origin
-  $ git tag | fgrep #{ver}	# confirm release tag
-  $ git push --tags
-  $ git checkout -      	# back to main branch
-  $ git log -1 $cid     	# if necessary
-  $ git cherry-pick $cid	# if necessary
-
-END
-end
-
-
-desc "run test scripts"
-task :test do
-  $LOAD_PATH << File.join(File.dirname(__FILE__), "lib")
-  sh "oktest test -sp"
-end
-
-
-desc "run test scripts on Ruby 2.x and 3.x"
-task :'test:all' do
-  vs_home = ENV['VS_HOME']  or raise "$VS_HOME should be set."
-  defined?(RUBY_VERSIONS)  or raise "RUBY_VERSIONS should be defined."
-  $LOAD_PATH << File.join(File.dirname(__FILE__), "lib")
-  RUBY_VERSIONS.each do |ver|
-    path_pat = "#{vs_home}/ruby/#{ver}.*/bin/ruby"
-    ruby_path = Dir.glob(path_pat).sort.last()  or
-      raise "#{path_pat}: Not exist."
-    puts "\e[33m======== Ruby #{ver} ========\e[0m"
-    sh "#{ruby_path} -r oktest -e 'Oktest.main' -- test -sp" do end
-    puts ""
-  end
-end

data/task/release-task.rb

@@ -1,77 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-desc "update version number"
-task :prepare, [:version] do |t, args|
-  version = version_number_required(args, :prepare)
-  spec = load_gemspec_file(SPECFILE)
-  edit(spec.files) {|s|
-    s.gsub(/\$Version\:.*?\$/,   "$Version\: #{version} $") \
-     .gsub(/\$Version\$/,        version)
-  }
-end
-
-
-desc "create gem package"
-task :package do
-  sh "gem build #{SPECFILE}"
-end
-
-
-desc "upload gem to rubygems.org"
-task :release, [:version] => :package do |t, args|
-  version = version_number_required(args, :release)
-  spec = load_gemspec_file(SPECFILE)
-  version == spec.version.to_s  or
-    raise "Version in gemspec file (#{spec.version}) is different from #{version}"
-  gemfile = "#{PROJECT}-#{version}.gem"
-  print "*** Are you sure to upload #{gemfile}? [y/N]: "
-  answer = $stdin.gets().strip()
-  if answer =~ /\A[yY]/
-    sh "git tag v#{version}"
-    #sh "git tag rel-#{version}"
-    sh "gem push #{gemfile}"
-  end
-end
-
-
-##
-## helpers
-##
-
-def edit(*filepaths)
-  filepaths.flatten.each do |fpath|
-    next if ! File.file?(fpath)
-    File.open(fpath, 'r+b:utf-8') do |f|
-      s = f.read()
-      new_s = yield s
-      if new_s != s
-        f.rewind()
-        f.truncate(0)
-        f.write(new_s)
-        puts "[Change] #{fpath}"
-      end
-    end
-  end
-end
-
-def load_gemspec_file(gemspec_file)
-  require 'rubygems'
-  return Gem::Specification::load(gemspec_file)
-end
-
-def version_number_required(args, task_name)
-  version = args[:version] || ENV['version']
-  unless version
-    $stderr.puts <<"END"
-##
-## ERROR: rake #{task_name}: requires 'version=X.X.X' option.
-##        For example:
-##           $ rake #{task_name} version=1.0.0
-##
-END
-    errmsg = "rake #{task_name}: requires 'version=X.X.X' option."
-    raise ArgumentError.new(errmsg)
-  end
-  return version
-end