run_kit 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dabac9fceff597dbc18cca5e813a37c784bce2ed1148425ad5fd82264a2e3bd
-  data.tar.gz: f544b871ca35c2da4fd965b017a9e2b11c052f99d755c92b6110e4113ec25a4f
+  metadata.gz: 1876301102a9221f5207f024bcd108a95d3547cf96d270f475700959d8209cb6
+  data.tar.gz: b21d96ce661cbe5e45f2de8b6bf9cb1718d2bb7305bce4e15773aa7a9c4882e2
 SHA512:
-  metadata.gz: 2e56df9f10755fec5eadc44396f368c0f6ebadd9987b2cf317373129902264c2e40073000198dba0511e142082780c0176a677461cd4fac083cd18d9dd8c2e29
-  data.tar.gz: b9dbdf57d9ec47c482f1dcdf23b237287564fe6b5c3568b2cdd1185d6ea893aee37b48634bd507e773d6deeb75d1234f54c522f9250e0ed8f348d8e17c9c424f
+  metadata.gz: a82974e7beaa687457ff4b8555e8d1b38a284c89d4ef756755bbccc92c16ff857cdfe9d5083620bb53265d6b04de43d7fdca168559c4bef25ef99c052e98fbae
+  data.tar.gz: 43946b37bb5f6a155b5eb2d27220afa96df7705827db9e0a7ddb4aa5b86f6234629908436cdd288ed20cc8b751c48c413f3441d265cf4c8925de373629f7e99f

data/.rubocop.yml

@@ -35,7 +35,6 @@ Naming/MemoizedInstanceVariableName: { Enabled: true } # clean memo ivars
 Naming/MethodName: { Enabled: true } # keep method names conventional
 Performance/MapCompact: { Enabled: true } # filter_map-ish style
 Performance/RegexpMatch: { Enabled: false } # local style is fine
-Performance/SelectMap: { Enabled: true } # filter_map-ish style
 Style/BlockDelimiters: { Enabled: true } # do/end vs braces
 Style/ClassAndModuleChildren: { Enabled: true, EnforcedStyle: nested } # explicit nesting
 Style/ClassMethodsDefinitions: { Enabled: true } # avoid "class << self"

data/README.md

@@ -111,6 +111,10 @@ Note: There has been some effort to get the Pathname helpers into Ruby itself, w
 
 ### Changelog
 
+#### 0.1.3 (Sep 2026)
+
+- move PROGBAR constant into RunKit::
+
 #### 0.1.2 (Sep 2026)
 
 - allow options to read from ENV

data/lib/run_kit/core_ext.rb

@@ -34,20 +34,15 @@ module RunKit
     # each.with_progresbar
     module Enumerator
       def with_progressbar(options = {}, &block)
-        defaults = {
-          format: "%t: %j%% %B #{RunKit::Term.paint_ansi("%c/%u %e", RunKit::Term.ansi256_fg(242))}",
-          progress_mark: RunKit::Term.paint_ansi("━", RunKit::Term.ansi256_fg(46)),
-          remainder_mark: RunKit::Term.paint_ansi("━", RunKit::Term.ansi256_fg(237)),
+        options = RunKit::PROGRESSBAR.merge(
           output: $stdout.isatty ? $stdout : $stderr,
-          total: size,
-          length: 72,
-        }
-        options = defaults.merge(options)
+          total: size
+        ).merge(options)
 
         return enum_for(__method__) if !block
 
-        if !options[:hide]
-          bar = ProgressBar.create(options)
+        bar = if !options[:hide]
+          ProgressBar.create(options)
         end
         RunKit::Term.with_hidden_cursor(options[:output]) do
           each do

data/lib/run_kit/options/parser.rb

@@ -6,7 +6,7 @@
 module RunKit
   module Options
     class Parser
-      attr_reader :config, :options, :queue
+      attr_reader :config
 
       def initialize(config)
         @config = config
@@ -14,12 +14,24 @@ module RunKit
 
       # Reset transient state, parse argv, and assemble the result.
       def parse(argv)
-        env = build_env
-        raise NakedRequested if config.naked? && argv.empty? && env.empty?
+        # 1. naked?
+        raise NakedRequested if config.naked? && argv.empty?
+
+        # 2. Parse argv. We do this first, because other things can raise and
+        # --help should trump other issues.
+        argv_options = parse_argv(argv)
+
+        # 3. defaults => ENV => ARGV
+        options = {}.merge(config.defaults, parse_env, argv_options)
+
+        # 4. validate final options
+        validate!(options)
+
+        # success! add predicate? keys
+        config.flags.select(&:bool?).map(&:key).each do
+          options[:"#{_1}?"] = options[_1] if options.key?(_1)
+        end
 
-        @options, @queue = config.defaults.merge(env), argv.dup
-        parse_queue
-        validate!
         options
       end
 
@@ -29,40 +41,36 @@ module RunKit
       # main parser
       #
 
-      def parse_queue
-        # any non-flags we find below
-        operands = []
-
-        # process argv as queue
-        while (item = queue.shift)
-          case item
-          when Flag::SWITCH_RE, Flag::INLINE_RE then parse_switch(item, Regexp.last_match)
-          when /\A-[^-]/ then parse_smashed(item)
-          when "", /\A[^-]/ then operands << item
-          when "--" then break operands.concat(queue)
-          else; raise Error, "unexpected argument '#{item}' found"
+      def parse_argv(argv)
+        {}.tap do |result|
+          # any non-flags we find below
+          operands = []
+
+          # process argv as queue
+          queue = argv.dup
+          while (item = queue.shift)
+            case item
+            when Flag::SWITCH_RE, Flag::INLINE_RE then result.merge!(parse_switch(item, Regexp.last_match, queue))
+            when /\A-[^-]/ then result.merge!(parse_smashed(item, queue))
+            when "", /\A[^-]/ then operands << item
+            when "--" then break operands.concat(queue)
+            else; raise Error, "unexpected argument '#{item}' found"
+            end
           end
-        end
 
-        # add pred? for bools
-        config.flags.filter_map { _1.key if _1.bool? }.each do
-          options[:"#{_1}?"] = options[_1] if options.key?(_1)
-        end
+          # positionals
+          config.positionals.each { result[_1.key] = operands.shift }
 
-        # positionals
-        config.positionals.each do
-          options[_1.key] = operands.shift
+          # _args
+          result[:_args] = operands
         end
-
-        # _args
-        options[:_args] = operands
       end
 
       #
       # -x or -x=123 or --xyz or --xyz=123 or --no-xyz
       #
 
-      def parse_switch(item, match)
+      def parse_switch(item, match, queue)
         switch = "-#{match[1]}"
         param = match[2]
         separator = param ? "=" : ""
@@ -71,15 +79,13 @@ module RunKit
         if (flag = config.flag(switch))
           builtin!(flag)
           param = queue.shift if flag.takes_param? && separator.empty?
-          options[flag.key] = flag.parse(switch, param)
-          return
+          return {flag.key => flag.parse(switch, param)}
         end
 
         # --no-xyz?
         if (neg = find_negated_flag(switch))
           raise Error, "option '#{item}' does not take a value" if separator == "="
-          options[neg.key] = false
-          return
+          return {neg.key => false}
         end
 
         raise Error, "unexpected argument '#{item}' found"
@@ -91,7 +97,8 @@ module RunKit
 
       # Expand short-switch groups such as `-qv`. A parameter-taking switch ends
       # the group and consumes either its attached suffix or the next queue item.
-      def parse_smashed(group)
+      def parse_smashed(group, queue)
+        result = {}
         (1...group.length).each do |idx|
           switch = "-#{group[idx]}"
           flag = config.flag(switch)
@@ -105,26 +112,30 @@ module RunKit
             else
               queue.shift
             end
-            options[flag.key] = flag.parse(switch, param)
-            return
+            result[flag.key] = flag.parse(switch, param)
+            return result
           end
 
           # bool
-          options[flag.key] = true
+          result[flag.key] = true
         end
+        result
       end
 
       #
-      # helpers
+      # env
       #
 
-      def build_env
-        config.flags.filter_map do
-          next unless _1.env && ENV.key?(_1.env)
-          [_1.key, _1.parse_env(ENV.fetch(_1.env))]
+      def parse_env
+        config.flags.select { _1.env && ENV.key?(_1.env) }.map do |flag|
+          [flag.key, flag.parse_env(ENV[flag.env])]
         end.to_h
       end
 
+      #
+      # helpers
+      #
+
       def builtin!(flag)
         raise HelpRequested if flag == config.help_flag
         raise VersionRequested if flag == config.version_flag
@@ -137,7 +148,7 @@ module RunKit
         end
       end
 
-      def validate!
+      def validate!(options)
         config.required.each do
           raise Error, "required option '#{_1.switch}' is missing" if !options.key?(_1.key)
         end

data/lib/run_kit.rb

@@ -16,7 +16,14 @@ require_relative "run_kit/term"
 require_relative "run_kit/options"
 require_relative "run_kit/shell"
 
-# handy entry point for RunKit::Options
 module RunKit
+  PROGRESSBAR = {
+    format: "%t: %j%% %B #{Term.paint_ansi("%c/%u %e", Term.ansi256_fg(242))}",
+    progress_mark: Term.paint_ansi("━", Term.ansi256_fg(46)),
+    remainder_mark: Term.paint_ansi("━", Term.ansi256_fg(237)),
+    length: 72,
+  }
+
+  # handy entry point for RunKit::Options
   def self.parse(...) = Options.parse(...)
 end

data/run_kit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "run_kit"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
   s.authors = ["Adam Doppelt"]
   s.email = "amd@gurge.com"
   s.summary = "Run kit."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: run_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Adam Doppelt
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Run kit.
 test_files: []