katapult 0.1.1 → 0.1.2

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

@@ -14,7 +14,6 @@ module Katapult
     argument :path, required: true, type: :string,
       description: 'The path to the application model file'
 
-
     def transform_application_model
       say_status :parse, path
       @app_model = Katapult::Parser.new.parse(path)
@@ -24,32 +23,28 @@ module Katapult
     end
 
     def write_root_route
-      root_wui = @app_model.wuis.find do |wui|
-        wui.find_action :index
+      unless File.read('config/routes.rb').include? '  root'
+        root_wui = @app_model.wuis.find { |w| w.find_action :index }
+        route "root '#{ root_wui.model_name(:variables) }#index'" if root_wui
       end
-
-      route "root '#{ root_wui.model_name(:variables) }#index'" if root_wui
-    end
-
-    def migrate
-      run 'bin/rake db:drop:all &> /dev/null'
-      run 'bin/rake db:create db:migrate RAILS_ENV=development'
-      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
+    def remigrate_all_databases
+      run 'spring stop' # parallel_tests does not work together with Spring
+      run 'rake db:drop:all db:create:all db:migrate parallel:create parallel:prepare'
     end
 
-    private
+  private
 
     def application_name
        File.basename(Dir.pwd)
     end
 
+    def run(*)
+      Bundler.with_clean_env do
+        super
+      end
+    end
+
   end
 end

data/lib/generators/katapult/w_u_i/w_u_i_generator.rb

@@ -18,7 +18,20 @@ module Katapult
       end
 
       def add_route
-        route render_partial('_route.rb')
+        route = model_name(:symbols)
+        routes = File.read('config/routes.rb')
+
+        if routes.include? "resources #{ route }"
+          say_status :warn, <<MESSAGE, :red
+Routes for #{ route } already exist! Not updated.
+
+In order to keep existing routes created by the user, the config/routes.rb file
+is not wiped on model transformation. To have Katapult update the #{ route}
+route for you, delete it before transforming the application model.
+MESSAGE
+        else
+          route render_partial('_route.rb')
+        end
       end
 
       def generate_views

data/lib/katapult/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katapult
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dominik Schöler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,16 +84,16 @@ dependencies:
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
 description: Katapult is a framework for generating base code
 email:
 - dominik.schoeler@makandra.de
@@ -154,19 +154,29 @@ files:
 - katapult.gemspec
 - katapult.png
 - lib/generators/katapult/basics/basics_generator.rb
+- lib/generators/katapult/basics/templates/.gitignore
 - 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
-- lib/generators/katapult/basics/templates/app/assets/stylesheets/application/blocks/_items.css.sass
-- lib/generators/katapult/basics/templates/app/assets/stylesheets/application/blocks/_layout.css.sass
-- lib/generators/katapult/basics/templates/app/assets/stylesheets/application/blocks/_navigation.css.sass
-- lib/generators/katapult/basics/templates/app/assets/stylesheets/application/blocks/_tools.css.sass
+- lib/generators/katapult/basics/templates/app/assets/stylesheets/application.sass
+- lib/generators/katapult/basics/templates/app/assets/stylesheets/application/blocks/_all.sass
+- lib/generators/katapult/basics/templates/app/assets/stylesheets/application/blocks/_items.sass
+- lib/generators/katapult/basics/templates/app/assets/stylesheets/application/blocks/_layout.sass
+- lib/generators/katapult/basics/templates/app/assets/stylesheets/application/blocks/_navigation.sass
+- lib/generators/katapult/basics/templates/app/assets/stylesheets/application/blocks/_tools.sass
+- lib/generators/katapult/basics/templates/config/cucumber.yml
 - lib/generators/katapult/basics/templates/config/database.sample.yml
 - lib/generators/katapult/basics/templates/config/database.yml
+- lib/generators/katapult/basics/templates/config/initializers/exception_notification.rb.tt
+- lib/generators/katapult/basics/templates/config/initializers/find_by_anything.rb
+- lib/generators/katapult/basics/templates/config/initializers/form_for_with_development_errors.rb
 - lib/generators/katapult/basics/templates/config/spring.rb
+- lib/generators/katapult/basics/templates/features/support/capybara_screenshot.rb
+- lib/generators/katapult/basics/templates/features/support/cucumber_factory.rb
+- lib/generators/katapult/basics/templates/features/support/database_cleaner.rb
 - lib/generators/katapult/basics/templates/features/support/env-custom.rb
 - lib/generators/katapult/basics/templates/features/support/paths.rb
+- lib/generators/katapult/basics/templates/features/support/selectors.rb
+- lib/generators/katapult/basics/templates/spec/support/shoulda_matchers.rb
 - lib/generators/katapult/cucumber_features/cucumber_features_generator.rb
 - lib/generators/katapult/cucumber_features/templates/feature.feature
 - lib/generators/katapult/haml/haml_generator.rb
@@ -220,7 +230,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -230,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Kickstart Rails development