dry-cli 0.5.0 → 0.5.1

data/lib/dry/cli/command.rb

@@ -352,16 +352,6 @@ module Dry
         required_arguments
         optional_arguments
       ] => 'self.class'
-
-      # @since 0.1.0
-      # @api private
-      attr_reader :command_name
-
-      # @since 0.1.0
-      # @api private
-      def initialize(command_name:, **)
-        @command_name = command_name
-      end
     end
   end
 end

data/lib/dry/cli/command_registry.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'set'
 require 'concurrent/hash'
 
 module Dry
@@ -17,9 +18,9 @@ module Dry
 
       # @since 0.1.0
       # @api private
-      def set(name, command, aliases, **options)
+      def set(name, command, aliases)
         node = @root
-        command = command_for(name, command, **options)
+        command = command.new if command
         name.split(/[[:space:]]/).each do |token|
           node = node.put(node, token)
         end
@@ -61,18 +62,6 @@ module Dry
         result
       end
 
-      private
-
-      # @since 0.1.0
-      # @api private
-      def command_for(name, command, **options)
-        if command.nil?
-          command
-        else
-          command.new(command_name: name, **options)
-        end
-      end
-
       # Node of the registry
       #
       # @since 0.1.0

data/lib/dry/cli/inflector.rb

@@ -10,7 +10,7 @@ module Dry
       def self.dasherize(input)
         return nil unless input
 
-        input.to_s.downcase.gsub(/[[[:space:]]_]/, "-")
+        input.to_s.downcase.gsub(/[[[:space:]]_]/, '-')
       end
     end
   end

data/lib/dry/cli/option.rb

@@ -86,7 +86,6 @@ module Dry
       # @since 0.1.0
       # @api private
       #
-      # rubocop:disable Metrics/AbcSize
       def parser_options
         dasherized_name = Inflector.dasherize(name)
         parser_options  = []
@@ -100,18 +99,20 @@ module Dry
 
         parser_options << Array if array?
         parser_options << values if values
-        parser_options.unshift(alias_name) unless alias_name.nil?
+        parser_options.unshift(*alias_names) if aliases.any?
         parser_options << desc if desc
         parser_options
       end
-      # rubocop:enable Metrics/AbcSize
-
-      private
 
       # @since 0.1.0
       # @api private
-      def alias_name
-        aliases.join(' ') if aliases.any?
+      def alias_names
+        aliases
+          .map { |name| name.gsub(/^-{1,2}/, '') }
+          .compact
+          .uniq
+          .map { |name| name.size == 1 ? "-#{name}" : "--#{name}" }
+          .map { |name| boolean? ? name : "#{name} VALUE" }
       end
     end
 

data/lib/dry/cli/parser.rb

@@ -32,7 +32,7 @@ module Dry
         parsed_options = command.default_params.merge(parsed_options)
         parse_required_params(command, arguments, names, parsed_options)
       rescue ::OptionParser::ParseError
-        Result.failure("Error: \"#{command.command_name}\" was called with arguments \"#{original_arguments.join(' ')}\"") # rubocop:disable Metrics/LineLength
+        Result.failure("Error: \"#{names.last}\" was called with arguments \"#{original_arguments.join(' ')}\"") # rubocop:disable Metrics/LineLength
       end
 
       # @since 0.1.0

data/lib/dry/cli/registry.rb

@@ -74,11 +74,16 @@ module Dry
       #       end
       #     end
       #   end
-      def register(name, command = nil, aliases: [], **options)
+      def register(name, command = nil, aliases: [], &block)
         if block_given?
-          yield Prefix.new(@commands, name, aliases)
+          prefix = Prefix.new(@commands, name, aliases)
+          if block.arity.zero?
+            prefix.instance_eval(&block)
+          else
+            yield(prefix)
+          end
         else
-          @commands.set(name, command, aliases, **options)
+          @commands.set(name, command, aliases)
         end
       end
 
@@ -308,9 +313,9 @@ module Dry
         # @since 0.1.0
         #
         # @see Dry::CLI::Registry#register
-        def register(name, command, aliases: [], **options)
+        def register(name, command, aliases: [])
           command_name = "#{prefix} #{name}"
-          registry.set(command_name, command, aliases, **options)
+          registry.set(command_name, command, aliases)
         end
 
         private

data/lib/dry/cli/version.rb

@@ -3,6 +3,6 @@
 module Dry
   class CLI
     # @since 0.1.0
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2019-12-21 00:00:00.000000000 Z
+date: 2020-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -93,26 +93,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
-- ".github/ISSUE_TEMPLATE/----please-don-t-ask-for-support-via-issues.md"
-- ".github/ISSUE_TEMPLATE/---bug-report.md"
-- ".github/ISSUE_TEMPLATE/---feature-request.md"
-- ".github/workflows/custom_ci.yml"
-- ".github/workflows/docsite.yml"
-- ".github/workflows/sync_configs.yml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
 - CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
-- docsite/source/index.html.md
 - dry-cli.gemspec
 - lib/dry/cli.rb
 - lib/dry/cli/banner.rb
@@ -127,13 +110,14 @@ files:
 - lib/dry/cli/usage.rb
 - lib/dry/cli/utils/files.rb
 - lib/dry/cli/version.rb
-- script/ci
-homepage: http://dry-rb.org
+homepage: https://dry-rb.org/gems/dry-cli
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/dry-rb/dry-cli/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-cli
+  bug_tracker_uri: https://github.com/dry-rb/dry-cli/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -142,15 +126,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Dry CLI
+summary: Common framework to build command line interfaces with Ruby
 test_files: []

data/.codeclimate.yml

@@ -1,12 +0,0 @@
-# this file is managed by dry-rb/devtools project
-
-version: "2"
-
-exclude_patterns:
-  - "benchmarks/"
-  - "examples/"
-  - "spec/"
-
-plugins:
-  rubocop:
-    enabled: true

data/.github/ISSUE_TEMPLATE/----please-don-t-ask-for-support-via-issues.md

@@ -1,10 +0,0 @@
----
-name: "⚠️  Please don't ask for support via issues"
-about: See CONTRIBUTING.md for more information
-title: ''
-labels: ''
-assignees: ''
-
----
-
-

data/.github/ISSUE_TEMPLATE/---bug-report.md

@@ -1,30 +0,0 @@
----
-name: "\U0001F41B Bug report"
-about: See CONTRIBUTING.md for more information
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**Before you submit this: WE ONLY ACCEPT BUG REPORTS AND FEATURE REQUESTS**
-
-For more information see `CONTRIBUTING.md`.
-
-**Describe the bug**
-
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-
-Provide detailed steps to reproduce, an executable script would be best.
-
-**Expected behavior**
-
-A clear and concise description of what you expected to happen.
-
-**Your environment**
-
-- Affects my production application: **YES/NO**
-- Ruby version: ...
-- OS: ...

data/.github/ISSUE_TEMPLATE/---feature-request.md

@@ -1,18 +0,0 @@
----
-name: "\U0001F6E0 Feature request"
-about: See CONTRIBUTING.md for more information
-title: ''
-labels: feature
-assignees: ''
-
----
-
-Summary of what the feature is supposed to do.
-
-## Examples
-
-Code examples showing how the feature could be used.
-
-## Resources
-
-Additional information, like a link to the discussion forum thread where the feature was discussed etc.

data/.github/workflows/custom_ci.yml

@@ -1,77 +0,0 @@
-# this file is managed by dry-rb/devtools project
-
-name: ci
-
-on:
-  push:
-    paths:
-      - .github/workflows/ci.yml
-      - lib/**
-      - spec/**
-      - Gemfile
-      - "*.gemspec"
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  tests-mri:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ["2.6.x", "2.5.x", "2.4.x"]
-        include:
-          - ruby: "2.6.x"
-            coverage: "true"
-    steps:
-      - uses: actions/checkout@v1
-      - name: Set up Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{matrix.ruby}}
-      - name: Download test reporter
-        if: "matrix.coverage == 'true'"
-        run: |
-          mkdir -p tmp/
-          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./tmp/cc-test-reporter
-          chmod +x ./tmp/cc-test-reporter
-          ./tmp/cc-test-reporter before-build
-      - name: Run all tests
-        env:
-          COVERAGE: ${{matrix.coverage}}
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3 --without tools docs benchmarks
-          script/ci
-      - name: Send coverage results
-        if: "matrix.coverage == 'true'"
-        env:
-          CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
-          GIT_COMMIT_SHA: ${{github.sha}}
-          GIT_BRANCH: ${{github.ref}}
-          GIT_COMMITTED_AT: ${{github.event.head_commit.timestamp}}
-        run: |
-          GIT_BRANCH=`ruby -e "puts ENV['GITHUB_REF'].split('/', 3).last"` \
-          GIT_COMMITTED_AT=`ruby -r time -e "puts Time.iso8601(ENV['GIT_COMMITTED_AT']).to_i"` \
-          ./tmp/cc-test-reporter after-build
-
-  tests-others:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        image: ["jruby:9.2.8", "ruby:rc"]
-    container:
-      image: ${{matrix.image}}
-    steps:
-      - uses: actions/checkout@v1
-      - name: Install git
-        run: |
-          apt-get update
-          apt-get install -y --no-install-recommends git
-      - name: Run all tests
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3 --without tools docs benchmarks
-          script/ci

data/.github/workflows/docsite.yml

@@ -1,34 +0,0 @@
-# this file is managed by dry-rb/devtools project
-
-name: docsite
-
-on:
-  push:
-    paths:
-      - docsite/**
-      - .github/workflows/docsite.yml
-    branches:
-      - master
-      - release-**
-    tags:
-
-jobs:
-  update-docs:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Set up Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: "2.6.x"
-      - name: Install dependencies
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3 --without benchmarks sql
-      - name: Symlink ossy
-        run: mkdir -p bin && ln -sf "$(bundle show ossy)/bin/ossy" bin/ossy
-      - name: Trigger dry-rb.org deploy
-        env:
-          GITHUB_LOGIN: dry-bot
-          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
-        run: bin/ossy github workflow dry-rb/dry-rb.org ci

data/.github/workflows/sync_configs.yml

@@ -1,34 +0,0 @@
-# this file is managed by dry-rb/devtools project
-
-name: sync_configs
-
-on:
-  repository_dispatch:
-
-jobs:
-  sync-configs:
-    runs-on: ubuntu-latest
-    if: github.event.action == 'sync_configs'
-    steps:
-      - uses: actions/checkout@v1
-      - name: Update configuration files from devtools
-        env:
-          GITHUB_LOGIN: dry-bot
-          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
-        run: |
-          git clone https://github.com/dry-rb/devtools.git tmp/devtools
-
-          if [ -f ".github/workflows/custom_ci.yml" ]; then
-            rsync -av --exclude '.github/workflows/ci.yml' tmp/devtools/shared/ . ;
-          else
-            rsync -av tmp/devtools/shared/ . ;
-          fi
-
-          git config --local user.email "dry-bot@dry-rb.org"
-          git config --local user.name "dry-bot"
-          git add -A
-          git commit -m "[devtools] config sync" || echo "nothing changed"
-      - name: Push changes
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.GH_PAT }}