shellopts 2.0.23 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48ea51e0cf39fea203412215192cb9328dd9fb9dbf9f0db345948e8692ff0669
-  data.tar.gz: fc529055f34445a55ef2a078b60a618dba9b715223e2dfc5382a7440ea5d0aa6
+  metadata.gz: 130dd1af11ce3370f270266c9a6b48bda041cdaa195526394b1740e21a5501b8
+  data.tar.gz: 51a3b79454a7fcbca825a3a227da2c9349263b9bb321611f69f4047d24dd0d78
 SHA512:
-  metadata.gz: 1b12355e432018020308e1772d81c7ca8058487e5d013ed33ff1168283dc2335afbe06d456bf5372ac349cfb3b54273f913aba80f7979b8cc11935b756c6eb28
-  data.tar.gz: c48a2ba4c201eef6e3fcde96abbf3f1625bb82548c7bab096d9f27d498bab7c8094503284919d42c5b4440ae453fa598d1771450c5e64f2b2b2845b84cfafbc9
+  metadata.gz: 7444f82972751e540863b31451b6bc2990bb3bc28e6904e2a42fe8dbdd80bf79246a3da29ae3300ff9168fa0f9f85202cd9efdac8d6c1fdc3780e6587c0e4a51
+  data.tar.gz: 7b37d02c7f1b006b7d2120f563f6ce7e6e4f56cad2c68e53abd6eb4ec24c7c2b8949448eb79c49e18ae7096355495e49a79c79e36d6133253775f1838fcd20bc

data/.ruby-version

@@ -1 +1 @@
-ruby-2.7.1
+ruby-3.1.2

data/TODO

@@ -1,4 +1,5 @@
 
+o Assigner methods for options
 o Make opts[] point at the main object
     opts[].subcommand is the direct subcommand of main
 o Make opts be the aggrated set of options in a subcommand

data/lib/shellopts/args.rb

@@ -46,8 +46,8 @@ module ShellOpts
       end
     end
 
-    # As #extract except it doesn't allow negative counts and that the array is
-    # expected to be emptied by the operation
+    # As #extract except the array is expected to be emptied by the operation.
+    # Raise a #inoa exception if count is negative
     #
     # #expect raise a ShellOpts::Error exception if the array is not emptied 
     # by the operation
@@ -57,7 +57,7 @@ module ShellOpts
         when Range
           count_or_range === self.size or inoa(message)
         when Integer
-          count_or_range >= 0 or raise ArgumentError, "Count can't be negative"
+          count_or_range >= 0 or inoa(message)
           count_or_range.abs == self.size or inoa(message)
       end
       extract(count_or_range) # Can't fail

data/lib/shellopts/argument_type.rb

@@ -18,7 +18,8 @@ module ShellOpts
       # if type is an IntegerArgument
       def value?(value) true end
 
-      # Convert value to Ruby type
+      # Convert value to Ruby type. This method can also be used to translate
+      # special keywords
       def convert(value) value end
 
       # String representation. Equal to #name
@@ -60,69 +61,120 @@ module ShellOpts
       attr_reader :kind
 
       def initialize(kind)
-        constrain kind, :file, :dir, :path, :efile, :edir, :epath, :nfile, :ndir, :npath
+        constrain kind, :file, :dir, :path, :efile, :edir, :epath, :nfile, :ndir, :npath, :ifile, :ofile
         @kind = kind 
       end
 
       def match?(name, literal)
-        case kind
-          when :file; match_path(name, literal, kind, :file?, :default)
-          when :dir; match_path(name, literal, kind, :directory?, :default)
-          when :path; match_path(name, literal, kind, :exist?, :default)
-
-          when :efile; match_path(name, literal, kind, :file?, :exist)
-          when :edir; match_path(name, literal, kind, :directory?, :exist)
-          when :epath; match_path(name, literal, kind, :exist?, :exist)
-
-          when :nfile; match_path(name, literal, kind, :file?, :new)
-          when :ndir; match_path(name, literal, kind, :directory?, :new)
-          when :npath; match_path(name, literal, kind, :exist?, :new)
+        # Special-case '-' keyword
+        if literal == '-' && [:ifile, :ofile].include?(kind)
+          true
+
+        # Special-case standard I/O files
+        elsif %w(/dev/stdin /dev/stdout /dev/stderr /dev/null).include?(literal)
+          case kind
+            when :file, :path, :efile, :epath, :nfile, :npath
+              true
+            when :ifile
+              %w(/dev/stdin /dev/null).include? literal or 
+                  set_message "Can't read #{literal}"
+            when :ofile
+              %w(/dev/stdout /dev/stderr /dev/null).include?(literal) or 
+                  set_message "Can't write to #{literal}"
+            when :dir, :edir, :ndir
+              set_message "Expected file, got directory #{literal}"
+          else
+            raise ArgumentError, "Unhandled kind: #{kind.inspect}"
+          end
+
+        # All other files or directories
         else
-          raise InternalError, "Illegal kind: #{kind.inspect}"
+          case kind # TODO: node, enode, npath - special files: character, block, socket, etc.
+            when :file; match_path(name, literal, kind, :file?, :default)
+            when :dir; match_path(name, literal, kind, :directory?, :default)
+            when :path; match_path(name, literal, kind, :exist?, :default)
+
+            when :efile; match_path(name, literal, kind, :file?, :exist)
+            when :edir; match_path(name, literal, kind, :directory?, :exist)
+            when :epath; match_path(name, literal, kind, :exist?, :exist)
+
+            when :nfile; match_path(name, literal, kind, :file?, :new)
+            when :ndir; match_path(name, literal, kind, :directory?, :new)
+            when :npath; match_path(name, literal, kind, :exist?, :new)
+
+            when :ifile; match_path(name, literal, kind, :readable?, :default)
+            when :ofile; match_path(name, literal, kind, :writable?, :default)
+          else
+            raise InternalError, "Illegal kind: #{kind.inspect}"
+          end
         end
       end
 
       # Note: No checks done, not sure if it is a feature or a bug
       def value?(value) value.is_a?(String) end
 
+      def convert(value)
+        if value == "-"
+          case kind
+            when :ifile; "/dev/stdin"
+            when :ofile; "/dev/stdout"
+          else
+            value
+          end
+        else
+          value
+        end
+      end
+
     protected
       def match_path(name, literal, kind, method, mode)
         subject = 
             case kind
-              when :file, :efile, :nfile; "regular file"
+              when :file, :efile, :nfile, :ifile, :ofile; "file"
               when :dir, :edir, :ndir; "directory"
               when :path, :epath, :npath; "path"
             else
               raise ArgumentError
             end
 
-        if File.send(method, literal) # exists?
+        # file exists and is the rigth type?
+        if File.send(method, literal)
           if mode == :new
             set_message "#{subject.capitalize} already exists in #{name}: #{literal}"
           elsif kind == :path || kind == :epath
             if File.file?(literal) || File.directory?(literal)
               true
             else
-              set_message "Expected regular file or directory as #{name} argument: #{literal}"
+              set_message "Expected file or directory as #{name} argument: #{literal}"
             end
+          elsif (kind == :ifile || kind == :ofile) && File.directory?(literal)
+            set_message "File expected, got directory: #{literal}"
           else
             true
           end
-        elsif File.exist?(literal) # exists but not the right type
-          if mode == :new
-            set_message "#{subject.capitalize} already exists"
+
+        # file exists but not the right type?
+        elsif File.exist?(literal)
+          if kind == :ifile
+            set_message "Can't read #{literal}"
+          elsif kind == :ofile
+            set_message "Can't write to #{literal}"
+          elsif mode == :new
+            set_message "#{subject.capitalize} already exists - #{literal}"
           else
             set_message "Expected #{subject} as #{name} argument: #{literal}"
           end
-        else # does not exist
+
+        # file does not exist
+        else 
           if [:default, :new].include? mode
-            if File.exist?(File.dirname(literal))
+            if File.exist?(File.dirname(literal)) || kind == :ofile
               true
             else
               set_message "Illegal path in #{name}: #{literal}"
             end
           else
-            set_message "Error in #{name} argument: Can't find #{literal}"
+            set_message "Can't find #{literal}"
           end
         end
       end

data/lib/shellopts/parser.rb

@@ -83,8 +83,8 @@ module ShellOpts
             when "$"
               @argument_name ||= "NUM"
               @argument_type = FloatArgument.new
-            when "FILE", "DIR", "PATH", "EFILE", "EDIR", "EPATH", "NFILE", "NDIR", "NPATH"
-              @argument_name ||= arg.sub(/^(?:E|N)/, "")
+            when "FILE", "DIR", "PATH", "EFILE", "EDIR", "EPATH", "NFILE", "NDIR", "NPATH", "IFILE", "OFILE"
+              @argument_name ||= arg.sub(/^(?:E|N|I|O)/, "")
               @argument_type = FileArgument.new(arg.downcase.to_sym)
             when /,/
               @argument_name ||= arg

data/lib/shellopts/version.rb

@@ -1,3 +1,3 @@
 module ShellOpts
-  VERSION = "2.0.23"
+  VERSION = "2.1.1"
 end

data/lib/shellopts.rb

@@ -27,6 +27,17 @@ require 'shellopts/renderer.rb'
 require 'shellopts/formatter.rb'
 require 'shellopts/dump.rb'
 
+# TODO: Describe exception handling
+#
+# Notes
+#   * Two kinds of exceptions: Expected & unexpected. Expected exceptions are
+#     RuntimeError or IOError. Unexpected exceptions are the rest. Both results
+#     in shellopts.failure messages if shellopts error handling is enabled 
+#   * Describe the difference between StandardError, RuntimeError, and IOError
+#   * Add an #internal error handling for the production environment that
+#     prints an intelligble error message and prettyfies stack dump. This
+#     should catch non-RuntimeError/UIError exceptions
+#   * Find a reliable way of testing environment
 
 module ShellOpts
   # Base error class

data/shellopts.gemspec

@@ -25,11 +25,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "forward_to"
   spec.add_dependency "constrain", "~> 0.5.1"
-  spec.add_dependency "ruby-terminfo"
+  spec.add_dependency "ruby-terminfo-r3"
   spec.add_dependency "indented_io"
 
-  spec.add_development_dependency "bundler", "~> 2.2.10"
-  spec.add_development_dependency "rake", ">= 12.3.3"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shellopts
 version: !ruby/object:Gem::Version
-  version: 2.0.23
+  version: 2.1.1
 platform: ruby
 authors:
 - Claus Rasmussen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-24 00:00:00.000000000 Z
+date: 2022-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forward_to
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.1
 - !ruby/object:Gem::Dependency
-  name: ruby-terminfo
+  name: ruby-terminfo-r3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,48 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.10
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -172,7 +158,7 @@ files:
 homepage: http://github.com/clrgit/shellopts
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -187,8 +173,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.18
+signing_key:
 specification_version: 4
 summary: Parse command line options and arguments
 test_files: []