dorian-arguments 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31d8f3ef5198b3dc9ce418928e840ed5c82f7f3691964e4c1d34d96be9846951
-  data.tar.gz: 7494ebf6c746f4207e21cf79846d24e59c19d3824382e70215c64aeeac8a60b7
+  metadata.gz: 78900d0ea10eeae177661f62aa4449052393785c8bc7a8c45581626a5d7dc594
+  data.tar.gz: a6964ff2d943a71b9abcd50c6975e5c07cd5fd42052f3da9ad75f2ce0c3504b8
 SHA512:
-  metadata.gz: d32f303df1fa9814866beb211aa8ee6bd90c37d34524d9820a716d768c2230b21799fc90bb472db9c2bf810a45363891475a72d58ce2855e21eeb2d07962b727
-  data.tar.gz: 0e12a036b21735bf712a35a9f96b328d65679f1d69185dac528de4a5eded68e1f7a3b4cbed1062c57ffd4ccf623b563a6b41a4f0bb06e7bf96798d2c78ad3112
+  metadata.gz: 4930286f6f79b4755900c977e038dc2bdd39fbc2bcc17f5f80c864fd09db763756bdd725ebf3ac63a974d8dcb2fd43e4b84d52b535eb5757c3715adebe255634
+  data.tar.gz: 25ac436b8a6cfead0a03c1e1235d755bd7fe137e4987814de909c69e0f9fb155a3726d1d4e7a955eb8914a76b3cdf80d027412d45807e23e89419033e9380863

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.1

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,10 +1,7 @@
-require "dorian/to_struct"
+# frozen_string_literal: true
+
 require "bigdecimal"
 require "bigdecimal/util"
-require "active_support"
-require "active_support/core_ext/string/inflections"
-require "active_support/core_ext/array/wrap"
-require "active_support/core_ext/enumerable"
 
 class Dorian
   class Arguments
@@ -17,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
 
@@ -30,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
@@ -45,12 +42,11 @@ class Dorian
     def parse
       arguments = ARGV
       options = {}
-      files = []
 
       definition.each do |key, value|
         type, default, aliases = normalize(value)
 
-        keys = ([key] + aliases).map(&:to_s).map(&:parameterize)
+        keys = ([key] + aliases).map(&:to_s).map { |key| parameterize(key) }
         keys = keys.map { |key| ["--#{key}", "-#{key}"] }.flatten
 
         indexes = []
@@ -64,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
@@ -75,13 +71,13 @@ class Dorian
                 end
               end
             end
-            .reject(&:nil?)
+            .compact
 
         indexes.sort.reverse.uniq.each { |index| arguments.delete_at(index) }
 
         values = [default] if values.empty?
         values = values.map { |value| cast(type, value) }
-        values = values.first unless values.many?
+        values = values.first unless many?(values)
         options[key] = values
       end
 
@@ -89,7 +85,14 @@ class Dorian
 
       arguments -= files
 
-      { arguments:, options:, files:, help: }.to_deep_struct
+      options = Struct.new(*options.keys).new(*options.values)
+
+      Struct.new(:arguments, :options, :files, :help).new(
+        arguments,
+        options,
+        files,
+        help
+      )
     end
 
     def cast(type, value)
@@ -99,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
@@ -107,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?
 
@@ -117,7 +120,7 @@ class Dorian
         keys_message =
           ([key] + aliases)
             .map(&:to_s)
-            .map(&:parameterize)
+            .map { |key| parameterize(key) }
             .map { |key| key.size == 1 ? "-#{key}" : "--#{key}" }
             .join("|")
 
@@ -128,12 +131,25 @@ class Dorian
       message
     end
 
+    def many?(array)
+      array.size > 1
+    end
+
+    def parameterize(string, separator: "-")
+      string
+        .to_s
+        .encode("ASCII", invalid: :replace, undef: :replace, replace: "")
+        .downcase
+        .gsub(/[^a-z0-9]+/, separator)
+        .gsub(/^#{separator}+|#{separator}+$/, "")
+    end
+
     def normalize(value)
       if value.is_a?(Hash)
         type = value[:type]&.to_s || DEFAULT_TYPE
         default = value[:default]&.to_s || DEFAULT
         aliases =
-          Array.wrap(
+          Array(
             value[:alias]&.to_s || value[:aliases]&.map(&:to_s) ||
               DEFAULT_ALIASES
           )

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dorian-arguments
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 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: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: dorian-to_struct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: parses arguments
 email: dorian@dorianmarie.com
 executables:
@@ -74,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:
   - - ">="