katapult 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b262aea45a6e72401c0cee7d558e0320e3fe4a1
-  data.tar.gz: c252ae0b85dd9bd0cf682910a22212bff6058e70
+  metadata.gz: c0c8a60d4ea75bbc8ab64191575c2a672d80daf6
+  data.tar.gz: 8e3b106a9465545b5bccef527bf11358aa0ecd37
 SHA512:
-  metadata.gz: 9a96e6f9ab0445e68bbf35bfa69a8dd2c9122ed212bc6c086a4f402ca57a11d717b5885c805702ba237b109e2439a5be06cefdfcba28eea4b7947c66f2cf39d9
-  data.tar.gz: b1ee95eb5749a091c3e9d4ed3dd95a209e816cd6c92dfd313a27df545ffb2bac83252988ea0b4b50f8cd21578109fa94968d658a6d9946adc39f07c252692674
+  metadata.gz: e0fa254887044ccb0d59a3d7921e8a6122797f1950a2ed4cd55ccfb5da9e25e5c62ab1fe496cdc7b6dbf5675ab7410ae005e888ac69e9e95667d3ca5c146ed8d
+  data.tar.gz: 5367cb38a7cd8945ad1c6bb912b0004b17051cbac11a38172c8ea0c1435369e12dbc36f2a3a86a582c6a1ace860515da88572e23a1bd535e0cc3c87657b4d723

data/.ruby-version

@@ -1 +1 @@
-2.1.0
+2.1.5

data/README.md

@@ -8,7 +8,7 @@ application basics and generates (makandra-flavored) code from an application
 model, significantly speeding up the initial phase of a Rails project.
 
 `Katapult` will always support current versions of Ruby and Rails, currently
-Rails 4.1 and Ruby 2.1.
+Rails 4.2 and Ruby 2.1.
 
 
 ## Installation
@@ -39,7 +39,9 @@ After installation, you find a file `lib/katapult/application_model.rb` where
 you will define the properties of your application. Inside this file, use
 `katapult`'s simple DSL (domain specific language) to express yourself.
 
-The DSL consists of elements, e.g. Model or WUI (which stands for *Web User
+
+### DSL syntax example
+The DSL consists of _elements_, e.g. Model or WUI (which stands for *Web User
 Interface*). Each `katapult` element has the same syntax, taking a name,
 options, and a block:
 
@@ -94,13 +96,7 @@ WUIs.
     navigation :main
 
 
-## Contributing
-
-<!-- 1. Fork it ( http://github.com/<my-github-username>/katapult/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request -->
+## Development
 
 `Katapult` caches a pristine Rails application inside its `tmp/` directory to
 speed up test runs. Keep this in mind, as it may lead to caching issues when

data/features/binary.feature

@@ -1,7 +1,7 @@
 Feature: Katapult binary `katapult`
 
   Scenario: Start new Rails application
-    Given The default aruba timeout is 120 seconds
+    Given the default aruba timeout is 120 seconds
 
     When I successfully run `katapult target binary_test`
     Then the output should contain "Creating new Rails application"
@@ -26,6 +26,12 @@ Feature: Katapult binary `katapult`
     And the output should contain "rails generate katapult:basics"
     And the output should contain "Author: katapult <katapult@makandra.com>"
 
+    And the output should contain:
+    """
+    Next step: Model your application in lib/katapult/application_model.rb and
+    trigger the code generation by running `katapult fire`.
+    """
+
 
   Scenario: Forget to pass application name
     When I run `katapult target # without app name`
@@ -46,3 +52,9 @@ Feature: Katapult binary `katapult`
     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"
+
+    And the output should contain:
+    """
+    You're done! Now boot up your development server (e.g. with `rails server`)
+    and try your kickstarted application in the browser.
+    """

data/features/katapult.feature

@@ -33,16 +33,16 @@ Feature: Katapult in general
   Scenario: Generate basic files and settings
     Given I install katapult
     When I generate katapult basics
-    Then the file "Gemfile" should contain exactly:
+    Then the file ".ruby-version" should contain "2.1.5"
+    And the file "Gemfile" should contain exactly:
       """
       source 'https://rubygems.org'
 
       # from original Gemfile
-      gem 'rails', '4.1.0'
+      gem 'rails', '4.2.1'
       gem 'mysql2'
       gem 'jquery-rails'
       gem 'jbuilder', '~> 2.0'
-      gem 'spring',        group: :development
       gem 'katapult', path: '../../..'
 
       # engines
@@ -79,7 +79,7 @@ Feature: Katapult in general
       gem 'autoprefixer-rails'
       gem 'coffee-rails'
       gem 'uglifier'
-      gem 'compass-rails'
+      gem 'compass-rails', '>= 2.0.4' # fixes "uninitialized constant Sprockets::SassCacheStore"
       gem 'compass-rgbapng'
 
       group :development do
@@ -98,6 +98,7 @@ Feature: Katapult in general
         gem 'byebug'
         gem 'factory_girl_rails'
         gem 'rspec-rails'
+        gem 'spring'
       end
 
       group :test do
@@ -113,7 +114,7 @@ Feature: Katapult in general
         gem 'selenium-webdriver'
         gem 'spreewald'
 
-        gem 'rspec_candy'
+        gem 'rspec'
         gem 'shoulda-matchers', require: false
       end
 
@@ -161,7 +162,6 @@ Feature: Katapult in general
 
     And the file "features/support/env-custom.rb" should contain:
       """
-      require 'rspec_candy/all'
       require 'spreewald/all_steps'
       """
     And a file named "features/support/paths.rb" should exist

data/features/model.feature

@@ -28,7 +28,7 @@ Feature: Generate Models
         def change
           create_table :cars do |t|
 
-            t.timestamps
+            t.timestamps null: false
           end
         end
       end
@@ -95,7 +95,7 @@ Feature: Generate Models
             t.string :homepage
             t.boolean :locked
 
-            t.timestamps
+            t.timestamps null: false
           end
         end
       end

data/features/step_definitions/file_steps.rb

@@ -10,5 +10,5 @@ Then /^there should be a migration with:$/ do |migration|
   migrations_path = File.join(current_dir, 'db', 'migrate', '*.rb')
 
   all_migrations = Dir.glob(migrations_path).map(&File.method(:read)).join
-  all_migrations.should include(migration)
+  expect(all_migrations).to include(migration)
 end

data/features/step_definitions/rails_steps.rb

@@ -21,7 +21,7 @@ module KatapultRailsHelper
   def ensure_bundled(path)
     Dir.chdir(path) do
       Bundler.with_clean_env do
-        system('bundle check &> /dev/null') or system('bundle install')
+        system('bundle check > /dev/null 2>&1') or system('bundle install')
       end
     end
   end

data/features/wui.feature

@@ -9,7 +9,7 @@ Feature: Web User Interface
   Scenario: Generate a Web User Interface
     When I overwrite "lib/katapult/application_model.rb" with:
       """
-      model 'Customer' do |customer|
+      model 'customer' do |customer|
         customer.attr :name
         customer.attr :age, type: :integer
 
@@ -19,7 +19,7 @@ Feature: Web User Interface
         customer.attr :locked, type: :flag, default: false
       end
 
-      wui 'Customer', model: 'Customer' do |wui|
+      wui 'customer', model: 'customer' do |wui|
         wui.crud
         wui.action :get_member, method: :get, scope: :member
         wui.action :post_member, method: :post, scope: :member

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

@@ -10,6 +10,10 @@ module Katapult
       source_root File.expand_path('../templates', __FILE__)
 
 
+      def write_ruby_version
+        template '.ruby-version'
+      end
+
       def write_database_ymls
         template 'config/database.yml', force: true
         template 'config/database.sample.yml'
@@ -28,6 +32,12 @@ module Katapult
 
       def bundle_install
         bundle 'install'
+
+        # There is a bug in the current version of Compass, so we use an older
+        # one in our Gemfile template. Since its dependencies "sprockets" and
+        # "sass-rails" are already in the Gemfile.lock (from installing Rails),
+        # we need to explicitly update them.
+        bundle 'update sprockets sass-rails'
       end
 
       def remove_turbolinks_js
@@ -78,6 +88,14 @@ config.autoload_paths << "#{Rails.root}/app/controllers/shared"
       #   template 'config/deploy.rb'
       # end
 
+      def print_instructions
+        puts <<-INSTRUCTIONS.strip_heredoc
+
+          Next step: Model your application in lib/katapult/application_model.rb and
+          trigger the code generation by running `katapult fire`.
+        INSTRUCTIONS
+      end
+
       private
 
       def app_name

data/lib/generators/katapult/basics/templates/.ruby-version

@@ -0,0 +1 @@
+2.1.5

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

@@ -37,7 +37,7 @@ gem 'sass-rails'
 gem 'autoprefixer-rails'
 gem 'coffee-rails'
 gem 'uglifier'
-gem 'compass-rails'
+gem 'compass-rails', '>= 2.0.4' # fixes "uninitialized constant Sprockets::SassCacheStore"
 gem 'compass-rgbapng'
 
 group :development do
@@ -56,6 +56,7 @@ group :development, :test do
   gem 'byebug'
   gem 'factory_girl_rails'
   gem 'rspec-rails'
+  gem 'spring'
 end
 
 group :test do
@@ -71,6 +72,6 @@ group :test do
   gem 'selenium-webdriver'
   gem 'spreewald'
 
-  gem 'rspec_candy'
+  gem 'rspec'
   gem 'shoulda-matchers', require: false
 end

data/lib/generators/katapult/basics/templates/features/support/env-custom.rb

@@ -1,3 +1 @@
-require 'rspec' # it does not work without explicitly doing this. why??
-require 'rspec_candy/all'
 require 'spreewald/all_steps'

data/lib/generators/katapult/cucumber_features/templates/feature.feature

@@ -1,6 +1,6 @@
-Feature: <%= model.name(:human_plural).titleize %>
+Feature: <%= model.name(:humans).titleize %>
 
-  Scenario: CRUD <%= model.name(:human_plural) %>
+  Scenario: CRUD <%= model.name(:humans) %>
     Given I am on the list of <%= model.name(:variables) %>
 
     # create

data/lib/generators/katapult/haml/templates/custom_action.html.haml

@@ -2,4 +2,4 @@
   <%= @action.name.humanize.titleize %>
 
 .tools
-  = link_to 'All <%= model_name(:human_plural) %>', <%= wui.path(:index) %>, class: 'tools__button'
+  = link_to 'All <%= model_name(:humans) %>', <%= wui.path(:index) %>, class: 'tools__button'

data/lib/generators/katapult/haml/templates/index.html.haml

@@ -1,5 +1,5 @@
 %h1
-  <%= model_name(:human_plural).capitalize %>
+  <%= model_name(:humans).capitalize %>
 
 .tools
   = link_to 'Add <%= model_name(:human) %>', <%= wui.path(:new) %>, class: 'tools__button is_primary'
@@ -26,4 +26,4 @@
 
 - else
   %p.help-block
-    There are no <%= model_name(:human_plural) %> yet.
+    There are no <%= model_name(:humans) %> yet.

data/lib/generators/katapult/haml/templates/show.html.haml

@@ -2,7 +2,7 @@
   = <%= model_name(:ivar) %>.to_s
 
 .tools
-  = link_to 'All <%= model_name(:human_plural) %>', <%= wui.path(:index) %>, class: 'tools__button'
+  = link_to 'All <%= model_name(:humans) %>', <%= wui.path(:index) %>, class: 'tools__button'
   = link_to 'Edit', <%= wui.path(:edit, model_name(:ivar)) %>, class: 'tools__button is_primary'
   = link_to 'Destroy', <%= wui.path(:destroy, model_name(:ivar)) %>, method: :delete, class: 'tools__button', confirm: 'Really destroy?'
 <% wui.custom_actions.select(&:member?).each do |action| -%>
@@ -15,7 +15,7 @@
 <% wui.model.attrs.each do |attribute| -%>
   <%- model_attribute = "#{model_name(:ivar)}.#{attribute.name}" -%>
   %dt
-    = <%= model_name(:class_name) %>.human_attribute_name(:<%= attribute.name %>)
+    = <%= model_name(:class) %>.human_attribute_name(:<%= attribute.name %>)
   %dd
   <%- case attribute.type -%>
   <%- when :string -%>

data/lib/generators/katapult/navigation/templates/app/models/navigation.rb

@@ -4,7 +4,7 @@ class Navigation
   navigation :<%= name.downcase %> do
 <% navigation.wuis.each do |wui| -%>
   <%- if wui.find_action(:index) -%>
-    section <%= navigation.section_name(wui) %>, <%= wui.model_name(:human_plural).titlecase.inspect %>, <%= wui.path(:index) %>
+    section <%= navigation.section_name(wui) %>, <%= wui.model_name(:humans).titlecase.inspect %>, <%= wui.path(:index) %>
   <%- end -%>
 <% end -%>
   end

data/lib/generators/katapult/transform/transform_generator.rb

@@ -37,6 +37,14 @@ module Katapult
       run 'bin/rake db:create db:migrate RAILS_ENV=test'
     end
 
+    def print_instructions
+      puts <<-INSTRUCTIONS.strip_heredoc
+
+        You're done! Now boot up your development server (e.g. with `rails server`)
+        and try your kickstarted application in the browser.
+      INSTRUCTIONS
+    end
+
     private
 
     def application_name

data/lib/generators/katapult/w_u_i/templates/controller.rb

@@ -95,7 +95,7 @@ class <%= model_name(:classes) %>Controller < ApplicationController
   end
 
   def <%= method_name(:scope) %>
-    <%= model_name(:class_name) %>.scoped
+    <%= model_name(:class) %>.scoped
   end
 
 <%- if navigation -%>

data/lib/katapult/element.rb

@@ -8,6 +8,7 @@ module Katapult
   class Element
 
     UnknownOptionError = Class.new(StandardError)
+    UnknownFormattingError = Class.new(StandardError)
 
     attr_accessor :name, :options
     attr_reader :application_model
@@ -36,18 +37,18 @@ module Katapult
       machine_name = @name.underscore
 
       case kind.to_s
-      when 'symbol'       then ":#{machine_name}"
-      when 'symbols'      then ":#{machine_name.pluralize}"
-      when 'variable'     then machine_name
-      when 'variables'    then machine_name.pluralize
-      when 'ivar'         then "@#{machine_name}"
-      when 'ivars'        then "@#{machine_name.pluralize}"
-      when 'human_plural' then human_name.pluralize
-      when 'human'        then human_name
-      when 'class'        then machine_name.classify
-      when 'classes'      then machine_name.classify.pluralize
-      else
-        @name
+      when ''          then @name
+      when 'symbol'    then ":#{machine_name}"
+      when 'symbols'   then ":#{machine_name.pluralize}"
+      when 'variable'  then machine_name
+      when 'variables' then machine_name.pluralize
+      when 'ivar'      then "@#{machine_name}"
+      when 'ivars'     then "@#{machine_name.pluralize}"
+      when 'human'     then human_name
+      when 'humans'    then human_name.pluralize
+      when 'class'     then machine_name.classify
+      when 'classes'   then machine_name.classify.pluralize
+      else raise UnknownFormattingError, "Unknown name formatting: #{ kind.inspect }"
       end
     end
 

data/lib/katapult/version.rb

@@ -1,3 +1,3 @@
 module Katapult
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/element_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+require 'katapult/element'
+
+describe Katapult::Element do
+  subject { described_class.new('element') }
+
+  describe '#name' do
+    it 'raises an error when passed an unknown formatting kind' do
+      expect do
+        subject.name(:foobar)
+      end.to raise_error(Katapult::Element::UnknownFormattingError,
+        'Unknown name formatting: :foobar')
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -7,7 +7,6 @@ require 'pry'
 require 'active_support/core_ext/string/inflections'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

data/spec/util_spec.rb

@@ -5,17 +5,17 @@ describe Katapult::Util do
 
   describe '#git_commit' do
     it 'adds all files before committing' do
-      Katapult::Util.should_receive(:system).with(/git add --all; git commit/)
+      allow(Katapult::Util).to receive(:system).with(/git add --all; git commit/)
       Katapult::Util.git_commit 'test'
     end
 
     it 'sets "katapult" as commit author' do
-      Katapult::Util.should_receive(:system).with(/git commit.*--author='katapult \<katapult@makandra\.com\>'/)
+      allow(Katapult::Util).to receive(:system).with(/git commit.*--author='katapult \<katapult@makandra\.com\>'/)
       Katapult::Util.git_commit 'test'
     end
 
     it 'sanitizes the commit message' do
-      Katapult::Util.should_receive(:system).with(/git commit -m '"hack0r"'/)
+      allow(Katapult::Util).to receive(:system).with(/git commit -m '"hack0r"'/)
       Katapult::Util.git_commit "\"hack''''0r\""
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katapult
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dominik Schöler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -154,6 +154,7 @@ files:
 - katapult.gemspec
 - katapult.png
 - lib/generators/katapult/basics/basics_generator.rb
+- lib/generators/katapult/basics/templates/.ruby-version
 - lib/generators/katapult/basics/templates/Gemfile
 - lib/generators/katapult/basics/templates/app/assets/stylesheets/application.css.sass
 - lib/generators/katapult/basics/templates/app/assets/stylesheets/application/blocks/_all.css.sass
@@ -204,6 +205,7 @@ files:
 - script/console
 - spec/action_spec.rb
 - spec/attribute_spec.rb
+- spec/element_spec.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb
 - spec/util_spec.rb
@@ -228,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Kickstart Rails development
@@ -247,6 +249,7 @@ test_files:
 - features/wui.feature
 - spec/action_spec.rb
 - spec/attribute_spec.rb
+- spec/element_spec.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb
 - spec/util_spec.rb