hanami-cli 2.0.0.alpha7 → 2.0.0.beta1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha7
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-10 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
@@ -116,6 +136,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".action_hero.yml"
+- ".github/FUNDING.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
@@ -123,7 +145,7 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- LICENSE.txt
+- LICENSE.md
 - README.md
 - Rakefile
 - bin/console
@@ -135,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
@@ -144,68 +186,54 @@ 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:
 - MIT

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2021 Luca Guidi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/lib/hanami/cli/commands/application.rb

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-require "dry/files"
-
-require_relative "db/utils/database"
-
-module Hanami
-  module CLI
-    module Commands
-      class Application < Hanami::CLI::Command
-        module Environment
-          def call(**opts)
-            env = opts[:env]
-            ENV["HANAMI_ENV"] = env.to_s
-            super(**opts)
-          end
-        end
-
-        def self.inherited(klass)
-          super
-          klass.option(:env, required: false, default: "development", desc: "Application's environment")
-          klass.prepend(Environment)
-        end
-
-        def application
-          @application ||=
-            begin
-              require "hanami/prepare"
-              Hanami.application
-            end
-        end
-
-        def run_command(klass, *args)
-          klass.new(
-            out: out,
-            inflector: application.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[application]
-        end
-
-        def database_config
-          database.config
-        end
-      end
-    end
-  end
-end

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

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-module Hanami
-  module CLI
-    module Commands
-      module Monolith
-        require_relative "monolith/version"
-        # require_relative "monolith/install"
-        # require_relative "monolith/generate"
-        require_relative "monolith/install"
-        require_relative "monolith/generate"
-        require_relative "monolith/console"
-        require_relative "monolith/db/create"
-        require_relative "monolith/db/create_migration"
-        require_relative "monolith/db/drop"
-        require_relative "monolith/db/migrate"
-        require_relative "monolith/db/setup"
-        require_relative "monolith/db/reset"
-        require_relative "monolith/db/rollback"
-        require_relative "monolith/db/sample_data"
-        require_relative "monolith/db/seed"
-        require_relative "monolith/db/structure/dump"
-        require_relative "monolith/db/version"
-
-        def self.extended(base)
-          base.module_eval do
-            register "version", Version, aliases: ["v", "-v", "--version"]
-            # FIXME: temporary disabled for Hanami v2.0.0.alpha2
-            # register "install", Install
-
-            # FIXME: temporary disabled for Hanami v2.0.0.alpha2
-            # register "generate", aliases: ["g"] do |prefix|
-            #   prefix.register "slice", Generate::Slice
-            #   prefix.register "action", Generate::Action
-            # end
-
-            register "console", Commands::Monolith::Console
-
-            register "db create", Commands::Monolith::DB::Create
-            register "db create_migration", Commands::Monolith::DB::CreateMigration
-            register "db drop", Commands::Monolith::DB::Drop
-            register "db migrate", Commands::Monolith::DB::Migrate
-            register "db setup", Commands::Monolith::DB::Setup
-            register "db reset", Commands::Monolith::DB::Reset
-            register "db rollback", Commands::Monolith::DB::Rollback
-            register "db sample_data", Commands::Monolith::DB::SampleData
-            register "db seed", Commands::Monolith::DB::Seed
-            register "db structure dump", Commands::Monolith::DB::Structure::Dump
-            register "db version", Commands::Monolith::DB::Version
-          end
-        end
-      end
-    end
-  end
-end

data/lib/hanami/cli/generators/gem/application/monolith/action.erb

@@ -1,21 +0,0 @@
-# auto_register: false
-# frozen_string_literal: true
-
-require "json" # required for Hanami::Action::Flash to work
-require "hanami/action"
-require "hanami/action/cookies"
-require "hanami/action/csrf_protection"
-require "hanami/action/session"
-
-module <%= classified_app_name %>
-  class Action < Hanami::Action
-    def self.inherited(klass)
-      super
-
-      # These will need to be sorted by the framework eventually
-      klass.include Hanami::Action::Cookies
-      klass.include Hanami::Action::Session
-      klass.include Hanami::Action::CSRFProtection
-    end
-  end
-end

data/lib/hanami/cli/generators/gem/application/monolith/gemfile.erb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-gem "rake"
-
-gem "hanami-router", "<%= hanami_version %>"
-gem "hanami-controller", "<%= hanami_version %>"
-gem "hanami-validations", "<%= hanami_version %>"
-gem "hanami-view", git: "https://github.com/hanami/view.git", branch: "master"
-gem "dry-cli", "~> 0.6", require: false, git: "https://github.com/dry-rb/dry-cli.git", branch: "feature/file-utils-class"
-gem "hanami-cli", git: "https://github.com/hanami/cli.git", branch: "main"
-gem "hanami", require: false, git: "https://github.com/hanami/hanami.git", branch: "feature/hanami-2-cli"
-
-gem "puma"
-
-group :cli, :development, :test do
-  gem "hanami-rspec", git: "https://github.com/hanami/rspec.git", branch: "main"
-end

data/lib/hanami/cli/generators/gem/application/monolith/operation.erb

@@ -1,18 +0,0 @@
-# auto_register: false
-# frozen_string_literal: true
-
-require "dry/monads"
-require "dry/matcher/result_matcher"
-
-module <%= classified_app_name %>
-  class Operation
-    include Dry::Monads[:result, :try]
-
-    class << self
-      def inherited(klass)
-        klass.include Dry::Monads[:do]
-        klass.include Dry::Matcher::ResultMatcher.for(:call)
-      end
-    end
-  end
-end

data/lib/hanami/cli/generators/gem/application/monolith/rakefile.erb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require "hanami/application/rake_tasks"

data/lib/hanami/cli/generators/gem/application/monolith/repository.erb

@@ -1,13 +0,0 @@
-# auto_register: false
-# frozen_string_literal: true
-
-require "rom-repository"
-require_relative "entities"
-
-module <%= classified_app_name %>
-  class Repository < ROM::Repository::Root
-    include Deps[container: "persistence.rom"]
-
-    struct_namespace Entities
-  end
-end

data/lib/hanami/cli/generators/gem/application/monolith/routes.erb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-Hanami.application.routes do
-end

data/lib/hanami/cli/generators/gem/application/monolith/settings.erb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require "<%= underscored_app_name %>/types"
-
-Hanami.application.settings do
-end

data/lib/hanami/cli/generators/gem/application/monolith/validation_contract.erb

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

data/lib/hanami/cli/generators/gem/application/monolith.rb

@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-require "erb"
-require "shellwords"
-require "hanami/cli/generators/context"
-
-module Hanami
-  module CLI
-    module Generators
-      module Gem
-        module Application
-          class Monolith
-            def initialize(fs:, inflector:, command_line:)
-              super()
-              @fs = fs
-              @inflector = inflector
-              @command_line = command_line
-            end
-
-            def call(app, slice, slice_url_prefix, context: Context.new(inflector, app), &blk)
-              generate_app(app, context)
-              blk.call
-              generate_slice!(slice, slice_url_prefix)
-            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/application.rb", t("application.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}/entities/.keep", t("keep.erb", context))
-              fs.write("lib/#{app}/persistence/relations/.keep", t("keep.erb", context))
-              fs.write("lib/#{app}/validation/contract.rb", t("validation_contract.erb", context))
-              fs.write("lib/#{app}/view/context.rb", t("view_context.erb", context))
-              fs.write("lib/#{app}/action.rb", t("action.erb", context))
-              fs.write("lib/#{app}/entities.rb", t("entities.erb", context))
-              fs.write("lib/#{app}/functions.rb", t("functions.erb", context))
-              fs.write("lib/#{app}/operation.rb", t("operation.erb", context))
-              fs.write("lib/#{app}/repository.rb", t("repository.erb", context))
-              fs.write("lib/#{app}/types.rb", t("types.erb", context))
-            end
-
-            def generate_slice!(slice_name, slice_url_prefix)
-              slice_name = Shellwords.shellescape(slice_name)
-              slice_url_prefix = Shellwords.shellescape(slice_url_prefix)
-
-              command_line.call("hanami generate slice #{slice_name} --url-prefix=#{slice_url_prefix}").tap do |result|
-                raise "hanami generate slice #{slice_name} failed\n\n\n#{result.err.inspect}" unless result.successful?
-              end
-            end
-
-            def template(path, context)
-              require "erb"
-
-              ERB.new(
-                File.read(__dir__ + "/monolith/#{path}")
-              ).result(context.ctx)
-            end
-
-            alias_method :t, :template
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Hanami
-  module CLI
-    module Generators
-      module Gem
-        module Application
-          class << self
-            def call(architecture, fs, inflector, command_line)
-              require_relative "./application/#{architecture}"
-
-              generator_name = inflector.classify(architecture).to_sym
-              const_get(generator_name).new(fs: fs, inflector: inflector, command_line: command_line)
-            end
-            alias_method :[], :call
-          end
-        end
-      end
-    end
-  end
-end

data/lib/hanami/rake_tasks.rb

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-require "rake"
-require "hanami/cli/bundler"
-
-module Hanami
-  # Install Rake tasks in an application
-  #
-  # @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
-
-Hanami::CLI::Bundler.require(:cli)