mogu 0.6.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5043094005d94e801e049d1a6a03689deee2ded40a10703feb2b1dbb5cda5df0
-  data.tar.gz: 3bc7f43bc271f0a32bbd3cf282020e6dbae6c6970975d3569ca796b379ea0757
+  metadata.gz: 269a89adb5358437707573187ca45661b19bde3752d18cda866624c22feffa4b
+  data.tar.gz: 26189a50fd73c9ceefcbef18a05bf161f1832fe26f6449decad4ee8af094e1bd
 SHA512:
-  metadata.gz: 07de320e8f7c9c8fdb96f85c78b69a8089711474f0727648701906d2f8e4dcf8959136a063058e835999e2541008c3577a18fee4a1db62a8b148eb3855ca874e
-  data.tar.gz: 00a5c8bd2bba6b3ad8c75b6df01f0f9088d9ea10807b8798a7d043d5e2553eaee40295ff17405cd5bdf2349c5c549e35ed7c9e12f959b79e37d035d8d912beff
+  metadata.gz: bdb9286c8524786c016a556b946a135de8df76cb0be38a6277b9edac6245d6235f3754bdfd4c61e7f7980db9a41a9435d16e90c68caaf6c75f804125bf2d667b
+  data.tar.gz: '0291883c08d156c983f845408f53eafe57d0576c58b065015ba3c5b7ee937fa3d3eff431367feb73d371a1860b6777cb5aff4d91a609bcbd2f7baabae2e1eaa8'

data/.devcontainer/devcontainer.json

@@ -20,7 +20,7 @@
   "settings": {},
 
   // Add the IDs of extensions you want installed when the container is created.
-  "extensions": ["castwide.solargraph"]
+  "extensions": ["castwide.solargraph", "soutaro.steep-vscode"]
 
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   // "forwardPorts": [],

data/.vscode/settings.json

@@ -2,6 +2,7 @@
   "[ruby]": {
     "editor.defaultFormatter": "castwide.solargraph"
   },
+  "solargraph.completion": false,
   "solargraph.diagnostics": true,
   "solargraph.formatting": true,
   "solargraph.useBundler": true

data/Gemfile

@@ -16,3 +16,5 @@ gem 'rubocop-rake', '~> 0.6.0'
 gem 'rubocop-rspec', '~> 2.9'
 
 gem 'solargraph', '~> 0.44.3'
+
+gem 'steep', '~> 0.52.0'

data/README.md

@@ -12,6 +12,7 @@ CLI to create rails projects interactively.
   - database
   - javascript
   - css
+  - skips
 - Support in adding gems
 
 ## Installation
@@ -22,45 +23,75 @@ gem install mogu
 
 ## Usage
 
+### help
+
 ```bash
-mogu
+mogu help
 ```
 
-```bash
-Please input app path
+### new
 
-Do you want api mode? (y/N)
+Create rails projects interactively.
 
-Choose customizes
-> ⬡ database (Default: sqlite3)
-  ⬡ javascript (Default: importmap)
-  ⬡ css
-  ⬡ gems
+```bash
+mogu new
+```
 
-Choose database
-> sqlite3
-  mysql
-  postgresql
+```bash
+? Please input app path
+>
+
+? Do you want api mode? (Choose with ↑ ↓ ⏎)
+> 1. no
+  2. yes
+
+? Choose customizes (Toggle options. Choose with ↑ ↓ ⏎, filter with 'f')
+> 1. ☐ database (Default: sqlite3)
+  2. ☐ javascript (Default: importmap)
+  3. ☐ css
+  4. ☐ skips
+  0. Done
+
+? Choose database (Choose with ↑ ↓ ⏎, filter with 'f')
+> 1.  sqlite3
+  2.  mysql
+  3.  postgresql
   ...
 
-Choose javascript
-> importmap
-  webpack
-  esbuild
-  rollup
-
-Choose css
-> tailwind
-  bootstrap
-  bulma
-  postcss
-  sass
-
-Choose gems
-> ⬡ brakeman
-  ⬡ solargraph
-  ⬡ rspec
-  ⬡ rubocop
+? Choose javascript (Choose with ↑ ↓ ⏎, filter with 'f')
+> 1. importmap
+  2. webpack
+  3. esbuild
+  4. rollup
+
+? Choose css (Choose with ↑ ↓ ⏎, filter with 'f')
+> 1. tailwind
+  2. bootstrap
+  3. bulma
+  4. postcss
+  5. sass
+
+? Choose skips (Toggle options. Choose with ↑ ↓ ⏎, filter with 'f')
+> 1. ☐ test
+  0. Done
+```
+
+### gem
+
+Add gems to rails projects.
+
+```bash
+mogu gem
+```
+
+```bash
+? Choose gems (Toggle options. Choose with ↑ ↓ ⏎, filter with 'f')
+> 1. ☐ brakeman
+  2. ☐ solargraph
+  3. ☐ rspec
+  4. ☐ rubocop
+  0. Done
+
 ```
 
 ## Development

data/Steepfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+target :lib do
+  signature 'sig'
+
+  check 'lib'
+
+  library 'erb', 'tempfile'
+end

data/lib/mogu/cli.rb

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
 
-require 'rails/command'
 require 'thor'
 
 module Mogu
   class CLI < Thor
+    desc 'gem', 'Add gems to rails projects'
+    def gem
+      Mogu::GemCommand.new.run
+    end
+
     desc 'new', 'Create rails projects interactively'
     def new
-      prompt = Mogu::Prompt.new
-      prompt.run
-
-      Rails::Command.invoke :application, ['new', *prompt.to_opt]
+      Mogu::NewCommand.new.run
     end
 
     desc 'version', 'Display mogu version'

data/lib/mogu/gem_command.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'cli/ui'
+require 'erb'
+require 'rails/command'
+require 'tempfile'
+
+module Mogu
+  class GemCommand
+    def run
+      erb = ERB.new File.read(File.expand_path('templates/gem.erb', __dir__.to_s))
+      template = Tempfile.new
+
+      gems = ask_gems
+      template.write erb.result_with_hash(gems: gems)
+      template.rewind
+
+      ENV.store 'LOCATION', template.path
+
+      Rails::Command.invoke 'app:template'
+    end
+
+    private
+
+    def ask_gems
+      options = %w[brakeman solargraph rspec rubocop]
+
+      ::CLI::UI::Prompt.ask 'Choose gems', multiple: true, options: options
+    end
+  end
+end

data/lib/mogu/new_command.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require 'cli/ui'
+require 'rails/command'
+
+module Mogu
+  class NewCommand
+    def run
+      @app_path = ask_app_path
+      @is_api = confirm_is_api
+      customizes = ask_customizes
+
+      @database = customizes.include?('database') ? ask_database : []
+      @javascript = customizes.include?('javascript') ? ask_javascript : []
+      @css = customizes.include?('css') ? ask_css : []
+      @skips = customizes.include?('skips') ? ask_skips : []
+
+      Rails::Command.invoke :application, ['new', *to_opt]
+    end
+
+    private
+
+    def ask_app_path
+      ::CLI::UI::Prompt.ask 'Please input app path', allow_empty: false
+    end
+
+    def confirm_is_api
+      ::CLI::UI::Prompt.confirm 'Do you want api mode?', default: false
+    end
+
+    def ask_customizes
+      ::CLI::UI::Prompt.ask 'Choose customizes', multiple: true do |handler|
+        handler.option('database (Default: sqlite3)') { 'database' }
+
+        unless @is_api
+          handler.option('javascript (Default: importmap)') { 'javascript' }
+          handler.option('css') { 'css' }
+        end
+
+        handler.option('skips') { 'skips' }
+      end
+    end
+
+    def ask_database
+      options = %w[sqlite3 mysql postgresql oracle sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc]
+
+      ::CLI::UI::Prompt.ask 'Choose database' do |handler|
+        options.each do |option|
+          handler.option(option) { |s| ['-d', s] }
+        end
+      end
+    end
+
+    def ask_javascript
+      options = %w[importmap webpack esbuild rollup]
+
+      ::CLI::UI::Prompt.ask 'Choose javascript' do |handler|
+        options.each do |option|
+          handler.option(option) { |s| ['-j', s] }
+        end
+      end
+    end
+
+    def ask_css
+      options = %w[tailwind bootstrap bulma postcss sass]
+
+      ::CLI::UI::Prompt.ask 'Choose css' do |handler|
+        options.each do |option|
+          handler.option(option) { |s| ['-c', s] }
+        end
+      end
+    end
+
+    def ask_skips
+      ::CLI::UI::Prompt.ask 'Choose skips', multiple: true do |handler|
+        handler.option('test') { '--skip-test' }
+      end
+    end
+
+    def to_opt
+      [
+        @app_path,
+        @is_api ? '--api' : [],
+        @database,
+        @javascript,
+        @css,
+        *@skips
+      ].flatten
+    end
+  end
+end

data/lib/mogu/templates/gem.erb

@@ -0,0 +1,39 @@
+<% if gems.include? 'brakeman' %>
+  gem 'brakeman', group: :development
+<% end %>
+
+<% if gems.include? 'rspec' %>
+  gem 'factory_bot_rails', group: %i[development test]
+  gem 'rspec-rails', group: %i[development test]
+<% end %>
+
+<% if gems.include? 'rubocop' %>
+  gem 'rubocop-rails', group: :development, require: false
+<% end %>
+
+<% if gems.include? 'solargraph' %>
+  gem 'solargraph', group: :development
+<% end %>
+
+<% if gems.include? 'rubocop' %>
+  create_file '.rubocop.yml', <<~YML
+    require:
+      - rubocop-rails
+
+    AllCops:
+      NewCops: enable
+
+    Rails:
+      Enabled: true
+  YML
+<% end %>
+
+run 'bundle install'
+
+<% if gems.include? 'rspec' %>
+  generate 'rspec:install'
+<% end %>
+
+<% if gems.include? 'rubocop' %>
+  run 'rubocop --auto-gen-config'
+<% end %>

data/lib/mogu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mogu
-  VERSION = '0.6.0'
+  VERSION = '0.8.1'
 end

data/lib/mogu.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require_relative 'mogu/cli'
-require_relative 'mogu/prompt'
-require_relative 'mogu/template'
+require_relative 'mogu/gem_command'
+require_relative 'mogu/new_command'
 require_relative 'mogu/version'
 
 module Mogu; end

data/mogu.gemspec

@@ -32,9 +32,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # Uncomment to register a new dependency of your gem
+  spec.add_dependency 'cli-ui', '~> 1.0'
   spec.add_dependency 'railties', '~> 7.0'
   spec.add_dependency 'thor', '~> 1.0'
-  spec.add_dependency 'tty-prompt', '~> 0.23'
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/sig/mogu/cli.rbs

@@ -0,0 +1,10 @@
+# TypeProf 0.21.2
+
+# Classes
+module Mogu
+  class CLI < Thor
+    def gem: -> void
+    def new: -> void
+    def version: -> void
+  end
+end

data/sig/mogu/gem_command.rbs

@@ -0,0 +1,11 @@
+# TypeProf 0.21.2
+
+# Classes
+module Mogu
+  class GemCommand
+    def run: -> void
+
+    private
+    def ask_gems: -> Array[String]
+  end
+end

data/sig/mogu/new_command.rbs

@@ -0,0 +1,25 @@
+# TypeProf 0.21.2
+
+# Classes
+module Mogu
+  class NewCommand
+    @app_path: String
+    @is_api: bool
+    @database: Array[String]
+    @javascript: Array[String]
+    @css: Array[String]
+    @skips: Array[String]
+
+    def run: -> void
+
+    private
+    def ask_app_path: -> String
+    def confirm_is_api: -> bool
+    def ask_customizes: -> Array[String]
+    def ask_database: -> Array[String]
+    def ask_javascript: -> Array[String]
+    def ask_css: -> Array[String]
+    def ask_skips: -> Array[String]
+    def to_opt: -> Array[String]
+  end
+end

data/sig/mogu/version.rbs

@@ -0,0 +1,6 @@
+# TypeProf 0.21.2
+
+# Classes
+module Mogu
+  VERSION: String
+end

data/sig/patch.rbs

@@ -0,0 +1,19 @@
+# Classes
+module CLI
+  module UI
+    class Prompt
+      def self.ask: (String, ?allow_empty: bool, ?multiple: bool, ?options: Array[String]) ?{ (untyped) -> void } -> untyped
+      def self.confirm: (String, ?default: bool) -> bool
+    end
+  end
+end
+
+module Rails
+  class Command
+    def self.invoke: (String | Symbol, ?Array[String]) -> void
+  end
+end
+
+class Thor
+  def self.desc: (String, String) -> void
+end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: mogu
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.1
 platform: ruby
 authors:
 - MoguraStore
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-03 00:00:00.000000000 Z
+date: 2022-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: cli-ui
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: tty-prompt
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '1.0'
 description: CLI to create rails projects interactively.
 email:
 - 368034+lisp719@users.noreply.github.com
@@ -71,16 +71,23 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Steepfile
 - bin/console
 - bin/setup
 - compose.yaml
 - exe/mogu
 - lib/mogu.rb
 - lib/mogu/cli.rb
-- lib/mogu/prompt.rb
-- lib/mogu/template.rb
+- lib/mogu/gem_command.rb
+- lib/mogu/new_command.rb
+- lib/mogu/templates/gem.erb
 - lib/mogu/version.rb
 - mogu.gemspec
+- sig/mogu/cli.rbs
+- sig/mogu/gem_command.rbs
+- sig/mogu/new_command.rbs
+- sig/mogu/version.rbs
+- sig/patch.rbs
 homepage: https://github.com/mogurastore/mogu
 licenses:
 - MIT

data/lib/mogu/prompt.rb

@@ -1,127 +0,0 @@
-# frozen_string_literal: true
-
-require 'tty-prompt'
-
-module Mogu
-  class Prompt
-    Result = Struct.new(
-      :app_path,
-      :is_api,
-      :customizes,
-      :database,
-      :javascript,
-      :css,
-      :gems,
-      :template,
-      keyword_init: true
-    )
-
-    def initialize
-      @prompt = TTY::Prompt.new
-
-      @result = Result.new(
-        app_path: '',
-        is_api: false,
-        customizes: [],
-        database: '',
-        javascript: '',
-        css: '',
-        gems: [],
-        template: nil
-      )
-    end
-
-    def run
-      @result.app_path = @prompt.ask 'Please input app path', required: true
-      @result.is_api = @prompt.yes? 'Do you want api mode?', default: false
-      @result.customizes = customizes
-
-      @result.database = database if database?
-      @result.javascript = javascript if javascript?
-      @result.css = css if css?
-      @result.gems = gems if gems?
-      @result.template = Mogu::Template.create @result.gems if template?
-    end
-
-    def to_opt
-      [
-        @result.app_path,
-        @result.is_api ? ['--api'] : [],
-        database? ? ['-d', @result.database] : [],
-        javascript? ? ['-j', @result.javascript] : [],
-        css? ? ['-c', @result.css] : [],
-        rspec? ? %w[-T] : [],
-        template? ? ['-m', @result.template.path] : []
-      ].flatten
-    end
-
-    private
-
-    def database?
-      @result.customizes.include? 'database'
-    end
-
-    def javascript?
-      @result.customizes.include? 'javascript'
-    end
-
-    def css?
-      @result.customizes.include? 'css'
-    end
-
-    def gems?
-      @result.customizes.include? 'gems'
-    end
-
-    def rspec?
-      @result.gems.include? 'rspec'
-    end
-
-    def template?
-      @result.gems.any?
-    end
-
-    def css
-      choices = %w[tailwind bootstrap bulma postcss sass]
-
-      @prompt.select 'Choose css', choices
-    end
-
-    def customizes
-      choices =
-        if @result.is_api
-          [
-            { name: 'database (Default: sqlite3)', value: 'database' },
-            { name: 'gems', value: 'gems' }
-          ]
-        else
-          [
-            { name: 'database (Default: sqlite3)', value: 'database' },
-            { name: 'javascript (Default: importmap)', value: 'javascript' },
-            { name: 'css', value: 'css' },
-            { name: 'gems', value: 'gems' }
-          ]
-        end
-
-      @prompt.multi_select 'Choose customizes', choices
-    end
-
-    def database
-      choices = %w[sqlite3 mysql postgresql oracle sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc]
-
-      @prompt.select 'Choose database', choices
-    end
-
-    def gems
-      choices = %w[brakeman solargraph rspec rubocop]
-
-      @prompt.multi_select 'Choose gems', choices
-    end
-
-    def javascript
-      choices = %w[importmap webpack esbuild rollup]
-
-      @prompt.select 'Choose javascript', choices
-    end
-  end
-end

data/lib/mogu/template.rb

@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-require 'tempfile'
-
-module Mogu
-  class Template
-    class << self
-      def create(gems)
-        template = new
-        template.write gems
-
-        template
-      end
-    end
-
-    def initialize
-      @file = Tempfile.new
-    end
-
-    def path
-      @file.path
-    end
-
-    def write(gems)
-      @file.write brakeman_code if gems.include? 'brakeman'
-      @file.write solargraph_code if gems.include? 'solargraph'
-      @file.write rspec_code if gems.include? 'rspec'
-      @file.write rubocop_code if gems.include? 'rubocop'
-
-      @file.rewind
-    end
-
-    private
-
-    def brakeman_code
-      <<~CODE
-        gem 'brakeman', group: :development
-      CODE
-    end
-
-    def solargraph_code
-      <<~CODE
-        gem 'solargraph', group: :development
-      CODE
-    end
-
-    def rspec_code
-      <<~CODE
-        gem 'factory_bot_rails', group: %i[development test]
-        gem 'rspec-rails', group: %i[development test]
-
-        after_bundle do
-          generate 'rspec:install'
-        end
-      CODE
-    end
-
-    def rubocop_code
-      <<~CODE
-        gem 'rubocop-rails', group: :development, require: false
-
-        create_file '.rubocop.yml', <<~YML
-          require:
-            - rubocop-rails
-
-          AllCops:
-            NewCops: enable
-
-          Rails:
-            Enabled: true
-        YML
-
-        after_bundle do
-          run 'rubocop --auto-gen-config'
-        end
-      CODE
-    end
-  end
-end