mogu 0.5.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2db47b44f542a88efc8a2bf123276264957d905fc299bc0fc87662090d139464
-  data.tar.gz: 39e544f5a42fcec266d1c410b415382679b1e7d92bafc8fbf8a717b7a80446f2
+  metadata.gz: ff62aaa44ea6ba8a4fa79cc8453cf5ac54bfe142b06d95d5512d80ea6e644540
+  data.tar.gz: 7ce4af13262e1cad5baf01e1c258a9d8d46918c8dc6f7b222f090d249c92d11e
 SHA512:
-  metadata.gz: ec71aa0276b7f96d7df1720c662cbf704f40c68e11351eb7fda301843be180772be15d48bc454f7002d0a93c4cd61dbfa429b449463017c03afde7f0dc41027c
-  data.tar.gz: 8fd8fc23a60b048820dc65a30b1d5da88d87ab47f4a0e40f3f15231f316df835d228582472b2cacfacabfcf83518a9620f06f6b67e71a194286383cf330dfbaf
+  metadata.gz: 7f7552ae5a1531d8bc61d7b0df6dfaaa867ee26d6e9a091a12c650b63aa5afb04725a9cebca260f8f9b4aa20fe52541db02c10e710a333b1e22b883af29f922b
+  data.tar.gz: f9cf99602a0ad431399e55dcf76f84a29f6e5f7adc3ce8a2fe26bee759c4de62dfbfc11cd5654fdc637dc4faceeb0af75def7f165a11a57b305ccfbbd9cdcfa3

data/.devcontainer/devcontainer.json

@@ -0,0 +1,39 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.231.2/containers/docker-existing-docker-compose
+// If you want to run as a non-root user in the container, see .devcontainer/docker-compose.yml.
+{
+  "name": "Existing Docker Compose (Extend)",
+
+  // Update the 'dockerComposeFile' list if you have more compose files or use different names.
+  // The .devcontainer/docker-compose.yml file contains any overrides you need/want to make.
+  "dockerComposeFile": ["../compose.yaml", "docker-compose.yml"],
+
+  // The 'service' property is the name of the service for the container that VS Code should
+  // use. Update this value and .devcontainer/docker-compose.yml to the real service name.
+  "service": "ruby",
+
+  // The optional 'workspaceFolder' property is the path VS Code should open by default when
+  // connected. This is typically a file mount in .devcontainer/docker-compose.yml
+  "workspaceFolder": "/workspace",
+
+  // Set *default* container specific settings.json values on container create.
+  "settings": {},
+
+  // Add the IDs of extensions you want installed when the container is created.
+  "extensions": ["castwide.solargraph"]
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
+
+  // Uncomment the next line if you want start specific services in your Docker Compose config.
+  // "runServices": [],
+
+  // Uncomment the next line if you want to keep your containers running after VS Code shuts down.
+  // "shutdownAction": "none",
+
+  // Uncomment the next line to run commands after the container is created - for example installing curl.
+  // "postCreateCommand": "apt-get update && apt-get install -y curl",
+
+  // Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
+  // "remoteUser": "vscode"
+}

data/.devcontainer/docker-compose.yml

@@ -0,0 +1,38 @@
+version: '3.8'
+services:
+  # Update this to the name of the service you want to work with in your docker-compose.yml file
+  ruby:
+    # If you want add a non-root user to your Dockerfile, you can use the "remoteUser"
+    # property in devcontainer.json to cause VS Code its sub-processes (terminals, tasks, 
+    # debugging) to execute as the user. Uncomment the next line if you want the entire 
+    # container to run as this user instead. Note that, on Linux, you may need to 
+    # ensure the UID and GID of the container user you create matches your local user. 
+    # See https://aka.ms/vscode-remote/containers/non-root for details.
+    #
+    # user: vscode
+
+    # Uncomment if you want to override the service's Dockerfile to one in the .devcontainer 
+    # folder. Note that the path of the Dockerfile and context is relative to the *primary* 
+    # docker-compose.yml file (the first in the devcontainer.json "dockerComposeFile"
+    # array). The sample below assumes your primary file is in the root of your project.
+    #
+    # build:
+    #   context: .
+    #   dockerfile: .devcontainer/Dockerfile
+
+    volumes:
+      # Update this to wherever you want VS Code to mount the folder of your project
+      - .:/workspace:cached
+
+      # Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker-compose for details.
+      # - /var/run/docker.sock:/var/run/docker.sock 
+
+    # Uncomment the next four lines if you will use a ptrace-based debugger like C++, Go, and Rust.
+    # cap_add:
+    #   - SYS_PTRACE
+    # security_opt:
+    #   - seccomp:unconfined
+
+    # Overrides default command so things don't shut down after the process ends.
+    command: /bin/sh -c "while sleep 1000; do :; done"
+ 

data/.gitignore

@@ -12,3 +12,5 @@
 
 /Gemfile.lock
 /*.gem
+
+/compose.override.yaml

data/README.md

@@ -12,6 +12,7 @@ CLI to create rails projects interactively.
   - database
   - javascript
   - css
+  - skips
 - Support in adding gems
 
 ## Installation
@@ -22,43 +23,75 @@ gem install mogu
 
 ## Usage
 
+### help
+
+```bash
+mogu help
+```
+
+### new
+
+Create rails projects interactively.
+
 ```bash
-mogu
+mogu new
 ```
 
 ```bash
-Please input app path
-
-Choose customizes
-> ⬡ database (Default: sqlite3)
-  ⬡ javascript (Default: importmap)
-  ⬡ css
-  ⬡ gems
-
-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 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/{docker-compose.yml → compose.yaml}

@@ -1,14 +1,10 @@
-version: "3.9"
-
 services:
   ruby:
     image: ruby
     volumes:
       - .:/workspace
-      - gem-credentials-data:/root/.local/share/gem
       - gem-data:/usr/local/bundle
     working_dir: /workspace
 
 volumes:
-  gem-credentials-data:
   gem-data:

data/lib/mogu/cli.rb

@@ -1,23 +1,22 @@
 # frozen_string_literal: true
 
-require 'optparse'
-require 'rails/command'
+require 'thor'
 
 module Mogu
-  class CLI
-    class << self
-      def start
-        params = OptionParser.getopts(ARGV, 'v')
+  class CLI < Thor
+    desc 'gem', 'Add gems to rails projects'
+    def gem
+      Mogu::GemCommand.new.run
+    end
 
-        if params['v']
-          puts "mogu #{Mogu::VERSION}"
-        else
-          prompt = Mogu::Prompt.new
-          prompt.run
+    desc 'new', 'Create rails projects interactively'
+    def new
+      Mogu::NewCommand.new.run
+    end
 
-          Rails::Command.invoke :application, ['new', *prompt.to_opt]
-        end
-      end
+    desc 'version', 'Display mogu version'
+    def version
+      puts Mogu::VERSION
     end
   end
 end

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__))
+      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.5.0'
+  VERSION = '0.8.0'
 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,8 +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 'tty-prompt', '~> 0.23'
+  spec.add_dependency 'thor', '~> 1.0'
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mogu
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.0
 platform: ruby
 authors:
 - MoguraStore
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-24 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cli-ui
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -25,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         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
@@ -46,6 +60,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/devcontainer.json"
+- ".devcontainer/docker-compose.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
@@ -57,12 +73,13 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- docker-compose.yml
+- 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
 homepage: https://github.com/mogurastore/mogu
@@ -87,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: CLI to create rails projects interactively.

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