hanami-cli 2.0.0.alpha8 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9254e418675a38d43d9ea6404db85e316332a7abb786faa381d6fa6d2c82b635
-  data.tar.gz: 5e1993cfa72b0f8e11e17e05de048ad28d38393de2d354900c4c9452cc9ceb8a
+  metadata.gz: 511daafabba67025eb83dd27f06c62a9809ab89c8901445e5c00f15bbf8fd8ca
+  data.tar.gz: 7d303b0c72fb47c2cf0ba107af0e6899d83b14b580565f4b30c43f4bc87ab4f9
 SHA512:
-  metadata.gz: 9915d5d4537081e5403cc11505efd02b91b65b42e4f83797027430c0f2f008052f29c151d8c67a800bff3134c6b5f061025d119a1b87d17cec4ae76ca7547b27
-  data.tar.gz: 7cfbe727c30c04711d13e622887eba5061558dd426a2cd61784e501fef390f6c618006a3c11962a2d7ed52c2a6bce500dfe8525771abe2306f75e3de8143737e
+  metadata.gz: 716e634d4c572a09cd9954484d9dafc6affaafc13d03ec1e79703436b3efd305d1823dc4d35e92207b5388ebc33aef9f9ba603089cf73b3aec904957fe760bd6
+  data.tar.gz: e7d545d1cd6bfabcc5b4305b755c319c06a4e688e74a4639765c8f0026aac6b039d3459d670014a096ebd726b4a3192f694e273285341698b52a02b0762ae4a4

data/.rubocop.yml

@@ -7,9 +7,10 @@ inherit_from:
 Layout/LineLength:
   Exclude:
     - Gemfile
+    - 'spec/**/*.rb'
 Lint/EmptyFile:
   Exclude:
-    - "spec/fixtures/**/*.rb"
+    - 'spec/fixtures/**/*.rb'
 Naming/HeredocDelimiterNaming:
   Enabled: false
 Naming/MethodParameterName:
@@ -29,3 +30,5 @@ Style/TrailingCommaInArrayLiteral:
   Enabled: false
 Style/TrailingCommaInHashLiteral:
   Enabled: false
+Style/StringConcatenation:
+  Enabled: false

data/CHANGELOG.md

@@ -1,41 +1,86 @@
 # Hanami::CLI
+
 Hanami Command Line Interface
 
-## v2.0.0.alpha8 - 2020-05-19
+## v2.0.0.beta2 - 2022-08-16
+
+### Added
+
+- [Luca Guidi] Added `hanami generate slice` command, for generating a new slice [#32]
+- [Luca Guidi] Added `hanami generate action` command, for generating a new action in the app or a slice [#33]
+- [Marc Busqué] Added `hanami middlewares` command, for listing middleware configed in app and/or in `config/routes.rb` [#30]
+
+### Changed
+
+- [Marc Busqué, Tim Riley] `hanami` command will detect the app even when called inside nested subdirectories [#34]
+- [Seb Wilgosz] Include hanami-validations in generated app’s `Gemfile`, allowing action classes to specify `.params` [#31]
+- [Tim Riley] Include dry-types in generated app’s `Gemfile`, which is used by the types module defined in `lib/[app_name]/types.rb` (dry-types is no longer a hard dependency of the hanami gem as of 2.0.0.beta2) [#29]
+- [Tim Riley] Include dotenv in generated app’s `Gemfile`, allowing `ENV` values to be loaded from `.env*` files [#29]
+
+## v2.0.0.beta1 - 2022-07-20
+
+### Added
+
+- [Luca Guidi] Implemented `hanami new` to generate a new Hanami app
+- [Piotr Solnica] Implemented `hanami console` to start an interactive console (REPL)
+- [Marc Busqué] Implemented `hanami server` to start a HTTP server based on Rack
+- [Marc Busqué] Implemented `hanami routes` to print app routes
+- [Luca Guidi] Implemented `hanami version` to print app Hanami version
+
+## v2.0.0.alpha8.1 - 2022-05-23
+
+### Fixed
+
+- [Tim Riley] Ensure CLI starts properly by fixing use of `Slice.slice_name`
+
+## v2.0.0.alpha8 - 2022-05-19
 
 ### Fixed
+
 - [Andrew Croome] Respect HANAMI_ENV env var to set Hanami env if no `--env` option is supplied
 - [Lucas Mendelowski] Ensure Sequel migrations extension is loaded before related `db` commands are run
 
 ## v2.0.0.alpha7 - 2022-03-11
 
 ### Changed
+
 - [Tim Riley] [Internal] Update console slice readers to work with new `Hanami::Application.slices` API
 
 ## v2.0.0.alpha6.1 - 2022-02-11
+
 ### Fixed
+
 - [Viet Tran] Ensure `hanami db` commands to work with `hanami` `v2.0.0.alpha6`
 
 ## v2.0.0.alpha6 - 2022-02-10
+
 ### Added
+
 - [Luca Guidi] Official support for Ruby: MRI 3.1
 
 ### Changed
+
 - [Luca Guidi] Drop support for Ruby: MRI 2.6, and 2.7
 
 ## v2.0.0.alpha4 - 2021-12-07
+
 ### Added
+
 - [Tim Riley] Display a custom prompt when using irb-based console (consistent with pry-based console)
 - [Phil Arndt] Support `postgresql://` URL schemes (in addition to existing `postgres://` support) for `db` subcommands
 
 ### Fixed
+
 - [Tim Riley] Ensure slice helper methods work in console (e.g. top-level `main` method will return `Main::Slice` if an app has a "main" slice defined)
 
 ## v2.0.0.alpha3 - 2021-11-09
+
 No changes.
 
 ## v2.0.0.alpha2 - 2021-05-04
+
 ### Added
+
 - [Luca Guidi] Official support for Ruby: MRI 3.0
 - [Luca Guidi] Dynamically change the set of available commands depending on the context (outside or inside an Hanami app)
 - [Luca Guidi] Dynamically change the set of available commands depending on Hanami app architecture
@@ -44,32 +89,41 @@ No changes.
 - [Piotr Solnica] Implemented `console` command with support for `IRB` and `Pry` (`pry` is auto-detected)
 
 ### Changed
+
 - [Luca Guidi] Changed the purpose of this gem: the CLI Ruby framework has been extracted into `dry-cli` gem. `hanami-cli` is now the `hanami` command line.
 - [Luca Guidi] Drop support for Ruby: MRI 2.5.
 
 ## v1.0.0.alpha1 - 2019-01-30
+
 ### Added
+
 - [Luca Guidi] Inheritng from subclasses of `Hanami::CLI::Command`, allows to inherit arguments, options, description, and examples.
 - [Luca Guidi] Allow to use `super` from `#call`
 
 ### Changed
+
 - [Luca Guidi] Drop support for Ruby: MRI 2.3, and 2.4.
 
 ## v0.3.1 - 2019-01-18
+
 ### Added
+
 - [Luca Guidi] Official support for Ruby: MRI 2.6
 - [Luca Guidi] Support `bundler` 2.0+
 
 ## v0.3.0 - 2018-10-24
 
 ## v0.3.0.beta1 - 2018-08-08
+
 ### Added
+
 - [Anton Davydov & Alfonso Uceda] Introduce array type for arguments (`foo exec test spec/bookshelf/entities spec/bookshelf/repositories`)
 - [Anton Davydov & Alfonso Uceda] Introduce array type for options (`foo generate config --apps=web,api`)
 - [Alfonso Uceda] Introduce variadic arguments (`foo run ruby:latest -- ruby -v`)
 - [Luca Guidi] Official support for JRuby 9.2.0.0
 
 ### Fixed
+
 - [Anton Davydov] Print informative message when unknown or wrong option is passed (`"test" was called with arguments "--framework=unknown"`)
 
 ## v0.2.0 - 2018-04-11
@@ -79,21 +133,29 @@ No changes.
 ## v0.2.0.rc1 - 2018-03-30
 
 ## 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
 
 ## v0.1.1 - 2018-02-27
+
 ### Added
+
 - [Luca Guidi] Official support for Ruby: MRI 2.5
 
 ### Fixed
+
 - [Alfonso Uceda] Ensure default values for arguments to be sent to commands
 - [Alfonso Uceda] Ensure to fail when a missing required argument isn't provider, but an option is provided instead
 
@@ -104,13 +166,18 @@ No changes.
 ## v0.1.0.beta3 - 2017-10-04
 
 ## v0.1.0.beta2 - 2017-10-03
+
 ### Added
+
 - [Alfonso Uceda] Allow default value for arguments
 
 ## v0.1.0.beta1 - 2017-08-11
+
 ### Added
+
 - [Alfonso Uceda, Luca Guidi] Commands banner and usage
 - [Alfonso Uceda] Added support for subcommands
+
 - [Alfonso Uceda] Validations for arguments and options
 - [Alfonso Uceda] Commands arguments and options
 - [Alfonso Uceda] Commands description

data/Gemfile

@@ -8,9 +8,9 @@ unless ENV["CI"]
   gem "yard",   require: false
 end
 
-gem "hanami", require: false, git: "https://github.com/hanami/hanami.git", branch: "main"
-gem "hanami-router", require: false, git: "https://github.com/hanami/router.git", branch: "main"
-gem "hanami-view", require: false, git: "https://github.com/hanami/view.git", branch: "main"
+gem "dry-files", require: false, github: "dry-rb/dry-files", branch: :main
+gem "hanami", require: false, github: "hanami/hanami", branch: :main
+gem "hanami-router", github: "hanami/router", branch: :main
 
 gem "rack"
 

data/README.md

@@ -2,23 +2,25 @@
 
 CLI commands for [full-stack Hanami applications](`https://github.com/hanami/hanami`).
 
-**NOTE**: For versions 0.4 and below, there was a general purpose CLI utility library with this same name. That library has since been renamed to [dry-rb/cli](https://github.com/dry-rb/dry-cli). Please update your Gemfiles accordingly.
+**NOTE**: For versions 0.4 and below, there was a general purpose CLI utility library with this same name. That library has since been renamed to [dry-rb/dry-cli](https://github.com/dry-rb/dry-cli). Please update your Gemfiles accordingly.
 
-## Installation
+## Status
 
-Add this line to your application's Gemfile:
+[![Gem Version](https://badge.fury.io/rb/hanami-cli.svg)](https://badge.fury.io/rb/hanami-cli)
+[![CI](https://github.com/hanami/cli/workflows/ci/badge.svg?branch=main)](https://github.com/hanami/cli/actions?query=workflow%3Aci+branch%3Amain)
+[![Depfu](https://badges.depfu.com/badges/a8545fb67cf32a2c75b6227bc0821027/overview.svg)](https://depfu.com/github/hanami/cli?project=Bundler)
 
-```ruby
-gem 'hanami-cli'
-```
+## Contact
 
-And then execute:
+- Home page: http://hanamirb.org
+- Mailing List: http://hanamirb.org/mailing-list
+- Bugs/Issues: https://github.com/hanami/cli/issues
+- Support: http://stackoverflow.com/questions/tagged/hanami
+- Chat: http://chat.hanamirb.org
 
-    $ bundle install
+## Rubies
 
-Or install it yourself as:
-
-    $ gem install hanami-cli
+**Hanami::RSpec** supports Ruby (MRI) 3.0+
 
 ## Usage
 

data/hanami-cli.gemspec

@@ -32,10 +32,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "bundler", "~> 2.1"
   spec.add_dependency "rake", "~> 13.0"
-  spec.add_dependency "dry-cli", "~> 0.6"
-  spec.add_dependency "dry-files", "~> 0.1"
+  spec.add_dependency "dry-cli", "~> 0.7"
+  spec.add_dependency "dry-files", "~> 0.2", ">= 0.2.0"
   spec.add_dependency "dry-inflector", "~> 0.2"
 
   spec.add_development_dependency "rspec", "~> 3.9"
   spec.add_development_dependency "rubocop", "~> 1.0"
+  spec.add_development_dependency "puma"
 end

data/lib/hanami/cli/bundler.rb

@@ -16,7 +16,7 @@ module Hanami
       private_constant :DEFAULT_GEMFILE_PATH
 
       def self.require(*groups)
-        return unless File.exist?(ENV[BUNDLE_GEMFILE] || DEFAULT_GEMFILE_PATH)
+        return unless File.exist?(ENV.fetch(BUNDLE_GEMFILE) { DEFAULT_GEMFILE_PATH })
 
         ::Bundler.require(*groups)
       end
@@ -57,13 +57,9 @@ module Hanami
 
       # Adapted from https://stackoverflow.com/a/5471032/498386
       def which(cmd)
-        exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
-
         ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
-          exts.each do |ext|
-            exe = fs.join(path, "#{cmd}#{ext}")
-            return exe if fs.executable?(exe) && !fs.directory?(exe)
-          end
+          exe = fs.join(path, cmd)
+          return exe if fs.executable?(exe) && !fs.directory?(exe)
         end
 
         nil

data/lib/hanami/cli/commands/app/command.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require "dry/files"
+require_relative "../db/utils/database"
+
+module Hanami
+  module CLI
+    module Commands
+      module App
+        class Command < Hanami::CLI::Command
+          module Environment
+            def call(**opts)
+              env = opts[:env]
+
+              hanami_env = env ? env.to_s : ENV.fetch("HANAMI_ENV", "development")
+
+              ENV["HANAMI_ENV"] = hanami_env
+
+              super(**opts)
+            end
+          end
+
+          def self.inherited(klass)
+            super
+            klass.prepend(Environment)
+          end
+
+          def app
+            @app ||=
+              begin
+                require "hanami/prepare"
+                Hanami.app
+              end
+          end
+
+          def run_command(klass, *args)
+            klass.new(
+              out: out,
+              inflector: app.inflector,
+              fs: Dry::Files
+            ).call(*args)
+          end
+
+          def measure(desc)
+            start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+            result = yield
+            stop = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+            if result
+              out.puts "=> #{desc} in #{(stop - start).round(4)}s"
+            else
+              out.puts "!!! => #{desc.inspect} FAILED"
+            end
+          end
+
+          def database
+            @database ||= Commands::DB::Utils::Database[app]
+          end
+
+          def database_config
+            database.config
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hanami/cli/commands/{monolith → app}/console.rb

@@ -2,14 +2,14 @@
 
 require "hanami/console/context"
 
-require_relative "../application"
+require_relative "../app/command"
 
 module Hanami
   module CLI
     module Commands
-      module Monolith
+      module App
         # @api public
-        class Console < Application
+        class Console < App::Command
           REPLS = {
             "pry" => -> (*args) {
               begin
@@ -23,8 +23,9 @@ module Hanami
             },
           }.freeze
 
-          desc "Application REPL"
+          desc "App REPL"
 
+          option :env, required: false, desc: "Application environment"
           option :repl, required: false, desc: "REPL gem that should be used ('pry' or 'irb')"
 
           # @api private
@@ -37,9 +38,9 @@ module Hanami
 
           def resolve_engine(repl, opts)
             if repl
-              REPLS.fetch(repl).(application, opts)
+              REPLS.fetch(repl).(app, opts)
             else
-              REPLS.map { |(_, loader)| loader.(application, opts) }.compact.first
+              REPLS.map { |(_, loader)| loader.(app, opts) }.compact.first
             end
           end
         end

data/lib/hanami/cli/commands/{monolith → app}/db/create.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative "../../application"
+require_relative "../../app/command"
 
 module Hanami
   module CLI
     module Commands
-      module Monolith
+      module App
         module DB
-          class Create < Application
+          class Create < App::Command
             desc "Create database"
 
             def call(**)

data/lib/hanami/cli/commands/{monolith → app}/db/create_migration.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative "../../application"
+require_relative "../../app/command"
 require_relative "structure/dump"
 
 module Hanami
   module CLI
     module Commands
-      module Monolith
+      module App
         module DB
-          class CreateMigration < Application
+          class CreateMigration < App::Command
             desc "Create new migration file"
 
             argument :name, desc: "Migration file name"

data/lib/hanami/cli/commands/{monolith → app}/db/drop.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative "../../application"
+require_relative "../../app/command"
 
 module Hanami
   module CLI
     module Commands
-      module Monolith
+      module App
         module DB
-          class Drop < Application
+          class Drop < App::Command
             desc "Delete database"
 
             def call(**)

data/lib/hanami/cli/commands/{monolith → app}/db/migrate.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-require_relative "../../application"
+require_relative "../../app/command"
 require_relative "structure/dump"
 
 module Hanami
   module CLI
     module Commands
-      module Monolith
+      module App
         module DB
-          class Migrate < Application
+          class Migrate < App::Command
             desc "Migrates database"
 
             option :target, desc: "Target migration number", aliases: ["-t"]
 
             def call(target: nil, **)
-              return true if Dir[File.join(application.root, "db/migrate/*.rb")].empty?
+              return true if Dir[File.join(app.root, "db/migrate/*.rb")].empty?
 
               measure "database #{database.name} migrated" do
                 if target

data/lib/hanami/cli/commands/{monolith → app}/db/reset.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../../application"
+require_relative "../../app/command"
 require_relative "create"
 require_relative "drop"
 require_relative "migrate"
@@ -8,9 +8,9 @@ require_relative "migrate"
 module Hanami
   module CLI
     module Commands
-      module Monolith
+      module App
         module DB
-          class Reset < Application
+          class Reset < App::Command
             desc "Drop, create, and migrate database"
 
             def call(**)

data/lib/hanami/cli/commands/{monolith → app}/db/rollback.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative "../../application"
+require_relative "../../app/command"
 require_relative "structure/dump"
 
 module Hanami
   module CLI
     module Commands
-      module Monolith
+      module App
         module DB
-          class Rollback < Application
+          class Rollback < App::Command
             desc "Rollback database to a previous migration"
 
             option :target, desc: "Target migration number", aliases: ["-t"]
@@ -32,7 +32,7 @@ module Hanami
             private
 
             def find_migration(code)
-              migration = database.applied_migrations.yield_self { |migrations|
+              migration = database.applied_migrations.then { |migrations|
                 if code
                   migrations.detect { |m| m.split("_").first == code }
                 else

data/lib/hanami/cli/commands/{monolith → app}/db/sample_data.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative "../../application"
+require_relative "../../app/command"
 require_relative "structure/dump"
 
 module Hanami
   module CLI
     module Commands
-      module Monolith
+      module App
         module DB
-          class SampleData < Application
+          class SampleData < App::Command
             FILE_PATH = "db/sample_data.rb"
 
             desc "Load sample data"
@@ -26,7 +26,7 @@ module Hanami
             private
 
             def full_file_path
-              File.join(application.root, FILE_PATH)
+              File.join(app.root, FILE_PATH)
             end
 
             def has_file?

data/lib/hanami/cli/commands/{monolith → app}/db/seed.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative "../../application"
+require_relative "../../app/command"
 require_relative "structure/dump"
 
 module Hanami
   module CLI
     module Commands
-      module Monolith
+      module App
         module DB
-          class Seed < Application
+          class Seed < App::Command
             FILE_PATH = "db/seeds.rb"
 
             desc "Load seed data"
@@ -26,7 +26,7 @@ module Hanami
             private
 
             def full_file_path
-              File.join(application.root, FILE_PATH)
+              File.join(app.root, FILE_PATH)
             end
 
             def has_file?

data/lib/hanami/cli/commands/{monolith → app}/db/setup.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require_relative "../../application"
+require_relative "../../app/command"
 require_relative "create"
 require_relative "migrate"
 
 module Hanami
   module CLI
     module Commands
-      module Monolith
+      module App
         module DB
-          class Setup < Application
+          class Setup < App::Command
             desc "Setup database"
 
             def call(**)

data/lib/hanami/cli/commands/{monolith → app}/db/structure/dump.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative "../../../application"
+require_relative "../../../app/command"
 
 module Hanami
   module CLI
     module Commands
-      module Monolith
+      module App
         module DB
           module Structure
-            class Dump < Application
+            class Dump < App::Command
               desc "Dumps database structure to db/structure.sql file"
 
               def call(*)

data/lib/hanami/cli/commands/{monolith → app}/db/version.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative "../../application"
+require_relative "../../app/command"
 
 module Hanami
   module CLI
     module Commands
-      module Monolith
+      module App
         module DB
-          class Version < Application
+          class Version < App::Command
             desc "Print schema version"
 
             option :target, desc: "Target migration number", aliases: ["-t"]