katapult 0.2.0 → 0.3.0

data/features/binary.feature

@@ -1,16 +1,50 @@
+#@announce-output
+#@announce-stderr
 Feature: Katapult binary `katapult`
 
-  Scenario: Start new Rails application
-    Given the default aruba exit timeout is 120 seconds
+  Scenario: Run without arguments
+    When I run `katapult`
+    Then the output should contain "Usage: katapult new APP_NAME | fire [path/to/model] | version"
+
 
-    When I run `katapult new binary_test` interactively
+  Scenario: Print versions
+    When I run `katapult version`
+    Then the output should contain "Katapult"
+      And the output should contain "Generating a Rails 5."
+      And the output should contain " app on Ruby 2."
+
+
+  Scenario: Missing options are asked for
+    When I run `katapult new` interactively
+      And I type "test_app"
       And I type "katapult"
       And I type "secret"
     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 "Using rails 4.2.6"
-    And the output should contain:
+
+    # Aruba seemingly cannot test output interleaved with input, so the output
+    # is tested after exiting the script
+    When I stop the command above
+    Then the output should contain "Please enter the database user"
+    Then the output should contain "Please enter the application name"
+    Then the output should contain "Please enter the database password"
+
+
+  Scenario: App name gets normalized
+    When I run `katapult new TestApp --verbose`
+    Then the output should contain "Normalized application name: test_app"
+
+
+#  @announce-output
+  Scenario: Start new Rails application
+    # Rails new including yarn install + installing basics takes quite some time
+    Given the aruba exit timeout is 90 seconds
+
+    When I successfully run `katapult new binary_test -u katapult -p secret`
+    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.
 
@@ -19,44 +53,28 @@ Feature: Katapult binary `katapult`
     """
 
     When I cd to "binary_test"
-
-    # test whether katapult is installed
     Then the file "Gemfile" should contain "gem 'katapult'"
-    And a file named "lib/katapult/application_model.rb" should exist
+      And a file named "lib/katapult/application_model.rb" should exist
 
-    # test correct insertion of database credentials
-    And the file "config/database.yml" should contain "username: katapult"
-    And the file "config/database.yml" should contain "password: secret"
+      And the file "config/database.yml" should contain "username: katapult"
+      And the file "config/database.yml" should contain "password: secret"
 
-#    Not working, probably because Bundler sees an empty BUNDLER_GEMFILE var
-#    # test whether the application is already bundled
-#    When I run `bundle check`
-#    Then the output should contain "The Gemfile's dependencies are satisfied"
+    When I run `bundle check`
+    Then the output should contain "The Gemfile's dependencies are satisfied"
 
-    # test whether katapult made git commits
     When I run `git log`
     Then the output should contain "rails new binary_test"
-    And the output should contain "rails generate katapult:install"
-    And the output should contain "rails generate katapult:basics"
-    And the output should contain "Author: katapult <katapult@makandra.com>"
-
-
-  Scenario: Forget to pass application name
-    When I run `katapult new --non-interactive # Without app name`
-    Then the output should contain "No value provided for required arguments 'app_path'"
-
-
-  Scenario: Run without arguments
-    When I run `katapult # without arguments`
-    Then the output should contain "Usage: katapult [new APP_NAME | fire [path/to/model] ]"
+      And the output should contain "rails generate katapult:app_model"
+      And the output should contain "rails generate katapult:basics"
+      And the output should contain "Author: katapult <katapult@makandra.com>"
 
 
   Scenario: Transform the application model
-    Given a pristine Rails application
-    And I install katapult
-    And I generate katapult basics
+    Given a new Rails application with Katapult basics installed
+      And the default aruba exit timeout is 45 seconds
 
-    When I run `katapult fire`
+    When I generate the application model
+      And I run `katapult fire`
     Then the output should contain "Loading katapult"
     And the output should contain "parse  lib/katapult/application_model"
     And the output should contain "render  into katapult_test_app"
@@ -75,9 +93,7 @@ Feature: Katapult binary `katapult`
 
 
   Scenario: Transform a custom application model
-    Given a pristine Rails application
-    And I install katapult
-    And I generate katapult basics
+    Given a new Rails application with Katapult basics installed
 
     When I write to "lib/katapult/custom_model.rb" with:
     """
@@ -90,11 +106,9 @@ Feature: Katapult binary `katapult`
 
 
   Scenario: When the transformation fails, an error message is printed
-    Given a pristine Rails application
-    And I install katapult
-    And I generate katapult basics
+    Given a new Rails application with Katapult basics installed
 
-    When I overwrite "lib/katapult/application_model.rb" with:
+    When I write to "lib/katapult/application_model.rb" with:
       """
       model 'failing example' do |ex|
         ex.attr :fail, type: :nonexistent

data/features/configuration.feature

@@ -1,13 +1,13 @@
+#@announce-output
+#@announce-stderr
 Feature: Configure katapult
 
   Background:
-    Given a pristine Rails application
-    And I install katapult
-    And I generate katapult basics
+    Given a new Rails application with Katapult basics installed
 
 
   Scenario: Custom model template
-    When I overwrite "lib/katapult/application_model.rb" with:
+    When I write to "lib/katapult/application_model.rb" with:
       """
       model 'Car'
       """

data/features/model.feature

@@ -1,13 +1,12 @@
+#@announce-output
 Feature: Generate Models
 
   Background:
-    Given a pristine Rails application
-    And I install katapult
-    And I generate katapult basics
+    Given a new Rails application with Katapult basics installed
 
 
   Scenario: Generate ActiveRecord Model
-    When I overwrite "lib/katapult/application_model.rb" with:
+    When I write to "lib/katapult/application_model.rb" with:
       """
       model 'Car'
       """
@@ -24,11 +23,11 @@ Feature: Generate Models
       """
     And there should be a migration with:
       """
-      class CreateCars < ActiveRecord::Migration
+      class CreateCars < ActiveRecord::Migration[5.1]
         def change
           create_table :cars do |t|
 
-            t.timestamps null: false
+            t.timestamps
           end
         end
       end
@@ -36,14 +35,12 @@ Feature: Generate Models
       """
     And the file "spec/models/car_spec.rb" should contain exactly:
       """
-      require 'rails_helper'
-
       describe Car do
 
         describe '#to_s' do
           it 'returns its class name with its id' do
             subject.id = 17
-            expect(subject.to_s).to eql("Car#17")
+            expect(subject.to_s).to eq("Car#17")
           end
         end
 
@@ -53,7 +50,7 @@ Feature: Generate Models
 
 
   Scenario: Generate ActiveRecord Model with attributes
-    When I overwrite "lib/katapult/application_model.rb" with:
+    When I write to "lib/katapult/application_model.rb" with:
       """
       model 'Person' do |person|
 
@@ -72,7 +69,7 @@ Feature: Generate Models
         person.attr :plain_json, type: :plain_json
       end
       """
-    And I successfully transform the application model
+    And I successfully transform the application model including migrations
     Then the file "app/models/person.rb" should contain exactly:
       """
       class Person < ActiveRecord::Base
@@ -87,7 +84,7 @@ Feature: Generate Models
       """
     And there should be a migration with:
       """
-      class CreatePeople < ActiveRecord::Migration
+      class CreatePeople < ActiveRecord::Migration[5.1]
         def change
           create_table :people do |t|
             t.integer :age
@@ -101,7 +98,7 @@ Feature: Generate Models
             t.jsonb :indexable_json
             t.json :plain_json
 
-            t.timestamps null: false
+            t.timestamps
           end
         end
       end
@@ -109,28 +106,26 @@ Feature: Generate Models
       """
     And the file "spec/models/person_spec.rb" should contain exactly:
       """
-      require 'rails_helper'
-
       describe Person do
 
         describe '#to_s' do
           it 'returns the #age attribute' do
             subject.age = 778
-            expect(subject.to_s).to eql("778")
+            expect(subject.to_s).to eq("778")
           end
         end
 
         describe '#homepage' do
 
           it 'has a default' do
-            expect( subject.homepage ).to eql("http://www.makandra.de")
+            expect(subject.homepage).to eq("http://www.makandra.de")
           end
         end
 
         describe '#locked' do
 
           it 'has a default' do
-            expect( subject.locked ).to eql(false)
+            expect(subject.locked).to eq(false)
           end
         end
 
@@ -143,7 +138,7 @@ Feature: Generate Models
 
 
   Scenario: Get a helpful error message when an attribute has an unknown option
-    When I overwrite "lib/katapult/application_model.rb" with:
+    When I write to "lib/katapult/application_model.rb" with:
       """
       model 'Person' do |person|
         person.attr :x, invalid_option: 'here'
@@ -154,14 +149,14 @@ Feature: Generate Models
 
 
   Scenario: Specify assignable values
-    When I overwrite "lib/katapult/application_model.rb" with:
+    When I write to "lib/katapult/application_model.rb" with:
       """
       model 'Person' do |person|
         person.attr :age, type: :integer, assignable_values: 9..99
         person.attr :hobby, assignable_values: %w[soccer baseball], default: 'soccer', allow_blank: true
       end
       """
-    And I successfully transform the application model
+    And I successfully transform the application model including migrations
     Then the file "app/models/person.rb" should contain exactly:
       """
       class Person < ActiveRecord::Base
@@ -180,14 +175,12 @@ Feature: Generate Models
       """
     And the file "spec/models/person_spec.rb" should contain exactly:
       """
-      require 'rails_helper'
-
       describe Person do
 
         describe '#to_s' do
           it 'returns the #age attribute' do
             subject.age = 9
-            expect(subject.to_s).to eql("9")
+            expect(subject.to_s).to eq("9")
           end
         end
 
@@ -201,7 +194,7 @@ Feature: Generate Models
           it { is_expected.to_not allow_value("baseball-unassignable").for(:hobby) }
 
           it 'has a default' do
-            expect( subject.hobby ).to eql("soccer")
+            expect(subject.hobby).to eq("soccer")
           end
         end
 
@@ -217,12 +210,10 @@ Feature: Generate Models
 
     Do not add routes twice.
 
-    When I overwrite "lib/katapult/application_model.rb" with:
+    When I write to "lib/katapult/application_model.rb" with:
       """
-      model 'Car'
-      wui 'Car' do |wui|
-        wui.crud
-      end
+      model('Car') { |c| c.attr :model }
+      web_ui 'Car', &:crud
       """
       And I successfully transform the application model
     Then the file named "config/routes.rb" should contain:

data/features/navigation.feature

@@ -1,76 +1,63 @@
+#@announce-stderr
 Feature: Navigation
 
   Background:
-    Given a pristine Rails application
-    And I install katapult
-    And I generate katapult basics
+    Given a new Rails application with Katapult basics installed
 
 
   Scenario: Generate navigation
 
-    The navigation is rendered from all WUIs in the application model. It
+    A navigation is rendered from all WebUIs in the application model. It
     consists of links to their index pages.
 
-    When I overwrite "lib/katapult/application_model.rb" with:
+    When I write to "lib/katapult/application_model.rb" with:
       """
       model 'Customer' do |customer|
         customer.attr :name
       end
+      web_ui 'Customer', &:crud
 
-      wui 'Customer', model: 'Customer' do |wui|
-        wui.action :index
-        wui.action :show
-        wui.action :create
-        wui.action :update
-        wui.action :destroy
-      end
-
-      navigation 'main'
+      navigation
       """
     And I successfully transform the application model
-    Then the file "app/models/navigation.rb" should contain exactly:
-      """
-      class Navigation
-        include Navy::Description
-
-        navigation :main do
-          section :customers, "Customers", customers_path
-        end
-
-      end
-
-      """
-    And the file "app/views/layouts/application.html.haml" should contain:
-      """
-      = render_navigation Navigation.main
-      """
-    And the file "app/controllers/customers_controller.rb" should contain:
-      """
-      before_filter :set_section
-      """
-    And the file "app/controllers/customers_controller.rb" should contain:
-      """
-        def set_section
-          in_sections :customers
-        end
-      """
+    And the file "app/views/layouts/_menu_bar.html.haml" should contain:
+    """
+    = render 'layouts/navigation'
+    """
+    And the file "app/views/layouts/_navigation.html.haml" should contain:
+    """
+    %ul.nav.navbar-nav
+      %li(up-expand)
+        = content_link_to "Customers", customers_path
+
+      %li.dropdown
+        = link_to '#', data: { toggle: 'dropdown' } do
+          Dropdown example
+          %span.caret
+
+        %ul.dropdown-menu
+          %li= link_to 'One', '#'
+          %li.divider
+          %li= link_to 'Two', '#'
+    """
 
 
   Scenario: Homepage (aka root route) is set automatically
 
-    The first WUI with an index action is set as home page
+    The first WebUI with an index action is set as home page. This does not
+    require a navigation.
 
-    When I overwrite "lib/katapult/application_model.rb" with:
+    When I write to "lib/katapult/application_model.rb" with:
       """
-      model 'Customer'
-      model 'Elephant'
+      model('Customer') { |c| c.attr :name }
+      model('Elephant') { |e| e.attr :name }
 
-      wui 'Elephant' do |wui|
-        wui.action :trumpet, scope: :member, method: :post
+      web_ui 'Elephant' do |web_ui|
+        web_ui.action :trumpet, scope: :member, method: :post
       end
 
-      wui 'Customer' do |wui|
-        wui.crud
+      web_ui 'Customer' do |web_ui|
+        web_ui.crud
       end
       """
     And I successfully transform the application model

data/features/step_definitions/aruba_steps.rb

@@ -0,0 +1,3 @@
+When 'I stop the command above' do
+  aruba.command_monitor.stop_process last_command_started
+end