mogu 0.7.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 997481175fb0e2074d0627ba83fd7fc057d85f3747c550f79c9ff45fd2442108
-  data.tar.gz: 8b4463bb1008a206d3c9db2d57ea834be6d631b7c75fc11870711cb18ce67ffc
+  metadata.gz: c2b97df52a63b57b648da331520f2dd757a6a6b91083065c4976adbf74ccf37c
+  data.tar.gz: eb9d4df6e3f74bc03a736b69cc7f037d22bad15f98bd08f295b819f21ae0a111
 SHA512:
-  metadata.gz: e13ab164f9080b1145e0d15f3014d892d67305f12984a8eaa1be04b58f6be367c33f7c02668f09325fd12719218dbcbcd599cfc388f55f1aae7808fa907940ff
-  data.tar.gz: a356b500527b00a46c08c9fa6631faa88b4669dc9a8d39bf81d54a9a3c6308ee68ab1f8a4ee1179c82bc9c1f379914a0acff7452bec650210853c9094d4a8947
+  metadata.gz: 05ec2871deacd7c4d4c2e9bf84aaeb38ae36ca01568fe94c34b87c839809467f555b6433783dcfa54d6783676a92170cffb962deab66fb9809abe7048e90bd72
+  data.tar.gz: e7b9207dd73b3db51f3b86db12f6fff893d1acbd92897eae97c8d2f459e863045b98875a46d4f913600537bde9268271e02d90030c19a474f235fb8bfa44d1c2

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

@@ -38,37 +38,42 @@ mogu new
 ```
 
 ```bash
-Please input app path
-
-Do you want api mode? (y/N)
-
-Choose customizes
-> ⬡ database (Default: sqlite3)
-  ⬡ javascript (Default: importmap)
-  ⬡ css
-  ⬡ skips
-
-Choose database
-> sqlite3
-  mysql
-  postgresql
+? 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 skips
-> ⬡ test
+? 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
@@ -80,11 +85,13 @@ mogu gem
 ```
 
 ```bash
-Choose gems
-> ⬡ brakeman
-  ⬡ solargraph
-  ⬡ rspec
-  ⬡ rubocop
+? 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/gem_command.rb

@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
+require 'cli/ui'
 require 'erb'
 require 'rails/command'
 require 'tempfile'
-require 'tty-prompt'
 
 module Mogu
   class GemCommand
     def run
-      erb = ERB.new File.read(File.expand_path('templates/gem.erb', __dir__))
-      prompt = TTY::Prompt.new
+      erb = ERB.new File.read(File.expand_path('templates/gem.erb', __dir__.to_s))
       template = Tempfile.new
 
-      gems = prompt.multi_select 'Choose gems', gem_choices
+      gems = ask_gems
       template.write erb.result_with_hash(gems: gems)
       template.rewind
 
@@ -23,8 +22,10 @@ module Mogu
 
     private
 
-    def gem_choices
-      %w[brakeman solargraph rspec rubocop]
+    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

@@ -1,81 +1,90 @@
 # frozen_string_literal: true
 
+require 'cli/ui'
 require 'rails/command'
-require 'tty-prompt'
 
 module Mogu
   class NewCommand
     def run
-      @prompt = TTY::Prompt.new
+      @app_path = ask_app_path
+      @is_api = confirm_is_api
+      customizes = ask_customizes
 
-      @app_path = @prompt.ask 'Please input app path', required: true
-      @is_api = @prompt.yes? 'Do you want api mode?', default: false
-      @customizes = @prompt.multi_select 'Choose customizes', customize_choices
-
-      @database = @prompt.select 'Choose database', database_choices if database?
-      @javascript = @prompt.select 'Choose javascript', javascript_choices if javascript?
-      @css = @prompt.select 'Choose css', css_choices if css?
-      @skips = @prompt.multi_select 'Choose skips', skip_choices if @customizes.include? 'skips'
+      @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 database?
-      @customizes.include? 'database'
+    def ask_app_path
+      ::CLI::UI::Prompt.ask 'Please input app path', allow_empty: false
     end
 
-    def javascript?
-      @customizes.include? 'javascript'
+    def confirm_is_api
+      ::CLI::UI::Prompt.confirm 'Do you want api mode?', default: false
     end
 
-    def css?
-      @customizes.include? 'css'
-    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
 
-    def css_choices
-      %w[tailwind bootstrap bulma postcss sass]
+        handler.option('skips') { 'skips' }
+      end
     end
 
-    def customize_choices
-      if @is_api
-        [
-          { name: 'database (Default: sqlite3)', value: 'database' },
-          { name: 'skips', value: 'skips' }
-        ]
-      else
-        [
-          { name: 'database (Default: sqlite3)', value: 'database' },
-          { name: 'javascript (Default: importmap)', value: 'javascript' },
-          { name: 'css', value: 'css' },
-          { name: 'skips', value: 'skips' }
-        ]
+    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 database_choices
-      %w[sqlite3 mysql postgresql oracle sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc]
+    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 javascript_choices
-      %w[importmap webpack esbuild rollup]
+    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 skip_choices
-      [
-        { name: 'test', value: '--skip-test' }
-      ]
+    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? ? ['-d', @database] : [],
-        javascript? ? ['-j', @javascript] : [],
-        css? ? ['-c', @css] : [],
-        @skips.to_a
+        @is_api ? '--api' : [],
+        @database,
+        @javascript,
+        @css,
+        *@skips
       ].flatten
     end
   end

data/lib/mogu/templates/gem.erb

@@ -28,7 +28,7 @@
   YML
 <% end %>
 
-run 'bundle install'
+Bundler.original_system 'bundle install'
 
 <% if gems.include? 'rspec' %>
   generate 'rspec:install'

data/lib/mogu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mogu
-  VERSION = '0.7.0'
+  VERSION = '0.8.2'
 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.7.0
+  version: 0.8.2
 platform: ruby
 authors:
 - MoguraStore
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-10 00:00:00.000000000 Z
+date: 2022-04-23 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,6 +71,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Steepfile
 - bin/console
 - bin/setup
 - compose.yaml
@@ -82,6 +83,11 @@ files:
 - 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