rubycli 0.1.2 → 0.1.5

data/lib/rubycli/environment.rb

@@ -6,6 +6,9 @@ module Rubycli
       @argv = argv
       @debug = env['RUBYCLI_DEBUG'] == 'true'
       @print_result = env['RUBYCLI_PRINT_RESULT'] == 'true'
+      @doc_check_mode = false
+      @strict_input = false
+      @documentation_issues = []
       scrub_argv_flags!
     end
 
@@ -17,14 +20,44 @@ module Rubycli
       @print_result
     end
 
-    def strict_mode?
-      value = fetch_env_value('RUBYCLI_STRICT', 'OFF')
-      !%w[off 0 false].include?(value.downcase)
-    end
-
     def allow_param_comments?
       value = fetch_env_value('RUBYCLI_ALLOW_PARAM_COMMENT', 'ON')
-      %w[on 1 true].include?(value.downcase)
+      %w[on 1 true].include?(value)
+    end
+
+    def enable_doc_check!
+      @doc_check_mode = true
+    end
+
+    def doc_check_mode?
+      @doc_check_mode
+    end
+
+    def disable_doc_check!
+      @doc_check_mode = false
+    end
+
+    def enable_strict_input!
+      @strict_input = true
+    end
+
+    def strict_input?
+      @strict_input
+    end
+
+    def documentation_issues
+      @documentation_issues.dup
+    end
+
+    def clear_documentation_issues!
+      @documentation_issues.clear
+    end
+
+    def constant_resolution_mode
+      value = fetch_env_value('RUBYCLI_AUTO_TARGET', 'strict')
+      return :auto if %w[auto on true yes 1].include?(value)
+
+      :strict
     end
 
     def handle_documentation_issue(message, file: nil, line: nil)
@@ -42,7 +75,17 @@ module Rubycli
         message
       end
 
-      warn "[WARN] Rubycli documentation mismatch: #{formatted_message}" if strict_mode?
+      entry = { message: formatted_message, location: location }
+      @documentation_issues << entry
+      warn "[WARN] Rubycli documentation mismatch: #{formatted_message}" if doc_check_mode?
+    end
+
+    def handle_input_violation(message)
+      if strict_input?
+        raise Rubycli::ArgumentError, message
+      else
+        warn "[WARN] #{message} (use --strict to abort on invalid input)"
+      end
     end
 
     def enable_print_result!
@@ -58,7 +101,6 @@ module Rubycli
     def scrub_argv_flags!
       return unless @argv
 
-      remove_all_flags!(@argv, '--debug') { @debug = true }
       remove_all_flags!(@argv, '--print-result') { @print_result = true }
     end
 

data/lib/rubycli/eval_coercer.rb

@@ -1,18 +1,26 @@
 module Rubycli
   class EvalCoercer
     THREAD_KEY = :rubycli_eval_mode
+    LAX_THREAD_KEY = :rubycli_eval_lax_mode
     EVAL_BINDING = Object.new.instance_eval { binding }
 
     def eval_mode?
       Thread.current[THREAD_KEY] == true
     end
 
-    def with_eval_mode(enabled = true)
+    def eval_lax_mode?
+      Thread.current[LAX_THREAD_KEY] == true
+    end
+
+    def with_eval_mode(enabled = true, lax: false)
       previous = Thread.current[THREAD_KEY]
+      previous_lax = Thread.current[LAX_THREAD_KEY]
       Thread.current[THREAD_KEY] = enabled
+      Thread.current[LAX_THREAD_KEY] = enabled && lax
       yield
     ensure
       Thread.current[THREAD_KEY] = previous
+      Thread.current[LAX_THREAD_KEY] = previous_lax
     end
 
     def coerce_eval_value(value)
@@ -37,6 +45,13 @@ module Rubycli
       return trimmed if trimmed.empty?
 
       EVAL_BINDING.eval(trimmed)
+    rescue SyntaxError, NameError => e
+      if eval_lax_mode?
+        warn "[WARN] Failed to evaluate argument as Ruby (#{e.message.strip}). Passing it through because --eval-lax is enabled."
+        expression
+      else
+        raise
+      end
     end
   end
 end

data/lib/rubycli/help_renderer.rb

@@ -45,7 +45,6 @@ module Rubycli
 
       puts
       puts "Detailed command help: #{File.basename($PROGRAM_NAME)} COMMAND help"
-      puts "Enable debug logging: --debug or RUBYCLI_DEBUG=true"
     end
 
     def method_description(method_obj)
@@ -152,10 +151,10 @@ module Rubycli
     end
 
     def render_positionals(positionals_in_order)
-      rows = positionals_in_order.map do |info|
+        rows = positionals_in_order.map do |info|
         definition = info[:definition]
         label = info[:label]
-        type = formatted_types(definition&.types)
+        type = type_display(definition)
         requirement = positional_requirement(info[:kind])
         description_parts = []
         description_parts << info[:description] if info[:description]
@@ -169,7 +168,7 @@ module Rubycli
     def render_options(options, required_keywords)
       rows = options.map do |opt|
         label = option_flag_with_placeholder(opt)
-        type = formatted_types(opt.types)
+        type = type_display(opt)
         requirement = required_keywords.include?(opt.keyword) ? 'required' : 'optional'
         description_parts = []
         description_parts << opt.description if opt.description
@@ -198,10 +197,53 @@ module Rubycli
     end
 
     def formatted_types(types)
-      type_list = Array(types).compact.map(&:to_s).reject(&:empty?).uniq
+      type_list = Array(types).compact.map { |token| token.to_s.strip }.reject(&:empty?)
+      type_list = type_list.each_with_object([]) do |token, acc|
+        acc << token unless acc.include?(token)
+      end
       return '' if type_list.empty?
 
-      "[#{type_list.join(', ')}]"
+      nil_tokens, rest = type_list.partition { |token| token.casecmp('nil').zero? }
+      ordered = rest + nil_tokens
+      "[#{ordered.join(', ')}]"
+    end
+
+    def type_display(definition)
+      return formatted_types(definition&.types) unless definition
+
+      literal_entries = Array(definition.allowed_values).map { |entry| format_allowed_value(entry[:value]) }
+      type_tokens = Array(definition.types).map { |token| token.to_s.strip }.reject(&:empty?)
+      type_tokens.reject! { |token| literal_token?(token) }
+
+      combined = (literal_entries + type_tokens).uniq
+      return formatted_types(definition.types) if combined.empty?
+
+      "[#{combined.join(', ')}]"
+    end
+
+    def format_allowed_value(value)
+      case value
+      when Symbol
+        ":#{value}"
+      when String
+        %("#{value}")
+      when Integer, Float
+        value.to_s
+      when TrueClass, FalseClass
+        value.to_s
+      when NilClass
+        'nil'
+      else
+        value.inspect
+      end
+    end
+
+    def literal_token?(token)
+      return true if token.start_with?('%')
+      return true if token.include?('[')
+      return true if token.start_with?(':')
+
+      false
     end
 
     def positional_requirement(kind)
@@ -268,19 +310,25 @@ module Rubycli
     end
 
     def required_placeholder(placeholder, definition, name)
-      return placeholder.strip unless placeholder.nil? || placeholder.strip.empty?
+      unless placeholder.nil? || placeholder.strip.empty? || auto_generated_placeholder?(placeholder, definition, name)
+        return placeholder.strip
+      end
 
       default_positional_label(definition, name, uppercase: true)
     end
 
     def optional_placeholder(placeholder, definition, name)
-      return placeholder.strip unless placeholder.nil? || placeholder.strip.empty?
+      unless placeholder.nil? || placeholder.strip.empty? || auto_generated_placeholder?(placeholder, definition, name)
+        return placeholder.strip
+      end
 
       "[#{default_positional_label(definition, name, uppercase: true)}]"
     end
 
     def rest_placeholder(placeholder, definition, name)
-      return placeholder.strip unless placeholder.nil? || placeholder.strip.empty?
+      unless placeholder.nil? || placeholder.strip.empty? || auto_generated_placeholder?(placeholder, definition, name)
+        return placeholder.strip
+      end
 
       base = default_positional_label(definition, name, uppercase: true)
       "[#{base}...]"
@@ -320,6 +368,13 @@ module Rubycli
       first_non_nil_type
     end
 
+    def auto_generated_placeholder?(placeholder, definition, name)
+      return false unless definition
+      return false unless definition.respond_to?(:doc_format) && definition.doc_format == :auto_generated
+
+      placeholder.strip.casecmp(name.to_s).zero?
+    end
+
     def ensure_angle_bracket_placeholder(placeholder)
       raw = placeholder.to_s.strip
       return raw if raw.empty?

data/lib/rubycli/types.rb

@@ -2,13 +2,13 @@ module Rubycli
   OptionDefinition = Struct.new(
     :keyword, :long, :short, :value_name, :types, :description, :requires_value,
     :boolean_flag, :optional_value, :default_value, :inline_type_annotation,
-    :inline_type_text, :doc_format,
+    :inline_type_text, :doc_format, :allowed_values,
     keyword_init: true
   )
 
   PositionalDefinition = Struct.new(
     :placeholder, :label, :types, :description, :param_name, :default_value,
-    :inline_type_annotation, :inline_type_text, :doc_format,
+    :inline_type_annotation, :inline_type_text, :doc_format, :allowed_values,
     keyword_init: true
   )
 

data/lib/rubycli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rubycli
-  VERSION = '0.1.2'
+  VERSION = '0.1.5'
 end