thredded_create_app 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a440b54c995a4acc228ea80bc49543584a7ace8
-  data.tar.gz: 783a3ef4755e06a4e49d99ce951a56c96c247195
+  metadata.gz: 8321129255513f386fad12a0d97ee42921986331
+  data.tar.gz: 191f06d32b4a785fc7247f4727a680a813e6255f
 SHA512:
-  metadata.gz: 9c531f266980d0071259f18c46093356931dd95da360a5f33a64106955789a46acba83d028d26568a74ece981f4d78115a26f0644e8eff4e778cdda963c4c52e
-  data.tar.gz: 7879d3b6eece4346ea7cc797950f56006cc4f6ff2d39a89a7307c727491dd45f696796cf5afeee34c68c5cf66636eb3cf59d1f94207f68b1ed010026c104800d
+  metadata.gz: 03e931cd479e9d3c1ae73b51ebf6885a28c2046d21744d60262daad28a04f18647a693f0d8b546e10cc377e3c62e561308fc08d9ffc3ffcd1aaa7fe53bcbb3c4
+  data.tar.gz: 1275fc973cdfe0b1ab08510f3a1ffaeb3e478cf13d39dd46939c870dea6027e27b178ddc471a80bda6799f310cc0e624b6f13592bf7bc8bbe5de6ee50b5fac87

data/README.md

@@ -20,7 +20,7 @@ Example screenshots of the generated app:
 ## Pre-requisites
 
 1. Git.
-2. A supported database: PostgreSQL (recommended), MySQL v5.6.4+, or SQLite.
+2. A supported database: PostgreSQL (recommended), MySQL v5.7+, or SQLite.
 3. Ruby 2.3+.
 
 ## Usage

data/lib/thredded_create_app/cli.rb

@@ -83,9 +83,6 @@ module ThreddedCreateApp
       ) do |op|
         flags = Flags.new(op, options)
 
-        flags.bool :auto_confirm, '-y', 'Auto-confirm all prompts'
-        flags.bool :simple_form, '--[no-]simple-form', 'Use simple_form'
-
         db_adapters = %i(postgresql mysql2 sqlite3)
         op.on '--database DATABASE', db_adapters,
               "The database adapter, one of: #{db_adapters.join(', ')} " \
@@ -93,19 +90,21 @@ module ThreddedCreateApp
           options[:database] = v.to_sym
         end
 
-        flags.bool :start_server, '--[no-]start-server', 'Start the app server'
+        flags.bool :simple_form, '--[no-]simple-form', 'Use simple_form'
 
+        op.separator "\nOther options:"
+        flags.bool :start_server, '--[no-]start-server', 'Start the app server'
         flags.bool :install_gem_bundler_rails,
                    '--[no-]install-gem-bundler-rails',
                    'Run `gem update --system and `gem install bundler rails`'
-
+        flags.bool :auto_confirm, '-y', 'Auto-confirm all prompts'
+        flags.bool :verbose, '--verbose', 'Verbose output' do
+          @verbose = true
+        end
         op.on '-v', '--version', 'Print the version' do
           puts ThreddedCreateApp::VERSION
           exit
         end
-        flags.bool :verbose, '--verbose', 'Verbose output' do
-          @verbose = true
-        end
         op.on '-h', '--help', 'Show this message' do
           STDERR.puts op
           exit

data/lib/thredded_create_app/tasks/base.rb

@@ -63,14 +63,14 @@ module ThreddedCreateApp
         File.write path, src
       end
 
-      def add_route(route_str, append: false)
+      def add_route(route_str, prepend: false)
         log_verbose "Add route: #{route_str}"
         inject_into_file 'config/routes.rb',
-                         content: "  #{route_str}\n",
-                         **(if append
+                         content: "#{"\n" unless prepend}  #{route_str}",
+                         **(if prepend
                               { after: /\.routes\.draw do\s*\n/m }
                             else
-                              { before: /end\n\z/ }
+                              { before: /\nend\n\z/ }
                             end)
       end
 

data/lib/thredded_create_app/tasks/create_rails_app.rb

@@ -10,7 +10,7 @@ module ThreddedCreateApp
       end
 
       def summary
-        "Create Rails app #{app_name.inspect} with postgresql and rspec"
+        "Create Rails app #{app_name.inspect} with #{rails_database} and rspec"
       end
 
       def before_bundle
@@ -18,10 +18,9 @@ module ThreddedCreateApp
           run 'gem update --system --no-document --quiet'
           run 'gem install bundler rails --no-document'
         end
-        rails_database_arg = { mysql2: :mysql }.fetch(@database, @database)
         # I have no idea why this bundle exec is necessary on Travis.
         run "#{'bundle exec ' if ENV['TRAVIS']}" \
-           "rails new . --skip-bundle --database=#{rails_database_arg} " \
+           "rails new . --skip-bundle --database=#{rails_database} " \
            "--skip-test#{verbose? ? ' --verbose' : ' --quiet'}"
         replace 'Gemfile', /gem 'sass-rails'.*$/, "gem 'sassc-rails'"
         add_gem 'rspec-rails', groups: %i(test)
@@ -33,6 +32,12 @@ module ThreddedCreateApp
         run_generator 'rspec:install'
         git_commit 'rails g rspec:install'
       end
+
+      private
+
+      def rails_database
+        { mysql2: :mysql }.fetch(@database, @database)
+      end
     end
   end
 end

data/lib/thredded_create_app/tasks/setup_app_skeleton.rb

@@ -105,6 +105,12 @@ module ThreddedCreateApp
                                 'data-turbolinks-track': 'reload' %>
         ERB
 
+        inject_into_file 'app/views/layouts/application.html.erb',
+                         before: '</head>',
+                         content: <<-'ERB'
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+        ERB
+
         replace 'app/views/layouts/application.html.erb',
                 %r{<body>.*?</body>}m,
                 File.read(
@@ -124,7 +130,11 @@ module ThreddedCreateApp
   def show
     @user = User.find(params[:id])
         RUBY
-        add_route <<~'RUBY'
+        # The route must be defined after `devise_for`.
+        # The route is injected before Thredded in case Thredded is mount at /.
+        inject_into_file 'config/routes.rb',
+                         before: /^\s*mount Thredded::Engine/,
+                         content: indent(2, <<~'RUBY')
           resources :users, only: [:show]
         RUBY
       end
@@ -132,7 +142,7 @@ module ThreddedCreateApp
       def add_home_page
         run_generator 'controller home show' \
                       ' --no-assets --no-helper --skip-routes'
-        add_route <<~'RUBY', append: true
+        add_route <<~'RUBY', prepend: true
           root to: 'home#show'
         RUBY
         copy_template 'setup_app_skeleton/home_show.html.erb.erb',

data/lib/thredded_create_app/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ThreddedCreateApp
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thredded_create_app
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor