thredded_create_app 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 317de5cb8dc2f463948d4aaa240ad6d546e88440
-  data.tar.gz: 6f61cf6b2c942359d761e45f3e85dd7026e5cc7c
+  metadata.gz: e5dce72b9a0003fe725e6e4ee50897f6d67c0d51
+  data.tar.gz: '09f4480264a614040a97dd322441cd4dac9748c0'
 SHA512:
-  metadata.gz: 5be5c1c0ad6a6eaef3a0e8a2e19eee17251486e42d383e75108e7ed1cb6d815a35d25afd950b4abd2d0fde8e70aeb4ec64f514466b3c7a2f35aa1171ee130529
-  data.tar.gz: a4d0710842921f74c8fdde1b9a47aa9f339a2cd5f1ef7eb0f3be2cd18d38cb4c71e5d8288a8129640e3cb5ff01b550023a2abb5d02b213b6b3052824d64e1ca8
+  metadata.gz: 4d2ae61e5101b67ae09d54207c710667c4a84d83ad7f977266a2ecef654723b28584d513c99bb66aa0228f693833980fe21634ec43f52503b4526f1550efb96a
+  data.tar.gz: 759a81eccb99b99a6fa9f05b291c31de5b0740a49c0603f7549211a99d432ef3c7a0ca6b1adeb93eae0c7d697b1ba688f4b38f7f76b3edc54bd28b5e6847f282

data/lib/thredded_create_app/generator.rb

@@ -9,6 +9,7 @@ require 'thredded_create_app/tasks/add_simple_form'
 require 'thredded_create_app/tasks/add_devise'
 require 'thredded_create_app/tasks/add_roadie'
 require 'thredded_create_app/tasks/add_rails_email_preview'
+require 'thredded_create_app/tasks/add_jquery'
 require 'thredded_create_app/tasks/add_thredded'
 require 'thredded_create_app/tasks/add_display_name_to_users'
 require 'thredded_create_app/tasks/setup_database'
@@ -69,6 +70,7 @@ module ThreddedCreateApp
         Tasks::AddDevise,
         Tasks::AddRailsEmailPreview,
         Tasks::AddRoadie,
+        Tasks::AddJquery,
         Tasks::AddThredded,
         Tasks::AddDisplayNameToUsers,
         Tasks::SetupAppSkeleton,
@@ -85,9 +87,13 @@ module ThreddedCreateApp
 
     # @final
     def bundle # rubocop:disable Metrics/AbcSize
+      gemfile_contents = File.read('Gemfile')
+      gems_to_add = gems.reject do |gem|
+        gemfile_contents =~ /^gem\s*['"]#{Regexp.escape(gem[0])}['"]/
+      end
       File.open('Gemfile', 'a') do |f|
         log_info 'Writing gems to Gemfile'
-        gems.each do |(name, version, groups, path)|
+        gems_to_add.each do |(name, version, groups, path)|
           f.puts ["gem '#{name}'",
                   (version if version),
                   ("groups: %i(#{groups * ' '})" if groups),
@@ -97,7 +103,7 @@ module ThreddedCreateApp
       log_info 'Installing gems'
       run "bundle install#{' --quiet' unless verbose?}" \
           "#{' --path .bundle' unless File.writable?(Gem.dir)}"
-      git_commit "Add gems: #{gems.map { |(name, *)| name } * ', '}"
+      git_commit "Add gems: #{gems_to_add.map { |(name, *)| name } * ', '}"
     end
   end
 end

data/lib/thredded_create_app/tasks/add_display_name_to_users.rb

@@ -22,9 +22,9 @@ module ThreddedCreateApp
       private
 
       def add_display_name
-        run_generator 'migration add_display_name_to_users'
-        copy 'add_display_name_to_users/add_display_name_to_users.rb',
-             Dir['db/migrate/*_add_display_name_to_users.rb'][0]
+        add_migration 'add_display_name_to_users',
+                      template: 'add_display_name_to_users/' \
+                                  'add_display_name_to_users.rb.erb'
         model_path = 'app/models/user.rb'
         inject_into_file model_path,
                          after:   "ApplicationRecord\n",
@@ -84,7 +84,7 @@ module ThreddedCreateApp
   def uniq_display_name!
     if display_name.present?
       new_display_name = display_name
-      i  = 0
+      i = 0
       while User.exists?(display_name: new_display_name)
         new_display_name = "#{display_name} #{i += 1}"
       end

data/lib/thredded_create_app/tasks/add_display_name_to_users/add_display_name_to_users.rb.erb

@@ -0,0 +1,17 @@
+def change
+  <%=
+  case database_adapter_name
+  when /mysql/i
+    'add_column :users, :display_name, :string, limit: 191'
+  when /sqlite/i
+    <<~'RUBY'
+      add_column :users, :display_name, :string
+      change_column_null :users, :display_name, false
+    RUBY
+  else
+    'add_column :users, :display_name, :string, null: false'
+  end
+  %>
+  DbTextSearch::CaseInsensitive.add_index connection, :users, :display_name,
+                                          unique: true
+end

data/lib/thredded_create_app/tasks/add_jquery.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'thredded_create_app/tasks/base'
+module ThreddedCreateApp
+  module Tasks
+    class AddJquery < Base
+      def summary
+        'Add jQuery v3'
+      end
+
+      def before_bundle
+        add_gem 'jquery-rails'
+      end
+
+      def after_bundle
+        if replace 'app/assets/javascripts/application.js',
+                   %r{^//= require jquery$},
+                   '//= require jquery3',
+                   optional: true
+          git_commit 'Use jQuery v3 instead of jQuery v1'
+        else
+          inject_into_file 'app/assets/javascripts/application.js',
+                           content: "//= require jquery3\n",
+                           before: '//='
+          git_commit 'Add jQuery'
+        end
+      end
+    end
+  end
+end

data/lib/thredded_create_app/tasks/add_thredded.rb

@@ -74,9 +74,11 @@ module ThreddedCreateApp
       end
 
       def add_admin_column_to_users
-        run_generator 'migration add_admin_to_users'
-        copy 'add_thredded/add_admin_to_users.rb',
-             Dir['db/migrate/*_add_admin_to_users.rb'][0]
+        add_migration 'add_admin_to_users', content: <<~RUBY
+          def change
+            add_column :users, :admin, :boolean, null: false, default: false
+          end
+        RUBY
       end
 
       def setup_thredded_emails

data/lib/thredded_create_app/tasks/base.rb

@@ -13,11 +13,12 @@ module ThreddedCreateApp
 
       attr_reader :app_name, :app_hostname, :app_path, :gems
 
-      def initialize(app_path:, verbose: false, **_args)
+      def initialize(app_path:, verbose: false, database:, **_args)
         @app_path = app_path
         @app_name = File.basename(File.expand_path(app_path))
         @app_hostname = "#{@app_name.tr(' ', '_').downcase}.com"
         @verbose = verbose
+        @database_adapter_name = database.to_s
         @gems = []
       end
 
@@ -31,6 +32,8 @@ module ThreddedCreateApp
 
       protected
 
+      attr_reader :database_adapter_name
+
       def add_gem(gem_name, version: nil, groups: nil, path: nil)
         log_verbose "+ gem #{gem_name}"
         @gems << [gem_name, version, groups, path]
@@ -60,11 +63,15 @@ module ThreddedCreateApp
           return
         end
         src = File.read(expanded_src_path)
-        src = ERB.new(src, nil, '-').result(binding) if process_erb
+        src = eval_template(src) if process_erb
         FileUtils.mkdir_p(File.dirname(target_path))
         File.write target_path, src, mode: mode
       end
 
+      def eval_template(src)
+        ERB.new(src, nil, '-').result(binding)
+      end
+
       def replace(path, pattern, replacement = nil, optional: false)
         src = File.read(path)
         changed = if block_given?
@@ -77,6 +84,7 @@ module ThreddedCreateApp
                "No match found for #{pattern} in #{path}"
         end
         File.write path, src
+        changed
       end
 
       def add_precompile_asset(asset)
@@ -104,6 +112,14 @@ module ThreddedCreateApp
                             end)
       end
 
+      def add_migration(name, content: nil, template: nil)
+        run_generator "migration #{name}"
+        replace Dir["db/migrate/*_#{name}.rb"][0],
+                /^ *def change\n *end\n/,
+                indent(2, content ||
+                    eval_template(File.read(expand_src_path(template))))
+      end
+
       def inject_into_file(path, content:, after: nil, before: nil)
         replace path, (after || before), after ? '\0' + content : content + '\0'
       end

data/lib/thredded_create_app/tasks/setup_app_skeleton.rb

@@ -58,11 +58,6 @@ module ThreddedCreateApp
       end
 
       def add_javascripts
-        replace 'app/assets/javascripts/application.js',
-                %r{^//= require jquery$},
-                '//= require jquery3'
-        git_commit 'Use jQuery v3 instead of jQuery v1'
-
         copy 'setup_app_skeleton/javascripts/app.js',
              'app/assets/javascripts/app.js'
         copy 'setup_app_skeleton/javascripts/app/',

data/lib/thredded_create_app/tasks/setup_database.rb

@@ -18,7 +18,10 @@ module ThreddedCreateApp
         log_info 'Creating config/database.yml from template'
         copy_template 'setup_database/database.yml.erb', 'config/database.yml'
         create_db_user
-        run 'bundle exec rails db:create db:migrate db:seed' \
+        run 'bundle exec rails db:create db:migrate' \
+            "#{' --quiet' unless verbose?}"
+        # On Rails 5.1, running db:seed together with the commands above fails.
+        run 'bundle exec rails db:seed' \
             "#{' --quiet' unless verbose?}"
         git_commit 'Configure the database'
       end

data/lib/thredded_create_app/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ThreddedCreateApp
-  VERSION = '0.1.17'
+  VERSION = '0.1.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thredded_create_app
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -126,7 +126,8 @@ files:
 - lib/thredded_create_app/logging.rb
 - lib/thredded_create_app/tasks/add_devise.rb
 - lib/thredded_create_app/tasks/add_display_name_to_users.rb
-- lib/thredded_create_app/tasks/add_display_name_to_users/add_display_name_to_users.rb
+- lib/thredded_create_app/tasks/add_display_name_to_users/add_display_name_to_users.rb.erb
+- lib/thredded_create_app/tasks/add_jquery.rb
 - lib/thredded_create_app/tasks/add_memcached_support.rb
 - lib/thredded_create_app/tasks/add_rails_config.rb
 - lib/thredded_create_app/tasks/add_rails_email_preview.rb
@@ -136,7 +137,6 @@ files:
 - lib/thredded_create_app/tasks/add_thredded.rb
 - lib/thredded_create_app/tasks/add_thredded/_thredded-custom.scss
 - lib/thredded_create_app/tasks/add_thredded/_thredded-variables.scss
-- lib/thredded_create_app/tasks/add_thredded/add_admin_to_users.rb
 - lib/thredded_create_app/tasks/add_thredded/myapp_thredded.js
 - lib/thredded_create_app/tasks/add_thredded/spec/features/thredded_spec.rb
 - lib/thredded_create_app/tasks/add_thredded/thredded.en.yml

data/lib/thredded_create_app/tasks/add_display_name_to_users/add_display_name_to_users.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-class AddDisplayNameToUsers < ActiveRecord::Migration[5.0]
-  def up
-    case connection.adapter_name.to_s
-    when /mysql/i
-      add_column :users, :display_name, :string, limit: 191
-    when /sqlite/i
-      add_column :users, :display_name, :string
-      change_column_null :users, :display_name, false
-    else
-      add_column :users, :display_name, :string, null: false
-    end
-
-    DbTextSearch::CaseInsensitive.add_index connection, :users, :display_name,
-                                            unique: true
-  end
-
-  def down
-    remove_column :users, :display_name
-  end
-end

data/lib/thredded_create_app/tasks/add_thredded/add_admin_to_users.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class AddAdminToUsers < ActiveRecord::Migration[5.0]
-  def up
-    add_column :users, :admin, :boolean, null: false, default: false
-  end
-
-  def down
-    remove_column :users, :admin
-  end
-end