hanami-cli 2.0.0.alpha3 → 2.0.0.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97c84f390960fa47aa204b96a95fdd97fac6b35f0d2d312ec2b1f8ed4588fd94
-  data.tar.gz: c97dc5ca0dd28614ba351b8211e3e865cb0be8fa3880dcded3b49f572b0527eb
+  metadata.gz: de637259c61267b5589f64a633fb38ba6e7eb5a8f5dcc0bd689a3942a57b6dba
+  data.tar.gz: 87be564477f075f9a357edcad9a39e69a74bc6971de10bd353f22f75f0964b01
 SHA512:
-  metadata.gz: f20b1a99b59e31bca7e92b23da280cc569e1f08b86170f1c7ff546f870e95b71f83c8a6f94c061519df82bfe30e56e2a7c5767806cbe526849955b37b7f1f6b3
-  data.tar.gz: c86e4af61a229eb8fc55ee45e6e0f8d999afe18ff8e595a93e2376df62a5b8ec4d13f68fec3b43f23f8e4d7a9147e6696331b159f52026deefa416e5c74916f9
+  metadata.gz: 23aa8295f0f6148ce79041296e4ea6a51a42378672ac95fadd0cbcd8b43f9e3325ff4fb7d263993331d620ae64daf099c3520a3b62ba253ebba5d9b6490cbebe
+  data.tar.gz: a5d92abd72e92442fb5c9e6a3471160906172dbd3013dd2248259deb233f1ceccb17faf9a320bec0b27a7fe9c44d2ab3d820af6b4152618e9f7b662e57e06832

data/.rubocop.yml

@@ -3,10 +3,13 @@
 AllCops:
   SuggestExtensions: false
 inherit_from:
-  - https://raw.githubusercontent.com/hanami/devtools/master/.rubocop-unstable.yml
+  - https://raw.githubusercontent.com/hanami/devtools/main/.rubocop.yml
 Layout/LineLength:
   Exclude:
     - Gemfile
+Lint/EmptyFile:
+  Exclude:
+    - "spec/fixtures/**/*.rb"
 Naming/HeredocDelimiterNaming:
   Enabled: false
 Naming/MethodParameterName:

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Hanami::CLI
 Hanami Command Line Interface
 
+## 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.
 

data/Gemfile

@@ -9,6 +9,7 @@ unless ENV["CI"]
 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 "rack"

data/hanami-cli.gemspec

@@ -37,4 +37,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rspec", "~> 3.9"
   spec.add_development_dependency "rubocop", "~> 1.11"
+  spec.metadata = {
+    "rubygems_mfa_required" => "true"
+  }
 end

data/lib/hanami/cli/commands/db/utils/database.rb

@@ -19,6 +19,10 @@ module Hanami
                 require_relative("postgres")
                 Postgres
               },
+              "postgresql" => -> {
+                require_relative("postgres")
+                Postgres
+              },
               "mysql" => -> {
                 require_relative("mysql")
                 Mysql
@@ -74,10 +78,6 @@ module Hanami
               config.db_name
             end
 
-            def applied_migrations
-              sequel_migrator.applied_migrations
-            end
-
             def gateway
               rom_config.gateways[:default]
             end

data/lib/hanami/cli/commands/monolith/console.rb

@@ -11,13 +11,13 @@ module Hanami
         # @api public
         class Console < Application
           REPLS = {
-            "pry" => -> *args {
+            "pry" => -> (*args) {
               begin
                 require "hanami/cli/repl/pry"
                 Repl::Pry.new(*args)
-              rescue LoadError; end
+              rescue LoadError; end # rubocop:disable Lint/SuppressedException
             },
-            "irb" => -> *args {
+            "irb" => -> (*args) {
               require "hanami/cli/repl/irb"
               Repl::Irb.new(*args)
             },
@@ -25,7 +25,7 @@ module Hanami
 
           desc "Application REPL"
 
-          option :repl, required: false, desc: "REPL gem that should be used"
+          option :repl, required: false, desc: "REPL gem that should be used ('pry' or 'irb')"
 
           # @api private
           def call(repl: nil, **opts)
@@ -35,7 +35,6 @@ module Hanami
 
           private
 
-          # @api private
           def resolve_engine(repl, opts)
             if repl
               REPLS.fetch(repl).(application, opts)

data/lib/hanami/cli/commands/monolith/db/version.rb

@@ -12,7 +12,7 @@ module Hanami
 
             option :target, desc: "Target migration number", aliases: ["-t"]
 
-            def call(target: nil, **)
+            def call(target: nil, **) # rubocop:disable Lint/UnusedMethodArgument
               migration = database.applied_migrations.last
               version = migration ? File.basename(migration, ".*") : "not available"
 

data/lib/hanami/cli/generators/monolith/action.rb

@@ -104,7 +104,7 @@ module Hanami
           alias_method :t, :template
 
           def route_url(controller, action, url)
-            CLI::URL.call(url || "/#{controller.join('/')}" + ROUTE_RESTFUL_URL_SUFFIXES.fetch(action))
+            CLI::URL.call(url || ("/#{controller.join('/')}" + ROUTE_RESTFUL_URL_SUFFIXES.fetch(action)))
           end
 
           def route_http(action, http)

data/lib/hanami/cli/repl/irb.rb

@@ -11,29 +11,26 @@ module Hanami
       class Irb < Core
         # @api public
         def start
-          ARGV.shift until ARGV.empty?
-          TOPLEVEL_BINDING.eval('self').extend(context)
-
-          IRB.conf[:PROMPT] = {}
+          $stdout.sync = true
 
-          IRB.conf[:PROMPT][:MY_PROMPT] = {
-            :AUTO_INDENT => true,
-            :PROMPT_I =>  ">> ",
-            :PROMPT_S => nil,
-            :PROMPT_C => nil,
-            :RETURN => "    ==>%s\n"
+          ARGV.shift until ARGV.empty?
+          TOPLEVEL_BINDING.eval("self").extend(context)
+
+          # Initializes the IRB.conf; our own conf changes must be after this
+          IRB.setup(nil)
+
+          IRB.conf[:PROMPT][:HANAMI] = {
+            AUTO_INDENT: true,
+            PROMPT_I: "#{prompt}> ",
+            PROMPT_N: "#{prompt}> ",
+            PROMPT_S: "#{prompt} %l> ",
+            PROMPT_C: "#{prompt} ?> ",
+            RETURN: "=> %s\n"
           }
 
-          IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-
-          IRB.start
-        end
-
-        private
+          IRB.conf[:PROMPT_MODE] = :HANAMI
 
-        # @api private
-        def conf
-          @conf ||= IRB.conf
+          IRB::Irb.new.run
         end
       end
     end

data/lib/hanami/cli/repl/pry.rb

@@ -10,7 +10,7 @@ module Hanami
       # @api public
       class Pry < Core
         # @api private
-        class Context
+        class Context # rubocop:disable Lint/EmptyClass
         end
 
         # @api public

data/lib/hanami/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Hanami
   module CLI
-    VERSION = "2.0.0.alpha3"
+    VERSION = "2.0.0.alpha4"
   end
 end

data/lib/hanami/console/context.rb

@@ -9,24 +9,38 @@ module Hanami
     # @api private
     # @since 2.0.0
     class Context < Module
+      # @api private
+      attr_reader :application
+
       # @api private
       def initialize(application)
+        super()
         @application = application
+
+        define_context_methods
+        include Plugins::SliceReaders.new(application)
       end
 
-      # @api private
-      def extended(other)
-        super
-        app = @application
+      private
 
-        extend(Plugins::SliceReaders.new(app))
+      def define_context_methods
+        app = application
 
         define_method(:inspect) do
           "#<#{self.class} application=#{app} env=#{app.config.env}>"
         end
 
+        define_method(:app) do
+          app
+        end
+
+        define_method(:application) do
+          app
+        end
+
         define_method(:method_missing) do |name, *args, &block|
           return app.public_send(name, *args, &block) if app.respond_to?(name)
+
           super(name, *args, &block)
         end
 

data/lib/hanami/console/plugins/slice_readers.rb

@@ -10,29 +10,11 @@ module Hanami
       class SliceReaders < Module
         # @api private
         def initialize(application)
+          super()
+
           application.slices.each do |(name, slice)|
             define_method(name) do
-              SliceDelegator.new(slice)
-            end
-          end
-        end
-
-        # @api private
-        # @since 2.0.0
-        class SliceDelegator < SimpleDelegator
-          # @api private
-          def respond_to_missing?(name)
-            key?(name)
-          end
-
-          private
-
-          # @api private
-          def method_missing(name, *args, &block)
-            if args.empty? && key?(name)
-              self[name]
-            else
-              super
+              slice
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha3
+  version: 2.0.0.alpha4
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -210,10 +210,7 @@ homepage: https://hanamirb.org
 licenses:
 - MIT
 metadata:
-  allowed_push_host: https://rubygems.org
-  homepage_uri: https://hanamirb.org
-  source_code_uri: https://github.com/hanami/cli
-  changelog_uri: https://github.com/hanami/cli/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -229,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Hanami CLI