hanami-cli 2.0.0.alpha7 → 2.0.0.beta1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.action_hero.yml +11 -0
- data/.github/FUNDING.yml +1 -0
- data/CHANGELOG.md +58 -0
- data/Gemfile +2 -3
- data/LICENSE.md +22 -0
- data/README.md +14 -10
- data/hanami-cli.gemspec +3 -2
- data/lib/hanami/cli/bundler.rb +3 -7
- data/lib/hanami/cli/commands/app/command.rb +68 -0
- data/lib/hanami/cli/commands/{monolith → app}/console.rb +6 -6
- data/lib/hanami/cli/commands/{monolith → app}/db/create.rb +3 -3
- data/lib/hanami/cli/commands/{monolith → app}/db/create_migration.rb +3 -3
- data/lib/hanami/cli/commands/{monolith → app}/db/drop.rb +3 -3
- data/lib/hanami/cli/commands/{monolith → app}/db/migrate.rb +4 -4
- data/lib/hanami/cli/commands/{monolith → app}/db/reset.rb +3 -3
- data/lib/hanami/cli/commands/{monolith → app}/db/rollback.rb +4 -4
- data/lib/hanami/cli/commands/{monolith → app}/db/sample_data.rb +4 -4
- data/lib/hanami/cli/commands/{monolith → app}/db/seed.rb +4 -4
- data/lib/hanami/cli/commands/{monolith → app}/db/setup.rb +3 -3
- data/lib/hanami/cli/commands/{monolith → app}/db/structure/dump.rb +3 -3
- data/lib/hanami/cli/commands/{monolith → app}/db/version.rb +3 -3
- data/lib/hanami/cli/commands/{monolith → app}/generate/action.rb +3 -3
- data/lib/hanami/cli/commands/{monolith → app}/generate/slice.rb +4 -4
- data/lib/hanami/cli/commands/{monolith → app}/generate.rb +1 -1
- data/lib/hanami/cli/commands/{monolith → app}/install.rb +1 -1
- data/lib/hanami/cli/commands/app/routes.rb +82 -0
- data/lib/hanami/cli/commands/app/server.rb +58 -0
- data/lib/hanami/cli/commands/{monolith → app}/version.rb +1 -1
- data/lib/hanami/cli/commands/app.rb +46 -0
- data/lib/hanami/cli/commands/db/utils/database.rb +14 -10
- data/lib/hanami/cli/commands/gem/new.rb +29 -38
- data/lib/hanami/cli/commands/gem/version.rb +21 -1
- data/lib/hanami/cli/commands/gem.rb +2 -4
- data/lib/hanami/cli/commands.rb +9 -10
- data/lib/hanami/cli/generators/{monolith → app}/action/action.erb +0 -0
- data/lib/hanami/cli/generators/{monolith → app}/action/template.erb +0 -0
- data/lib/hanami/cli/generators/{monolith → app}/action/template.html.erb +0 -0
- data/lib/hanami/cli/generators/{monolith → app}/action/view.erb +0 -0
- data/lib/hanami/cli/generators/{monolith → app}/action.rb +2 -2
- data/lib/hanami/cli/generators/{monolith → app}/action_context.rb +1 -1
- data/lib/hanami/cli/generators/{monolith → app}/slice/action.erb +0 -0
- data/lib/hanami/cli/generators/{monolith → app}/slice/entities.erb +0 -0
- data/lib/hanami/cli/generators/{gem/application/monolith → app/slice}/keep.erb +0 -0
- data/lib/hanami/cli/generators/{monolith → app}/slice/repository.erb +0 -0
- data/lib/hanami/cli/generators/{monolith → app}/slice/routes.erb +0 -0
- data/lib/hanami/cli/generators/{monolith → app}/slice/view.erb +0 -0
- data/lib/hanami/cli/generators/{monolith → app}/slice.rb +2 -2
- data/lib/hanami/cli/generators/{monolith → app}/slice_context.rb +1 -1
- data/lib/hanami/cli/generators/context.rb +2 -2
- data/lib/hanami/cli/generators/gem/{application/monolith/entities.erb → app/action.erb} +3 -3
- data/lib/hanami/cli/generators/gem/{application/monolith/application.erb → app/app.erb} +1 -1
- data/lib/hanami/cli/generators/gem/{application/monolith → app}/config_ru.erb +0 -0
- data/lib/hanami/cli/generators/gem/{application/monolith → app}/env.erb +0 -0
- data/lib/hanami/cli/generators/gem/app/gemfile.erb +15 -0
- data/lib/hanami/cli/generators/{monolith/slice → gem/app}/keep.erb +0 -0
- data/lib/hanami/cli/generators/gem/app/operation.erb +9 -0
- data/lib/hanami/cli/generators/gem/app/rakefile.erb +3 -0
- data/lib/hanami/cli/generators/gem/{application/monolith → app}/readme.erb +0 -0
- data/lib/hanami/cli/generators/gem/app/relation.erb +7 -0
- data/lib/hanami/cli/generators/gem/app/repository.erb +9 -0
- data/lib/hanami/cli/generators/gem/app/routes.erb +11 -0
- data/lib/hanami/cli/generators/gem/app/settings.erb +9 -0
- data/lib/hanami/cli/generators/gem/{application/monolith/functions.erb → app/transformations.erb} +1 -1
- data/lib/hanami/cli/generators/gem/{application/monolith → app}/types.erb +0 -0
- data/lib/hanami/cli/generators/gem/app/validator.erb +12 -0
- data/lib/hanami/cli/generators/gem/app/view.erb +9 -0
- data/lib/hanami/cli/generators/gem/{application/monolith → app}/view_context.erb +1 -6
- data/lib/hanami/cli/generators/gem/app/view_part.erb +10 -0
- data/lib/hanami/cli/generators/gem/app.rb +64 -0
- data/lib/hanami/cli/generators/version.rb +55 -0
- data/lib/hanami/cli/rake_tasks.rb +54 -0
- data/lib/hanami/cli/repl/core.rb +7 -7
- data/lib/hanami/cli/server.rb +45 -0
- data/lib/hanami/cli/version.rb +1 -1
- data/lib/hanami/console/context.rb +12 -12
- data/lib/hanami/console/plugins/slice_readers.rb +3 -3
- data/project.yml +2 -0
- metadata +88 -60
- data/LICENSE.txt +0 -21
- data/lib/hanami/cli/commands/application.rb +0 -63
- data/lib/hanami/cli/commands/monolith.rb +0 -55
- data/lib/hanami/cli/generators/gem/application/monolith/action.erb +0 -21
- data/lib/hanami/cli/generators/gem/application/monolith/gemfile.erb +0 -19
- data/lib/hanami/cli/generators/gem/application/monolith/operation.erb +0 -18
- data/lib/hanami/cli/generators/gem/application/monolith/rakefile.erb +0 -3
- data/lib/hanami/cli/generators/gem/application/monolith/repository.erb +0 -13
- data/lib/hanami/cli/generators/gem/application/monolith/routes.erb +0 -4
- data/lib/hanami/cli/generators/gem/application/monolith/settings.erb +0 -6
- data/lib/hanami/cli/generators/gem/application/monolith/validation_contract.erb +0 -14
- data/lib/hanami/cli/generators/gem/application/monolith.rb +0 -83
- data/lib/hanami/cli/generators/gem/application.rb +0 -21
- data/lib/hanami/rake_tasks.rb +0 -52
File without changes
|
File without changes
|
@@ -0,0 +1,12 @@
|
|
1
|
+
# auto_register: false
|
2
|
+
# frozen_string_literal: true
|
3
|
+
|
4
|
+
require "dry/validation"
|
5
|
+
require "dry/schema/messages/i18n"
|
6
|
+
|
7
|
+
module <%= classified_app_name %>
|
8
|
+
module Validator < Dry::Validation::Contract
|
9
|
+
config.messages.backend = :i18n
|
10
|
+
config.messages.top_namespace = "validation"
|
11
|
+
end
|
12
|
+
end
|
@@ -3,13 +3,8 @@
|
|
3
3
|
require "hanami/view/context"
|
4
4
|
|
5
5
|
module <%= classified_app_name %>
|
6
|
-
module
|
6
|
+
module Views
|
7
7
|
class Context < Hanami::View::Context
|
8
|
-
def initialize(**args)
|
9
|
-
defaults = {content: {}}
|
10
|
-
|
11
|
-
super(**defaults.merge(args))
|
12
|
-
end
|
13
8
|
end
|
14
9
|
end
|
15
10
|
end
|
@@ -0,0 +1,64 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "erb"
|
4
|
+
require "shellwords"
|
5
|
+
require "hanami/cli/generators/context"
|
6
|
+
|
7
|
+
module Hanami
|
8
|
+
module CLI
|
9
|
+
module Generators
|
10
|
+
module Gem
|
11
|
+
class App
|
12
|
+
def initialize(fs:, inflector:, command_line:)
|
13
|
+
super()
|
14
|
+
@fs = fs
|
15
|
+
@inflector = inflector
|
16
|
+
@command_line = command_line
|
17
|
+
end
|
18
|
+
|
19
|
+
def call(app, context: Context.new(inflector, app), &blk)
|
20
|
+
generate_app(app, context)
|
21
|
+
blk.call
|
22
|
+
end
|
23
|
+
|
24
|
+
private
|
25
|
+
|
26
|
+
attr_reader :fs
|
27
|
+
|
28
|
+
attr_reader :inflector
|
29
|
+
|
30
|
+
attr_reader :command_line
|
31
|
+
|
32
|
+
def generate_app(app, context) # rubocop:disable Metrics/AbcSize
|
33
|
+
fs.write(".env", t("env.erb", context))
|
34
|
+
|
35
|
+
fs.write("README.md", t("readme.erb", context))
|
36
|
+
fs.write("Gemfile", t("gemfile.erb", context))
|
37
|
+
fs.write("Rakefile", t("rakefile.erb", context))
|
38
|
+
fs.write("config.ru", t("config_ru.erb", context))
|
39
|
+
|
40
|
+
fs.write("config/app.rb", t("app.erb", context))
|
41
|
+
fs.write("config/settings.rb", t("settings.erb", context))
|
42
|
+
fs.write("config/routes.rb", t("routes.erb", context))
|
43
|
+
|
44
|
+
fs.write("lib/tasks/.keep", t("keep.erb", context))
|
45
|
+
fs.write("lib/#{app}/types.rb", t("types.erb", context))
|
46
|
+
|
47
|
+
fs.write("app/actions/.keep", t("keep.erb", context))
|
48
|
+
fs.write("app/action.rb", t("action.erb", context))
|
49
|
+
end
|
50
|
+
|
51
|
+
def template(path, context)
|
52
|
+
require "erb"
|
53
|
+
|
54
|
+
ERB.new(
|
55
|
+
File.read(File.join(__dir__, "app", path))
|
56
|
+
).result(context.ctx)
|
57
|
+
end
|
58
|
+
|
59
|
+
alias_method :t, :template
|
60
|
+
end
|
61
|
+
end
|
62
|
+
end
|
63
|
+
end
|
64
|
+
end
|
@@ -0,0 +1,55 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Hanami
|
4
|
+
module CLI
|
5
|
+
module Generators
|
6
|
+
module Version
|
7
|
+
# @since 2.0.0
|
8
|
+
# @api private
|
9
|
+
def self.version
|
10
|
+
return Hanami::VERSION if defined?(Hanami::VERSION)
|
11
|
+
|
12
|
+
Hanami::CLI::VERSION
|
13
|
+
end
|
14
|
+
|
15
|
+
# @since 2.0.0
|
16
|
+
# @api private
|
17
|
+
def self.gem_requirement
|
18
|
+
result = if prerelease?
|
19
|
+
prerelease_version
|
20
|
+
else
|
21
|
+
stable_version
|
22
|
+
end
|
23
|
+
|
24
|
+
"~> #{result}"
|
25
|
+
end
|
26
|
+
|
27
|
+
# @since 2.0.0
|
28
|
+
# @api private
|
29
|
+
def self.prerelease?
|
30
|
+
version =~ /alpha|beta|rc/
|
31
|
+
end
|
32
|
+
|
33
|
+
# @since 2.0.0
|
34
|
+
# @api private
|
35
|
+
#
|
36
|
+
# @example
|
37
|
+
# Hanami::VERSION # => 2.0.0
|
38
|
+
# Hanami::CLI::Generators::Version.stable_version # => "2.0"
|
39
|
+
def self.stable_version
|
40
|
+
version.scan(/\A\d{1,2}\.\d{1,2}/).first
|
41
|
+
end
|
42
|
+
|
43
|
+
# @since 2.0.0
|
44
|
+
# @api private
|
45
|
+
#
|
46
|
+
# @example
|
47
|
+
# Hanami::VERSION # => 2.0.0.alpha8.1
|
48
|
+
# Hanami::CLI::Generators::Version.stable_version # => "2.0.0.alpha"
|
49
|
+
def self.prerelease_version
|
50
|
+
version.sub(/[[[:digit:]].]*\Z/, "")
|
51
|
+
end
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
@@ -0,0 +1,54 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "rake"
|
4
|
+
require "hanami/cli/bundler"
|
5
|
+
|
6
|
+
module Hanami
|
7
|
+
module CLI
|
8
|
+
# Install Rake tasks in an app
|
9
|
+
#
|
10
|
+
# @since 2.0.0
|
11
|
+
class RakeTasks
|
12
|
+
include Rake::DSL
|
13
|
+
|
14
|
+
# @since 2.0.0
|
15
|
+
# @api private
|
16
|
+
@tasks = []
|
17
|
+
|
18
|
+
# @since 2.0.0
|
19
|
+
# @api private
|
20
|
+
@_mutex = Mutex.new
|
21
|
+
|
22
|
+
# @since 2.0.0
|
23
|
+
# @api private
|
24
|
+
def self.register_tasks(&blk)
|
25
|
+
@_mutex.synchronize do
|
26
|
+
@tasks << blk
|
27
|
+
@tasks.uniq!
|
28
|
+
end
|
29
|
+
end
|
30
|
+
|
31
|
+
# @since 2.0.0
|
32
|
+
# @api private
|
33
|
+
def self.tasks
|
34
|
+
@_mutex.synchronize do
|
35
|
+
@tasks
|
36
|
+
end
|
37
|
+
end
|
38
|
+
|
39
|
+
# @since 0.6.0
|
40
|
+
# @api private
|
41
|
+
def self.install_tasks
|
42
|
+
new.call(tasks)
|
43
|
+
end
|
44
|
+
|
45
|
+
# @since 2.0.0
|
46
|
+
# @api private
|
47
|
+
def call(tasks)
|
48
|
+
tasks.each(&:call)
|
49
|
+
end
|
50
|
+
end
|
51
|
+
end
|
52
|
+
end
|
53
|
+
|
54
|
+
Hanami::CLI::Bundler.require(:cli)
|
data/lib/hanami/cli/repl/core.rb
CHANGED
@@ -8,14 +8,14 @@ module Hanami
|
|
8
8
|
# @api private
|
9
9
|
class Core
|
10
10
|
# @api private
|
11
|
-
attr_reader :
|
11
|
+
attr_reader :app
|
12
12
|
|
13
13
|
# @api private
|
14
14
|
attr_reader :opts
|
15
15
|
|
16
16
|
# @api private
|
17
|
-
def initialize(
|
18
|
-
@
|
17
|
+
def initialize(app, opts)
|
18
|
+
@app = app
|
19
19
|
@opts = opts
|
20
20
|
end
|
21
21
|
|
@@ -26,7 +26,7 @@ module Hanami
|
|
26
26
|
|
27
27
|
# @api private
|
28
28
|
def context
|
29
|
-
@context ||= Hanami::Console::Context.new(
|
29
|
+
@context ||= Hanami::Console::Context.new(app)
|
30
30
|
end
|
31
31
|
|
32
32
|
# @api private
|
@@ -36,18 +36,18 @@ module Hanami
|
|
36
36
|
|
37
37
|
# @api private
|
38
38
|
def name
|
39
|
-
(
|
39
|
+
(app.container.config.name || inflector.underscore(app.name))
|
40
40
|
.to_s.split("/")[0]
|
41
41
|
end
|
42
42
|
|
43
43
|
# @api private
|
44
44
|
def env
|
45
|
-
|
45
|
+
app.container.env
|
46
46
|
end
|
47
47
|
|
48
48
|
# @api private
|
49
49
|
def inflector
|
50
|
-
|
50
|
+
app.inflector
|
51
51
|
end
|
52
52
|
end
|
53
53
|
end
|
@@ -0,0 +1,45 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Hanami
|
4
|
+
module CLI
|
5
|
+
# @api private
|
6
|
+
class Server
|
7
|
+
attr_reader :rack_server
|
8
|
+
|
9
|
+
RACK_FALLBACK_OPTIONS = {
|
10
|
+
host: :Host,
|
11
|
+
port: :Port
|
12
|
+
}.freeze
|
13
|
+
|
14
|
+
OVERRIDING_OPTIONS = {
|
15
|
+
config: :config,
|
16
|
+
debug: :debug,
|
17
|
+
warn: :warn
|
18
|
+
}.freeze
|
19
|
+
|
20
|
+
def initialize(rack_server: Rack::Server)
|
21
|
+
@rack_server = rack_server
|
22
|
+
end
|
23
|
+
|
24
|
+
def call(**options)
|
25
|
+
rack_server.start(Hash[
|
26
|
+
extract_rack_fallback_options(options) + extract_overriding_options(options)
|
27
|
+
])
|
28
|
+
end
|
29
|
+
|
30
|
+
private
|
31
|
+
|
32
|
+
def extract_rack_fallback_options(options)
|
33
|
+
RACK_FALLBACK_OPTIONS.filter_map do |(name, rack_name)|
|
34
|
+
options[name] && [rack_name, options[name]]
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
def extract_overriding_options(options)
|
39
|
+
OVERRIDING_OPTIONS.map do |(name, rack_name)|
|
40
|
+
[rack_name, options[name]]
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
44
|
+
end
|
45
|
+
end
|
data/lib/hanami/cli/version.rb
CHANGED
@@ -4,48 +4,48 @@ require_relative "plugins/slice_readers"
|
|
4
4
|
|
5
5
|
module Hanami
|
6
6
|
module Console
|
7
|
-
# Hanami
|
7
|
+
# Hanami app console context
|
8
8
|
#
|
9
9
|
# @api private
|
10
10
|
# @since 2.0.0
|
11
11
|
class Context < Module
|
12
12
|
# @api private
|
13
|
-
attr_reader :
|
13
|
+
attr_reader :app
|
14
14
|
|
15
15
|
# @api private
|
16
|
-
def initialize(
|
16
|
+
def initialize(app)
|
17
17
|
super()
|
18
|
-
@
|
18
|
+
@app = app
|
19
19
|
|
20
20
|
define_context_methods
|
21
|
-
include Plugins::SliceReaders.new(
|
21
|
+
include Plugins::SliceReaders.new(app)
|
22
22
|
end
|
23
23
|
|
24
24
|
private
|
25
25
|
|
26
26
|
def define_context_methods
|
27
|
-
|
27
|
+
hanami_app = app
|
28
28
|
|
29
29
|
define_method(:inspect) do
|
30
|
-
"#<#{self.class}
|
30
|
+
"#<#{self.class} app=#{hanami_app} env=#{hanami_app.config.env}>"
|
31
31
|
end
|
32
32
|
|
33
33
|
define_method(:app) do
|
34
|
-
|
34
|
+
hanami_app
|
35
35
|
end
|
36
36
|
|
37
|
-
define_method(:
|
38
|
-
|
37
|
+
define_method(:app) do
|
38
|
+
hanami_app
|
39
39
|
end
|
40
40
|
|
41
41
|
define_method(:method_missing) do |name, *args, &block|
|
42
|
-
return
|
42
|
+
return hanami_app.public_send(name, *args, &block) if hanami_app.respond_to?(name)
|
43
43
|
|
44
44
|
super(name, *args, &block)
|
45
45
|
end
|
46
46
|
|
47
47
|
define_method(:respond_to_missing?) do |name, include_private|
|
48
|
-
super(name, include_private) ||
|
48
|
+
super(name, include_private) || hanami_app.respond_to?(name, include_private)
|
49
49
|
end
|
50
50
|
end
|
51
51
|
end
|
@@ -9,11 +9,11 @@ module Hanami
|
|
9
9
|
# @since 2.0.0
|
10
10
|
class SliceReaders < Module
|
11
11
|
# @api private
|
12
|
-
def initialize(
|
12
|
+
def initialize(app)
|
13
13
|
super()
|
14
14
|
|
15
|
-
|
16
|
-
define_method(slice.slice_name) do
|
15
|
+
app.slices.each do |slice|
|
16
|
+
define_method(slice.slice_name.to_sym) do
|
17
17
|
slice
|
18
18
|
end
|
19
19
|
end
|
data/project.yml
ADDED