mogu 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83c36d8a3dcfd0d836638de3e3f7cadcdb0ba191014ad43c0284b5fdc5cf3c75
-  data.tar.gz: e415394242ec7c6dc4f74c9d5319b0bb8b981b31920ff2d3b8d9eea2068e9476
+  metadata.gz: 997481175fb0e2074d0627ba83fd7fc057d85f3747c550f79c9ff45fd2442108
+  data.tar.gz: 8b4463bb1008a206d3c9db2d57ea834be6d631b7c75fc11870711cb18ce67ffc
 SHA512:
-  metadata.gz: debd2684a695d3d2d9dadfd60514e51903e566a576546e7691e681e0a483efc5739388016682f51bccfb1fc1d739d784b8945a79df7b2b6c3dbb7672a77bed19
-  data.tar.gz: 36140ce40449777bb3a7f55e6d237360b03021629eef4b036aa8f0fcbe4a16b4fb8aed849569b91229af2f55769f7ce908c8f26b29b43e34a6027350b19933c5
+  metadata.gz: e13ab164f9080b1145e0d15f3014d892d67305f12984a8eaa1be04b58f6be367c33f7c02668f09325fd12719218dbcbcd599cfc388f55f1aae7808fa907940ff
+  data.tar.gz: a356b500527b00a46c08c9fa6631faa88b4669dc9a8d39bf81d54a9a3c6308ee68ab1f8a4ee1179c82bc9c1f379914a0acff7452bec650210853c9094d4a8947

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,12 @@ CLI to create rails projects interactively.
 
 ## Features
 
-- Support for rails new option selection.
+- Support in selecting rails new options
+  - database
+  - javascript
+  - css
+  - skips
+- Support in adding gems
 
 ## Installation
 
@@ -18,18 +23,30 @@ gem install mogu
 
 ## Usage
 
+### help
+
+```bash
+mogu help
+```
+
+### new
+
+Create rails projects interactively.
+
 ```bash
-mogu
+mogu new
 ```
 
 ```bash
 Please input app path
 
+Do you want api mode? (y/N)
+
 Choose customizes
-> ⬡ database
-  ⬡ javascript
+> ⬡ database (Default: sqlite3)
+  ⬡ javascript (Default: importmap)
   ⬡ css
-  ⬡ gems
+  ⬡ skips
 
 Choose database
 > sqlite3
@@ -50,8 +67,22 @@ Choose css
   postcss
   sass
 
+Choose skips
+> ⬡ test
+```
+
+### gem
+
+Add gems to rails projects.
+
+```bash
+mogu gem
+```
+
+```bash
 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,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,30 @@
+# frozen_string_literal: true
+
+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
+      template = Tempfile.new
+
+      gems = prompt.multi_select 'Choose gems', gem_choices
+      template.write erb.result_with_hash(gems: gems)
+      template.rewind
+
+      ENV.store 'LOCATION', template.path
+
+      Rails::Command.invoke 'app:template'
+    end
+
+    private
+
+    def gem_choices
+      %w[brakeman solargraph rspec rubocop]
+    end
+  end
+end

data/lib/mogu/new_command.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require 'rails/command'
+require 'tty-prompt'
+
+module Mogu
+  class NewCommand
+    def run
+      @prompt = TTY::Prompt.new
+
+      @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'
+
+      Rails::Command.invoke :application, ['new', *to_opt]
+    end
+
+    private
+
+    def database?
+      @customizes.include? 'database'
+    end
+
+    def javascript?
+      @customizes.include? 'javascript'
+    end
+
+    def css?
+      @customizes.include? 'css'
+    end
+
+    def css_choices
+      %w[tailwind bootstrap bulma postcss sass]
+    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' }
+        ]
+      end
+    end
+
+    def database_choices
+      %w[sqlite3 mysql postgresql oracle sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc]
+    end
+
+    def javascript_choices
+      %w[importmap webpack esbuild rollup]
+    end
+
+    def skip_choices
+      [
+        { name: 'test', value: '--skip-test' }
+      ]
+    end
+
+    def to_opt
+      [
+        @app_path,
+        @is_api ? ['--api'] : [],
+        database? ? ['-d', @database] : [],
+        javascript? ? ['-j', @javascript] : [],
+        css? ? ['-c', @css] : [],
+        @skips.to_a
+      ].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.4.0'
+  VERSION = '0.7.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

@@ -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.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - MoguraStore
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2022-04-10 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,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,101 +0,0 @@
-# frozen_string_literal: true
-
-require 'tty-prompt'
-
-module Mogu
-  class Prompt
-    Result = Struct.new(:app_path, :customizes, :database, :javascript, :css, :gems, :template, keyword_init: true)
-
-    def initialize
-      @prompt = TTY::Prompt.new
-      @result = Result.new(app_path: '', 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?
-    end
-
-    def to_opt
-      [
-        @result.app_path,
-        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 app_path
-      @prompt.ask 'Please input app path', required: true
-    end
-
-    def css
-      choices = %w[tailwind bootstrap bulma postcss sass]
-
-      @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
-    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