mogu 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b6b652ea5e6c6cff5a7afea1a7001739c1037b999574e11010c24eb56f12a4a
-  data.tar.gz: 8d6d194add2fff01d83ed36568940892e4f915b8b1093df8d904e3a9227c93f8
+  metadata.gz: 83c36d8a3dcfd0d836638de3e3f7cadcdb0ba191014ad43c0284b5fdc5cf3c75
+  data.tar.gz: e415394242ec7c6dc4f74c9d5319b0bb8b981b31920ff2d3b8d9eea2068e9476
 SHA512:
-  metadata.gz: eb5b43087c23d0cb37565a73aff07563fcf3fcc597e5c572c7619cca1df8d92e37892e28a1370abc5e09ed1b380222290fab16e14979859db3eb58ac7a8a5fa3
-  data.tar.gz: a91fdab847dd718b44f017e1f149949a8fee092d150452eb63d2c84db74e2261d502cb7c31e7ec4faffeeac3595faab3a2c94aea43c8db34cc647f5c4648677c
+  metadata.gz: debd2684a695d3d2d9dadfd60514e51903e566a576546e7691e681e0a483efc5739388016682f51bccfb1fc1d739d784b8945a79df7b2b6c3dbb7672a77bed19
+  data.tar.gz: 36140ce40449777bb3a7f55e6d237360b03021629eef4b036aa8f0fcbe4a16b4fb8aed849569b91229af2f55769f7ce908c8f26b29b43e34a6027350b19933c5

data/README.md

@@ -51,7 +51,9 @@ Choose css
   sass
 
 Choose gems
-> ⬡ rspec
+> ⬡ brakeman
+  ⬡ rspec
+  ⬡ rubocop
 ```
 
 ## Development

data/docker-compose.yml

@@ -5,8 +5,10 @@ services:
     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,15 +1,22 @@
 # frozen_string_literal: true
 
+require 'optparse'
 require 'rails/command'
 
 module Mogu
   class CLI
     class << self
       def start
-        prompt = Mogu::Prompt.new
-        prompt.run
+        params = OptionParser.getopts(ARGV, 'v')
 
-        Rails::Command.invoke :application, ['new', *prompt.to_opt]
+        if params['v']
+          puts "mogu #{Mogu::VERSION}"
+        else
+          prompt = Mogu::Prompt.new
+          prompt.run
+
+          Rails::Command.invoke :application, ['new', *prompt.to_opt]
+        end
       end
     end
   end

data/lib/mogu/prompt.rb

@@ -4,102 +4,98 @@ require 'tty-prompt'
 
 module Mogu
   class Prompt
-    attr_reader :prompt, :result
+    Result = Struct.new(:app_path, :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: '', 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 = 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] : [],
+      [
+        @result.app_path,
+        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?
+      @result.gems.any?
     end
 
     def app_path
-      prompt.ask 'Please input app path', required: true
+      @prompt.ask 'Please input app path', required: true
     end
 
     def css
       choices = %w[tailwind bootstrap bulma postcss sass]
 
-      prompt.select 'Choose css', choices
+      @prompt.select 'Choose css', choices
     end
 
     def customizes
-      choices = %w[database javascript css gems]
+      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
+      @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]
@@ -50,25 +59,21 @@ module Mogu
       <<~CODE
         gem 'rubocop-rails', group: :development, require: false
 
-        create_file '.rubocop.yml', #{rubocop_yml}
+        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
-
-    def rubocop_yml
-      <<~CODE
-        require:
-          - rubocop-rails
-
-        AllCops:
-          NewCops: enable
-
-        Rails:
-          Enabled: true
-      CODE
-    end
   end
 end

data/lib/mogu/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mogu
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - MoguraStore
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-20 00:00:00.000000000 Z
+date: 2022-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties