hanami-cli 0.2.0.beta1 → 0.2.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a068faee4ac4b225d048b6552c2f3c996dcebaeb2c4b45e7496882bd1633507b
-  data.tar.gz: 51c34e8bd8306949cf344507bbf906a7876e47d5d39a26b70e94ad78e4191f0f
+  metadata.gz: 5c3fd112b3dc098cba00e1ef4b617afb7b32194584f9108a2de44e94be16d1d2
+  data.tar.gz: 034f35aff9557f17a1f28353f177ced498ee1479d631584e9fbc55eeee007f5b
 SHA512:
-  metadata.gz: 5c5817a42a314f553bc42b24f04e9a574e44efae82d462721ff9c27bb37ab4ef3c9096156a6166e94ce11728d1e6f0e4a009b8feb3e48e0a670e034e3e5c6d16
-  data.tar.gz: 349d5bcc6d5214feb852a01cbf57a185a8448072f1590e6160a4878cb550a80361c7abbec463cd787ed621c80046322351ec67d611f59f19ac2423ba4beb3176
+  metadata.gz: e09e61536293649735e70ffcffcd2868d1c41754055ab6e56ac8cfaf2e6c6e0b9dd70e10bdc5906078e821264103c3aea96bc6c498c1f52e9fd79df08e931bbf
+  data.tar.gz: 2320bac7acf1ff217a97e5b2f27810b5d939488961ed6668e8791793c75f4c33ea1720b56b1fbd95ae1cf362bbbd5ffd5cf4507695872fd0401a3f590e4949d2

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Hanami::CLI
 General purpose Command Line Interface (CLI) framework for Ruby
 
+## v0.2.0.beta2 - 2018-03-23
+### Added
+- [Anton Davydov & Luca Guidi] Support objects as callbacks
+
+### Fixed
+- [Anton Davydov & Luca Guidi] Ensure callbacks' context of execution (aka `self`) to be the command that is being executed
+
 ## v0.2.0.beta1 - 2018-02-28
 ### Added
 - [Anton Davydov] Register `before`/`after` callbacks for commands

data/Gemfile

@@ -6,6 +6,6 @@ unless ENV['TRAVIS']
   gem 'yard',   require: false
 end
 
-gem 'hanami-utils', '1.2.0.beta1', require: false, git: 'https://github.com/hanami/utils.git', branch: 'develop'
+gem 'hanami-utils', '1.2.0.beta2', require: false, git: 'https://github.com/hanami/utils.git', branch: 'develop'
 
 gem 'hanami-devtools', require: false, git: 'https://github.com/hanami/devtools.git'

data/hanami-cli.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features)/})
   end
 
-  spec.add_dependency "hanami-utils",    "1.2.0.beta1"
+  spec.add_dependency "hanami-utils",    "1.2.0.beta2"
   spec.add_dependency "concurrent-ruby", "~> 1.0"
 
   spec.add_development_dependency "bundler"

data/lib/hanami/cli.rb

@@ -53,9 +53,9 @@ module Hanami
       if result.found?
         command, args = parse(result, out)
 
-        result.before_callbacks.run(self, args)
+        result.before_callbacks.run(command, args)
         command.call(args)
-        result.after_callbacks.run(self, args)
+        result.after_callbacks.run(command, args)
       else
         usage(result, out)
       end

data/lib/hanami/cli/errors.rb

@@ -12,5 +12,21 @@ module Hanami
         super("unknown command: `#{command_name}'")
       end
     end
+
+    # @since 0.2.0
+    class InvalidCallbackError < Error
+      # @since 0.2.0
+      # @api private
+      def initialize(callback)
+        message = case callback
+                  when Class
+                    "expected `#{callback.inspect}' to respond to `#initialize' with arity 0"
+                  else
+                    "expected `#{callback.inspect}' to respond to `#call'"
+                  end
+
+        super(message)
+      end
+    end
   end
 end

data/lib/hanami/cli/registry.rb

@@ -83,9 +83,13 @@ module Hanami
       # Register a before callback.
       #
       # @param command_name [String] the name used for command registration
-      # @param callback [Proc] the callback
+      # @param callback [Class, #call] the callback object. If a class is given,
+      #   it MUST respond to `#call`.
+      # @param blk [Proc] the callback espressed as a block
       #
       # @raise [Hanami::CLI::UnkwnownCommandError] if the command isn't registered
+      # @raise [Hanami::CLI::InvalidCallbackError] if the given callback doesn't
+      #   implement the required interface
       #
       # @since 0.2.0
       #
@@ -106,16 +110,72 @@ module Hanami
       #       before "hello", -> { puts "I'm about to say.." }
       #     end
       #   end
-      def before(command_name, &callback)
-        command(command_name).before_callbacks.append(&callback)
+      #
+      # @example Register an object as callback
+      #   require "hanami/cli"
+      #
+      #   module Callbacks
+      #     class Hello
+      #       def call(*)
+      #         puts "world"
+      #       end
+      #     end
+      #   end
+      #
+      #   module Foo
+      #     module Commands
+      #       extend Hanami::CLI::Registry
+      #
+      #       class Hello < Hanami::CLI::Command
+      #         def call(*)
+      #           puts "I'm about to say.."
+      #         end
+      #       end
+      #
+      #       register "hello", Hello
+      #       before "hello", Callbacks::Hello.new
+      #     end
+      #   end
+      #
+      # @example Register a class as callback
+      #   require "hanami/cli"
+      #
+      #   module Callbacks
+      #     class Hello
+      #       def call(*)
+      #         puts "world"
+      #       end
+      #     end
+      #   end
+      #
+      #   module Foo
+      #     module Commands
+      #       extend Hanami::CLI::Registry
+      #
+      #       class Hello < Hanami::CLI::Command
+      #         def call(*)
+      #           puts "I'm about to say.."
+      #         end
+      #       end
+      #
+      #       register "hello", Hello
+      #       before "hello", Callbacks::Hello
+      #     end
+      #   end
+      def before(command_name, callback = nil, &blk)
+        command(command_name).before_callbacks.append(&_callback(callback, blk))
       end
 
       # Register an after callback.
       #
       # @param command_name [String] the name used for command registration
-      # @param callback [Proc] the callback
+      # @param callback [Class, #call] the callback object. If a class is given,
+      #   it MUST respond to `#call`.
+      # @param blk [Proc] the callback espressed as a block
       #
       # @raise [Hanami::CLI::UnkwnownCommandError] if the command isn't registered
+      # @raise [Hanami::CLI::InvalidCallbackError] if the given callback doesn't
+      #   implement the required interface
       #
       # @since 0.2.0
       #
@@ -136,8 +196,60 @@ module Hanami
       #       after "hello", -> { puts "world" }
       #     end
       #   end
-      def after(command_name, &callback)
-        command(command_name).after_callbacks.append(&callback)
+      #
+      # @example Register an object as callback
+      #   require "hanami/cli"
+      #
+      #   module Callbacks
+      #     class World
+      #       def call(*)
+      #         puts "world"
+      #       end
+      #     end
+      #   end
+      #
+      #   module Foo
+      #     module Commands
+      #       extend Hanami::CLI::Registry
+      #
+      #       class Hello < Hanami::CLI::Command
+      #         def call(*)
+      #           puts "hello"
+      #         end
+      #       end
+      #
+      #       register "hello", Hello
+      #       after "hello", Callbacks::World.new
+      #     end
+      #   end
+      #
+      # @example Register a class as callback
+      #   require "hanami/cli"
+      #
+      #   module Callbacks
+      #     class World
+      #       def call(*)
+      #         puts "world"
+      #       end
+      #     end
+      #   end
+      #
+      #   module Foo
+      #     module Commands
+      #       extend Hanami::CLI::Registry
+      #
+      #       class Hello < Hanami::CLI::Command
+      #         def call(*)
+      #           puts "hello"
+      #         end
+      #       end
+      #
+      #       register "hello", Hello
+      #       after "hello", Callbacks::World
+      #     end
+      #   end
+      def after(command_name, callback = nil, &blk)
+        command(command_name).after_callbacks.append(&_callback(callback, blk))
       end
 
       # @since 0.1.0
@@ -158,6 +270,28 @@ module Hanami
         end
       end
 
+      # @since 0.2.0
+      # @api private
+      #
+      # rubocop:disable Metrics/MethodLength
+      def _callback(callback, blk)
+        return blk if blk.respond_to?(:to_proc)
+
+        case callback
+        when ->(c) { c.respond_to?(:call) }
+          callback.method(:call)
+        when Class
+          begin
+            _callback(callback.new, blk)
+          rescue ArgumentError
+            raise InvalidCallbackError.new(callback)
+          end
+        else
+          raise InvalidCallbackError.new(callback)
+        end
+      end
+      # rubocop:enable Metrics/MethodLength
+
       # Command name prefix
       #
       # @since 0.1.0

data/lib/hanami/cli/version.rb

@@ -1,6 +1,6 @@
 module Hanami
   class CLI
     # @since 0.1.0
-    VERSION = "0.2.0.beta1".freeze
+    VERSION = "0.2.0.beta2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta1
+  version: 0.2.0.beta2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0.beta1
+        version: 1.2.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0.beta1
+        version: 1.2.0.beta2
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement