katapult 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4099dfe92529880417ce7c3ac5204b70fc115b33a6b60b0027d75c6f7e001e3
-  data.tar.gz: 688a93e927f9240fc0d6e67caceeaae882438c9f5114618f051fda4c5063495f
+  metadata.gz: 0e300dbf1f253287be637c885c6d9c42ee23272c4e1259c1608194c744433c6d
+  data.tar.gz: 92e3a0218852ab314dee4de60e3e753140795031310eaa2bc90700a2b5113666
 SHA512:
-  metadata.gz: 5a2a28034878af36af8c5251550c87b257091d4ddadc0e923a7845ea4ace323660040c50de547f7460153fac5df88520bbe10558870a6ec6de9f22153300c5e4
-  data.tar.gz: 405ae1ffbdd3172e78f5e2aced6bf4096e400b5ca30d86aaa6f23b8ed10e0875c6de048d5da11e333f20709644e4fb21c6941a8e68b5e7c83eb1590ff4256f41
+  metadata.gz: 99f96cfcd585edc21231c1d3c0d2778bbc2def2f60facdb4ffdf56f64d8498ee34eb3b6c6f751a00768a1bdc0fc690bbca3a871cf373c499c53e4a21d968171d
+  data.tar.gz: 48655800af8a0439cc7738c6e455e03589e6d071fe25177b652b342fdea0ce1268e1c9f88974fa21f284f64961985d8706e6888c8438740e277e27bf85a20456

data/bin/katapult

@@ -60,15 +60,18 @@ when 'new'
 
   util.pink 'Installing katapult ...'
   File.open('Gemfile', 'a') do |file|
-    file.puts "gem 'katapult'#{ ENV['KATAPULT_GEMFILE_OPTIONS'] }, group: :development"
+    file.puts "gem 'katapult', '#{ Katapult::VERSION }', group: :development #{ ENV['KATAPULT_GEMFILE_OPTIONS'] }"
   end
-  util.run 'bundle install --quiet'
+  # "update rails" ensures the application uses the Rails version that katapult
+  # requires (the default Gemfile lists Rails with ~>, meaning the patch level
+  # may mismatch). It also installs katapult.
+  util.run 'bundle update rails --quiet'
   util.run 'bundle exec rails generate katapult:app_model'
   util.git_commit 'rails generate katapult:app_model', '--quiet'
 
   util.pink 'Generating katapult basics ...'
   util.run basics_command
-  # Do not use `basics_command` as commit message, as it contains the password!
+  # Do not use `basics_command` as commit message, it contains the db password!
   util.git_commit 'rails generate katapult:basics', '--quiet'
 
   util.pink <<-INSTRUCTIONS

data/features/binary.feature

@@ -43,7 +43,6 @@ Feature: Katapult binary `katapult`
     Then the output should contain "Creating new Rails application"
       And the output should contain "Installing katapult"
       And the output should contain "Generating katapult basics"
-      And the output should contain the configured Rails version
 
       And the output should contain "Application initialization done."
       And the output should contain "Model your application in lib/katapult/application_model.rb"
@@ -52,6 +51,7 @@ Feature: Katapult binary `katapult`
 
     When I cd to "binary_test"
     Then the file "Gemfile" should contain "gem 'katapult'"
+      And the configured Rails version should be listed in the Gemfile.lock
       And a file named "lib/katapult/application_model.rb" should exist
 
       And the file "config/database.yml" should contain "username: katapult"

data/features/step_definitions/katapult_steps.rb

@@ -3,6 +3,12 @@
 When 'I install katapult' do
   next if @no_clobber
   append_to_file 'Gemfile', "gem 'katapult', path: '../../..'"
+
+  # Make sure katapult's version of Rails is used
+  # Cannot use #run_simple because it already expects a working Bundler setup
+  Dir.chdir expand_path('.') do
+    Katapult::BinaryUtil.run 'bundle update rails --quiet'
+  end
 end
 
 When 'I generate the application model' do

data/features/step_definitions/rails_steps.rb

@@ -86,8 +86,10 @@ Given 'a new Rails application with Katapult basics installed' do
           create_app(RailsHelper::APP_WITH_BASICS)
 
           Dir.chdir(RailsHelper::APP_WITH_BASICS) do
-            # :path will be correct when copied to the TEST_APP path
+            # :path is correct within the TEST_APP path
             Katapult::BinaryUtil.run %(echo "gem 'katapult', path: '../../..'" >> Gemfile)
+            # Make sure katapult's version of Rails is used
+            Katapult::BinaryUtil.run 'bundle update rails --quiet'
             Katapult::BinaryUtil.run 'bin/rails generate katapult:basics --db-user katapult --db-password secret'
             # Spring running in the cache dir is of no further use, but would
             # break things when the cache dir is removed

data/features/step_definitions/version_steps.rb

@@ -8,10 +8,6 @@ Then 'the configured Rails version should be listed in the Gemfile.lock' do
   step %(the file "Gemfile.lock" should contain "    rails (#{rails_version})")
 end
 
-Then 'the output should contain the configured Rails version' do
-  step %(the output should contain "Using rails #{Katapult::RAILS_VERSION}")
-end
-
 Then 'Capistrano should be locked to the installed version' do
   cd '.' do
     gemfile = File.read('Gemfile.lock')

data/lib/generators/katapult/basics/basics_generator.rb

@@ -43,7 +43,7 @@ module Katapult
       end
 
       def bundle_install
-        run 'bundle install'
+        run 'bundle install --quiet'
 
         # Fix Bundler for parallel_tests
         run 'bundle config --local disable_exec_load true'
@@ -180,7 +180,7 @@ config.time_zone = 'Berlin'
       # Configure 3rd party ####################################################
 
       def setup_spring
-        run 'spring binstub --all'
+        run 'bundle exec spring binstub --all'
 
         # Enhance Spring config
         config = 'config/spring.rb'
@@ -294,11 +294,6 @@ config.autoload_paths << "#{Rails.root}/app/controllers/shared"
         template '.browserslistrc'
       end
 
-      # Bundler prefers installed gems, but we want the newest versions possible
-      def update_gems
-        run 'bundle install'
-      end
-
       private
 
       def merge_rails_helper_into_spec_helper

data/lib/generators/katapult/basics/templates/Gemfile

@@ -8,7 +8,6 @@ gem 'webpacker'
 
 # Internals and security
 gem 'exception_notification'
-# gem 'admin_cleaner', git: 'git@code.makandra.de:makandra/admin_cleaner.git'
 
 # Models
 gem 'active_type'
@@ -27,7 +26,7 @@ gem 'whenever'
 group :development do
   gem 'query_diet'
   gem 'better_errors'
-  gem 'binding_of_caller'
+  gem 'binding_of_caller', '>= 0.8.0' # Fixes a bug with Ruby 2.5.0
 
   gem 'web-console'
   gem 'listen', '< 3.2'

data/lib/katapult/support/generator_goodies.rb

@@ -1,7 +1,7 @@
 module Katapult::GeneratorGoodies
 
   def yarn(*args)
-    command =  'bin/yarn ' + args.join(' ')
+    command =  'bin/yarn --silent --non-interactive ' + args.join(' ')
     run command
   end
 

data/lib/katapult/version.rb

@@ -1,7 +1,7 @@
 module Katapult
   ruby_version_path = File.expand_path('../../.ruby-version', __dir__)
 
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
   RUBY_VERSION = File.read(ruby_version_path).strip
   RAILS_VERSION = '5.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katapult
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Dominik Schöler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails