RubyGems - clamp - Versions diffs - 0.5.1 → 0.6.0 - Mend

clamp 0.5.1 → 0.6.0

Files changed (38) hide show

checksums.yaml +8 -8
data/.autotest +9 -0
data/.travis.yml +1 -0
data/CHANGES.md +10 -0
data/{README.markdown → README.md} +10 -4
data/examples/admin +1 -3
data/examples/flipflop +1 -3
data/examples/fubar +1 -3
data/examples/scoop +17 -0
data/examples/speak +2 -4
data/lib/clamp.rb +4 -0
data/lib/clamp/attribute/declaration.rb +49 -0
data/lib/clamp/attribute/definition.rb +82 -0
data/lib/clamp/command.rb +4 -1
data/lib/clamp/errors.rb +7 -4
data/lib/clamp/help.rb +4 -4
data/lib/clamp/option/declaration.rb +9 -7
data/lib/clamp/option/definition.rb +94 -0
data/lib/clamp/option/parsing.rb +3 -26
data/lib/clamp/parameter/declaration.rb +8 -7
data/lib/clamp/parameter/definition.rb +48 -0
data/lib/clamp/parameter/parsing.rb +5 -4
data/lib/clamp/subcommand/declaration.rb +25 -6
data/lib/clamp/subcommand/definition.rb +25 -0
data/lib/clamp/subcommand/execution.rb +23 -4
data/lib/clamp/subcommand/parsing.rb +3 -21
data/lib/clamp/truthy.rb +9 -0
data/lib/clamp/version.rb +1 -1
data/spec/clamp/command_group_spec.rb +50 -3
data/spec/clamp/command_spec.rb +94 -65
data/spec/clamp/{option_spec.rb → option/definition_spec.rb} +76 -13
data/spec/clamp/{parameter_spec.rb → parameter/definition_spec.rb} +21 -13
metadata +16 -12
data/lib/clamp/attribute.rb +0 -44
data/lib/clamp/attribute_declaration.rb +0 -40
data/lib/clamp/option.rb +0 -94
data/lib/clamp/parameter.rb +0 -77
data/lib/clamp/subcommand.rb +0 -23

@@ -1,94 +0,0 @@
-require 'clamp/attribute'
-module Clamp
-  class Option < Attribute
-    def initialize(switches, type, description, options = {})
-      @switches = Array(switches)
-      @type = type
-      @description = description
-      if options.has_key?(:attribute_name)
-        @attribute_name = options[:attribute_name].to_s
-      end
-      if options.has_key?(:default)
-        @default_value = options[:default]
-      end
-      if options.has_key?(:environment_variable)
-        @environment_variable = options[:environment_variable]
-      end
-      if options.has_key?(:required)
-        @required = options[:required]
-        # Do some light validation for conflicting settings.
-        if options.has_key?(:default)
-          raise ArgumentError, "Specifying a :default value also :required doesn't make sense"
-        end
-        if type == :flag
-          raise ArgumentError, "A required flag (boolean) doesn't make sense."
-        end
-      end
-    end
-    attr_reader :switches, :type
-    def attribute_name
-      @attribute_name ||= long_switch.sub(/^--(\[no-\])?/, '').tr('-', '_')
-    end
-    def long_switch
-      switches.find { |switch| switch =~ /^--/ }
-    end
-    def handles?(switch)
-      recognised_switches.member?(switch)
-    end
-    def required?
-      @required
-    end
-    def flag?
-      @type == :flag
-    end
-    def flag_value(switch)
-      !(switch =~ /^--no-(.*)/ && switches.member?("--\[no-\]#{$1}"))
-    end
-    def read_method
-      if flag?
-        super + "?"
-      else
-        super
-      end
-    end
-    def extract_value(switch, arguments)
-      if flag?
-        flag_value(switch)
-      else
-        arguments.shift
-      end
-    end
-    def help_lhs
-      lhs = switches.join(", ")
-      lhs += " " + type unless flag?
-      lhs
-    end
-    private
-    def recognised_switches
-      switches.map do |switch|
-        if switch =~ /^--\[no-\](.*)/
-          ["--#{$1}", "--no-#{$1}"]
-        else
-          switch
-        end
-      end.flatten
-    end
-  end
-end

data/lib/clamp/parameter.rb DELETED

@@ -1,77 +0,0 @@
-require 'clamp/attribute'
-module Clamp
-  class Parameter < Attribute
-    def initialize(name, description, options = {})
-      @name = name
-      @description = description
-      @multivalued = (@name =~ ELLIPSIS_SUFFIX)
-      @required = (@name !~ OPTIONAL)
-      if options.has_key?(:attribute_name)
-        @attribute_name = options[:attribute_name].to_s
-      end
-      if options.has_key?(:default)
-        @default_value = options[:default]
-      end
-      if options.has_key?(:environment_variable)
-        @environment_variable = options[:environment_variable]
-      end
-      @attribute_name ||= infer_attribute_name
-    end
-    attr_reader :name, :attribute_name
-    def help_lhs
-      name
-    end
-    def consume(arguments)
-      if required? && arguments.empty?
-        raise ArgumentError, "no value provided"
-      end
-      if multivalued?
-        if arguments.length > 0
-          arguments.shift(arguments.length)
-        end
-      else
-        arguments.shift
-      end
-    end
-    def default_value
-      if defined?(@default_value)
-        @default_value
-      elsif multivalued?
-        []
-      end
-    end
-    private
-    ELLIPSIS_SUFFIX = / \.\.\.$/
-    OPTIONAL = /^\[(.*)\]/
-    VALID_ATTRIBUTE_NAME = /^[a-z0-9_]+$/
-    def infer_attribute_name
-      inferred_name = name.downcase.tr('-', '_').sub(ELLIPSIS_SUFFIX, '').sub(OPTIONAL) { $1 }
-      unless inferred_name =~ VALID_ATTRIBUTE_NAME
-        raise "cannot infer attribute_name from #{name.inspect}"
-      end
-      inferred_name += "_list" if multivalued?
-      inferred_name
-    end
-    def multivalued?
-      @multivalued
-    end
-    def required?
-      @required
-    end
-  end
-end

data/lib/clamp/subcommand.rb DELETED

@@ -1,23 +0,0 @@
-module Clamp
-  class Subcommand < Struct.new(:name, :description, :subcommand_class)
-    def initialize(names, description, subcommand_class)
-      @names = Array(names)
-      @description = description
-      @subcommand_class = subcommand_class
-    end
-    attr_reader :names, :description, :subcommand_class
-    def is_called?(name)
-      names.member?(name)
-    end
-    def help
-      [names.join(", "), description]
-    end
-  end
-end