hanami-cli 2.0.0.alpha8.1 → 2.0.0.beta1

data/lib/hanami/cli/generators/gem/app/repository.erb

@@ -0,0 +1,9 @@
+# auto_register: false
+# frozen_string_literal: true
+
+require "hanami/repository"
+
+module <%= classified_app_name %>
+  class Repository < Hanami::Repository
+  end
+end

data/lib/hanami/cli/generators/gem/app/routes.erb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "hanami/routes"
+
+module <%= classified_app_name %>
+  class Routes < Hanami::Routes
+    define do
+      root { "Hello from Hanami" }
+    end
+  end
+end

data/lib/hanami/cli/generators/gem/app/settings.erb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "<%= underscored_app_name %>/types"
+require "hanami/settings"
+
+module <%= classified_app_name %>
+  class Settings < Hanami::Settings
+  end
+end

data/lib/hanami/cli/generators/gem/{application/monolith/functions.erb → app/transformations.erb}

@@ -4,7 +4,7 @@
 require "dry/transformer"
 
 module <%= classified_app_name %>
-  module Functions
+  module Transformations
     extend Dry::Transformer::Registry
 
     import Dry::Transformer::ArrayTransformations

data/lib/hanami/cli/generators/gem/app/validator.erb

@@ -0,0 +1,12 @@
+# auto_register: false
+# frozen_string_literal: true
+
+require "dry/validation"
+require "dry/schema/messages/i18n"
+
+module <%= classified_app_name %>
+  module Validator < Dry::Validation::Contract
+    config.messages.backend = :i18n
+    config.messages.top_namespace = "validation"
+  end
+end

data/lib/hanami/cli/generators/gem/app/view.erb

@@ -0,0 +1,9 @@
+# auto_register: false
+# frozen_string_literal: true
+
+require "hanami/view"
+
+module <%= classified_app_name %>
+  class View < Hanami::View
+  end
+end

data/lib/hanami/cli/generators/gem/{application/monolith → app}/view_context.erb

@@ -3,13 +3,8 @@
 require "hanami/view/context"
 
 module <%= classified_app_name %>
-  module View
+  module Views
     class Context < Hanami::View::Context
-      def initialize(**args)
-        defaults = {content: {}}
-
-        super(**defaults.merge(args))
-      end
     end
   end
 end

data/lib/hanami/cli/generators/gem/app/view_part.erb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "hanami/view/part"
+
+module <%= classified_app_name %>
+  module Views
+    class Part < Hanami::View::Part
+    end
+  end
+end

data/lib/hanami/cli/generators/gem/app.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require "erb"
+require "shellwords"
+require "hanami/cli/generators/context"
+
+module Hanami
+  module CLI
+    module Generators
+      module Gem
+        class App
+          def initialize(fs:, inflector:, command_line:)
+            super()
+            @fs = fs
+            @inflector = inflector
+            @command_line = command_line
+          end
+
+          def call(app, context: Context.new(inflector, app), &blk)
+            generate_app(app, context)
+            blk.call
+          end
+
+          private
+
+          attr_reader :fs
+
+          attr_reader :inflector
+
+          attr_reader :command_line
+
+          def generate_app(app, context) # rubocop:disable Metrics/AbcSize
+            fs.write(".env", t("env.erb", context))
+
+            fs.write("README.md", t("readme.erb", context))
+            fs.write("Gemfile", t("gemfile.erb", context))
+            fs.write("Rakefile", t("rakefile.erb", context))
+            fs.write("config.ru", t("config_ru.erb", context))
+
+            fs.write("config/app.rb", t("app.erb", context))
+            fs.write("config/settings.rb", t("settings.erb", context))
+            fs.write("config/routes.rb", t("routes.erb", context))
+
+            fs.write("lib/tasks/.keep", t("keep.erb", context))
+            fs.write("lib/#{app}/types.rb", t("types.erb", context))
+
+            fs.write("app/actions/.keep", t("keep.erb", context))
+            fs.write("app/action.rb", t("action.erb", context))
+          end
+
+          def template(path, context)
+            require "erb"
+
+            ERB.new(
+              File.read(File.join(__dir__, "app", path))
+            ).result(context.ctx)
+          end
+
+          alias_method :t, :template
+        end
+      end
+    end
+  end
+end

data/lib/hanami/cli/generators/version.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Hanami
+  module CLI
+    module Generators
+      module Version
+        # @since 2.0.0
+        # @api private
+        def self.version
+          return Hanami::VERSION if defined?(Hanami::VERSION)
+
+          Hanami::CLI::VERSION
+        end
+
+        # @since 2.0.0
+        # @api private
+        def self.gem_requirement
+          result = if prerelease?
+                     prerelease_version
+                   else
+                     stable_version
+                   end
+
+          "~> #{result}"
+        end
+
+        # @since 2.0.0
+        # @api private
+        def self.prerelease?
+          version =~ /alpha|beta|rc/
+        end
+
+        # @since 2.0.0
+        # @api private
+        #
+        # @example
+        #   Hanami::VERSION # => 2.0.0
+        #   Hanami::CLI::Generators::Version.stable_version # => "2.0"
+        def self.stable_version
+          version.scan(/\A\d{1,2}\.\d{1,2}/).first
+        end
+
+        # @since 2.0.0
+        # @api private
+        #
+        # @example
+        #   Hanami::VERSION # => 2.0.0.alpha8.1
+        #   Hanami::CLI::Generators::Version.stable_version # => "2.0.0.alpha"
+        def self.prerelease_version
+          version.sub(/[[[:digit:]].]*\Z/, "")
+        end
+      end
+    end
+  end
+end

data/lib/hanami/cli/rake_tasks.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require "rake"
+require "hanami/cli/bundler"
+
+module Hanami
+  module CLI
+    # Install Rake tasks in an app
+    #
+    # @since 2.0.0
+    class RakeTasks
+      include Rake::DSL
+
+      # @since 2.0.0
+      # @api private
+      @tasks = []
+
+      # @since 2.0.0
+      # @api private
+      @_mutex = Mutex.new
+
+      # @since 2.0.0
+      # @api private
+      def self.register_tasks(&blk)
+        @_mutex.synchronize do
+          @tasks << blk
+          @tasks.uniq!
+        end
+      end
+
+      # @since 2.0.0
+      # @api private
+      def self.tasks
+        @_mutex.synchronize do
+          @tasks
+        end
+      end
+
+      # @since 0.6.0
+      # @api private
+      def self.install_tasks
+        new.call(tasks)
+      end
+
+      # @since 2.0.0
+      # @api private
+      def call(tasks)
+        tasks.each(&:call)
+      end
+    end
+  end
+end
+
+Hanami::CLI::Bundler.require(:cli)

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

@@ -8,14 +8,14 @@ module Hanami
       # @api private
       class Core
         # @api private
-        attr_reader :application
+        attr_reader :app
 
         # @api private
         attr_reader :opts
 
         # @api private
-        def initialize(application, opts)
-          @application = application
+        def initialize(app, opts)
+          @app = app
           @opts = opts
         end
 
@@ -26,7 +26,7 @@ module Hanami
 
         # @api private
         def context
-          @context ||= Hanami::Console::Context.new(application)
+          @context ||= Hanami::Console::Context.new(app)
         end
 
         # @api private
@@ -36,18 +36,18 @@ module Hanami
 
         # @api private
         def name
-          (application.container.config.name || inflector.underscore(application.name))
+          (app.container.config.name || inflector.underscore(app.name))
             .to_s.split("/")[0]
         end
 
         # @api private
         def env
-          application.container.env
+          app.container.env
         end
 
         # @api private
         def inflector
-          application.inflector
+          app.inflector
         end
       end
     end

data/lib/hanami/cli/server.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Hanami
+  module CLI
+    # @api private
+    class Server
+      attr_reader :rack_server
+
+      RACK_FALLBACK_OPTIONS = {
+        host: :Host,
+        port: :Port
+      }.freeze
+
+      OVERRIDING_OPTIONS = {
+        config: :config,
+        debug: :debug,
+        warn: :warn
+      }.freeze
+
+      def initialize(rack_server: Rack::Server)
+        @rack_server = rack_server
+      end
+
+      def call(**options)
+        rack_server.start(Hash[
+          extract_rack_fallback_options(options) + extract_overriding_options(options)
+        ])
+      end
+
+      private
+
+      def extract_rack_fallback_options(options)
+        RACK_FALLBACK_OPTIONS.filter_map do |(name, rack_name)|
+          options[name] && [rack_name, options[name]]
+        end
+      end
+
+      def extract_overriding_options(options)
+        OVERRIDING_OPTIONS.map do |(name, rack_name)|
+          [rack_name, options[name]]
+        end
+      end
+    end
+  end
+end

data/lib/hanami/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Hanami
   module CLI
-    VERSION = "2.0.0.alpha8.1"
+    VERSION = "2.0.0.beta1"
   end
 end

data/lib/hanami/console/context.rb

@@ -4,48 +4,48 @@ require_relative "plugins/slice_readers"
 
 module Hanami
   module Console
-    # Hanami application console context
+    # Hanami app console context
     #
     # @api private
     # @since 2.0.0
     class Context < Module
       # @api private
-      attr_reader :application
+      attr_reader :app
 
       # @api private
-      def initialize(application)
+      def initialize(app)
         super()
-        @application = application
+        @app = app
 
         define_context_methods
-        include Plugins::SliceReaders.new(application)
+        include Plugins::SliceReaders.new(app)
       end
 
       private
 
       def define_context_methods
-        app = application
+        hanami_app = app
 
         define_method(:inspect) do
-          "#<#{self.class} application=#{app} env=#{app.config.env}>"
+          "#<#{self.class} app=#{hanami_app} env=#{hanami_app.config.env}>"
         end
 
         define_method(:app) do
-          app
+          hanami_app
         end
 
-        define_method(:application) do
-          app
+        define_method(:app) do
+          hanami_app
         end
 
         define_method(:method_missing) do |name, *args, &block|
-          return app.public_send(name, *args, &block) if app.respond_to?(name)
+          return hanami_app.public_send(name, *args, &block) if hanami_app.respond_to?(name)
 
           super(name, *args, &block)
         end
 
         define_method(:respond_to_missing?) do |name, include_private|
-          super(name, include_private) || app.respond_to?(name, include_private)
+          super(name, include_private) || hanami_app.respond_to?(name, include_private)
         end
       end
     end

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

@@ -9,10 +9,10 @@ module Hanami
       # @since 2.0.0
       class SliceReaders < Module
         # @api private
-        def initialize(application)
+        def initialize(app)
           super()
 
-          application.slices.each do |slice|
+          app.slices.each do |slice|
             define_method(slice.slice_name.to_sym) do
               slice
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha8.1
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-23 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,28 +44,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: dry-files
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +114,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Hanami command line
 email:
 - me@lucaguidi.com
@@ -137,7 +157,27 @@ files:
 - lib/hanami/cli/command.rb
 - lib/hanami/cli/command_line.rb
 - lib/hanami/cli/commands.rb
-- lib/hanami/cli/commands/application.rb
+- lib/hanami/cli/commands/app.rb
+- lib/hanami/cli/commands/app/command.rb
+- lib/hanami/cli/commands/app/console.rb
+- lib/hanami/cli/commands/app/db/create.rb
+- lib/hanami/cli/commands/app/db/create_migration.rb
+- lib/hanami/cli/commands/app/db/drop.rb
+- lib/hanami/cli/commands/app/db/migrate.rb
+- lib/hanami/cli/commands/app/db/reset.rb
+- lib/hanami/cli/commands/app/db/rollback.rb
+- lib/hanami/cli/commands/app/db/sample_data.rb
+- lib/hanami/cli/commands/app/db/seed.rb
+- lib/hanami/cli/commands/app/db/setup.rb
+- lib/hanami/cli/commands/app/db/structure/dump.rb
+- lib/hanami/cli/commands/app/db/version.rb
+- lib/hanami/cli/commands/app/generate.rb
+- lib/hanami/cli/commands/app/generate/action.rb
+- lib/hanami/cli/commands/app/generate/slice.rb
+- lib/hanami/cli/commands/app/install.rb
+- lib/hanami/cli/commands/app/routes.rb
+- lib/hanami/cli/commands/app/server.rb
+- lib/hanami/cli/commands/app/version.rb
 - lib/hanami/cli/commands/db/utils/database.rb
 - lib/hanami/cli/commands/db/utils/database_config.rb
 - lib/hanami/cli/commands/db/utils/mysql.rb
@@ -146,68 +186,53 @@ files:
 - lib/hanami/cli/commands/gem.rb
 - lib/hanami/cli/commands/gem/new.rb
 - lib/hanami/cli/commands/gem/version.rb
-- lib/hanami/cli/commands/monolith.rb
-- lib/hanami/cli/commands/monolith/console.rb
-- lib/hanami/cli/commands/monolith/db/create.rb
-- lib/hanami/cli/commands/monolith/db/create_migration.rb
-- lib/hanami/cli/commands/monolith/db/drop.rb
-- lib/hanami/cli/commands/monolith/db/migrate.rb
-- lib/hanami/cli/commands/monolith/db/reset.rb
-- lib/hanami/cli/commands/monolith/db/rollback.rb
-- lib/hanami/cli/commands/monolith/db/sample_data.rb
-- lib/hanami/cli/commands/monolith/db/seed.rb
-- lib/hanami/cli/commands/monolith/db/setup.rb
-- lib/hanami/cli/commands/monolith/db/structure/dump.rb
-- lib/hanami/cli/commands/monolith/db/version.rb
-- lib/hanami/cli/commands/monolith/generate.rb
-- lib/hanami/cli/commands/monolith/generate/action.rb
-- lib/hanami/cli/commands/monolith/generate/slice.rb
-- lib/hanami/cli/commands/monolith/install.rb
-- lib/hanami/cli/commands/monolith/version.rb
 - lib/hanami/cli/error.rb
+- lib/hanami/cli/generators/app/action.rb
+- lib/hanami/cli/generators/app/action/action.erb
+- lib/hanami/cli/generators/app/action/template.erb
+- lib/hanami/cli/generators/app/action/template.html.erb
+- lib/hanami/cli/generators/app/action/view.erb
+- lib/hanami/cli/generators/app/action_context.rb
+- lib/hanami/cli/generators/app/slice.rb
+- lib/hanami/cli/generators/app/slice/action.erb
+- lib/hanami/cli/generators/app/slice/entities.erb
+- lib/hanami/cli/generators/app/slice/keep.erb
+- lib/hanami/cli/generators/app/slice/repository.erb
+- lib/hanami/cli/generators/app/slice/routes.erb
+- lib/hanami/cli/generators/app/slice/view.erb
+- lib/hanami/cli/generators/app/slice_context.rb
 - lib/hanami/cli/generators/context.rb
-- lib/hanami/cli/generators/gem/application.rb
-- lib/hanami/cli/generators/gem/application/monolith.rb
-- lib/hanami/cli/generators/gem/application/monolith/action.erb
-- lib/hanami/cli/generators/gem/application/monolith/application.erb
-- lib/hanami/cli/generators/gem/application/monolith/config_ru.erb
-- lib/hanami/cli/generators/gem/application/monolith/entities.erb
-- lib/hanami/cli/generators/gem/application/monolith/env.erb
-- lib/hanami/cli/generators/gem/application/monolith/functions.erb
-- lib/hanami/cli/generators/gem/application/monolith/gemfile.erb
-- lib/hanami/cli/generators/gem/application/monolith/keep.erb
-- lib/hanami/cli/generators/gem/application/monolith/operation.erb
-- lib/hanami/cli/generators/gem/application/monolith/rakefile.erb
-- lib/hanami/cli/generators/gem/application/monolith/readme.erb
-- lib/hanami/cli/generators/gem/application/monolith/repository.erb
-- lib/hanami/cli/generators/gem/application/monolith/routes.erb
-- lib/hanami/cli/generators/gem/application/monolith/settings.erb
-- lib/hanami/cli/generators/gem/application/monolith/types.erb
-- lib/hanami/cli/generators/gem/application/monolith/validation_contract.erb
-- lib/hanami/cli/generators/gem/application/monolith/view_context.erb
-- lib/hanami/cli/generators/monolith/action.rb
-- lib/hanami/cli/generators/monolith/action/action.erb
-- lib/hanami/cli/generators/monolith/action/template.erb
-- lib/hanami/cli/generators/monolith/action/template.html.erb
-- lib/hanami/cli/generators/monolith/action/view.erb
-- lib/hanami/cli/generators/monolith/action_context.rb
-- lib/hanami/cli/generators/monolith/slice.rb
-- lib/hanami/cli/generators/monolith/slice/action.erb
-- lib/hanami/cli/generators/monolith/slice/entities.erb
-- lib/hanami/cli/generators/monolith/slice/keep.erb
-- lib/hanami/cli/generators/monolith/slice/repository.erb
-- lib/hanami/cli/generators/monolith/slice/routes.erb
-- lib/hanami/cli/generators/monolith/slice/view.erb
-- lib/hanami/cli/generators/monolith/slice_context.rb
+- lib/hanami/cli/generators/gem/app.rb
+- lib/hanami/cli/generators/gem/app/action.erb
+- lib/hanami/cli/generators/gem/app/app.erb
+- lib/hanami/cli/generators/gem/app/config_ru.erb
+- lib/hanami/cli/generators/gem/app/env.erb
+- lib/hanami/cli/generators/gem/app/gemfile.erb
+- lib/hanami/cli/generators/gem/app/keep.erb
+- lib/hanami/cli/generators/gem/app/operation.erb
+- lib/hanami/cli/generators/gem/app/rakefile.erb
+- lib/hanami/cli/generators/gem/app/readme.erb
+- lib/hanami/cli/generators/gem/app/relation.erb
+- lib/hanami/cli/generators/gem/app/repository.erb
+- lib/hanami/cli/generators/gem/app/routes.erb
+- lib/hanami/cli/generators/gem/app/settings.erb
+- lib/hanami/cli/generators/gem/app/transformations.erb
+- lib/hanami/cli/generators/gem/app/types.erb
+- lib/hanami/cli/generators/gem/app/validator.erb
+- lib/hanami/cli/generators/gem/app/view.erb
+- lib/hanami/cli/generators/gem/app/view_context.erb
+- lib/hanami/cli/generators/gem/app/view_part.erb
+- lib/hanami/cli/generators/version.rb
+- lib/hanami/cli/rake_tasks.rb
 - lib/hanami/cli/repl/core.rb
 - lib/hanami/cli/repl/irb.rb
 - lib/hanami/cli/repl/pry.rb
+- lib/hanami/cli/server.rb
 - lib/hanami/cli/system_call.rb
 - lib/hanami/cli/url.rb
 - lib/hanami/cli/version.rb
 - lib/hanami/console/context.rb
 - lib/hanami/console/plugins/slice_readers.rb
-- lib/hanami/rake_tasks.rb
 - project.yml
 homepage: https://hanamirb.org
 licenses:
@@ -233,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Hanami CLI