skellington 0.8.3 → 0.8.4

data/spec/jekyll/layout/layout_spec.rb

@@ -7,7 +7,7 @@ module Skellington
     context 'layout' do
       it 'creates a header' do
         subject.options = { 'framework' => 'jekyll' }
-        subject.generate 'dummy_app'
+        subject.generate 'dummy-app'
 
         expect('dummy_app/_includes/header.html').to have_content (
         """
@@ -46,7 +46,7 @@ module Skellington
 
       it 'creates a footer' do
         subject.options = { 'framework' => 'jekyll' }
-        subject.generate 'dummy_app'
+        subject.generate 'dummy-app'
 
         expect('dummy_app/_includes/footer.html').to have_content (
         """
@@ -66,7 +66,7 @@ module Skellington
 
       it 'creates a layout' do
         subject.options = { 'framework' => 'jekyll' }
-        subject.generate 'dummy_app'
+        subject.generate 'dummy-app'
 
         expect('dummy_app/_layouts/default.html').to have_content (
         """
@@ -86,7 +86,7 @@ module Skellington
 
       it 'has the ie shims' do
         subject.options = { 'framework' => 'jekyll' }
-        subject.generate 'dummy_app'
+        subject.generate 'dummy-app'
 
         expect('dummy_app/_includes/ie-cruft.html').to have_content (
         """

data/spec/jekyll/root_files/config_yml_spec.rb

@@ -6,7 +6,7 @@ module Skellington
 
     it 'generates a _config.yml file' do
       subject.options = { 'framework' => 'jekyll' }
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
       expect('dummy_app/_config.yml').to have_content (
       """
       ---
@@ -17,7 +17,7 @@ module Skellington
           layout: default
       permalink: pretty
 
-      baseurl: /dummy_app
+      baseurl: /dummy-app
       """
       )
     end

data/spec/jekyll/root_files/gemfile_spec.rb

@@ -6,7 +6,7 @@ module Skellington
 
     it 'generates a Gemfile' do
       subject.options = { 'framework' => 'jekyll' }
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
       expect('dummy_app/Gemfile').to have_content (
       """
       source 'https://rubygems.org'

data/spec/jekyll/root_files/license_spec.rb

@@ -8,7 +8,7 @@ module Skellington
       it 'plain license' do
         Timecop.freeze Time.local 2016, 01, 19
         subject.options = { 'framework' => 'jekyll' }
-        subject.generate 'dummy_app'
+        subject.generate 'dummy-app'
         expect('dummy_app/LICENSE.md').to have_content (
         """
         ##Copyright (c) 2016 YOUR-NAME-HERE
@@ -41,7 +41,7 @@ module Skellington
       it 'with a provided name' do
         Timecop.freeze Time.local 2016, 01, 19
         subject.options = {licensor: 'Beyoncé'}
-        subject.generate 'dummy_app'
+        subject.generate 'dummy-app'
         expect('dummy_app/LICENSE.md').to have_content (
         """
         ##Copyright (c) 2016 Beyoncé

data/spec/jekyll/root_files/rbenv_spec.rb

@@ -6,7 +6,7 @@ module Skellington
 
     it 'generates a .ruby-version' do
       subject.options = { 'framework' => 'jekyll' }
-      expect { subject.generate 'dummy_app' }.to produce_file 'dummy_app/.ruby-version'
+      expect { subject.generate 'dummy-app' }.to produce_file 'dummy_app/.ruby-version'
       expect('dummy_app/.ruby-version').to have_content (
       """
       /[0-9]*\\.[0-9]*\\.[0-9]*/

data/spec/non_local_path_spec.rb

@@ -32,19 +32,6 @@ module Skellington
                 @github_url = CONFIG['github_url']
                 erb :index
               end
-
-              wants.json do
-                {
-                  app: 'SomeApp'
-                }.to_json
-              end
-            end
-          end
-
-          # start the server if ruby file executed directly
-          run! if app_file == $0
-        end
-      end
       """
       )
 

data/spec/sinatra/app/app_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates an app file' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
       expect('dummy_app/lib/dummy_app.rb').to have_content (
       """
       require 'sinatra/base'
@@ -43,6 +43,12 @@ module Skellington
 
           # start the server if ruby file executed directly
           run! if app_file == $0
+
+          not_found do
+            status 404
+            @title = '404'
+            erb :oops
+          end
         end
       end
       """

data/spec/sinatra/app/config_yml_spec.rb

@@ -5,11 +5,11 @@ module Skellington
     end
 
     it 'generates a config/config.yml file' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
       expect('dummy_app/config/config.yml').to have_content (
       """
       #google-analytics-tag: UA-00000000-0
-      #github_url: https://github.com
+      #github_url: https://github.com # also uncomment the `include` line in `styles.scss`
       """
       )
     end

data/spec/sinatra/app/helpers_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates an app file' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
       expect('dummy_app/lib/dummy_app/helpers.rb').to have_content (
       """
       module DummyApp

data/spec/sinatra/app/public_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates placeholders for static files' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
 
       expect(File).to exist 'dummy_app/public/js/dummy_app.js'
       expect(File).to exist 'dummy_app/public/assets/favicon.ico'

data/spec/sinatra/app/racks_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates an app file' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
       expect('dummy_app/lib/dummy_app/racks.rb').to have_content (
       """
       require 'rack/conneg'

data/spec/sinatra/bootstrap/css_spec.rb

@@ -5,11 +5,21 @@ module Skellington
     end
 
     it 'installs bootstrap' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
 
+      expect(File).to exist 'dummy_app/public/sass/palettes/_default.scss'
       expect('dummy_app/public/sass/_colours.scss').to have_content (
       """
-      $brand-primary: rgba(250, 129, 0, 1);
+      @import 'palettes/default';
+
+      $brand-primary: $rgba-primary-0;
+      //$brand-complement: $rgba-complement-0;
+      //$brand-secondary-1: $rgba-secondary-1-0;
+      //$brand-secondary-2: $rgba-secondary-2-0;
+
+      $grey: rgb(127, 127, 127);
+      $light-grey: lighten($grey, 25%);
+      $dark-grey: darken($grey, 25%);
       """
       )
       expect('dummy_app/public/sass/_fonts.scss').to have_content (
@@ -20,7 +30,7 @@ module Skellington
     end
 
     it 'sets up sass' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
 
       expect('dummy_app/public/sass/styles.scss').to have_content (
       """

data/spec/sinatra/bootstrap_4/config_rb_bootstrap_4_spec.rb

@@ -6,7 +6,7 @@ module Skellington
 
     it 'generates a config.rb file' do
       subject.options = { 'bootstrap' => '4' }
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
       expect('dummy_app/config.rb').to have_content (
       """
       require 'bootstrap'

data/spec/sinatra/bootstrap_4/gemfile_bootstrap_4_spec.rb

@@ -6,7 +6,7 @@ module Skellington
 
     it 'generates a Gemfile' do
       subject.options = { 'bootstrap' => '4' }
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
       expect('dummy_app/Gemfile').to have_content (
       """
       source 'https://rubygems.org'

data/spec/sinatra/bootstrap_4/public_bootstrap_4_spec.rb

@@ -6,7 +6,7 @@ module Skellington
 
     it 'generates placeholders for static files' do
       subject.options = { 'bootstrap' => '4' }
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
 
       expect('dummy_app/public/sass/_footer.scss').to have_content (
       """

data/spec/sinatra/cli_spec.rb

@@ -9,9 +9,11 @@ module Skellington
     end
 
     it 'generates correct output' do
-      expect { subject.generate 'dummy_app' }.to output(/
+      expect { subject.generate 'dummy-app' }.to output(/
 Your new Sinatra app DummyApp has been created
 
+\(Note that 'dummy-app' has been changed to 'dummy_app' because Ruby finds '-'s troubling\)
+
 Now do
 
     cd dummy_app
@@ -23,9 +25,10 @@ And presuming that passes OK
     git add .
     git commit -m 'First commit'
 
-Then try
+Then try \(in 2 different windows\)
 
-    bundle exec rake run
+    bundle exec rake run:sass
+    bundle exec rake run:app
 
 which will launch Compass and then run the app \(at http:\/\/localhost:9292\)
 
@@ -39,7 +42,7 @@ For post-install hints, try
 
     it 'suppresses the LICENSE help when supplied with a licensor' do
       subject.options = {licensor: 'Beyoncé'}
-      expect { subject.generate 'dummy_app' }.to_not output(/
+      expect { subject.generate 'dummy-app' }.to_not output(/
       You should also fill in your name in LICENSE.md
 /).to_stdout
     end

data/spec/sinatra/git_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'initialises a git repo' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
       expect(Dir).to exist 'dummy_app/.git'
 
       expect('dummy_app/.gitignore').to have_content (

data/spec/sinatra/javascript/javascript_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates javascript files' do
-      expect{ subject.generate 'dummy_app'}.to produce_file 'dummy_app/spec/javascripts/support/jasmine_helper.rb'
+      expect{ subject.generate 'dummy-app'}.to produce_file 'dummy_app/spec/javascripts/support/jasmine_helper.rb'
 
       expect('dummy_app/spec/javascripts/support/jasmine.yml').to have_content (
       """

data/spec/sinatra/layout/includes_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'includes some third-party javascript libs' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
 
       expect('dummy_app/views/includes/js-libs.erb').to have_content (
       """
@@ -22,7 +22,7 @@ module Skellington
     end
 
     it 'includes some third-party css' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
 
       expect('dummy_app/views/includes/css-libs.erb').to have_content (
       """
@@ -37,7 +37,7 @@ module Skellington
     end
 
     it 'includes some fonts' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
 
       expect('dummy_app/views/includes/fonts-libs.erb').to have_content (
       """
@@ -54,7 +54,7 @@ module Skellington
     end
 
     it 'handles some cruft required by IE' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
 
       expect('dummy_app/views/includes/ie-cruft.erb').to have_content (
       """

data/spec/sinatra/layout/layout_spec.rb

@@ -6,7 +6,7 @@ module Skellington
 
     context 'layout' do
       it 'creates a header' do
-        subject.generate 'dummy_app'
+        subject.generate 'dummy-app'
 
         expect('dummy_app/views/includes/header.erb').to have_content (
         """
@@ -32,7 +32,7 @@ module Skellington
       end
 
       it 'creates a footer' do
-        subject.generate 'dummy_app'
+        subject.generate 'dummy-app'
 
         expect('dummy_app/views/includes/footer.erb').to have_content (
         """
@@ -51,7 +51,7 @@ module Skellington
       end
 
       it 'creates a github corner' do
-        subject.generate 'dummy_app'
+        subject.generate 'dummy-app'
 
         expect('dummy_app/views/includes/github-corner.erb').to have_content (
         """
@@ -69,7 +69,7 @@ module Skellington
       end
 
       it 'creates a layout' do
-        subject.generate 'dummy_app'
+        subject.generate 'dummy-app'
 
         expect('dummy_app/views/layout.erb').to have_content (
         """

data/spec/sinatra/layout/views_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates a view' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
 
       expect('dummy_app/views/index.erb').to have_content (
       """
@@ -13,5 +13,19 @@ module Skellington
       """
       )
     end
+
+    it 'has a 404 page' do
+      subject.generate 'dummy-app'
+
+      expect('dummy_app/views/oops.erb').to have_content (
+      """
+      <h1>404</h1>
+
+      <h2>Nothing to see here</h2>
+
+      <a href='/'>Home</a>
+      """
+      )
+    end
   end
 end

data/spec/sinatra/root_files/config_rb_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates a config.rb file' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
       expect('dummy_app/config.rb').to have_content (
       """
       require 'bootstrap-sass'

data/spec/sinatra/root_files/config_ru_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates a config.ru file' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
       expect('dummy_app/config.ru').to have_content (
       """
       require File.join(File.dirname(__FILE__), 'lib/dummy_app.rb')

data/spec/sinatra/root_files/gemfile_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates a Gemfile' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
       expect('dummy_app/Gemfile').to have_content (
       """
       source 'https://rubygems.org'

data/spec/sinatra/root_files/guardfile_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates a Guardfile' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
       expect('dummy_app/Guardfile').to have_content (
       """
       guard :jasmine do

data/spec/sinatra/root_files/license_spec.rb

@@ -7,7 +7,7 @@ module Skellington
     context 'generate a LICENSE' do
       it 'plain license' do
         Timecop.freeze Time.local 2016, 01, 19
-        subject.generate 'dummy_app'
+        subject.generate 'dummy-app'
         expect('dummy_app/LICENSE.md').to have_content (
         """
         ##Copyright (c) 2016 YOUR-NAME-HERE
@@ -40,7 +40,7 @@ module Skellington
       it 'with a provided name' do
         Timecop.freeze Time.local 2016, 01, 19
         subject.options = {licensor: 'Beyoncé'}
-        subject.generate 'dummy_app'
+        subject.generate 'dummy-app'
         expect('dummy_app/LICENSE.md').to have_content (
         """
         ##Copyright (c) 2016 Beyoncé

data/spec/sinatra/root_files/procfile_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates a Procfile' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
       expect('dummy_app/Procfile').to have_content (
       """
       web: bundle exec rackup -p $PORT

data/spec/sinatra/root_files/rakefile_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates a Rakefile' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
       expect('dummy_app/Rakefile').to have_content (
       """
       require File.join(File.dirname(__FILE__), 'lib/dummy_app.rb')
@@ -22,10 +22,16 @@ module Skellington
         task :default => [:spec, 'jasmine:ci', 'coveralls:push']
       end
 
-      task :run do
-        sh 'bundle exec compass clean'
-        sh 'bundle exec compass watch . &'
-        sh 'bundle exec rackup'
+      namespace :run do
+        desc 'start app'
+        task :app do
+          sh 'rackup -o 0.0.0.0'
+        end
+
+        desc 'clean-up and run compass'
+        task :sass do
+          sh 'compass clean && compass watch'
+        end
       end
       """
       )

data/spec/sinatra/root_files/rbenv_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates a .ruby-version' do
-      expect { subject.generate 'dummy_app' }.to produce_file 'dummy_app/.ruby-version'
+      expect { subject.generate 'dummy-app' }.to produce_file 'dummy_app/.ruby-version'
       expect('dummy_app/.ruby-version').to have_content (
       """
       /[0-9]*\\.[0-9]*\\.[0-9]*/

data/spec/sinatra/spec/spec_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates rspec files' do
-      subject.generate 'dummy_app'
+      subject.generate 'dummy-app'
       expect('dummy_app/spec/spec_helper.rb').to have_content (
       """
       require 'coveralls'