atli 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58210dece21bb6f5e41acd1ad1ace1230b856687
-  data.tar.gz: 600873fc0d393528eeca7ecac5ad9359a2b88af6
+  metadata.gz: 4928dae505429de7588e87a1f608f66855382062
+  data.tar.gz: d23dccf0b6733881d72ac7cf18e7159b675e9c78
 SHA512:
-  metadata.gz: 641a5a3c2283c1c70e68b71291bfebb1e118bba9bf3c0678aaffcd74606c604dd052aa6ff79b393cfdea606a4a8312013d629a04039a1dd9db9d8c93b5855f9a
-  data.tar.gz: 7c21174463863a9463dcfb1bb945c76866cbc3576c85a7b5c9d6389ec56a255117b196fccf75e449d705aee84e00076bdd5887427ec220d97596609dbb645e37
+  metadata.gz: dc179bc04faef26be94ee778f158d5369fa4eb94b6b8de1da7676a8df8d8b42eddb63a2a68b00aa6c570c125dbd0b7835720e5206559625e0e42c88d5cb30376
+  data.tar.gz: 3a5dd46711a174e6d13294c18d1a3fd47c983633c49bc50b1a9ddc115757f3b91ef2807a7472bf36224704cf815e7048fb94b1842f38165bae9070df4308e1a5

data/atli.gemspec

@@ -4,7 +4,6 @@ $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 require "thor/version"
 
 Gem::Specification.new do |spec|
-  spec.add_development_dependency "bundler", "~> 1.0"
   spec.authors = ["Neil Souza (Atli)", "Yehuda Katz (Thor)", "José Valim (Thor)"]
   spec.description = "Atli is a fork of Thor that's better or worse."
   spec.email = "neil@atli.nrser.com"
@@ -33,7 +32,7 @@ Gem::Specification.new do |spec|
   # ============================================================================
   
   # My guns
-  spec.add_dependency "nrser", '~> 0.3.9'
+  spec.add_dependency "nrser", '~> 0.3.12'
   
   
   # Development Dependencies
@@ -42,6 +41,8 @@ Gem::Specification.new do |spec|
   # NOTE Development dependencies that came from Thor are in `//Gemfile`
   # 
   
+  spec.add_development_dependency "bundler", ">= 1.0"
+  
   ### Yard
   # 
   # I'm not used to dealing with RDoc docstrings, and want to still write doc

data/lib/thor.rb

@@ -828,24 +828,6 @@ class Thor
 
     singleton_class.send :alias_method, :subtask_help, :subcommand_help
     
-
-    # Atli Protected Class Methods
-    # ======================================================================
-    
-    # Build a Thor::SharedOption and add it to Thor.shared_method_options.
-    # 
-    # The Thor::SharedOption is returned.
-    #
-    # ==== Parameters
-    # name<Symbol>:: The name of the argument.
-    # options<Hash>::   Described in both class_option and method_option,
-    #                   with the additional `:groups` shared option keyword.
-    def self.build_shared_option(name, options)
-      shared_method_options[name] = Thor::SharedOption.new(
-        name,
-        options.merge(:check_default_type => check_default_type?)
-      )
-    end # .build_shared_option
   
   public # END protected Class Methods ***************************************
   
@@ -868,9 +850,16 @@ class Thor
       
       # Add groups (if any)
       if groups
-        self.class.find_shared_options( groups: groups ).each do |name, option|
-          name_set << name.to_s
-        end
+        groups = Array( groups )
+        
+        self.class.
+          shared_defs.
+          select { |shared_def|
+            groups.any? { |group| shared_def[ :groups].include? group }
+          }.
+          each do |shared|
+            name_set << shared[:name].to_s
+          end
       end
       
       options.slice( *name_set ).sym_keys

data/lib/thor/base.rb

@@ -21,7 +21,6 @@ require "thor/util"
 require 'thor/execution'
 require 'thor/base/class_methods'
 require 'thor/base/arguments_concern'
-require 'thor/base/shared_options_concern'
 require 'thor/base/shared_concern'
 
 
@@ -69,7 +68,6 @@ class Thor
       base.send :include, Invocation
       base.send :include, Shell
       base.send :include, ArgumentsConcern
-      base.send :include, SharedOptionsConcern
       base.send :include, SharedConcern
       
       base.no_commands {

data/lib/thor/base/common_class_options.rb

@@ -40,6 +40,11 @@ module Thor::Base::CommonClassOptions
           type: :boolean
   
   
+  define  :color,
+          desc: "Use color output",
+          type: :boolean
+  
+  
   def common_class_options *names
     messages = Hamster::Hash.new @@messages
     

data/lib/thor/base/shared_concern.rb

@@ -34,83 +34,61 @@ module SharedConcern
   
   class_methods do
   # ==========================================================================
+    
+    
+    protected
+    # ========================================================================
+      
+      def this_class_shared_defs_ref
+        @shared_defs ||= []
+      end
+      
+      
+      def copy_shared_defs_to array, inherited: true
+        array.push *this_class_shared_defs_ref
+        
+        if  inherited &&
+            superclass &&
+            superclass.respond_to?( :copy_shared_defs_to, true )
+          superclass.copy_shared_defs_to array
+        end
+        
+        array
+      end
+      
+    public # end protected ***************************************************
+    
 
-    def shared_defs
-      @shared_defs ||= []
+    def shared_defs inherited: true
+      [].tap do |array|
+        copy_shared_defs_to array, inherited: inherited
+      end
     end
 
 
-    # def normalize_kind input
-    #   {
-    #     'arg' => 'argument',
-
-    #   }
-    # end
-
-
     def def_shared kind, name:, groups: nil, **options
-      shared_defs << {
-        name: name.to_s,
-        kind: kind,
-        groups: Set[*groups],
-        options: options,
-      }
+      this_class_shared_defs_ref << {
+        name: name.to_sym,
+        kind: kind.to_sym,
+        groups: Set[*groups].freeze,
+        options: options.freeze,
+      }.freeze
     end
     
     
-    def include_shared *names, kinds: nil, groups: nil, **overrides
-      find_shared( *names, kinds: kinds, groups: groups ).
-        each do |name:, kind:, groups:, options:|
-          send kind, name, **options.merge( overrides )
-        end
-    end
-
-
-    # Find shared options given names and groups.
-    # 
-    # @param [*<Symbol>] names
-    #   Individual shared option names to include.
-    # 
-    # @param [nil | Symbol | Enumerable<Symbol>] groups:
-    #   Single or list of shared option groups to include.
-    # 
-    # @return [Hash<Symbol, Thor::SharedOption>]
-    #   Hash mapping option names (as {Symbol}) to instances.
-    # 
-    def find_shared *names, kinds: nil, groups: nil
-      groups_set = Set[*groups]
-      kinds_set = Set[*kinds]
-      names.map! &:to_s
-
-      results = []
+    def include_shared selector, **overrides
+      defs = shared_defs.select &selector
       
-      shared_defs.each do |name:, kind:, groups:, options:|
-        match = {}
-        
-        if names.include? name
-          match[:name] = true
-        end
-        
-        match_groups = groups & groups_set
-          
-        unless match_groups.empty?
-          match[:groups] = match_groups
-        end
-
-        if kinds_set.include? kind
-          match[:kind] = true
-        end
-        
-        unless match.empty?
-          results << {
-            name: name,
-            kind: kind,
-            groups: groups,
-            options: options,
-          }
-        end
+      if defs.empty?
+        logger.warn "No shared parameters found",
+          selector: selector,
+          class: self
       end
-    end # #find_shared
+      
+      defs.each do |name:, kind:, groups:, options:|
+        send kind, name, **options.merge( overrides )
+      end
+    end
 
   end # class_methods ********************************************************
   

data/lib/thor/completion/bash/request.rb

@@ -9,6 +9,7 @@
 
 require 'nrser'
 require 'nrser/labs/i8'
+require 'nrser/labs/i8/struct'
 
 
 # Refinements

data/lib/thor/parser.rb

@@ -1,5 +1,4 @@
 require "thor/parser/argument"
 require "thor/parser/arguments"
 require "thor/parser/option"
-require "thor/parser/shared_option"
 require "thor/parser/options"

data/lib/thor/version.rb

@@ -14,7 +14,7 @@ class Thor
   # 
   # @return [String]
   # 
-  VERSION = '0.1.12'
+  VERSION = '0.1.13'
   
   
   # The version of Thor that Atli is up to date with.
@@ -27,7 +27,7 @@ class Thor
   # 
   # @return [String]
   # 
-  THOR_VERSION = '0.1.12'
+  THOR_VERSION = '0.1.13'
 
 
   # Are we running from the source code (vesus from a Gem install)?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atli
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Neil Souza (Atli)
@@ -10,36 +10,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-20 00:00:00.000000000 Z
+date: 2019-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: nrser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
+        version: 0.3.12
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.3.12
 - !ruby/object:Gem::Dependency
-  name: nrser
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.9
-  type: :runtime
+        version: '1.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,6 @@ files:
 - lib/thor/base/class_methods.rb
 - lib/thor/base/common_class_options.rb
 - lib/thor/base/shared_concern.rb
-- lib/thor/base/shared_options_concern.rb
 - lib/thor/command.rb
 - lib/thor/completion/bash.rb
 - lib/thor/completion/bash/argument_mixin.rb
@@ -132,7 +131,6 @@ files:
 - lib/thor/parser/arguments.rb
 - lib/thor/parser/option.rb
 - lib/thor/parser/options.rb
-- lib/thor/parser/shared_option.rb
 - lib/thor/rake_compat.rb
 - lib/thor/runner.rb
 - lib/thor/shell.rb
@@ -162,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Atli is a fork of Thor that's better or worse.

data/lib/thor/base/shared_options_concern.rb

@@ -1,235 +0,0 @@
-# encoding: UTF-8
-# frozen_string_literal: true
-
-
-# Requirements
-# =======================================================================
-
-# Deps
-# -----------------------------------------------------------------------
-
-require 'active_support/concern'
-
-
-# Refinements
-# =======================================================================
-
-require 'nrser/refinements/types'
-using NRSER::Types
-
-# Namespace
-# =======================================================================
-
-class   Thor
-module  Base
-
-
-# Definitions
-# =======================================================================
-
-# Support for sharing {Thor::Option} declarations among many 
-# {Thor::Command} (methods). All class methods.
-# 
-module SharedOptionsConcern
-  
-  # Mixins
-  # ========================================================================
-
-  # Get concerned
-  extend ActiveSupport::Concern
-
-  
-  class_methods do
-  # ==========================================================================
-
-    # Declare a shared method option with an optional groups that can then
-    # be added by name or group to commands.
-    # 
-    # The shared options can then be added to methods individually by name and
-    # collectively as groups with {Thor.include_method_options}.
-    # 
-    # @example
-    #   class MyCLI < Thor
-    #     
-    #     # Declare a shared option:
-    #     shared_option :force,
-    #       groups: :write,
-    #       desc: "Force the operation",
-    #       type: :boolean
-    #     
-    #     # ...
-    #     
-    #     desc            "write [OPTIONS] path",
-    #                     "Write to a path"
-    #     
-    #     # Add the shared options to the method:
-    #     include_options groups: :write
-    #     
-    #     def write       path
-    #       
-    #       # Get a slice of `#options` with any of the `:write` group options
-    #       # that were provided and use it in a method call:
-    #       MyModule.write path, **option_kwds( groups: :write )
-    #       
-    #     end
-    #   end
-    # 
-    # @param [Symbol] name
-    #   The name of the option.
-    # 
-    # @param [**<Symbol, V>] options
-    #   Keyword args used to initialize the {Thor::SharedOption}.
-    #   
-    #   All +**options+ are optional.
-    # 
-    # @option options [Symbol | Array<Symbol>] :groups
-    #   One or more _shared_ _option_ _group_ that the new option will belong
-    #   to.
-    #   
-    #   Examples:
-    #     groups: :read
-    #     groups: [:read, :write]
-    #   
-    #   *NOTE*  The keyword is +groups+ with an +s+! {Thor::Option} already has
-    #           a +group+ string attribute that, as far as I can tell, is only
-    #           
-    # @option options [String] :desc
-    #   Description for the option for help and feedback.
-    # 
-    # @option options [Boolean] :required
-    #   If the option is required or not.
-    # 
-    # @option options [Object] :default
-    #   Default value for this argument.
-    #   
-    #   It cannot be +required+ and have default values.
-    # 
-    # @option options [String | Array<String>] :aliases
-    #   Aliases for this option.
-    #   
-    #   Examples:
-    #     aliases: '-s'
-    #     aliases: '--other-name'
-    #     aliases: ['-s', '--other-name']
-    # 
-    # @option options [:string | :hash | :array | :numeric | :boolean] :type
-    #   Type of acceptable values, see
-    #   {types for method options}[https://github.com/erikhuda/thor/wiki/Method-Options#types-for-method_options]
-    #   in the Thor wiki.
-    # 
-    # @option options [String] :banner
-    #   String to show on usage notes.
-    # 
-    # @option options [Boolean] :hide
-    #   If you want to hide this option from the help.
-    # 
-    # @return (see .build_shared_option)
-    # 
-    def shared_method_option name, **options
-      # Don't think the `:for` option makes sense... that would just be a
-      # regular method option, right? I guess `:for` could be an array and
-      # apply the option to each command, but it seems like that would just
-      # be better as an extension to the {.method_option} behavior.
-      # 
-      # So, we raise if we see it
-      if options.key? :for
-        raise ArgumentError,
-          ".shared_method_option does not accept the `:for` option"
-      end
-      
-      build_shared_option(name, options)
-    end # #shared_method_option
-
-    alias_method :shared_option, :shared_method_option
-
-
-    # @return [Hash<Symbol, Thor::SharedOption]
-    #   Get all shared options
-    # 
-    def shared_method_options(options = nil)
-      @shared_method_options ||= begin
-        # Reach up the inheritance chain, if there's anyone there
-        if superclass.respond_to? __method__
-          superclass.send( __method__ ).dup
-        else
-          # Or just default to empty
-          {}
-        end
-      end
-      
-      if options
-        # We don't support this (yet at least)
-        raise NotImplementedError,
-          "Bulk set not supported, use .shared_method_option"
-        # build_shared_options(options, @shared_method_options)
-      end
-      @shared_method_options
-    end
-
-    alias_method :shared_options, :shared_method_options
-
-
-    # Find shared options given names and groups.
-    # 
-    # @param [*<Symbol>] names
-    #   Individual shared option names to include.
-    # 
-    # @param [nil | Symbol | Enumerable<Symbol>] groups:
-    #   Single or list of shared option groups to include.
-    # 
-    # @return [Hash<Symbol, Thor::SharedOption>]
-    #   Hash mapping option names (as {Symbol}) to instances.
-    # 
-    def find_shared_method_options *names, groups: nil
-      groups_set = Set[*groups]
-      
-      shared_method_options.each_with_object( {} ) do |(name, option), results|
-        match = {}
-        
-        if names.include? name
-          match[:name] = true
-        end
-        
-        match_groups = option.groups & groups_set
-          
-        unless match_groups.empty?
-          match[:groups] = match_groups
-        end
-        
-        unless match.empty?
-          results[name] = {
-            option: option,
-            match: match,
-          }
-        end
-      end
-    end # #find_shared_method_options
-
-    alias_method :find_shared_options, :find_shared_method_options
-
-
-    # Add the {Thor::SharedOption} instances with +names+ and in +groups+ to
-    # the next defined command method.
-    # 
-    # @param (see .find_shared_method_options)
-    # @return (see .find_shared_method_options)
-    # 
-    def include_method_options *names, groups: nil
-      find_shared_method_options( *names, groups: groups ).
-        each do |name, result|
-          method_options[name] = Thor::IncludedOption.new **result
-        end
-    end
-    
-    alias_method :include_options, :include_method_options
-
-  end # class_methods ********************************************************
-  
-end # module SharedOptionsConcern
-
-
-# /Namespace
-# =======================================================================
-
-end # module Base
-end # class Thor

data/lib/thor/parser/shared_option.rb

@@ -1,117 +0,0 @@
-# encoding: UTF-8
-# frozen_string_literal: true
-
-# Requirements
-# ========================================================================
-
-# Stdlib
-# ------------------------------------------------------------------------
-require 'set'
-
-# Deps
-# ------------------------------------------------------------------------
-
-# Need {String#titleize}
-require 'active_support/core_ext/string/inflections'
-
-# Need {NRSER::LazyAttr}
-require 'nrser/meta/lazy_attr'
-
-# Project / Package
-# ------------------------------------------------------------------------
-
-require_relative './option'
-
-
-class Thor
-  # A {Thor::Option} that has an additional {#groups} attribute storing a
-  # set of group symbols that the option is a part of.
-  # 
-  class SharedOption < Option
-    
-    # Shared option groups this option belongs to.
-    # 
-    # @return [Set<Symbol>]
-    #     
-    attr_reader :groups
-    
-    # 
-    # 
-    def initialize name, **options
-      @groups = Set.new [*options[:groups]].map( &:to_sym )
-      
-      # # If
-      # if options[:group].nil? && groups.count == 1
-      #   options[:group] = groups.first.to_s.titleize
-      # end
-      
-      super name, options
-    end
-    
-    
-    def initialize_options
-      {
-        # {Thor::Argument} options
-        desc:               :@description,
-        required:           :@required,
-        type:               :@type,
-        default:            :@default,
-        banner:             :@banner,
-        eunm:               :@enum,
-        
-        # {Thor::Option} options
-        check_default_type: :@check_default_type,
-        lazy_default:       :@lazy_default,
-        group:              :@group,
-        aliases:            :@aliases,
-        hide:               :@hide,
-        
-        # {Thor::SharedOption} options
-        groups:             :@groups,
-      }.transform_values &method( :instance_variable_get )
-    end
-    
-  end
-  
-  
-  class IncludedOption < SharedOption
-    
-    # The match that resulted in this option getting included.
-    # 
-    # @return [Hash]
-    #     
-    attr_reader :match
-    
-    
-    def initialize option:, match:
-      super option.name, **option.initialize_options
-      @match = match
-    end
-    
-    
-    +NRSER::LazyAttr
-    def group
-      case @group
-      when false
-        nil
-      when String
-        @group
-      when nil
-        default_group
-      else
-        logger.warn "Bad {Option#group}: #{ @group.inspect }",
-          option: self
-        nil
-      end
-    end
-    
-    
-    +NRSER::LazyAttr
-    def default_group
-      return nil unless match[:groups]
-      
-      match[:groups].map { |group| group.to_s.titleize }.join ' / '
-    end
-    
-  end
-end