mogu 0.3.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c4239f0c02de6282a1e9d02a3579e19afcaa21fbd6ecf364ad86c60cc401346
-  data.tar.gz: 4e58930609faa0ab989f8d3622c5fc80a16eada1fcffec77b57ffb2bef33f756
+  metadata.gz: 5043094005d94e801e049d1a6a03689deee2ded40a10703feb2b1dbb5cda5df0
+  data.tar.gz: 3bc7f43bc271f0a32bbd3cf282020e6dbae6c6970975d3569ca796b379ea0757
 SHA512:
-  metadata.gz: 6e329ea0115a7f1bec70cc05021ce61c005a692defaada0836525fd7731e34c260096059d2d0fc62c63584dfba1ce6c255c47ca7b276a2ab323363fd94295548
-  data.tar.gz: 82f34cf0948727f2eacc0d09d0d04b484a42bbcc289e66b94ad6e194350a439d50cb26055754df5cd77b9f71225107bc2f7848d72de2889271f14e7634cf0d76
+  metadata.gz: 07de320e8f7c9c8fdb96f85c78b69a8089711474f0727648701906d2f8e4dcf8959136a063058e835999e2541008c3577a18fee4a1db62a8b148eb3855ca874e
+  data.tar.gz: 00a5c8bd2bba6b3ad8c75b6df01f0f9088d9ea10807b8798a7d043d5e2553eaee40295ff17405cd5bdf2349c5c549e35ed7c9e12f959b79e37d035d8d912beff

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

@@ -8,7 +8,11 @@ CLI to create rails projects interactively.
 
 ## Features
 
-- Support for rails new option selection.
+- Support in selecting rails new options
+  - database
+  - javascript
+  - css
+- Support in adding gems
 
 ## Installation
 
@@ -25,9 +29,11 @@ mogu
 ```bash
 Please input app path
 
+Do you want api mode? (y/N)
+
 Choose customizes
-> ⬡ database
-  ⬡ javascript
+> ⬡ database (Default: sqlite3)
+  ⬡ javascript (Default: importmap)
   ⬡ css
   ⬡ gems
 
@@ -52,6 +58,7 @@ Choose css
 
 Choose gems
 > ⬡ brakeman
+  ⬡ solargraph
   ⬡ rspec
   ⬡ rubocop
 ```

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,21 @@
 # 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 'new', 'Create rails projects interactively'
+    def new
+      prompt = Mogu::Prompt.new
+      prompt.run
 
-        if params['v']
-          puts "mogu #{Mogu::VERSION}"
-        else
-          prompt = Mogu::Prompt.new
-          prompt.run
+      Rails::Command.invoke :application, ['new', *prompt.to_opt]
+    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/prompt.rb

@@ -4,107 +4,124 @@ require 'tty-prompt'
 
 module Mogu
   class Prompt
-    attr_reader :prompt, :result
+    Result = Struct.new(
+      :app_path,
+      :is_api,
+      :customizes,
+      :database,
+      :javascript,
+      :css,
+      :gems,
+      :template,
+      keyword_init: true
+    )
 
     def initialize
       @prompt = TTY::Prompt.new
 
-      result = Struct.new(:app_path, :customizes, :database, :javascript, :css, :gems, :template, keyword_init: true)
-      @result = result.new(app_path: '', customizes: [], database: '', javascript: '', css: '', gems: [], template: nil)
+      @result = Result.new(
+        app_path: '',
+        is_api: false,
+        customizes: [],
+        database: '',
+        javascript: '',
+        css: '',
+        gems: [],
+        template: nil
+      )
     end
 
     def run
-      result.app_path = app_path
-      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?
+      @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] + [
-        database? ? ['-d', result.database] : [],
-        javascript? ? ['-j', result.javascript] : [],
-        css? ? ['-c', result.css] : [],
+      [
+        @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.file.path] : []
+        template? ? ['-m', @result.template.path] : []
       ].flatten
     end
 
     private
 
     def database?
-      result.customizes.include? 'database'
+      @result.customizes.include? 'database'
     end
 
     def javascript?
-      result.customizes.include? 'javascript'
+      @result.customizes.include? 'javascript'
     end
 
     def css?
-      result.customizes.include? 'css'
+      @result.customizes.include? 'css'
     end
 
     def gems?
-      result.customizes.include? 'gems'
-    end
-
-    def brakeman?
-      result.gems.include? 'brakeman'
+      @result.customizes.include? 'gems'
     end
 
     def rspec?
-      result.gems.include? 'rspec'
-    end
-
-    def rubocop?
-      result.gems.include? 'rubocop'
+      @result.gems.include? 'rspec'
     end
 
     def template?
-      [brakeman?, rspec?, rubocop?].any?
-    end
-
-    def app_path
-      prompt.ask 'Please input app path', required: true
+      @result.gems.any?
     end
 
     def css
       choices = %w[tailwind bootstrap bulma postcss sass]
 
-      prompt.select 'Choose css', choices
+      @prompt.select 'Choose css', choices
     end
 
     def customizes
-      choices = [
-        { name: 'database (Default: sqlite3)', value: 'database' },
-        { name: 'javascript (Default: importmap)', value: 'javascript' },
-        { name: 'css', value: 'css' },
-        { name: 'gems', value: 'gems' }
-      ]
-
-      prompt.multi_select 'Choose customizes', choices
+      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
+      @prompt.select 'Choose database', choices
     end
 
     def gems
-      choices = %w[brakeman rspec rubocop]
+      choices = %w[brakeman solargraph rspec rubocop]
 
-      prompt.multi_select 'Choose gems', choices
+      @prompt.multi_select 'Choose gems', choices
     end
 
     def javascript
       choices = %w[importmap webpack esbuild rollup]
 
-      prompt.select 'Choose javascript', choices
+      @prompt.select 'Choose javascript', choices
     end
   end
 end

data/lib/mogu/template.rb

@@ -4,8 +4,6 @@ require 'tempfile'
 
 module Mogu
   class Template
-    attr_reader :file
-
     class << self
       def create(gems)
         template = new
@@ -19,12 +17,17 @@ module Mogu
       @file = Tempfile.new
     end
 
+    def path
+      @file.path
+    end
+
     def write(gems)
-      file.write brakeman_code if gems.include? 'brakeman'
-      file.write rspec_code if gems.include? 'rspec'
-      file.write rubocop_code if gems.include? 'rubocop'
+      @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
+      @file.rewind
     end
 
     private
@@ -35,6 +38,12 @@ module Mogu
       CODE
     end
 
+    def solargraph_code
+      <<~CODE
+        gem 'solargraph', group: :development
+      CODE
+    end
+
     def rspec_code
       <<~CODE
         gem 'factory_bot_rails', group: %i[development test]

data/lib/mogu/version.rb

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

data/mogu.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mogu
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.6.0
 platform: ruby
 authors:
 - MoguraStore
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  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: tty-prompt
   requirement: !ruby/object:Gem::Requirement
@@ -46,6 +60,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/devcontainer.json"
+- ".devcontainer/docker-compose.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
@@ -57,7 +73,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- docker-compose.yml
+- compose.yaml
 - exe/mogu
 - lib/mogu.rb
 - lib/mogu/cli.rb
@@ -87,7 +103,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.