thredded_create_app 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63c67451a346d7cf30ee4088aa6da71aa0f5c262
-  data.tar.gz: e3d3a3ee6579c3b385ad949395bc94ee9d6c9e99
+  metadata.gz: 317de5cb8dc2f463948d4aaa240ad6d546e88440
+  data.tar.gz: 6f61cf6b2c942359d761e45f3e85dd7026e5cc7c
 SHA512:
-  metadata.gz: 2d1c6cef277dfbc4a0040beaa41044fb0f964b590e63ac36f104669b65a72c251b6428f53f302237c742585b5aad7b92692fecf5813591f3754faf6cb6f6c20a
-  data.tar.gz: 2ca16dd5bf5a25fac8ebc0be75bed2303e0323efd534df98f592d84ae969ac2c25ab156b012f59cab2b4c7e75446a514a85549c8ca05c9ddf4f39bbb2963c774
+  metadata.gz: 5be5c1c0ad6a6eaef3a0e8a2e19eee17251486e42d383e75108e7ed1cb6d815a35d25afd950b4abd2d0fde8e70aeb4ec64f514466b3c7a2f35aa1171ee130529
+  data.tar.gz: a4d0710842921f74c8fdde1b9a47aa9f339a2cd5f1ef7eb0f3be2cd18d38cb4c71e5d8288a8129640e3cb5ff01b550023a2abb5d02b213b6b3052824d64e1ca8

data/lib/thredded_create_app/cli.rb

@@ -16,7 +16,8 @@ module ThreddedCreateApp
       install_gem_bundler_rails: true,
       start_server: true,
       simple_form: true,
-      database: :postgresql
+      database: :postgresql,
+      rails_version: nil
     }.freeze
 
     def self.start(argv)
@@ -85,13 +86,18 @@ module ThreddedCreateApp
       ) do |op|
         flags = Flags.new(op, options)
 
-        db_adapters = %i(postgresql mysql2 sqlite3)
+        db_adapters = %i[postgresql mysql2 sqlite3]
         op.on '--database DATABASE', db_adapters,
               "The database adapter, one of: #{db_adapters.join(', ')} " \
               "(default: #{DEFAULTS[:database]})" do |v|
           options[:database] = v.to_sym
         end
 
+        op.on '--rails-version VERSION',
+              'The exact version of Rails to use (default: latest)' do |value|
+          options[:rails_version] = value
+        end
+
         flags.bool :simple_form, '--[no-]simple-form', 'Use simple_form'
 
         op.separator "\nOther options:"

data/lib/thredded_create_app/tasks/add_devise.rb

@@ -57,8 +57,8 @@ module ThreddedCreateApp
         replace 'app/views/devise/registrations/edit.html.erb',
                 ', :back %>', ', back_url %>'
         # Make the views render-able outside Devise controllers
-        %w(app/views/devise/sessions/new.html.erb
-           app/views/devise/shared/_links.html.erb).each do |path|
+        %w[app/views/devise/sessions/new.html.erb
+           app/views/devise/shared/_links.html.erb].each do |path|
           replace path, 'resource_class', 'User', optional: true
           replace path, /resource_name(?!:)/, ':user'
           replace path, /resource(?!:)/, ':user', optional: true

data/lib/thredded_create_app/tasks/add_display_name_to_users.rb

@@ -39,8 +39,8 @@ module ThreddedCreateApp
         inject_into_file 'app/controllers/application_controller.rb',
                          after:   /protect_from_forgery.*\n/,
                          content: devise_permitted_params_rb
-        %w(app/views/devise/registrations/new.html.erb
-           app/views/devise/registrations/edit.html.erb).each do |path|
+        %w[app/views/devise/registrations/new.html.erb
+           app/views/devise/registrations/edit.html.erb].each do |path|
           autofocus = File.read(path).include?(', autofocus: true')
           replace path, ', autofocus: true', '' if autofocus
           if @simple_form

data/lib/thredded_create_app/tasks/create_rails_app.rb

@@ -1,33 +1,41 @@
 # frozen_string_literal: true
 
+require 'yaml'
 require 'thredded_create_app/tasks/base'
+
 module ThreddedCreateApp
   module Tasks
     class CreateRailsApp < Base
-      def initialize(install_gem_bundler_rails:, database:, **args)
+      def initialize(install_gem_bundler_rails:, rails_version:, database:,
+                     **args)
         super
         @install_gem_bundler_rails = install_gem_bundler_rails
         @database = database
+        @rails_version = rails_version
+        @user_install = !File.writable?(Gem.dir)
       end
 
       def summary
-        "Create Rails app #{app_name.inspect} with #{rails_database} and rspec"
+        "Create a Rails v#{@rails_version} app #{app_name.inspect} with"\
+          " #{rails_database} and rspec"
       end
 
       def before_bundle
         if @install_gem_bundler_rails
-          user_install = !File.writable?(Gem.dir)
-          run 'gem update --system --no-document --quiet' unless user_install
-          run 'gem install bundler rails --no-document' \
-              "#{' --user' if user_install}"
+          run 'gem update --system --no-document --quiet' unless @user_install
+          install_gem 'bundler'
+          install_gem 'rails', version: @rails_version
         end
+        @rails_version ||= latest_installed_rails_version
+
         # 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} " \
-           "--skip-test#{verbose? ? ' --verbose' : ' --quiet'}"
+           "rails _#{@rails_version}_ 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)
-        add_gem 'capybara', groups: %i(test)
+        add_gem 'rspec-rails', groups: %i[test]
+        add_gem 'capybara', groups: %i[test]
         git_commit summary
       end
 
@@ -38,9 +46,21 @@ module ThreddedCreateApp
 
       private
 
+      def install_gem(gem_name, version: nil)
+        run ["gem install #{gem_name} --no-document",
+             ('--user' if @user_install),
+             ("-v #{version}" if version)].compact.join(' ')
+      end
+
       def rails_database
         { mysql2: :mysql }.fetch(@database, @database)
       end
+
+      def latest_installed_rails_version
+        # rubocop:disable Security/YAMLLoad
+        YAML.load(`gem specification rails`).version.to_s
+        # rubocop:enable Security/YAMLLoad
+      end
     end
   end
 end

data/lib/thredded_create_app/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thredded_create_app
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Rails app generator for Thredded.