shellopts 2.0.23 → 2.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48ea51e0cf39fea203412215192cb9328dd9fb9dbf9f0db345948e8692ff0669
-  data.tar.gz: fc529055f34445a55ef2a078b60a618dba9b715223e2dfc5382a7440ea5d0aa6
+  metadata.gz: fff67178855b9164ee7e432d2074040c4c7d8249231e83f27ce1b6a345dbad4c
+  data.tar.gz: 9c9816fda6e7361e310080fd9d150d0c9e7419de929e42a552cfa8dd4c9d7740
 SHA512:
-  metadata.gz: 1b12355e432018020308e1772d81c7ca8058487e5d013ed33ff1168283dc2335afbe06d456bf5372ac349cfb3b54273f913aba80f7979b8cc11935b756c6eb28
-  data.tar.gz: c48a2ba4c201eef6e3fcde96abbf3f1625bb82548c7bab096d9f27d498bab7c8094503284919d42c5b4440ae453fa598d1771450c5e64f2b2b2845b84cfafbc9
+  metadata.gz: 4c6f20dd0afbf624cc671ffc2468977861a3533c5f447acadf3082cdf577dbb9547a96e5ece6cc78fc9f93045dea99581d37f6f7e521e2bcc43261bec07cf653
+  data.tar.gz: 773fde53cd201e58c8d860d19861c5d33c2ce0214d5c5986cc9ce5d91d5b920e33f54398a2b6e9185c7300504ce82169c94e1d92854d68ce76c8cf9050b035f8

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.0.24"
 end

data/shellopts.gemspec

@@ -28,8 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-terminfo"
   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.0.24
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-24 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forward_to
@@ -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