thor-plus 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f483251a5a8dc7d64817f01855dd09a1f3073de4
-  data.tar.gz: 49de3b45cc64696aa9e98810508224fafddc2a5d
+  metadata.gz: 3dfe41e5f6475c9cecd7c40a7d1b821c0a3c9aa5
+  data.tar.gz: 3ae375b919909902c286778693db87b98b0c9991
 SHA512:
-  metadata.gz: c7fb604ecf73e9d478625b053a8353cc2f2e763d6dd1b6b749e2b84df262713531e7b22dc0d45764c788bea252ef2762afc892ff0fb3f645c31a10b5ffc2f159
-  data.tar.gz: bae1a232716f10d9243bdefa1e35f42bbc8d59d99bfee0883853a2d3955385b3905698c64f621ca7047282ca9e23b502380a022f1500929843e5c6509229d926
+  metadata.gz: af4e05abca2333347f3664485b64bb230bc306bc39fe0c896bd66898c9d576f90734d4436bf4ca3c4902ee1a348ede0bd2139052d36338d80929ed05eb22ed6e
+  data.tar.gz: 8915fb4d9d2e5e0dd75651bca6e3736a7194550aa2d732a87ce6a793dce97a28cc9680b6240e95be733837aded349e11a495a503789943849b719a5b940ce6fa

data/lib/thor.rb

@@ -1,7 +1,12 @@
 require "set"
 require "thor/base"
 
+require 'active_support/callbacks'
+
 class Thor # rubocop:disable ClassLength
+  include ActiveSupport::Callbacks
+  define_callbacks :invoke
+
   class << self
     # Allows for custom "Command" package naming.
     #
@@ -31,8 +36,8 @@ class Thor # rubocop:disable ClassLength
     #
     # ==== Parameters
     # methods<*String|Symbol>:: Callbacks to execute before command runs.
-    def before_command(*methods)
-      methods.each { |m| register_callback(:before, m) }
+    def before_command(*arguments)
+      set_callback :invoke, :before, *arguments
     end
     alias_method :before_task, :before_command
 
@@ -40,26 +45,11 @@ class Thor # rubocop:disable ClassLength
     #
     # ==== Parameters
     # methods<*String|Symbol>:: Callbacks to execute after command runs.
-    def after_command(*methods)
-      methods.each { |m| register_callback(:after, m) }
+    def after_command(*arguments)
+      set_callback :invoke, :after, *arguments
     end
     alias_method :after_task, :after_command
 
-    # All callbacks defined for this class & superclass.
-    def callbacks
-      @callbacks ||= from_superclass(:callbacks, {})
-    end
-
-    # Register a callback of generic type.
-    #
-    # ==== Parameters
-    # type<Symbol>:: Type of callback to register.
-    # name<Symbol>:: Name of callback command to run.
-    def register_callback(type, name)
-      callbacks[type.to_sym] ||= []
-      callbacks[type.to_sym] << name.to_sym
-    end
-
     # Registers another Thor subclass as a command.
     #
     # ==== Parameters

data/lib/thor/base.rb

@@ -23,7 +23,7 @@ class Thor
   TEMPLATE_EXTNAME = ".tt"
 
   module Base
-    attr_accessor :options, :parent_options, :args
+    attr_accessor :current_command, :options, :parent_options, :args
 
     # It receives arguments in an Array and two hashes, one for options and
     # other for configuration.
@@ -84,13 +84,15 @@ class Thor
       @args = thor_args.remaining
     end
 
-    # Run callbacks by type.
-    #
-    # ==== Parameters
-    # type<Symbol>:: Type of callbacks to run.
-    def run_callbacks(type)
-      callbacks = self.class.callbacks[type.to_sym] || []
-      callbacks.each { |c| __send__(c) }
+    # Execute a method with callbacks.
+    def execute_command(name, arguments)
+      @current_command = name.to_sym
+
+      run_callbacks :invoke do
+        __send__(name, *arguments)
+      end
+
+      @current_command = nil
     end
 
     class << self

data/lib/thor/command.rb

@@ -24,10 +24,7 @@ class Thor
         instance.class.handle_no_command_error(name)
       elsif public_method?(instance)
         arity = instance.method(name).arity
-
-        instance.run_callbacks(:before)
-        instance.__send__(name, *args)
-        instance.run_callbacks(:after)
+        instance.execute_command(name, args)
       elsif local_method?(instance, :method_missing)
         instance.__send__(:method_missing, name.to_sym, *args)
       else

data/lib/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.2.0"
+  VERSION = "0.3.1"
 end

data/{thor.gemspec → thor-plus.gemspec}

@@ -18,4 +18,8 @@ Gem::Specification.new do |spec|
   spec.required_rubygems_version = ">= 1.3.5"
   spec.summary = spec.description
   spec.version = Thor::VERSION
+
+  # Active Support is a collection of utility classes and standard library extensions that were found useful for the Rails framework.
+  # https://github.com/rails/rails/tree/master/activesupport
+  spec.add_dependency 'activesupport', '~> 4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thor-plus
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Yehuda Katz
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -26,6 +26,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: ThorPlus is an improvement upon the Thor command line tool suite.
 email: andrew@andrewpage.me
 executables:
@@ -71,7 +85,7 @@ files:
 - lib/thor/shell/html.rb
 - lib/thor/util.rb
 - lib/thor/version.rb
-- thor.gemspec
+- thor-plus.gemspec
 homepage: http://whatisthor.com/
 licenses:
 - MIT