dorian-arguments 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9954bfae6d2589acc531515399fd72719c17e59850945789eda577bbdbf76a1
-  data.tar.gz: a515bd1890f8bb0f69f7851b17a3e2e7c81a347ff3bdd0043d9de6f5978b375d
+  metadata.gz: f09e26d0411f7f84c04ddaab79c610688bbef8cde70168e382c7e5ba0806f318
+  data.tar.gz: cc1076eee8faf10974beac03a902bbf687b6877a347b729dd5a4156d817a9c9d
 SHA512:
-  metadata.gz: f162d7069cce665ddafef2c864e4cfb97e367303624bcfa9fedd9539c0f1776292bb5b52073b0cd202e2a713b27ff18c3db53950f38008a4b54f81640db57cdf
-  data.tar.gz: e45aaa64ba83d4c43e7b1cc08115556ded6942de9a2d85b16d1bf2b106870703347922558d5e99afdedbe65d89c1c2dcb26890d9552a645d5e136fc32bb21f1e
+  metadata.gz: cadb685adb75738e5c25f8deb35f4108a761ba8fbc960a40c9b9da975f83c01a866fa12fc2ecb14b15e7e279ef941a8a16a82ded81b0348f5e85dd3c9a398746
+  data.tar.gz: 98ff574b80ed6cd988418bab196d4a0753a6e14470af260c59323703620f142a80b5285f945a1004b82c046bf838caaa822c6fc55d83dfe124a70ac5e288e456

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/bin/arguments

@@ -6,7 +6,7 @@ require "dorian/arguments"
 parsed = Dorian::Arguments.parse(version: { alias: :v }, help: { alias: :h })
 
 if parsed.options.version
-  abort File.read(File.expand_path("../../VERSION", __FILE__))
+  abort File.read(File.expand_path("../VERSION", __dir__))
 else
   abort parsed.help
 end

data/lib/dorian/arguments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bigdecimal"
 require "bigdecimal/util"
 
@@ -12,10 +14,10 @@ class Dorian
     DECIMAL = "decimal"
 
     DEFAULT_MULTIPLE = false
-    DEFAULT_ALIASES = []
+    DEFAULT_ALIASES = [].freeze
     DEFAULT_TYPE = BOOLEAN
 
-    TYPES = [BOOLEAN, STRING, NUMBER, INTEGER, DECIMAL]
+    TYPES = [BOOLEAN, STRING, NUMBER, INTEGER, DECIMAL].freeze
 
     DEFAULT = nil
 
@@ -25,9 +27,9 @@ class Dorian
       NUMBER => /^[0-9.]+$/i,
       INTEGER => /^[0-9]+$/i,
       DECIMAL => /^[0-9.]+$/i
-    }
+    }.freeze
 
-    BOOLEANS = { "true" => true, "false" => false }
+    BOOLEANS = { "true" => true, "false" => false }.freeze
 
     def initialize(**definition)
       @definition = definition
@@ -40,7 +42,6 @@ class Dorian
     def parse
       arguments = ARGV
       options = {}
-      files = []
 
       definition.each do |key, value|
         type, default, aliases = normalize(value)
@@ -59,8 +60,8 @@ class Dorian
 
                 if argument.include?("=")
                   argument.split("=", 2).last
-                elsif arguments[index + 1].to_s =~ MATCHES.fetch(type)
-                  indexes << index + 1
+                elsif arguments[index + 1].to_s&.match?(MATCHES.fetch(type))
+                  indexes << (index + 1)
 
                   arguments[index + 1]
                 elsif type == BOOLEAN
@@ -70,7 +71,7 @@ class Dorian
                 end
               end
             end
-            .reject(&:nil?)
+            .compact
 
         indexes.sort.reverse.uniq.each { |index| arguments.delete_at(index) }
 
@@ -87,7 +88,10 @@ class Dorian
       options = Struct.new(*options.keys).new(*options.values)
 
       Struct.new(:arguments, :options, :files, :help).new(
-        arguments, options, files, help
+        arguments,
+        options,
+        files,
+        help
       )
     end
 
@@ -98,7 +102,7 @@ class Dorian
         BOOLEANS.fetch(value.downcase)
       elsif type == INTEGER
         value.to_i
-      elsif type == DECIMAL || type == NUMBER
+      elsif [DECIMAL, NUMBER].include?(type)
         value.to_d
       else
         value
@@ -106,7 +110,7 @@ class Dorian
     end
 
     def help
-      message = "USAGE: #{$PROGRAM_NAME}\n"
+      message = "USAGE: #{File.basename($PROGRAM_NAME)}\n"
 
       message += "\n" if definition.any?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorian-arguments
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-24 00:00:00.000000000 Z
+date: 2024-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -46,9 +46,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.3.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="