From c7f2466a292bf7009fcda81c219d901795178d47 Mon Sep 17 00:00:00 2001 From: pikesley Date: Thu, 25 Jan 2018 18:59:49 +0000 Subject: [PATCH 1/9] Transition to Bootstrap 4 --- lib/skellington/version.rb | 2 +- lib/templates/jekyll/post-run | 2 +- lib/templates/sinatra/post-run | 2 +- skellington.gemspec | 16 ++++++++-------- spec/hyphens_spec.rb | 2 +- spec/jekyll/bootstrap_4/bootstrap_4_spec.rb | 17 +++-------------- spec/jekyll/cli_spec.rb | 11 ++++++++++- spec/sinatra/cli_spec.rb | 2 +- 8 files changed, 26 insertions(+), 28 deletions(-) diff --git a/lib/skellington/version.rb b/lib/skellington/version.rb index 96bd605..7cb696e 100644 --- a/lib/skellington/version.rb +++ b/lib/skellington/version.rb @@ -1,3 +1,3 @@ module Skellington - VERSION = '0.8.9' + VERSION = '0.8.10' end diff --git a/lib/templates/jekyll/post-run b/lib/templates/jekyll/post-run index 53bf268..80e800b 100644 --- a/lib/templates/jekyll/post-run +++ b/lib/templates/jekyll/post-run @@ -7,7 +7,7 @@ Your new Jekyll site <%= @gen.camelname %> has been created <% end %> Now do - cd <%= @gen.wormname %> + cd <%= File.join @gen.path, @gen.wormname %> bundle bundle exec jekyll serve diff --git a/lib/templates/sinatra/post-run b/lib/templates/sinatra/post-run index 397b36c..a04888c 100644 --- a/lib/templates/sinatra/post-run +++ b/lib/templates/sinatra/post-run @@ -7,7 +7,7 @@ Your new Sinatra app <%= @gen.camelname %> has been created <% end %> Now do - cd <%= @gen.wormname %> + cd <%= File.join @gen.path, @gen.wormname %> bundle bundle exec rake diff --git a/skellington.gemspec b/skellington.gemspec index a72b11e..c7b0fe9 100644 --- a/skellington.gemspec +++ b/skellington.gemspec @@ -20,15 +20,15 @@ Gem::Specification.new do |spec| spec.add_dependency 'thor', '~> 0.19' spec.add_dependency 'erubis', '~> 2.7' - spec.add_dependency 'git', '~> 1.2' + spec.add_dependency 'git', '~> 1.3' spec.add_dependency 'bootstrap-sass' - spec.add_dependency 'bootstrap', '~> 4.0.0.alpha4' + spec.add_dependency 'bootstrap', '~> 4.0' - spec.add_development_dependency 'coveralls', '~> 0.7' - spec.add_development_dependency 'bundler', '~> 1.7' - spec.add_development_dependency 'rake', '~> 10.0' - spec.add_development_dependency 'rspec', '~> 3.1' - spec.add_development_dependency 'guard-rspec', '~> 4.5' + spec.add_development_dependency 'coveralls', '~> 0.8' + spec.add_development_dependency 'bundler', '~> 1.14' + spec.add_development_dependency 'rake', '~> 12.3' + spec.add_development_dependency 'rspec', '~> 3.7' + spec.add_development_dependency 'guard-rspec', '~> 4.7' spec.add_development_dependency 'curacao', '~> 0.1' - spec.add_development_dependency 'timecop', '~> 0.8' + spec.add_development_dependency 'timecop', '~> 0.9' end diff --git a/spec/hyphens_spec.rb b/spec/hyphens_spec.rb index 33fbcce..b77f0f6 100644 --- a/spec/hyphens_spec.rb +++ b/spec/hyphens_spec.rb @@ -16,7 +16,7 @@ module Skellington Now do - cd hyphenated_name + cd \.\/hyphenated_name bundle bundle exec rake diff --git a/spec/jekyll/bootstrap_4/bootstrap_4_spec.rb b/spec/jekyll/bootstrap_4/bootstrap_4_spec.rb index d65f716..adfdb0d 100644 --- a/spec/jekyll/bootstrap_4/bootstrap_4_spec.rb +++ b/spec/jekyll/bootstrap_4/bootstrap_4_spec.rb @@ -8,24 +8,13 @@ module Skellington subject.options = { 'framework' => 'jekyll', 'bootstrap' => 4 } subject.generate 'dummy-app' - # expect(Dir).to exist 'dummy_app/javascripts/bootstrap' - # expect('dummy_app/javascripts/bootstrap.min.js').to have_content ( - # """ - # /*! - # * Bootstrap v4.0.0-alpha.5 (https://getbootstrap.com) - # * Copyright 2011-2016 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors) - # * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - # */ - # """ - # ) - expect(Dir).to exist 'dummy_app/_sass/bootstrap' expect('dummy_app/_sass/bootstrap.scss').to have_content ( """ /*! - * Bootstrap v4.0.0-alpha.5 (https://getbootstrap.com) - * Copyright 2011-2016 The Bootstrap Authors - * Copyright 2011-2016 Twitter, Inc. + * Bootstrap v4.0.0 (https://getbootstrap.com) + * Copyright 2011-2018 The Bootstrap Authors + * Copyright 2011-2018 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ """ diff --git a/spec/jekyll/cli_spec.rb b/spec/jekyll/cli_spec.rb index 3286453..5fa2dcc 100644 --- a/spec/jekyll/cli_spec.rb +++ b/spec/jekyll/cli_spec.rb @@ -13,7 +13,7 @@ module Skellington Now do - cd dummy_app + cd \.\/dummy_app bundle bundle exec jekyll serve @@ -27,5 +27,14 @@ module Skellington You should also fill in your name in LICENSE.md /).to_stdout end + + context 'non-local path' do + it 'generates correct output' do + subject.options = { 'framework' => 'jekyll' } + expect { subject.generate 'some/path/dummy-app' }.to output(/ + cd some\/path\/dummy_app +/).to_stdout + end + end end end diff --git a/spec/sinatra/cli_spec.rb b/spec/sinatra/cli_spec.rb index 35799bd..34b7a75 100644 --- a/spec/sinatra/cli_spec.rb +++ b/spec/sinatra/cli_spec.rb @@ -16,7 +16,7 @@ module Skellington Now do - cd dummy_app + cd \.\/dummy_app bundle bundle exec rake From e5c0790111d30fb287151ef1e857f298fad66ca0 Mon Sep 17 00:00:00 2001 From: Sam Pikesley Date: Mon, 5 Feb 2018 19:06:59 +0000 Subject: [PATCH 2/9] Tests all passing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There’s still some residual bootstrap 3, though --- config/config.yaml | 5 +- lib/skellington.rb | 2 +- lib/skellington/generator.rb | 16 ++-- lib/templates/common/includes/header | 16 +--- lib/templates/common/includes/libs | 14 ++++ lib/templates/common/includes/nav | 35 +++------ lib/templates/common/sass/colours | 13 +++- lib/templates/common/sass/footer | 16 +--- lib/templates/common/sass/styles | 3 +- lib/templates/jekyll/_data/libs.yml | 13 +++- spec/jekyll/bootstrap/css_spec.rb | 37 +++++----- spec/jekyll/bootstrap_4/bootstrap_4_spec.rb | 13 +++- spec/jekyll/data/libs_spec.rb | 13 +++- spec/jekyll/layout/layout_spec.rb | 74 +++++++++---------- spec/sinatra/bootstrap/css_spec.rb | 18 ++++- .../bootstrap_4/public_bootstrap_4_spec.rb | 19 ++++- spec/sinatra/layout/layout_spec.rb | 35 +++------ 17 files changed, 175 insertions(+), 167 deletions(-) create mode 100644 lib/templates/common/includes/libs diff --git a/config/config.yaml b/config/config.yaml index 3afa5ed..9aa05ca 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -103,7 +103,6 @@ sinatra: jekyll: gems: github-pages: - # bootstrap: '4.0.0.alpha4' rake: files: @@ -118,6 +117,8 @@ jekyll: common: includes/nav _includes/footer.html: common: includes/footer + _includes/libs.html: + common: includes/libs _includes/ie-cruft.html: common: includes/ie-cruft css/styles.scss: @@ -126,8 +127,6 @@ jekyll: common: sass/variables _sass/colours.scss: common: sass/colours - _sass/nav.scss: - common: sass/nav _sass/palettes/default.scss: common: sass/palettes/default _sass/fonts.scss: diff --git a/lib/skellington.rb b/lib/skellington.rb index c5b246d..06ab604 100644 --- a/lib/skellington.rb +++ b/lib/skellington.rb @@ -3,7 +3,7 @@ require 'fileutils' require 'erubis' require 'git' -require 'bootstrap-sass' +require 'bootstrap' require 'skellington/version' require 'skellington/generator' diff --git a/lib/skellington/generator.rb b/lib/skellington/generator.rb index 2f70d8d..4c5305a 100644 --- a/lib/skellington/generator.rb +++ b/lib/skellington/generator.rb @@ -47,17 +47,15 @@ def generate def strap_boots if @framework == 'jekyll' - if @bootstrap == '4' - Object.send(:remove_const, :Bootstrap) - require 'bootstrap' - end + # Object.send(:remove_const, :Bootstrap) + require 'bootstrap' + end - root = "#{self.path}/#{self.wormname}" + root = "#{self.path}/#{self.wormname}" - FileUtils.mkdir_p "#{root}/_sass" - FileUtils.cp_r "#{Bootstrap.assets_path}/stylesheets/bootstrap", "#{root}/_sass" - FileUtils.cp "#{Bootstrap.assets_path}/stylesheets/_bootstrap.scss", "#{root}/_sass/bootstrap.scss" - end + FileUtils.mkdir_p "#{root}/_sass" + FileUtils.cp_r "#{Bootstrap.assets_path}/stylesheets/bootstrap", "#{root}/_sass" + FileUtils.cp "#{Bootstrap.assets_path}/stylesheets/_bootstrap.scss", "#{root}/_sass/bootstrap.scss" end def wormname diff --git a/lib/templates/common/includes/header b/lib/templates/common/includes/header index ac2f964..564d30e 100644 --- a/lib/templates/common/includes/header +++ b/lib/templates/common/includes/header @@ -12,21 +12,7 @@ <% when 'jekyll' %> {% include ie-cruft.html %} - {% for lib in site.data.libs.js %} - - - {% endfor %} - - {% for lib in site.data.libs.css %} - - - {% endfor %} - - {% for font in site.data.libs.fonts %} - - - {% endfor %} -<% end %> + {% include libs.html %}<% end %> <% prefix = '{{ site.baseurl }}' if @gen.framework == 'jekyll' %> diff --git a/lib/templates/common/includes/libs b/lib/templates/common/includes/libs new file mode 100644 index 0000000..a007dcb --- /dev/null +++ b/lib/templates/common/includes/libs @@ -0,0 +1,14 @@ +{% for lib in site.data.libs.js %} + + +{% endfor %} + +{% for lib in site.data.libs.css %} + + +{% endfor %} + +{% for font in site.data.libs.fonts %} + + +{% endfor %} diff --git a/lib/templates/common/includes/nav b/lib/templates/common/includes/nav index c938462..46ccfa4 100644 --- a/lib/templates/common/includes/nav +++ b/lib/templates/common/includes/nav @@ -1,27 +1,14 @@ <% if @gen.framework == 'jekyll' %> <% prefix = '{{ site.baseurl }}' %> <% end %> - + diff --git a/lib/templates/common/sass/colours b/lib/templates/common/sass/colours index 0e6f454..4e2db33 100644 --- a/lib/templates/common/sass/colours +++ b/lib/templates/common/sass/colours @@ -1,6 +1,6 @@ @import 'palettes/default'; -$brand-primary: $rgba-primary-0; +//$brand-primary: $rgba-primary-0; //$brand-complement: $rgba-complement-0; //$brand-secondary-1: $rgba-secondary-1-0; //$brand-secondary-2: $rgba-secondary-2-0; @@ -8,3 +8,14 @@ $brand-primary: $rgba-primary-0; $grey: rgb(127, 127, 127); $light-grey: lighten($grey, 25%); $dark-grey: darken($grey, 25%); + +$theme-colors: ( + primary: $rgba-primary-0, + secondary: $rgba-secondary-1-0, + // success: $green, + // info: $cyan, + // warning: $yellow, + // danger: $red, + // light: $gray-100, + // dark: $gray-800 +) diff --git a/lib/templates/common/sass/footer b/lib/templates/common/sass/footer index 66b178b..10cfb43 100644 --- a/lib/templates/common/sass/footer +++ b/lib/templates/common/sass/footer @@ -7,17 +7,6 @@ body { margin-bottom: $footer-height; } -<% if @gen.bootstrap == '4' %> -.footer { - position: absolute; - bottom: 0; - width: 100%; - height: $footer-height; - line-height: $footer-height; - text-align: center; - background: $brand-primary; -} -<% else %> .footer { position: absolute; bottom: 0; @@ -26,7 +15,7 @@ body { text-align: center; margin-top: $padding-large-vertical; - background: $brand-primary; + background: map-get($theme-colors, primary); color: white; height: $footer-height; @@ -35,9 +24,8 @@ body { ul { @extend .list-inline; } - + a { color: white; } } -<% end %> diff --git a/lib/templates/common/sass/styles b/lib/templates/common/sass/styles index 7ab96ce..2f6cd31 100644 --- a/lib/templates/common/sass/styles +++ b/lib/templates/common/sass/styles @@ -7,10 +7,9 @@ @import 'bootstrap'; @import 'footer'; -@import 'nav'; //@import 'github-corner'; h1 { - color: $brand-primary; + color: map-get($theme-colors, primary); font-family: $font-primary; } diff --git a/lib/templates/jekyll/_data/libs.yml b/lib/templates/jekyll/_data/libs.yml index ba0351b..1635c1e 100644 --- a/lib/templates/jekyll/_data/libs.yml +++ b/lib/templates/jekyll/_data/libs.yml @@ -1,15 +1,20 @@ js: - name: jquery - url: //ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js + url: //code.jquery.com/jquery-3.2.1.slim.min.js + hash: sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN + - name: popper + url: //cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js + hash: sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q - name: bootstrap - url: //maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js + url: //maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js + hash: sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl + - name: fontawesome + url: //use.fontawesome.com/releases/v5.0.4/js/all.js css: - name: foo bar: //bar.com/baz.css fonts: - - name: fontawesome - url: //maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css - name: ubuntu url: //fonts.googleapis.com/css?family=Ubuntu+Mono diff --git a/spec/jekyll/bootstrap/css_spec.rb b/spec/jekyll/bootstrap/css_spec.rb index 7b04536..a59a5da 100644 --- a/spec/jekyll/bootstrap/css_spec.rb +++ b/spec/jekyll/bootstrap/css_spec.rb @@ -11,8 +11,9 @@ module Skellington expect('dummy_app/_sass/bootstrap.scss').to have_content ( """ /*! - * Bootstrap v3.3.7 (http://getbootstrap.com) - * Copyright 2011-2016 Twitter, Inc. + * Bootstrap v4.0.0 (https://getbootstrap.com) + * Copyright 2011-2018 The Bootstrap Authors + * Copyright 2011-2018 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ """ @@ -35,7 +36,7 @@ module Skellington """ @import 'palettes/default'; - $brand-primary: $rgba-primary-0; + //$brand-primary: $rgba-primary-0; //$brand-complement: $rgba-complement-0; //$brand-secondary-1: $rgba-secondary-1-0; //$brand-secondary-2: $rgba-secondary-2-0; @@ -43,6 +44,17 @@ module Skellington $grey: rgb(127, 127, 127); $light-grey: lighten($grey, 25%); $dark-grey: darken($grey, 25%); + + $theme-colors: ( + primary: $rgba-primary-0, + secondary: $rgba-secondary-1-0, + // success: $green, + // info: $cyan, + // warning: $yellow, + // danger: $red, + // light: $gray-100, + // dark: $gray-800 + ) """ ) @@ -65,7 +77,7 @@ module Skellington text-align: center; margin-top: $padding-large-vertical; - background: $brand-primary; + background: map-get($theme-colors, primary); color: white; height: $footer-height; @@ -81,20 +93,6 @@ module Skellington } """ ) - - expect('dummy_app/_sass/nav.scss').to have_content ( - """ - .navbar-default { - .navbar-nav { - li { - a { - color: $brand-primary; - } - } - } - } - """ - ) end it 'sets up sass' do @@ -112,11 +110,10 @@ module Skellington @import 'bootstrap'; @import 'footer'; - @import 'nav'; //@import 'github-corner'; h1 { - color: $brand-primary; + color: map-get($theme-colors, primary); font-family: $font-primary; } """ diff --git a/spec/jekyll/bootstrap_4/bootstrap_4_spec.rb b/spec/jekyll/bootstrap_4/bootstrap_4_spec.rb index adfdb0d..4163ce9 100644 --- a/spec/jekyll/bootstrap_4/bootstrap_4_spec.rb +++ b/spec/jekyll/bootstrap_4/bootstrap_4_spec.rb @@ -23,7 +23,7 @@ module Skellington """ @import 'palettes/default'; - $brand-primary: $rgba-primary-0; + //$brand-primary: $rgba-primary-0; //$brand-complement: $rgba-complement-0; //$brand-secondary-1: $rgba-secondary-1-0; //$brand-secondary-2: $rgba-secondary-2-0; @@ -31,6 +31,17 @@ module Skellington $grey: rgb(127, 127, 127); $light-grey: lighten($grey, 25%); $dark-grey: darken($grey, 25%); + + $theme-colors: ( + primary: $rgba-primary-0, + secondary: $rgba-secondary-1-0, + // success: $green, + // info: $cyan, + // warning: $yellow, + // danger: $red, + // light: $gray-100, + // dark: $gray-800 + ) """ ) expect('dummy_app/_sass/fonts.scss').to have_content ( diff --git a/spec/jekyll/data/libs_spec.rb b/spec/jekyll/data/libs_spec.rb index 80da057..decf6c0 100644 --- a/spec/jekyll/data/libs_spec.rb +++ b/spec/jekyll/data/libs_spec.rb @@ -13,17 +13,22 @@ module Skellington """ js: - name: jquery - url: //ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js + url: //code.jquery.com/jquery-3.2.1.slim.min.js + hash: sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN + - name: popper + url: //cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js + hash: sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q - name: bootstrap - url: //maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js + url: //maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js + hash: sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl + - name: fontawesome + url: //use.fontawesome.com/releases/v5.0.4/js/all.js css: - name: foo bar: //bar.com/baz.css fonts: - - name: fontawesome - url: //maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css - name: ubuntu url: //fonts.googleapis.com/css?family=Ubuntu+Mono """ diff --git a/spec/jekyll/layout/layout_spec.rb b/spec/jekyll/layout/layout_spec.rb index ea21067..60234ed 100644 --- a/spec/jekyll/layout/layout_spec.rb +++ b/spec/jekyll/layout/layout_spec.rb @@ -18,20 +18,7 @@ module Skellington {% include ie-cruft.html %} - {% for lib in site.data.libs.js %} - - - {% endfor %} - - {% for lib in site.data.libs.css %} - - - {% endfor %} - - {% for font in site.data.libs.fonts %} - - - {% endfor %} + {% include libs.html %} @@ -66,30 +53,41 @@ module Skellington expect('dummy_app/_includes/nav.html').to have_content ( """ - + + """ + ) + end + + it 'creates a JS libs section' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' + + expect('dummy_app/_includes/libs.html').to have_content ( + """ + {% for lib in site.data.libs.js %} + + + {% endfor %} + + {% for lib in site.data.libs.css %} + + + {% endfor %} + + {% for font in site.data.libs.fonts %} + + + {% endfor %} """ ) end diff --git a/spec/sinatra/bootstrap/css_spec.rb b/spec/sinatra/bootstrap/css_spec.rb index 0c3a82b..65d8fdb 100644 --- a/spec/sinatra/bootstrap/css_spec.rb +++ b/spec/sinatra/bootstrap/css_spec.rb @@ -12,7 +12,7 @@ module Skellington """ @import 'palettes/default'; - $brand-primary: $rgba-primary-0; + //$brand-primary: $rgba-primary-0; //$brand-complement: $rgba-complement-0; //$brand-secondary-1: $rgba-secondary-1-0; //$brand-secondary-2: $rgba-secondary-2-0; @@ -20,6 +20,17 @@ module Skellington $grey: rgb(127, 127, 127); $light-grey: lighten($grey, 25%); $dark-grey: darken($grey, 25%); + + $theme-colors: ( + primary: $rgba-primary-0, + secondary: $rgba-secondary-1-0, + // success: $green, + // info: $cyan, + // warning: $yellow, + // danger: $red, + // light: $gray-100, + // dark: $gray-800 + ) """ ) expect('dummy_app/public/sass/_fonts.scss').to have_content ( @@ -47,7 +58,7 @@ module Skellington text-align: center; margin-top: $padding-large-vertical; - background: $brand-primary; + background: map-get($theme-colors, primary); color: white; height: $footer-height; @@ -139,11 +150,10 @@ module Skellington @import 'bootstrap'; @import 'footer'; - @import 'nav'; //@import 'github-corner'; h1 { - color: $brand-primary; + color: map-get($theme-colors, primary); font-family: $font-primary; } """ diff --git a/spec/sinatra/bootstrap_4/public_bootstrap_4_spec.rb b/spec/sinatra/bootstrap_4/public_bootstrap_4_spec.rb index a152037..f473fcd 100644 --- a/spec/sinatra/bootstrap_4/public_bootstrap_4_spec.rb +++ b/spec/sinatra/bootstrap_4/public_bootstrap_4_spec.rb @@ -23,10 +23,23 @@ module Skellington position: absolute; bottom: 0; width: 100%; - height: $footer-height; - line-height: $footer-height; + text-align: center; - background: $brand-primary; + + margin-top: $padding-large-vertical; + background: map-get($theme-colors, primary); + color: white; + height: $footer-height; + + padding: $padding-large-vertical $padding-large-horizontal; + + ul { + @extend .list-inline; + } + + a { + color: white; + } } """ ) diff --git a/spec/sinatra/layout/layout_spec.rb b/spec/sinatra/layout/layout_spec.rb index c804c6b..26ac266 100644 --- a/spec/sinatra/layout/layout_spec.rb +++ b/spec/sinatra/layout/layout_spec.rb @@ -69,30 +69,17 @@ module Skellington expect('dummy_app/views/includes/nav.erb').to have_content ( """ - + """ ) end From 66af12b211f95595c2273f0539470503e20171e8 Mon Sep 17 00:00:00 2001 From: Sam Pikesley Date: Mon, 5 Feb 2018 20:09:26 +0000 Subject: [PATCH 3/9] Saving game --- .ruby-version | 1 + .../sinatra/views/includes/js-libs.erb | 25 ++++++--- skellington.gemspec | 1 - spec/jekyll/bootstrap_4/bootstrap_4_spec.rb | 54 ------------------- spec/sinatra/layout/includes_spec.rb | 25 ++++++--- 5 files changed, 39 insertions(+), 67 deletions(-) create mode 100644 .ruby-version delete mode 100644 spec/jekyll/bootstrap_4/bootstrap_4_spec.rb diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..437459c --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.5.0 diff --git a/lib/templates/sinatra/views/includes/js-libs.erb b/lib/templates/sinatra/views/includes/js-libs.erb index 1da5df0..beb1897 100644 --- a/lib/templates/sinatra/views/includes/js-libs.erb +++ b/lib/templates/sinatra/views/includes/js-libs.erb @@ -1,8 +1,21 @@ <%% -libs = { - jquery: '//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js', - bootstrap: '//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js' -}.each_pair do |name, url| %> - - + { + jquery: { + url: '//code.jquery.com/jquery-3.2.1.slim.min.js', + hash: 'sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN' + }, + bootstrap: { + url: '//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js', + hash: 'sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q' + }, + popper: { + url: '//cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js', + hash: 'sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl' + }, + fontawesome: { + url: '//use.fontawesome.com/releases/v5.0.4/js/all.js' + } +}.each do |lib| %> + + <%% end %> diff --git a/skellington.gemspec b/skellington.gemspec index c7b0fe9..0151774 100644 --- a/skellington.gemspec +++ b/skellington.gemspec @@ -21,7 +21,6 @@ Gem::Specification.new do |spec| spec.add_dependency 'thor', '~> 0.19' spec.add_dependency 'erubis', '~> 2.7' spec.add_dependency 'git', '~> 1.3' - spec.add_dependency 'bootstrap-sass' spec.add_dependency 'bootstrap', '~> 4.0' spec.add_development_dependency 'coveralls', '~> 0.8' diff --git a/spec/jekyll/bootstrap_4/bootstrap_4_spec.rb b/spec/jekyll/bootstrap_4/bootstrap_4_spec.rb deleted file mode 100644 index 4163ce9..0000000 --- a/spec/jekyll/bootstrap_4/bootstrap_4_spec.rb +++ /dev/null @@ -1,54 +0,0 @@ -module Skellington - describe CLI, troublesome: true do - let :subject do - described_class.new - end - - it 'installs bootstrap 4' do - subject.options = { 'framework' => 'jekyll', 'bootstrap' => 4 } - subject.generate 'dummy-app' - - expect(Dir).to exist 'dummy_app/_sass/bootstrap' - expect('dummy_app/_sass/bootstrap.scss').to have_content ( - """ - /*! - * Bootstrap v4.0.0 (https://getbootstrap.com) - * Copyright 2011-2018 The Bootstrap Authors - * Copyright 2011-2018 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */ - """ - ) - expect('dummy_app/_sass/colours.scss').to have_content ( - """ - @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%); - - $theme-colors: ( - primary: $rgba-primary-0, - secondary: $rgba-secondary-1-0, - // success: $green, - // info: $cyan, - // warning: $yellow, - // danger: $red, - // light: $gray-100, - // dark: $gray-800 - ) - """ - ) - expect('dummy_app/_sass/fonts.scss').to have_content ( - """ - $font-primary: 'Ubuntu Mono'; - """ - ) - end - end -end diff --git a/spec/sinatra/layout/includes_spec.rb b/spec/sinatra/layout/includes_spec.rb index 50400e2..6dd9d7c 100644 --- a/spec/sinatra/layout/includes_spec.rb +++ b/spec/sinatra/layout/includes_spec.rb @@ -10,12 +10,25 @@ module Skellington expect('dummy_app/views/includes/js-libs.erb').to have_content ( """ <% - libs = { - jquery: '//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js', - bootstrap: '//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js' - }.each_pair do |name, url| %> - - + { + jquery: { + url: '//code.jquery.com/jquery-3.2.1.slim.min.js', + hash: 'sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN' + }, + bootstrap: { + url: '//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js', + hash: 'sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q' + }, + popper: { + url: '//cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js', + hash: 'sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl' + }, + fontawesome: { + url: '//use.fontawesome.com/releases/v5.0.4/js/all.js' + } + }.each do |lib| %> + + <% end %> """ ) From 30dc456520faedabaee52c63870beb7289fa8948 Mon Sep 17 00:00:00 2001 From: Sam Pikesley Date: Mon, 5 Feb 2018 20:37:29 +0000 Subject: [PATCH 4/9] Again, saving game --- Rakefile | 34 +------------ config/config.yaml | 2 +- lib/skellington/generator.rb | 5 -- lib/templates/common/Gemfile | 6 --- lib/templates/sinatra/config.rb | 2 +- .../bootstrap_4/config_rb_bootstrap_4_spec.rb | 20 -------- .../bootstrap_4/gemfile_bootstrap_4_spec.rb | 39 --------------- .../bootstrap_4/public_bootstrap_4_spec.rb | 48 ------------------- spec/sinatra/root_files/config_rb_spec.rb | 2 +- spec/sinatra/root_files/gemfile_spec.rb | 2 +- 10 files changed, 6 insertions(+), 154 deletions(-) delete mode 100644 spec/sinatra/bootstrap_4/config_rb_bootstrap_4_spec.rb delete mode 100644 spec/sinatra/bootstrap_4/gemfile_bootstrap_4_spec.rb delete mode 100644 spec/sinatra/bootstrap_4/public_bootstrap_4_spec.rb diff --git a/Rakefile b/Rakefile index bd8fa43..4d5373b 100644 --- a/Rakefile +++ b/Rakefile @@ -3,36 +3,6 @@ require 'rspec/core/rake_task' require 'coveralls/rake/task' Coveralls::RakeTask.new +RSpec::Core::RakeTask.new -namespace :specs do - desc 'run the trustworthy specs' - task :safe do - RSpec::Core::RakeTask.new(:spec) do |t| - t.rspec_opts = "--tag ~troublesome" - end - Rake::Task['spec'].execute - end - - desc 'run the shonky specs' - task :shaky do - RSpec::Core::RakeTask.new(:spec) do |t| - t.rspec_opts = "--tag troublesome" - end - Rake::Task['spec'].execute - end - - desc 'run all the specs' - task :all do - RSpec::Core::RakeTask.new(:spec) do |t| - t.rspec_opts = "--tag troublesome" - end - - RSpec::Core::RakeTask.new(:spec) do |t| - t.rspec_opts = "--tag ~troublesome" - end - - Rake::Task['spec'].execute - end -end - -task :default => ['specs:all', 'coveralls:push'] +task :default => [:spec, 'coveralls:push'] diff --git a/config/config.yaml b/config/config.yaml index 9aa05ca..cfa35ab 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -15,7 +15,7 @@ sinatra: rack-tracker: rake: compass: - bootstrap-sass: + bootstrap: erubis: puma: test: diff --git a/lib/skellington/generator.rb b/lib/skellington/generator.rb index 4c5305a..7b356d5 100644 --- a/lib/skellington/generator.rb +++ b/lib/skellington/generator.rb @@ -46,11 +46,6 @@ def generate end def strap_boots - if @framework == 'jekyll' - # Object.send(:remove_const, :Bootstrap) - require 'bootstrap' - end - root = "#{self.path}/#{self.wormname}" FileUtils.mkdir_p "#{root}/_sass" diff --git a/lib/templates/common/Gemfile b/lib/templates/common/Gemfile index 4499ec3..2036499 100644 --- a/lib/templates/common/Gemfile +++ b/lib/templates/common/Gemfile @@ -1,9 +1,3 @@ -<% if @gen.framework == 'sinatra' %> - <% if @gen.bootstrap == '4' %> - <% @gen.gems['production'].delete 'bootstrap-sass' %> - <% @gen.gems['production']['bootstrap'] = '4.0.0.alpha5' %> - <% end %> -<% end %> source 'https://rubygems.org' ruby '<%= RUBY_VERSION %>' diff --git a/lib/templates/sinatra/config.rb b/lib/templates/sinatra/config.rb index 2f1643d..45a5c41 100644 --- a/lib/templates/sinatra/config.rb +++ b/lib/templates/sinatra/config.rb @@ -1,4 +1,4 @@ -require 'bootstrap<%= '-sass' if @gen.bootstrap == '3' %>' +require 'bootstrap' css_dir = 'public/css' sass_dir = 'public/sass' diff --git a/spec/sinatra/bootstrap_4/config_rb_bootstrap_4_spec.rb b/spec/sinatra/bootstrap_4/config_rb_bootstrap_4_spec.rb deleted file mode 100644 index a61fcfc..0000000 --- a/spec/sinatra/bootstrap_4/config_rb_bootstrap_4_spec.rb +++ /dev/null @@ -1,20 +0,0 @@ -module Skellington - describe CLI do - let :subject do - described_class.new - end - - it 'generates a config.rb file' do - subject.options = { 'bootstrap' => '4' } - subject.generate 'dummy-app' - expect('dummy_app/config.rb').to have_content ( - """ - require 'bootstrap' - - css_dir = 'public/css' - sass_dir = 'public/sass' - """ - ) - end - end -end diff --git a/spec/sinatra/bootstrap_4/gemfile_bootstrap_4_spec.rb b/spec/sinatra/bootstrap_4/gemfile_bootstrap_4_spec.rb deleted file mode 100644 index 5ba574d..0000000 --- a/spec/sinatra/bootstrap_4/gemfile_bootstrap_4_spec.rb +++ /dev/null @@ -1,39 +0,0 @@ -module Skellington - describe CLI do - let :subject do - described_class.new - end - - it 'generates a Gemfile' do - subject.options = { 'bootstrap' => '4' } - subject.generate 'dummy-app' - expect('dummy_app/Gemfile').to have_content ( - """ - source 'https://rubygems.org' - - /ruby '[0-9]*\\.[0-9]*\\.[0-9]*'/ - - gem 'sinatra', '~> 1.4' - gem 'rack-conneg' - gem 'rack-tracker' - gem 'rake' - gem 'compass' - gem 'erubis' - gem 'puma' - gem 'bootstrap', '~> 4.0.0.alpha5' - - group :test do - gem 'rspec' - gem 'guard' - gem 'guard-rspec' - gem 'guard-jasmine' - gem 'coveralls' - gem 'jasmine' - gem 'pry' - gem 'actionpack' - end - """ - ) - end - end -end diff --git a/spec/sinatra/bootstrap_4/public_bootstrap_4_spec.rb b/spec/sinatra/bootstrap_4/public_bootstrap_4_spec.rb deleted file mode 100644 index f473fcd..0000000 --- a/spec/sinatra/bootstrap_4/public_bootstrap_4_spec.rb +++ /dev/null @@ -1,48 +0,0 @@ -module Skellington - describe CLI do - let :subject do - described_class.new - end - - it 'generates placeholders for static files' do - subject.options = { 'bootstrap' => '4' } - subject.generate 'dummy-app' - - expect('dummy_app/public/sass/_footer.scss').to have_content ( - """ - html { - position: relative; - min-height: 100%; - } - - body { - margin-bottom: $footer-height; - } - - .footer { - position: absolute; - bottom: 0; - width: 100%; - - text-align: center; - - margin-top: $padding-large-vertical; - background: map-get($theme-colors, primary); - color: white; - height: $footer-height; - - padding: $padding-large-vertical $padding-large-horizontal; - - ul { - @extend .list-inline; - } - - a { - color: white; - } - } - """ - ) - end - end -end diff --git a/spec/sinatra/root_files/config_rb_spec.rb b/spec/sinatra/root_files/config_rb_spec.rb index 552d145..f6e95d7 100644 --- a/spec/sinatra/root_files/config_rb_spec.rb +++ b/spec/sinatra/root_files/config_rb_spec.rb @@ -8,7 +8,7 @@ module Skellington subject.generate 'dummy-app' expect('dummy_app/config.rb').to have_content ( """ - require 'bootstrap-sass' + require 'bootstrap' css_dir = 'public/css' sass_dir = 'public/sass' diff --git a/spec/sinatra/root_files/gemfile_spec.rb b/spec/sinatra/root_files/gemfile_spec.rb index 1bf8328..a7102ec 100644 --- a/spec/sinatra/root_files/gemfile_spec.rb +++ b/spec/sinatra/root_files/gemfile_spec.rb @@ -17,7 +17,7 @@ module Skellington gem 'rack-tracker' gem 'rake' gem 'compass' - gem 'bootstrap-sass' + gem 'bootstrap' gem 'erubis' gem 'puma' From 41de4bc28cc671cdaca4fb96ab60c5c2c8e3d7b6 Mon Sep 17 00:00:00 2001 From: Sam Pikesley Date: Mon, 5 Feb 2018 22:20:47 +0000 Subject: [PATCH 5/9] Delicate surgery impending --- config/config.yaml | 15 ++++++++++- lib/skellington/version.rb | 2 +- lib/templates/common/includes/footer | 2 +- lib/templates/common/includes/libs | 2 +- lib/templates/common/sass/footer | 3 --- lib/templates/jekyll/_data/libs.yml | 16 ++++------- lib/templates/sinatra/Rakefile | 6 ++--- lib/templates/sinatra/config.rb | 4 --- .../sinatra/views/includes/js-libs.erb | 27 ++++++------------- spec/jekyll/bootstrap/css_spec.rb | 3 --- spec/jekyll/layout/layout_spec.rb | 4 +-- spec/sinatra/bootstrap/css_spec.rb | 5 +--- spec/sinatra/layout/includes_spec.rb | 21 ++++++++------- spec/sinatra/layout/layout_spec.rb | 2 +- spec/sinatra/root_files/config_rb_spec.rb | 19 ------------- spec/sinatra/root_files/rakefile_spec.rb | 4 +-- 16 files changed, 51 insertions(+), 84 deletions(-) delete mode 100644 lib/templates/sinatra/config.rb delete mode 100644 spec/sinatra/root_files/config_rb_spec.rb diff --git a/config/config.yaml b/config/config.yaml index cfa35ab..4d137b8 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -41,7 +41,6 @@ sinatra: Procfile: .rspec: config.ru: - config.rb: config/config.yml: # the template has this name lib/app.rb: @@ -138,3 +137,17 @@ jekyll: js/app.js: outpath: app/wormname common: js/app.js + +bootstrap: + js: + - name: jquery + url: //code.jquery.com/jquery-3.2.1.slim.min.js + hash: sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN + - name: popper + url: //cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js + hash: sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q + - name: bootstrap + url: //maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js + hash: sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl + - name: fontawesome + url: //use.fontawesome.com/releases/v5.0.4/js/all.js diff --git a/lib/skellington/version.rb b/lib/skellington/version.rb index 7cb696e..0b12ca0 100644 --- a/lib/skellington/version.rb +++ b/lib/skellington/version.rb @@ -1,3 +1,3 @@ module Skellington - VERSION = '0.8.10' + VERSION = '0.9.0' end diff --git a/lib/templates/common/includes/footer b/lib/templates/common/includes/footer index 58bfc0c..6217a95 100644 --- a/lib/templates/common/includes/footer +++ b/lib/templates/common/includes/footer @@ -1,4 +1,4 @@ -
+
Generated with Skellington diff --git a/lib/templates/common/includes/libs b/lib/templates/common/includes/libs index a007dcb..de91257 100644 --- a/lib/templates/common/includes/libs +++ b/lib/templates/common/includes/libs @@ -1,6 +1,6 @@ {% for lib in site.data.libs.js %} - + {% endfor %} {% for lib in site.data.libs.css %} diff --git a/lib/templates/common/sass/footer b/lib/templates/common/sass/footer index 10cfb43..e05c97a 100644 --- a/lib/templates/common/sass/footer +++ b/lib/templates/common/sass/footer @@ -14,13 +14,10 @@ body { text-align: center; - margin-top: $padding-large-vertical; background: map-get($theme-colors, primary); color: white; height: $footer-height; - padding: $padding-large-vertical $padding-large-horizontal; - ul { @extend .list-inline; } diff --git a/lib/templates/jekyll/_data/libs.yml b/lib/templates/jekyll/_data/libs.yml index 1635c1e..cb8364e 100644 --- a/lib/templates/jekyll/_data/libs.yml +++ b/lib/templates/jekyll/_data/libs.yml @@ -1,15 +1,9 @@ js: - - name: jquery - url: //code.jquery.com/jquery-3.2.1.slim.min.js - hash: sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN - - name: popper - url: //cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js - hash: sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q - - name: bootstrap - url: //maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js - hash: sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl - - name: fontawesome - url: //use.fontawesome.com/releases/v5.0.4/js/all.js +<% lines = @gen.config['bootstrap']['js'].to_yaml.split "\n" %> +<% lines.shift %> +<% lines.each do |l| %> +<%= ' %s' %l.gsub('"', '').gsub('url: ', 'url: ') %> +<% end %> css: - name: foo diff --git a/lib/templates/sinatra/Rakefile b/lib/templates/sinatra/Rakefile index ab47e13..98463ab 100644 --- a/lib/templates/sinatra/Rakefile +++ b/lib/templates/sinatra/Rakefile @@ -17,9 +17,9 @@ namespace :run do task :app do sh 'rackup -o 0.0.0.0' end - - desc 'clean-up and run compass' + + desc 'watch and compile sass' task :sass do - sh 'compass clean && compass watch' + sh 'sass --watch public/sass:public/css' end end diff --git a/lib/templates/sinatra/config.rb b/lib/templates/sinatra/config.rb deleted file mode 100644 index 45a5c41..0000000 --- a/lib/templates/sinatra/config.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'bootstrap' - -css_dir = 'public/css' -sass_dir = 'public/sass' diff --git a/lib/templates/sinatra/views/includes/js-libs.erb b/lib/templates/sinatra/views/includes/js-libs.erb index beb1897..bacc300 100644 --- a/lib/templates/sinatra/views/includes/js-libs.erb +++ b/lib/templates/sinatra/views/includes/js-libs.erb @@ -1,21 +1,10 @@ -<%% - { - jquery: { - url: '//code.jquery.com/jquery-3.2.1.slim.min.js', - hash: 'sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN' - }, - bootstrap: { - url: '//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js', - hash: 'sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q' - }, - popper: { - url: '//cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js', - hash: 'sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl' - }, - fontawesome: { - url: '//use.fontawesome.com/releases/v5.0.4/js/all.js' - } -}.each do |lib| %> +<% s = @gen.config['bootstrap']['js'].map do |js| " #{js['name']}: {\n url: '#{js['url']}',\n hash: '#{js['hash']}'\n }" end %> +<%= "<%" %> +libs = { +<%= s.join ",\n" %> +} + +libs.each do |lib| %> - + <%% end %> diff --git a/spec/jekyll/bootstrap/css_spec.rb b/spec/jekyll/bootstrap/css_spec.rb index a59a5da..b819ccf 100644 --- a/spec/jekyll/bootstrap/css_spec.rb +++ b/spec/jekyll/bootstrap/css_spec.rb @@ -76,13 +76,10 @@ module Skellington text-align: center; - margin-top: $padding-large-vertical; background: map-get($theme-colors, primary); color: white; height: $footer-height; - padding: $padding-large-vertical $padding-large-horizontal; - ul { @extend .list-inline; } diff --git a/spec/jekyll/layout/layout_spec.rb b/spec/jekyll/layout/layout_spec.rb index 60234ed..f01e073 100644 --- a/spec/jekyll/layout/layout_spec.rb +++ b/spec/jekyll/layout/layout_spec.rb @@ -37,7 +37,7 @@ module Skellington expect('dummy_app/_includes/footer.html').to have_content ( """ -
+
Generated with Skellington @@ -76,7 +76,7 @@ module Skellington """ {% for lib in site.data.libs.js %} - + {% endfor %} {% for lib in site.data.libs.css %} diff --git a/spec/sinatra/bootstrap/css_spec.rb b/spec/sinatra/bootstrap/css_spec.rb index 65d8fdb..e1150b5 100644 --- a/spec/sinatra/bootstrap/css_spec.rb +++ b/spec/sinatra/bootstrap/css_spec.rb @@ -57,13 +57,10 @@ module Skellington text-align: center; - margin-top: $padding-large-vertical; background: map-get($theme-colors, primary); color: white; height: $footer-height; - padding: $padding-large-vertical $padding-large-horizontal; - ul { @extend .list-inline; } @@ -147,7 +144,7 @@ module Skellington @import 'colours'; @import 'fonts'; - @import 'bootstrap'; + @import '../../_sass/bootstrap'; @import 'footer'; //@import 'github-corner'; diff --git a/spec/sinatra/layout/includes_spec.rb b/spec/sinatra/layout/includes_spec.rb index 6dd9d7c..1590492 100644 --- a/spec/sinatra/layout/includes_spec.rb +++ b/spec/sinatra/layout/includes_spec.rb @@ -10,25 +10,28 @@ module Skellington expect('dummy_app/views/includes/js-libs.erb').to have_content ( """ <% - { + libs = { jquery: { - url: '//code.jquery.com/jquery-3.2.1.slim.min.js', + url: '//code.jquery.com/jquery-3.2.1.slim.min.js', hash: 'sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN' }, - bootstrap: { - url: '//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js', + popper: { + url: '//cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js', hash: 'sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q' }, - popper: { - url: '//cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js', + bootstrap: { + url: '//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js', hash: 'sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl' }, fontawesome: { - url: '//use.fontawesome.com/releases/v5.0.4/js/all.js' + url: '//use.fontawesome.com/releases/v5.0.4/js/all.js', + hash: '' } - }.each do |lib| %> + } + + libs.each do |lib| %> - + <% end %> """ ) diff --git a/spec/sinatra/layout/layout_spec.rb b/spec/sinatra/layout/layout_spec.rb index 26ac266..ecd1946 100644 --- a/spec/sinatra/layout/layout_spec.rb +++ b/spec/sinatra/layout/layout_spec.rb @@ -36,7 +36,7 @@ module Skellington expect('dummy_app/views/includes/footer.erb').to have_content ( """ -
+
Generated with Skellington diff --git a/spec/sinatra/root_files/config_rb_spec.rb b/spec/sinatra/root_files/config_rb_spec.rb deleted file mode 100644 index f6e95d7..0000000 --- a/spec/sinatra/root_files/config_rb_spec.rb +++ /dev/null @@ -1,19 +0,0 @@ -module Skellington - describe CLI do - let :subject do - described_class.new - end - - it 'generates a config.rb file' do - subject.generate 'dummy-app' - expect('dummy_app/config.rb').to have_content ( - """ - require 'bootstrap' - - css_dir = 'public/css' - sass_dir = 'public/sass' - """ - ) - end - end -end diff --git a/spec/sinatra/root_files/rakefile_spec.rb b/spec/sinatra/root_files/rakefile_spec.rb index 90d2620..679422b 100644 --- a/spec/sinatra/root_files/rakefile_spec.rb +++ b/spec/sinatra/root_files/rakefile_spec.rb @@ -28,9 +28,9 @@ module Skellington sh 'rackup -o 0.0.0.0' end - desc 'clean-up and run compass' + desc 'watch and compile sass' task :sass do - sh 'compass clean && compass watch' + sh 'sass --watch public/sass:public/css' end end """ From 89eb9fe8510f407ff8097edd30db23b529cef2b3 Mon Sep 17 00:00:00 2001 From: Sam Pikesley Date: Mon, 5 Feb 2018 22:56:01 +0000 Subject: [PATCH 6/9] I *think* I've nailed this For Sinatra at least. Must make sure all the jQuery is working --- config/config.yaml | 2 - .../sass/styles => jekyll/css/styles.scss} | 4 +- lib/templates/sinatra/Rakefile | 3 +- lib/templates/sinatra/public/sass/styles.scss | 13 +++++ spec/sinatra/root_files/gemfile_spec.rb | 58 ++++++++++--------- spec/sinatra/root_files/rakefile_spec.rb | 1 + 6 files changed, 48 insertions(+), 33 deletions(-) rename lib/templates/{common/sass/styles => jekyll/css/styles.scss} (79%) create mode 100644 lib/templates/sinatra/public/sass/styles.scss diff --git a/config/config.yaml b/config/config.yaml index 4d137b8..c40c4c5 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -97,7 +97,6 @@ sinatra: public/sass/_colours.scss: common: sass/colours public/sass/styles.scss: - common: sass/styles jekyll: gems: @@ -121,7 +120,6 @@ jekyll: _includes/ie-cruft.html: common: includes/ie-cruft css/styles.scss: - common: sass/styles _sass/variables.scss: common: sass/variables _sass/colours.scss: diff --git a/lib/templates/common/sass/styles b/lib/templates/jekyll/css/styles.scss similarity index 79% rename from lib/templates/common/sass/styles rename to lib/templates/jekyll/css/styles.scss index 2f6cd31..a5f17c3 100644 --- a/lib/templates/common/sass/styles +++ b/lib/templates/jekyll/css/styles.scss @@ -1,5 +1,5 @@ -<% if @gen.framework == 'jekyll' %>--- ----<% end %> +--- +--- @import 'variables'; @import 'colours'; @import 'fonts'; diff --git a/lib/templates/sinatra/Rakefile b/lib/templates/sinatra/Rakefile index 98463ab..f503351 100644 --- a/lib/templates/sinatra/Rakefile +++ b/lib/templates/sinatra/Rakefile @@ -17,9 +17,10 @@ namespace :run do task :app do sh 'rackup -o 0.0.0.0' end - + desc 'watch and compile sass' task :sass do + sh 'sass --update --force public/sass:public/css' sh 'sass --watch public/sass:public/css' end end diff --git a/lib/templates/sinatra/public/sass/styles.scss b/lib/templates/sinatra/public/sass/styles.scss new file mode 100644 index 0000000..94826ba --- /dev/null +++ b/lib/templates/sinatra/public/sass/styles.scss @@ -0,0 +1,13 @@ +@import 'variables'; +@import 'colours'; +@import 'fonts'; + +@import '../../_sass/bootstrap'; + +@import 'footer'; +//@import 'github-corner'; + +h1 { + color: map-get($theme-colors, primary); + font-family: $font-primary; +} diff --git a/spec/sinatra/root_files/gemfile_spec.rb b/spec/sinatra/root_files/gemfile_spec.rb index a7102ec..e5f5dab 100644 --- a/spec/sinatra/root_files/gemfile_spec.rb +++ b/spec/sinatra/root_files/gemfile_spec.rb @@ -1,38 +1,40 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - it 'generates a Gemfile' do - subject.generate 'dummy-app' - expect('dummy_app/Gemfile').to have_content ( - """ - source 'https://rubygems.org' + it 'generates a Gemfile' do + subject.generate 'dummy-app' + expect('dummy_app/Gemfile').to have_content ( + """ + source 'https://rubygems.org' - /ruby '[0-9]*\\.[0-9]*\\.[0-9]*'/ + /ruby '[0-9]*\\.[0-9]*\\.[0-9]*'/ - gem 'sinatra', '~> 1.4' - gem 'rack-conneg' - gem 'rack-tracker' - gem 'rake' - gem 'compass' - gem 'bootstrap' - gem 'erubis' - gem 'puma' + gem 'sinatra', '~> 1.4' + gem 'rack-conneg' + gem 'rack-tracker' + gem 'rake' + gem 'compass' + gem 'bootstrap' + gem 'erubis' + gem 'puma' - group :test do - gem 'rspec' - gem 'guard' - gem 'guard-rspec' - gem 'guard-jasmine' - gem 'coveralls' - gem 'jasmine' - gem 'pry' - gem 'actionpack' + group :test do + gem 'rspec' + gem 'guard' + gem 'guard-rspec' + gem 'guard-jasmine' + gem 'coveralls' + gem 'jasmine' + gem 'pry' + gem 'actionpack' + end + """ + ) end - """ - ) end end end diff --git a/spec/sinatra/root_files/rakefile_spec.rb b/spec/sinatra/root_files/rakefile_spec.rb index 679422b..7f4221a 100644 --- a/spec/sinatra/root_files/rakefile_spec.rb +++ b/spec/sinatra/root_files/rakefile_spec.rb @@ -30,6 +30,7 @@ module Skellington desc 'watch and compile sass' task :sass do + sh 'sass --update --force public/sass:public/css' sh 'sass --watch public/sass:public/css' end end From 70380b7aac2b08eb40286b81252dce78c4e41b7d Mon Sep 17 00:00:00 2001 From: Sam Pikesley Date: Wed, 7 Feb 2018 19:11:55 +0000 Subject: [PATCH 7/9] Think I've removed all references to bootstrap versions now --- README.md | 12 +++--------- lib/skellington/cli.rb | 4 ---- lib/skellington/generator.rb | 4 +--- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 2ae4edc..eabab5d 100644 --- a/README.md +++ b/README.md @@ -13,14 +13,14 @@ Extremely opinionated generator for your [Sinatra](http://www.sinatrarb.com/) a * Sinatra * [Rspec](http://rspec.info/) * [Jasmine](http://jasmine.github.io/2.0/introduction.html) - * [Bootstrap](http://getbootstrap.com/) - * [Compass](http://compass-style.org/) + * [Bootstrap 4](http://getbootstrap.com/) + * [Sass](https://sass-lang.com/) * An MIT License file * A Code-of-Conduct file * Jekyll * [Jekyll](https://jekyllrb.com/) - * [Bootstrap](http://getbootstrap.com/) + * [Bootstrap 4](http://getbootstrap.com/) * Reasonable default things * An MIT License file * A Code-of-Conduct file @@ -104,12 +104,6 @@ or just * Default: sinatra * Possible values: sinatra, jekyll -* --bootstrap - * Bootstrap major version to include - * Default: 3 - * Possible values: 3, 4 - * VERY EXPERIMENTAL - * --licensor * Name to include in the license file diff --git a/lib/skellington/cli.rb b/lib/skellington/cli.rb index 8726aa2..1338df0 100644 --- a/lib/skellington/cli.rb +++ b/lib/skellington/cli.rb @@ -11,10 +11,6 @@ def version default: 'sinatra', description: 'Framework to generate for', enum: ['sinatra', 'jekyll'] - method_option :bootstrap, - default: '3', - description: 'Bootstrap major version to use *VERY EXPERIMENTAL*', - enum: ['3', '4'] method_option :licensor, aliases: '-l', description: 'Name to insert into the license file' diff --git a/lib/skellington/generator.rb b/lib/skellington/generator.rb index 7b356d5..7e2d554 100644 --- a/lib/skellington/generator.rb +++ b/lib/skellington/generator.rb @@ -6,13 +6,11 @@ class Generator :camelname, :files, :gems, - :framework, - :bootstrap + :framework attr_accessor :licensor def initialize path, options = {} @framework = options.fetch('framework', 'sinatra') - @bootstrap = options.fetch('bootstrap', 3).to_s @full_path = path @path = File.dirname @full_path @filename = File.basename(@full_path) From 19d18ec207965cb0bd929e11f69ecae010464e3c Mon Sep 17 00:00:00 2001 From: Sam Pikesley Date: Wed, 7 Feb 2018 22:14:29 +0000 Subject: [PATCH 8/9] Helpers for JS libs --- config/config.yaml | 26 ++++++++------- lib/skellington/helpers.rb | 17 ++++++++++ lib/templates/jekyll/_data/libs.yml | 6 +--- .../sinatra/views/includes/js-libs.erb | 3 +- spec/skellington_spec.rb | 33 +++++++++++++++++-- 5 files changed, 65 insertions(+), 20 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index c40c4c5..2c73a4c 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -138,14 +138,18 @@ jekyll: bootstrap: js: - - name: jquery - url: //code.jquery.com/jquery-3.2.1.slim.min.js - hash: sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN - - name: popper - url: //cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js - hash: sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q - - name: bootstrap - url: //maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js - hash: sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl - - name: fontawesome - url: //use.fontawesome.com/releases/v5.0.4/js/all.js + - name: jquery + url: //code.jquery.com/jquery-VERSION.slim.min.js + version: 3.2.1 + hash: sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN + - name: popper + url: //cdnjs.cloudflare.com/ajax/libs/popper.js/VERSION/umd/popper.min.js + version: 1.12.9 + hash: sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q + - name: bootstrap + url: //maxcdn.bootstrapcdn.com/bootstrap/VERSION/js/bootstrap.min.js + version: 4.0.0 + hash: sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl + - name: fontawesome + url: //use.fontawesome.com/releases/vVERSION/js/all.js + version: 5.0.4 diff --git a/lib/skellington/helpers.rb b/lib/skellington/helpers.rb index cfac30e..c2c7c0a 100644 --- a/lib/skellington/helpers.rb +++ b/lib/skellington/helpers.rb @@ -7,4 +7,21 @@ def self.unslash word return word[2..-1] if word[0..1] == './' word end + + def self.js_for_sinatra data + s = [' %s: {' % data['name']] + s.push " url: '%s'," % (data['url'].sub 'VERSION', data['version']) + s.push " hash: '%s'" % data['hash'] + s.push ' }' + + s.join "\n" + end + + def self.js_for_jekyll data + s = [' - name: %s' % data['name']] + s.push " url: %s" % (data['url'].sub 'VERSION', data['version']) + s.push " hash: %s" % data['hash'] if data['hash'] + + s.join "\n" + end end diff --git a/lib/templates/jekyll/_data/libs.yml b/lib/templates/jekyll/_data/libs.yml index cb8364e..40d23dc 100644 --- a/lib/templates/jekyll/_data/libs.yml +++ b/lib/templates/jekyll/_data/libs.yml @@ -1,9 +1,5 @@ js: -<% lines = @gen.config['bootstrap']['js'].to_yaml.split "\n" %> -<% lines.shift %> -<% lines.each do |l| %> -<%= ' %s' %l.gsub('"', '').gsub('url: ', 'url: ') %> -<% end %> +<%= @gen.config['bootstrap']['js'].map { |js| Skellington.js_for_jekyll js }.join "\n" %> css: - name: foo diff --git a/lib/templates/sinatra/views/includes/js-libs.erb b/lib/templates/sinatra/views/includes/js-libs.erb index bacc300..c956eca 100644 --- a/lib/templates/sinatra/views/includes/js-libs.erb +++ b/lib/templates/sinatra/views/includes/js-libs.erb @@ -1,7 +1,6 @@ -<% s = @gen.config['bootstrap']['js'].map do |js| " #{js['name']}: {\n url: '#{js['url']}',\n hash: '#{js['hash']}'\n }" end %> <%= "<%" %> libs = { -<%= s.join ",\n" %> +<%= @gen.config['bootstrap']['js'].map { |js| Skellington.js_for_sinatra js }.join ",\n" %> } libs.each do |lib| %> diff --git a/spec/skellington_spec.rb b/spec/skellington_spec.rb index 7954d0f..866d6b9 100644 --- a/spec/skellington_spec.rb +++ b/spec/skellington_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - module Skellington describe Skellington do it 'camelises a worm_case string' do @@ -10,5 +8,36 @@ module Skellington expect(Skellington.unslash './word').to eq 'word' expect(Skellington.unslash 'another_word').to eq 'another_word' end + + it 'generates a JS lib import line for Sinatra' do + data = YAML.load(""" +- name: bootstrap + url: //maxcdn.bootstrapcdn.com/bootstrap/VERSION/js/bootstrap.min.js + version: 4.0.0 + hash: sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl + """)[0] + + expect(Skellington.js_for_sinatra data).to eq ( + """ bootstrap: { + url: '//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js', + hash: 'sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl' + }""" + ) + end + + it 'generates a JS lib import line for Jekyll' do + data = YAML.load(""" +- name: bootstrap + url: //maxcdn.bootstrapcdn.com/bootstrap/VERSION/js/bootstrap.min.js + version: 4.0.0 + hash: sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl + """)[0] + + expect(Skellington.js_for_jekyll data).to eq ( + """ - name: bootstrap + url: //maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js + hash: sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl""" + ) + end end end From 49263cc994a19b3a85e7289137d77d3b4409046c Mon Sep 17 00:00:00 2001 From: Sam Pikesley Date: Wed, 7 Feb 2018 22:27:08 +0000 Subject: [PATCH 9/9] Add contexts everywhere --- spec/jekyll/404_spec.rb | 32 ++- spec/jekyll/assets/static_spec.rb | 16 +- spec/jekyll/bootstrap/css_spec.rb | 222 +++++++-------- spec/jekyll/cli_spec.rb | 24 +- spec/jekyll/data/libs_spec.rb | 60 ++-- spec/jekyll/git_spec.rb | 28 +- spec/jekyll/index_md_spec.rb | 28 +- spec/jekyll/js/javascript_spec.rb | 16 +- spec/jekyll/layout/layout_spec.rb | 252 ++++++++--------- .../jekyll/root_files/code-of-conduct_spec.rb | 32 ++- spec/jekyll/root_files/config_yml_spec.rb | 38 +-- spec/jekyll/root_files/gemfile_spec.rb | 30 +- spec/jekyll/root_files/license_spec.rb | 120 ++++---- spec/jekyll/root_files/rbenv_spec.rb | 24 +- spec/jekyll/root_files/readme_spec.rb | 24 +- spec/sinatra/app/app_spec.rb | 90 +++--- spec/sinatra/app/config_yml_spec.rb | 24 +- spec/sinatra/app/helpers_spec.rb | 30 +- spec/sinatra/app/public_spec.rb | 16 +- spec/sinatra/app/racks_spec.rb | 64 +++-- spec/sinatra/bootstrap/css_spec.rb | 264 +++++++++--------- spec/sinatra/cli_spec.rb | 32 ++- spec/sinatra/git_spec.rb | 26 +- spec/sinatra/javascript/javascript_spec.rb | 82 +++--- spec/sinatra/layout/includes_spec.rb | 146 +++++----- spec/sinatra/layout/layout_spec.rb | 184 ++++++------ spec/sinatra/layout/views_spec.rb | 42 +-- .../root_files/code-of-conduct_spec.rb | 30 +- spec/sinatra/root_files/config_ru_spec.rb | 24 +- spec/sinatra/root_files/guardfile_spec.rb | 50 ++-- spec/sinatra/root_files/license_spec.rb | 118 ++++---- spec/sinatra/root_files/procfile_spec.rb | 22 +- spec/sinatra/root_files/rakefile_spec.rb | 58 ++-- spec/sinatra/root_files/rbenv_spec.rb | 22 +- spec/sinatra/root_files/readme_spec.rb | 22 +- spec/sinatra/spec/spec_spec.rb | 140 +++++----- 36 files changed, 1252 insertions(+), 1180 deletions(-) diff --git a/spec/jekyll/404_spec.rb b/spec/jekyll/404_spec.rb index e9f9f93..3f24099 100644 --- a/spec/jekyll/404_spec.rb +++ b/spec/jekyll/404_spec.rb @@ -1,23 +1,25 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'jekyll' do + let :subject do + described_class.new + end - it 'has a 404 page' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' + it 'has a 404 page' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' - expect('dummy_app/404.md').to have_content ( - """ - --- - title: 404 - permalink: /404.html - --- + expect('dummy_app/404.md').to have_content ( + """ + --- + title: 404 + permalink: /404.html + --- - # Nothing to see here - """ - ) + # Nothing to see here + """ + ) + end end end end diff --git a/spec/jekyll/assets/static_spec.rb b/spec/jekyll/assets/static_spec.rb index b27c4ae..991621b 100644 --- a/spec/jekyll/assets/static_spec.rb +++ b/spec/jekyll/assets/static_spec.rb @@ -1,14 +1,16 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'jekyll' do + let :subject do + described_class.new + end - it 'creates a favicon' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' + it 'creates a favicon' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' - expect(File).to exist 'dummy_app/assets/favicon.ico' + expect(File).to exist 'dummy_app/assets/favicon.ico' + end end end end diff --git a/spec/jekyll/bootstrap/css_spec.rb b/spec/jekyll/bootstrap/css_spec.rb index b819ccf..65dedb4 100644 --- a/spec/jekyll/bootstrap/css_spec.rb +++ b/spec/jekyll/bootstrap/css_spec.rb @@ -1,120 +1,122 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'jekyll' do + let :subject do + described_class.new + end + + it 'installs bootstrap' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' + + expect('dummy_app/_sass/bootstrap.scss').to have_content ( + """ + /*! + * Bootstrap v4.0.0 (https://getbootstrap.com) + * Copyright 2011-2018 The Bootstrap Authors + * Copyright 2011-2018 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + """ + ) + + expect('dummy_app/_sass/variables.scss').to have_content ( + """ + $footer-height: 40px; + """ + ) + + expect('dummy_app/_sass/fonts.scss').to have_content ( + """ + $font-primary: 'Ubuntu Mono'; + """ + ) + + expect(File).to exist 'dummy_app/_sass/palettes/default.scss' + expect('dummy_app/_sass/colours.scss').to have_content ( + """ + @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%); + + $theme-colors: ( + primary: $rgba-primary-0, + secondary: $rgba-secondary-1-0, + // success: $green, + // info: $cyan, + // warning: $yellow, + // danger: $red, + // light: $gray-100, + // dark: $gray-800 + ) + """ + ) + + expect('dummy_app/_sass/footer.scss').to have_content ( + """ + html { + position: relative; + min-height: 100%; + } - it 'installs bootstrap' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' - - expect('dummy_app/_sass/bootstrap.scss').to have_content ( - """ - /*! - * Bootstrap v4.0.0 (https://getbootstrap.com) - * Copyright 2011-2018 The Bootstrap Authors - * Copyright 2011-2018 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */ - """ - ) - - expect('dummy_app/_sass/variables.scss').to have_content ( - """ - $footer-height: 40px; - """ - ) - - expect('dummy_app/_sass/fonts.scss').to have_content ( - """ - $font-primary: 'Ubuntu Mono'; - """ - ) - - expect(File).to exist 'dummy_app/_sass/palettes/default.scss' - expect('dummy_app/_sass/colours.scss').to have_content ( - """ - @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%); - - $theme-colors: ( - primary: $rgba-primary-0, - secondary: $rgba-secondary-1-0, - // success: $green, - // info: $cyan, - // warning: $yellow, - // danger: $red, - // light: $gray-100, - // dark: $gray-800 - ) - """ - ) - - expect('dummy_app/_sass/footer.scss').to have_content ( - """ - html { - position: relative; - min-height: 100%; - } - - body { - margin-bottom: $footer-height; - } - - .footer { - position: absolute; - bottom: 0; - width: 100%; - - text-align: center; - - background: map-get($theme-colors, primary); - color: white; - height: $footer-height; - - ul { - @extend .list-inline; + body { + margin-bottom: $footer-height; } - a { + .footer { + position: absolute; + bottom: 0; + width: 100%; + + text-align: center; + + background: map-get($theme-colors, primary); color: white; - } - } - """ - ) - end + height: $footer-height; + + ul { + @extend .list-inline; + } - it 'sets up sass' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' - - expect('dummy_app/css/styles.scss').to have_content ( - """ - --- - --- - @import 'variables'; - @import 'colours'; - @import 'fonts'; - - @import 'bootstrap'; - - @import 'footer'; - //@import 'github-corner'; - - h1 { - color: map-get($theme-colors, primary); - font-family: $font-primary; - } - """ - ) + a { + color: white; + } + } + """ + ) + end + + it 'sets up sass' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' + + expect('dummy_app/css/styles.scss').to have_content ( + """ + --- + --- + @import 'variables'; + @import 'colours'; + @import 'fonts'; + + @import 'bootstrap'; + + @import 'footer'; + //@import 'github-corner'; + + h1 { + color: map-get($theme-colors, primary); + font-family: $font-primary; + } + """ + ) + end end end end diff --git a/spec/jekyll/cli_spec.rb b/spec/jekyll/cli_spec.rb index 5fa2dcc..f7ec98a 100644 --- a/spec/jekyll/cli_spec.rb +++ b/spec/jekyll/cli_spec.rb @@ -1,12 +1,13 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'jekyll' do + let :subject do + described_class.new + end - it 'generates correct output' do - subject.options = { 'framework' => 'jekyll' } - expect { subject.generate 'dummy-app' }.to output(/ + it 'generates correct output' do + subject.options = { 'framework' => 'jekyll' } + expect { subject.generate 'dummy-app' }.to output(/ Your new Jekyll site DummyApp has been created \(Note that 'dummy-app' has been changed to 'dummy_app' because Ruby finds '-'s troubling\) @@ -26,14 +27,15 @@ module Skellington You should also fill in your name in LICENSE.md /).to_stdout - end + end - context 'non-local path' do - it 'generates correct output' do - subject.options = { 'framework' => 'jekyll' } - expect { subject.generate 'some/path/dummy-app' }.to output(/ + context 'non-local path' do + it 'generates correct output' do + subject.options = { 'framework' => 'jekyll' } + expect { subject.generate 'some/path/dummy-app' }.to output(/ cd some\/path\/dummy_app /).to_stdout + end end end end diff --git a/spec/jekyll/data/libs_spec.rb b/spec/jekyll/data/libs_spec.rb index decf6c0..91fbde3 100644 --- a/spec/jekyll/data/libs_spec.rb +++ b/spec/jekyll/data/libs_spec.rb @@ -1,38 +1,40 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'jekyll' do + let :subject do + described_class.new + end - it 'creates a libs data file' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' + it 'creates a libs data file' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' - expect(Dir).to exist 'dummy_app/_data' - expect('dummy_app/_data/libs.yml').to have_content ( - """ - js: - - name: jquery - url: //code.jquery.com/jquery-3.2.1.slim.min.js - hash: sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN - - name: popper - url: //cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js - hash: sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q - - name: bootstrap - url: //maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js - hash: sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl - - name: fontawesome - url: //use.fontawesome.com/releases/v5.0.4/js/all.js + expect(Dir).to exist 'dummy_app/_data' + expect('dummy_app/_data/libs.yml').to have_content ( + """ + js: + - name: jquery + url: //code.jquery.com/jquery-3.2.1.slim.min.js + hash: sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN + - name: popper + url: //cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js + hash: sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q + - name: bootstrap + url: //maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js + hash: sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl + - name: fontawesome + url: //use.fontawesome.com/releases/v5.0.4/js/all.js - css: - - name: foo - bar: //bar.com/baz.css + css: + - name: foo + bar: //bar.com/baz.css - fonts: - - name: ubuntu - url: //fonts.googleapis.com/css?family=Ubuntu+Mono - """ - ) + fonts: + - name: ubuntu + url: //fonts.googleapis.com/css?family=Ubuntu+Mono + """ + ) + end end end end diff --git a/spec/jekyll/git_spec.rb b/spec/jekyll/git_spec.rb index a7ed7db..7fbf619 100644 --- a/spec/jekyll/git_spec.rb +++ b/spec/jekyll/git_spec.rb @@ -1,20 +1,22 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'jekyll' do + let :subject do + described_class.new + end - it 'initialises a git repo' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' - expect(Dir).to exist 'dummy_app/.git' + it 'initialises a git repo' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' + expect(Dir).to exist 'dummy_app/.git' - expect('dummy_app/.gitignore').to have_content ( - """ - _site/ - .sass-cache - """ - ) + expect('dummy_app/.gitignore').to have_content ( + """ + _site/ + .sass-cache + """ + ) + end end end end diff --git a/spec/jekyll/index_md_spec.rb b/spec/jekyll/index_md_spec.rb index 0aeb07f..2a08e29 100644 --- a/spec/jekyll/index_md_spec.rb +++ b/spec/jekyll/index_md_spec.rb @@ -1,21 +1,23 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'jekyll' do + let :subject do + described_class.new + end - it 'creates a default index page' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' + it 'creates a default index page' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' - expect('dummy_app/index.md').to have_content ( - """ - --- - --- + expect('dummy_app/index.md').to have_content ( + """ + --- + --- - # Hello from DummyApp - """ - ) + # Hello from DummyApp + """ + ) + end end end end diff --git a/spec/jekyll/js/javascript_spec.rb b/spec/jekyll/js/javascript_spec.rb index 9ac8af9..3598250 100644 --- a/spec/jekyll/js/javascript_spec.rb +++ b/spec/jekyll/js/javascript_spec.rb @@ -1,14 +1,16 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'jekyll' do + let :subject do + described_class.new + end - it 'installs bootstrap' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' + it 'installs bootstrap' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' - expect(File).to exist 'dummy_app/js/dummy_app.js' + expect(File).to exist 'dummy_app/js/dummy_app.js' + end end end end diff --git a/spec/jekyll/layout/layout_spec.rb b/spec/jekyll/layout/layout_spec.rb index f01e073..67205ef 100644 --- a/spec/jekyll/layout/layout_spec.rb +++ b/spec/jekyll/layout/layout_spec.rb @@ -1,132 +1,134 @@ module Skellington describe CLI do - let :subject do - described_class.new - end - - context 'layout' do - it 'creates a header' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' - - expect('dummy_app/_includes/header.html').to have_content ( - """ - - - - - - {% include ie-cruft.html %} - - {% include libs.html %} - - - - - - {{ page.title }} - - - """ - ) - end - - it 'creates a footer' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' - - expect('dummy_app/_includes/footer.html').to have_content ( - """ -
- Generated with - - Skellington - -
- """ - ) - end - - it 'creates a nav' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' - - expect('dummy_app/_includes/nav.html').to have_content ( - """ - - """ - ) - end - - it 'creates a JS libs section' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' - - expect('dummy_app/_includes/libs.html').to have_content ( - """ - {% for lib in site.data.libs.js %} - - - {% endfor %} - - {% for lib in site.data.libs.css %} - - - {% endfor %} - - {% for font in site.data.libs.fonts %} - - - {% endfor %} - """ - ) - end - - it 'creates a layout' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' - - expect('dummy_app/_layouts/default.html').to have_content ( - """ - - - {% include header.html %} - - {% include nav.html %} -
- {{ content }} -
- {% include footer.html %} - - - """ - ) + context 'jekyll' do + let :subject do + described_class.new end - it 'has the ie shims' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' - - expect('dummy_app/_includes/ie-cruft.html').to have_content ( - """ - - - - """ - ) + context 'layout' do + it 'creates a header' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' + + expect('dummy_app/_includes/header.html').to have_content ( + """ + + + + + + {% include ie-cruft.html %} + + {% include libs.html %} + + + + + + {{ page.title }} + + + """ + ) + end + + it 'creates a footer' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' + + expect('dummy_app/_includes/footer.html').to have_content ( + """ +
+ Generated with + + Skellington + +
+ """ + ) + end + + it 'creates a nav' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' + + expect('dummy_app/_includes/nav.html').to have_content ( + """ + + """ + ) + end + + it 'creates a JS libs section' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' + + expect('dummy_app/_includes/libs.html').to have_content ( + """ + {% for lib in site.data.libs.js %} + + + {% endfor %} + + {% for lib in site.data.libs.css %} + + + {% endfor %} + + {% for font in site.data.libs.fonts %} + + + {% endfor %} + """ + ) + end + + it 'creates a layout' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' + + expect('dummy_app/_layouts/default.html').to have_content ( + """ + + + {% include header.html %} + + {% include nav.html %} +
+ {{ content }} +
+ {% include footer.html %} + + + """ + ) + end + + it 'has the ie shims' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' + + expect('dummy_app/_includes/ie-cruft.html').to have_content ( + """ + + + + """ + ) + end end end end diff --git a/spec/jekyll/root_files/code-of-conduct_spec.rb b/spec/jekyll/root_files/code-of-conduct_spec.rb index 6c0c012..f24a8b1 100644 --- a/spec/jekyll/root_files/code-of-conduct_spec.rb +++ b/spec/jekyll/root_files/code-of-conduct_spec.rb @@ -1,22 +1,24 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'jekyll' do + let :subject do + described_class.new + end - it 'generates a Code of Conduct' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' - expect('dummy_app/CODE_OF_CONDUCT.md').to have_content ( - """ - # Contributor Code of Conduct + it 'generates a Code of Conduct' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' + expect('dummy_app/CODE_OF_CONDUCT.md').to have_content ( + """ + # Contributor Code of Conduct - As contributors and maintainers of this project, and in the interest of - fostering an open and welcoming community, we pledge to respect all people who - contribute through reporting issues, posting feature requests, updating - documentation, submitting pull requests or patches, and other activities. - """ - ) + As contributors and maintainers of this project, and in the interest of + fostering an open and welcoming community, we pledge to respect all people who + contribute through reporting issues, posting feature requests, updating + documentation, submitting pull requests or patches, and other activities. + """ + ) + end end end end diff --git a/spec/jekyll/root_files/config_yml_spec.rb b/spec/jekyll/root_files/config_yml_spec.rb index f994037..eebd613 100644 --- a/spec/jekyll/root_files/config_yml_spec.rb +++ b/spec/jekyll/root_files/config_yml_spec.rb @@ -1,25 +1,27 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'jekyll' do + let :subject do + described_class.new + end - it 'generates a _config.yml file' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' - expect('dummy_app/_config.yml').to have_content ( - """ - --- - defaults: - - scope: - path: '' - values: - layout: default - permalink: pretty + it 'generates a _config.yml file' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' + expect('dummy_app/_config.yml').to have_content ( + """ + --- + defaults: + - scope: + path: '' + values: + layout: default + permalink: pretty - baseurl: /dummy-app - """ - ) + baseurl: /dummy-app + """ + ) + end end end end diff --git a/spec/jekyll/root_files/gemfile_spec.rb b/spec/jekyll/root_files/gemfile_spec.rb index 15a7e99..3a4987f 100644 --- a/spec/jekyll/root_files/gemfile_spec.rb +++ b/spec/jekyll/root_files/gemfile_spec.rb @@ -1,22 +1,24 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'jekyll' do + let :subject do + described_class.new + end - it 'generates a Gemfile' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' - expect('dummy_app/Gemfile').to have_content ( - """ - source 'https://rubygems.org' + it 'generates a Gemfile' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' + expect('dummy_app/Gemfile').to have_content ( + """ + source 'https://rubygems.org' - /ruby '[0-9]*\\.[0-9]*\\.[0-9]*'/ + /ruby '[0-9]*\\.[0-9]*\\.[0-9]*'/ - gem 'github-pages' - gem 'rake' - """ - ) + gem 'github-pages' + gem 'rake' + """ + ) + end end end end diff --git a/spec/jekyll/root_files/license_spec.rb b/spec/jekyll/root_files/license_spec.rb index 8414d69..554b683 100644 --- a/spec/jekyll/root_files/license_spec.rb +++ b/spec/jekyll/root_files/license_spec.rb @@ -1,74 +1,76 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'jekyll' do + let :subject do + described_class.new + end - context 'generate a LICENSE' do - specify 'plain license' do - Timecop.freeze Time.local 2016, 01, 19 - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' - expect('dummy_app/LICENSE.md').to have_content ( - """ - ##Copyright (c) 2016 YOUR-NAME-HERE + context 'generate a LICENSE' do + specify 'plain license' do + Timecop.freeze Time.local 2016, 01, 19 + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' + expect('dummy_app/LICENSE.md').to have_content ( + """ + ##Copyright (c) 2016 YOUR-NAME-HERE - #MIT License + #MIT License - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - 'Software'), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + 'Software'), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - """ - ) - Timecop.return - end + THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + """ + ) + Timecop.return + end - specify 'with a provided name' do - Timecop.freeze Time.local 2016, 01, 19 - subject.options = {licensor: 'Beyoncé'} - subject.generate 'dummy-app' - expect('dummy_app/LICENSE.md').to have_content ( - """ - ##Copyright (c) 2016 Beyoncé + specify 'with a provided name' do + Timecop.freeze Time.local 2016, 01, 19 + subject.options = {licensor: 'Beyoncé'} + subject.generate 'dummy-app' + expect('dummy_app/LICENSE.md').to have_content ( + """ + ##Copyright (c) 2016 Beyoncé - #MIT License + #MIT License - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - 'Software'), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + 'Software'), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - """ - ) - Timecop.return + THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + """ + ) + Timecop.return + end end end end diff --git a/spec/jekyll/root_files/rbenv_spec.rb b/spec/jekyll/root_files/rbenv_spec.rb index ef236e7..572cd47 100644 --- a/spec/jekyll/root_files/rbenv_spec.rb +++ b/spec/jekyll/root_files/rbenv_spec.rb @@ -1,17 +1,19 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'jekyll' do + let :subject do + described_class.new + end - it 'generates a .ruby-version' do - subject.options = { 'framework' => 'jekyll' } - 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]*/ - """ - ) + it 'generates a .ruby-version' do + subject.options = { 'framework' => 'jekyll' } + 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]*/ + """ + ) + end end end end diff --git a/spec/jekyll/root_files/readme_spec.rb b/spec/jekyll/root_files/readme_spec.rb index 75a5973..bef5c15 100644 --- a/spec/jekyll/root_files/readme_spec.rb +++ b/spec/jekyll/root_files/readme_spec.rb @@ -1,17 +1,19 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'jekyll' do + let :subject do + described_class.new + end - it 'generates a README' do - subject.options = { 'framework' => 'jekyll' } - subject.generate 'dummy-app' - expect('dummy_app/README.md').to have_content ( - """ - # DummyApp - """ - ) + it 'generates a README' do + subject.options = { 'framework' => 'jekyll' } + subject.generate 'dummy-app' + expect('dummy_app/README.md').to have_content ( + """ + # DummyApp + """ + ) + end end end end diff --git a/spec/sinatra/app/app_spec.rb b/spec/sinatra/app/app_spec.rb index a3bf56b..d520f44 100644 --- a/spec/sinatra/app/app_spec.rb +++ b/spec/sinatra/app/app_spec.rb @@ -1,58 +1,60 @@ module Skellington describe CLI do - let :subject do - described_class.new - end - - it 'generates an app file' do - subject.generate 'dummy-app' - expect('dummy_app/lib/dummy_app.rb').to have_content ( - """ - require 'sinatra/base' - require 'tilt/erubis' - require 'json' - require 'yaml' - - require_relative 'dummy_app/helpers' - require_relative 'dummy_app/racks' - - module DummyApp - class App < Sinatra::Base - helpers do - include DummyApp::Helpers - end - - get '/' do - headers 'Vary' => 'Accept' + context 'sinatra' do + let :subject do + described_class.new + end - respond_to do |wants| - wants.html do - @content = '

Hello from DummyApp

' - @title = 'DummyApp' - @github_url = CONFIG['github_url'] - erb :index - end + it 'generates an app file' do + subject.generate 'dummy-app' + expect('dummy_app/lib/dummy_app.rb').to have_content ( + """ + require 'sinatra/base' + require 'tilt/erubis' + require 'json' + require 'yaml' + + require_relative 'dummy_app/helpers' + require_relative 'dummy_app/racks' + + module DummyApp + class App < Sinatra::Base + helpers do + include DummyApp::Helpers + end - wants.json do - { - app: 'DummyApp' - }.to_json + get '/' do + headers 'Vary' => 'Accept' + + respond_to do |wants| + wants.html do + @content = '

Hello from DummyApp

' + @title = 'DummyApp' + @github_url = CONFIG['github_url'] + erb :index + end + + wants.json do + { + app: 'DummyApp' + }.to_json + end end end - end - # start the server if ruby file executed directly - run! if app_file == $0 + # start the server if ruby file executed directly + run! if app_file == $0 - not_found do - status 404 - @title = '404' - erb :oops + not_found do + status 404 + @title = '404' + erb :oops + end end end + """ + ) end - """ - ) end end end diff --git a/spec/sinatra/app/config_yml_spec.rb b/spec/sinatra/app/config_yml_spec.rb index 6e48f45..49f2ef1 100644 --- a/spec/sinatra/app/config_yml_spec.rb +++ b/spec/sinatra/app/config_yml_spec.rb @@ -1,17 +1,19 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - it 'generates a config/config.yml file' do - subject.generate 'dummy-app' - expect('dummy_app/config/config.yml').to have_content ( - """ - #google-analytics-tag: UA-00000000-0 - #github_url: https://github.com # also uncomment the `include` line in `styles.scss` - """ - ) + it 'generates a config/config.yml file' do + subject.generate 'dummy-app' + expect('dummy_app/config/config.yml').to have_content ( + """ + #google-analytics-tag: UA-00000000-0 + #github_url: https://github.com # also uncomment the `include` line in `styles.scss` + """ + ) + end end end end diff --git a/spec/sinatra/app/helpers_spec.rb b/spec/sinatra/app/helpers_spec.rb index ceeb2a8..3a57727 100644 --- a/spec/sinatra/app/helpers_spec.rb +++ b/spec/sinatra/app/helpers_spec.rb @@ -1,24 +1,26 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - it 'generates an app file' do - subject.generate 'dummy-app' - expect('dummy_app/lib/dummy_app/helpers.rb').to have_content ( - """ - module DummyApp - CONFIG = YAML.load_file('config/config.yml') || {} + it 'generates an app file' do + subject.generate 'dummy-app' + expect('dummy_app/lib/dummy_app/helpers.rb').to have_content ( + """ + module DummyApp + CONFIG = YAML.load_file('config/config.yml') || {} - module Helpers - def hello - 'Hello' + module Helpers + def hello + 'Hello' + end end end + """ + ) end - """ - ) end end end diff --git a/spec/sinatra/app/public_spec.rb b/spec/sinatra/app/public_spec.rb index 1dc43c7..dddd38e 100644 --- a/spec/sinatra/app/public_spec.rb +++ b/spec/sinatra/app/public_spec.rb @@ -1,14 +1,16 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - it 'generates placeholders for static files' do - subject.generate 'dummy-app' + it 'generates placeholders for static files' do + 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' + expect(File).to exist 'dummy_app/public/js/dummy_app.js' + expect(File).to exist 'dummy_app/public/assets/favicon.ico' + end end end end diff --git a/spec/sinatra/app/racks_spec.rb b/spec/sinatra/app/racks_spec.rb index 06951d5..bd7c6b1 100644 --- a/spec/sinatra/app/racks_spec.rb +++ b/spec/sinatra/app/racks_spec.rb @@ -1,46 +1,48 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - it 'generates an app file' do - subject.generate 'dummy-app' - expect('dummy_app/lib/dummy_app/racks.rb').to have_content ( - """ - require 'rack/conneg' - require 'rack/tracker' + it 'generates an app file' do + subject.generate 'dummy-app' + expect('dummy_app/lib/dummy_app/racks.rb').to have_content ( + """ + require 'rack/conneg' + require 'rack/tracker' - module DummyApp - class App < Sinatra::Base - set :public_folder, 'public' - set :views, 'views' + module DummyApp + class App < Sinatra::Base + set :public_folder, 'public' + set :views, 'views' - if CONFIG['google-analytics-tag'] - use Rack::Tracker do - handler :google_analytics, { tracker: CONFIG['google-analytics-tag'] } + if CONFIG['google-analytics-tag'] + use Rack::Tracker do + handler :google_analytics, { tracker: CONFIG['google-analytics-tag'] } + end end - end - use Rack::Conneg do |conneg| - conneg.set :accept_all_extensions, true - conneg.set :fallback, :html - conneg.ignore_contents_of 'public' - conneg.provide [ - :html, - :json - ] - end + use Rack::Conneg do |conneg| + conneg.set :accept_all_extensions, true + conneg.set :fallback, :html + conneg.ignore_contents_of 'public' + conneg.provide [ + :html, + :json + ] + end - before do - if negotiated? - content_type negotiated_type + before do + if negotiated? + content_type negotiated_type + end end end end + """ + ) end - """ - ) end end end diff --git a/spec/sinatra/bootstrap/css_spec.rb b/spec/sinatra/bootstrap/css_spec.rb index e1150b5..c883153 100644 --- a/spec/sinatra/bootstrap/css_spec.rb +++ b/spec/sinatra/bootstrap/css_spec.rb @@ -1,160 +1,162 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end + + it 'installs bootstrap' do + 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 ( + """ + @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%); + + $theme-colors: ( + primary: $rgba-primary-0, + secondary: $rgba-secondary-1-0, + // success: $green, + // info: $cyan, + // warning: $yellow, + // danger: $red, + // light: $gray-100, + // dark: $gray-800 + ) + """ + ) + expect('dummy_app/public/sass/_fonts.scss').to have_content ( + """ + $font-primary: 'Ubuntu Mono'; + """ + ) + + expect('dummy_app/public/sass/_footer.scss').to have_content ( + """ + html { + position: relative; + min-height: 100%; + } - it 'installs bootstrap' do - 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 ( - """ - @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%); - - $theme-colors: ( - primary: $rgba-primary-0, - secondary: $rgba-secondary-1-0, - // success: $green, - // info: $cyan, - // warning: $yellow, - // danger: $red, - // light: $gray-100, - // dark: $gray-800 - ) - """ - ) - expect('dummy_app/public/sass/_fonts.scss').to have_content ( - """ - $font-primary: 'Ubuntu Mono'; - """ - ) - - expect('dummy_app/public/sass/_footer.scss').to have_content ( - """ - html { - position: relative; - min-height: 100%; - } - - body { - margin-bottom: $footer-height; - } - - .footer { - position: absolute; - bottom: 0; - width: 100%; - - text-align: center; - - background: map-get($theme-colors, primary); - color: white; - height: $footer-height; - - ul { - @extend .list-inline; + body { + margin-bottom: $footer-height; } - a { + .footer { + position: absolute; + bottom: 0; + width: 100%; + + text-align: center; + + background: map-get($theme-colors, primary); color: white; + height: $footer-height; + + ul { + @extend .list-inline; + } + + a { + color: white; + } } - } - """ - ) - - expect('dummy_app/public/sass/_nav.scss').to have_content ( - """ - .navbar-default { - .navbar-nav { - li { - a { - color: $brand-primary; + """ + ) + + expect('dummy_app/public/sass/_nav.scss').to have_content ( + """ + .navbar-default { + .navbar-nav { + li { + a { + color: $brand-primary; + } } } } - } - """ - ) - - expect('dummy_app/public/sass/_github-corner.scss').to have_content ( - """ - .octo-background { - fill: $brand-primary; - } - - .octo-arm, .octo-body { - fill: white; - } - - .github-corner:hover .octo-arm { - animation: octocat-wave 560ms ease-in-out - } - - @keyframes octocat-wave { - 0%, 100% { - transform: rotate(0) - } + """ + ) - 20%, 60% { - transform: rotate(-25deg) + expect('dummy_app/public/sass/_github-corner.scss').to have_content ( + """ + .octo-background { + fill: $brand-primary; } - 40%, 80% { - transform: rotate(10deg) + .octo-arm, .octo-body { + fill: white; } - } - @media (max-width: 500px) { .github-corner:hover .octo-arm { - animation: none + animation: octocat-wave 560ms ease-in-out } - .github-corner .octo-arm { - animation: octocat-wave 560ms ease-in-out + @keyframes octocat-wave { + 0%, 100% { + transform: rotate(0) + } + + 20%, 60% { + transform: rotate(-25deg) + } + + 40%, 80% { + transform: rotate(10deg) + } } - } - .github-corner { - svg { - position: absolute; - top: $navbar-height; - right: 0; + @media (max-width: 500px) { + .github-corner:hover .octo-arm { + animation: none + } + + .github-corner .octo-arm { + animation: octocat-wave 560ms ease-in-out + } } - } - """ - ) - end - it 'sets up sass' do - subject.generate 'dummy-app' + .github-corner { + svg { + position: absolute; + top: $navbar-height; + right: 0; + } + } + """ + ) + end + + it 'sets up sass' do + subject.generate 'dummy-app' - expect('dummy_app/public/sass/styles.scss').to have_content ( - """ - @import 'variables'; - @import 'colours'; - @import 'fonts'; + expect('dummy_app/public/sass/styles.scss').to have_content ( + """ + @import 'variables'; + @import 'colours'; + @import 'fonts'; - @import '../../_sass/bootstrap'; + @import '../../_sass/bootstrap'; - @import 'footer'; - //@import 'github-corner'; + @import 'footer'; + //@import 'github-corner'; - h1 { - color: map-get($theme-colors, primary); - font-family: $font-primary; - } - """ - ) + h1 { + color: map-get($theme-colors, primary); + font-family: $font-primary; + } + """ + ) + end end end end diff --git a/spec/sinatra/cli_spec.rb b/spec/sinatra/cli_spec.rb index 34b7a75..663e50a 100644 --- a/spec/sinatra/cli_spec.rb +++ b/spec/sinatra/cli_spec.rb @@ -1,15 +1,16 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - it 'has a version' do - expect { subject.version }.to output(/^skellington version #{VERSION}$/).to_stdout - end + it 'has a version' do + expect { subject.version }.to output(/^skellington version #{VERSION}$/).to_stdout + end - it 'generates correct output' do - expect { subject.generate 'dummy-app' }.to output(/ + it 'generates correct output' do + 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\) @@ -38,20 +39,21 @@ module Skellington skellington postinstall /).to_stdout - end + end - it 'suppresses the LICENSE help when supplied with a licensor' do - subject.options = {licensor: 'Beyoncé'} - expect { subject.generate 'dummy-app' }.to_not output(/ + it 'suppresses the LICENSE help when supplied with a licensor' do + subject.options = {licensor: 'Beyoncé'} + expect { subject.generate 'dummy-app' }.to_not output(/ You should also fill in your name in LICENSE.md /).to_stdout - end + end - it 'gives helpful post-generate advice' do - expect { subject.postinstall }.to output(/For some other things you might find useful, see this gist: + it 'gives helpful post-generate advice' do + expect { subject.postinstall }.to output(/For some other things you might find useful, see this gist: https:\/\/gist.github.com\/pikesley\/1789cab7b10f0d8765d4 /).to_stdout + end end end end diff --git a/spec/sinatra/git_spec.rb b/spec/sinatra/git_spec.rb index 60235d0..bf67394 100644 --- a/spec/sinatra/git_spec.rb +++ b/spec/sinatra/git_spec.rb @@ -1,19 +1,21 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - it 'initialises a git repo' do - subject.generate 'dummy-app' - expect(Dir).to exist 'dummy_app/.git' + it 'initialises a git repo' do + subject.generate 'dummy-app' + expect(Dir).to exist 'dummy_app/.git' - expect('dummy_app/.gitignore').to have_content ( - """ - coverage/ - .sass-cache - """ - ) + expect('dummy_app/.gitignore').to have_content ( + """ + coverage/ + .sass-cache + """ + ) + end end end end diff --git a/spec/sinatra/javascript/javascript_spec.rb b/spec/sinatra/javascript/javascript_spec.rb index 592b334..8d652e8 100644 --- a/spec/sinatra/javascript/javascript_spec.rb +++ b/spec/sinatra/javascript/javascript_spec.rb @@ -1,51 +1,53 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - it 'generates javascript files' do - expect{ subject.generate 'dummy-app'}.to produce_file 'dummy_app/spec/javascripts/support/jasmine_helper.rb' + it 'generates javascript files' do + 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 ( - """ - src_files: - - public/js/**/*.js - stylesheets: - - stylesheets/**/*.css - helpers: - - helpers/**/*.js - spec_files: - - '**/*[sS]pec.js' - src_dir: - spec_dir: - spec_helper: spec/javascripts/support/jasmine_helper.rb - boot_dir: - boot_files: - server: 'puma' - random: true - """ - ) + expect('dummy_app/spec/javascripts/support/jasmine.yml').to have_content ( + """ + src_files: + - public/js/**/*.js + stylesheets: + - stylesheets/**/*.css + helpers: + - helpers/**/*.js + spec_files: + - '**/*[sS]pec.js' + src_dir: + spec_dir: + spec_helper: spec/javascripts/support/jasmine_helper.rb + boot_dir: + boot_files: + server: 'puma' + random: true + """ + ) - expect('dummy_app/spec/javascripts/support/jasmine_helper.rb').to have_content ( - """ - Jasmine.configure do |config| - config.prevent_phantom_js_auto_install = true - end - """ - ) + expect('dummy_app/spec/javascripts/support/jasmine_helper.rb').to have_content ( + """ + Jasmine.configure do |config| + config.prevent_phantom_js_auto_install = true + end + """ + ) - expect('dummy_app/spec/javascripts/dummy_app_spec.js').to have_content ( - """ - describe('DummyApp', function() { - it('knows the truth', function() { - expect(true).toEqual(true) + expect('dummy_app/spec/javascripts/dummy_app_spec.js').to have_content ( + """ + describe('DummyApp', function() { + it('knows the truth', function() { + expect(true).toEqual(true) + }) }) - }) - """ - ) + """ + ) - expect(File).to exist 'dummy_app/public/js/dummy_app.js' + expect(File).to exist 'dummy_app/public/js/dummy_app.js' + end end end end diff --git a/spec/sinatra/layout/includes_spec.rb b/spec/sinatra/layout/includes_spec.rb index 1590492..f64efdf 100644 --- a/spec/sinatra/layout/includes_spec.rb +++ b/spec/sinatra/layout/includes_spec.rb @@ -1,87 +1,89 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - it 'includes some third-party javascript libs' do - subject.generate 'dummy-app' + it 'includes some third-party javascript libs' do + subject.generate 'dummy-app' - expect('dummy_app/views/includes/js-libs.erb').to have_content ( - """ - <% - libs = { - jquery: { - url: '//code.jquery.com/jquery-3.2.1.slim.min.js', - hash: 'sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN' - }, - popper: { - url: '//cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js', - hash: 'sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q' - }, - bootstrap: { - url: '//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js', - hash: 'sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl' - }, - fontawesome: { - url: '//use.fontawesome.com/releases/v5.0.4/js/all.js', - hash: '' + expect('dummy_app/views/includes/js-libs.erb').to have_content ( + """ + <% + libs = { + jquery: { + url: '//code.jquery.com/jquery-3.2.1.slim.min.js', + hash: 'sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN' + }, + popper: { + url: '//cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js', + hash: 'sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q' + }, + bootstrap: { + url: '//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js', + hash: 'sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl' + }, + fontawesome: { + url: '//use.fontawesome.com/releases/v5.0.4/js/all.js', + hash: '' + } } - } - libs.each do |lib| %> - - - <% end %> - """ - ) - end + libs.each do |lib| %> + + + <% end %> + """ + ) + end - it 'includes some third-party css' do - subject.generate 'dummy-app' + it 'includes some third-party css' do + subject.generate 'dummy-app' - expect('dummy_app/views/includes/css-libs.erb').to have_content ( - """ - <% - libs = { - }.each_pair do |name, url| %> - - - <% end %> - """ - ) - end + expect('dummy_app/views/includes/css-libs.erb').to have_content ( + """ + <% + libs = { + }.each_pair do |name, url| %> + + + <% end %> + """ + ) + end - it 'includes some fonts' do - subject.generate 'dummy-app' + it 'includes some fonts' do + subject.generate 'dummy-app' - expect('dummy_app/views/includes/fonts-libs.erb').to have_content ( - """ - <% - libs = { - fontawesome: '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', - ubuntu: '//fonts.googleapis.com/css?family=Ubuntu+Mono' - }.each_pair do |name, url| %> - - - <% end %> - """ - ) - end + expect('dummy_app/views/includes/fonts-libs.erb').to have_content ( + """ + <% + libs = { + fontawesome: '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', + ubuntu: '//fonts.googleapis.com/css?family=Ubuntu+Mono' + }.each_pair do |name, url| %> + + + <% end %> + """ + ) + end - it 'handles some cruft required by IE' do - subject.generate 'dummy-app' + it 'handles some cruft required by IE' do + subject.generate 'dummy-app' - expect('dummy_app/views/includes/ie-cruft.erb').to have_content ( - """ - - - - """ - ) + expect('dummy_app/views/includes/ie-cruft.erb').to have_content ( + """ + + + + """ + ) + end end end end diff --git a/spec/sinatra/layout/layout_spec.rb b/spec/sinatra/layout/layout_spec.rb index ecd1946..a2ca341 100644 --- a/spec/sinatra/layout/layout_spec.rb +++ b/spec/sinatra/layout/layout_spec.rb @@ -1,108 +1,110 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - context 'layout' do - it 'creates a header' do - subject.generate 'dummy-app' + context 'layout' do + it 'creates a header' do + subject.generate 'dummy-app' - expect('dummy_app/views/includes/header.erb').to have_content ( - """ - - - - + expect('dummy_app/views/includes/header.erb').to have_content ( + """ + + + + - <%= erb :'includes/ie-cruft' %> - <%= erb :'includes/js-libs' %> - <%= erb :'includes/css-libs' %> - <%= erb :'includes/fonts-libs' %> + <%= erb :'includes/ie-cruft' %> + <%= erb :'includes/js-libs' %> + <%= erb :'includes/css-libs' %> + <%= erb :'includes/fonts-libs' %> - - - - - <%= @title %> - - - """ - ) - end + + + + + <%= @title %> + + + """ + ) + end - it 'creates a footer' do - subject.generate 'dummy-app' + it 'creates a footer' do + subject.generate 'dummy-app' - expect('dummy_app/views/includes/footer.erb').to have_content ( - """ -
- Generated with - - Skellington - -
- """ - ) - end + expect('dummy_app/views/includes/footer.erb').to have_content ( + """ +
+ Generated with + + Skellington + +
+ """ + ) + end - it 'creates a github corner' do - subject.generate 'dummy-app' + it 'creates a github corner' do + subject.generate 'dummy-app' - expect('dummy_app/views/includes/github-corner.erb').to have_content ( - """ - - - - - - - - - - """ - ) - end + expect('dummy_app/views/includes/github-corner.erb').to have_content ( + """ + + + + + + + + + + """ + ) + end - it 'creates a nav' do - subject.generate 'dummy-app' + it 'creates a nav' do + subject.generate 'dummy-app' - expect('dummy_app/views/includes/nav.erb').to have_content ( - """ - - """ - ) - end + expect('dummy_app/views/includes/nav.erb').to have_content ( + """ + + """ + ) + end - it 'creates a layout' do - subject.generate 'dummy-app' + it 'creates a layout' do + subject.generate 'dummy-app' - expect('dummy_app/views/layout.erb').to have_content ( - """ - - - <%= erb :'includes/header' %> - - <%= erb :'includes/github-corner' if @github_url %> - <%= erb :'includes/nav' %> -
- <%= yield %> -
- <%= erb :'includes/footer' %> - - - """ - ) + expect('dummy_app/views/layout.erb').to have_content ( + """ + + + <%= erb :'includes/header' %> + + <%= erb :'includes/github-corner' if @github_url %> + <%= erb :'includes/nav' %> +
+ <%= yield %> +
+ <%= erb :'includes/footer' %> + + + """ + ) + end end end end diff --git a/spec/sinatra/layout/views_spec.rb b/spec/sinatra/layout/views_spec.rb index 4fe03ff..3078b7c 100644 --- a/spec/sinatra/layout/views_spec.rb +++ b/spec/sinatra/layout/views_spec.rb @@ -1,31 +1,33 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - it 'generates a view' do - subject.generate 'dummy-app' + it 'generates a view' do + subject.generate 'dummy-app' - expect('dummy_app/views/index.erb').to have_content ( - """ - <%= @content %> - """ - ) - end + expect('dummy_app/views/index.erb').to have_content ( + """ + <%= @content %> + """ + ) + end - it 'has a 404 page' do - subject.generate 'dummy-app' + it 'has a 404 page' do + subject.generate 'dummy-app' - expect('dummy_app/views/oops.erb').to have_content ( - """ -

404

+ expect('dummy_app/views/oops.erb').to have_content ( + """ +

404

-

Nothing to see here

+

Nothing to see here

- Home - """ - ) + Home + """ + ) + end end end end diff --git a/spec/sinatra/root_files/code-of-conduct_spec.rb b/spec/sinatra/root_files/code-of-conduct_spec.rb index e45834e..9c22234 100644 --- a/spec/sinatra/root_files/code-of-conduct_spec.rb +++ b/spec/sinatra/root_files/code-of-conduct_spec.rb @@ -1,21 +1,23 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - it 'generates a Code of Conduct' do - subject.generate 'dummy-app' - expect('dummy_app/CODE_OF_CONDUCT.md').to have_content ( - """ - # Contributor Code of Conduct + it 'generates a Code of Conduct' do + subject.generate 'dummy-app' + expect('dummy_app/CODE_OF_CONDUCT.md').to have_content ( + """ + # Contributor Code of Conduct - As contributors and maintainers of this project, and in the interest of - fostering an open and welcoming community, we pledge to respect all people who - contribute through reporting issues, posting feature requests, updating - documentation, submitting pull requests or patches, and other activities. - """ - ) + As contributors and maintainers of this project, and in the interest of + fostering an open and welcoming community, we pledge to respect all people who + contribute through reporting issues, posting feature requests, updating + documentation, submitting pull requests or patches, and other activities. + """ + ) + end end end end diff --git a/spec/sinatra/root_files/config_ru_spec.rb b/spec/sinatra/root_files/config_ru_spec.rb index f7e7537..9cd5beb 100644 --- a/spec/sinatra/root_files/config_ru_spec.rb +++ b/spec/sinatra/root_files/config_ru_spec.rb @@ -1,18 +1,20 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - it 'generates a config.ru file' do - subject.generate 'dummy-app' - expect('dummy_app/config.ru').to have_content ( - """ - require File.join(File.dirname(__FILE__), 'lib/dummy_app.rb') + it 'generates a config.ru file' do + subject.generate 'dummy-app' + expect('dummy_app/config.ru').to have_content ( + """ + require File.join(File.dirname(__FILE__), 'lib/dummy_app.rb') - run DummyApp::App - """ - ) + run DummyApp::App + """ + ) + end end end end diff --git a/spec/sinatra/root_files/guardfile_spec.rb b/spec/sinatra/root_files/guardfile_spec.rb index 84c52d8..567011d 100644 --- a/spec/sinatra/root_files/guardfile_spec.rb +++ b/spec/sinatra/root_files/guardfile_spec.rb @@ -1,34 +1,36 @@ module Skellington describe CLI do - let :subject do - described_class.new - end - - it 'generates a Guardfile' do - subject.generate 'dummy-app' - expect('dummy_app/Guardfile').to have_content ( - """ - guard :jasmine do - /watch/ - /watch/ - /watch/ - /watch/ + context 'sinatra' do + let :subject do + described_class.new end - guard :rspec, cmd: 'bundle exec rspec' do - require 'guard/rspec/dsl' - dsl = Guard::RSpec::Dsl.new(self) + it 'generates a Guardfile' do + subject.generate 'dummy-app' + expect('dummy_app/Guardfile').to have_content ( + """ + guard :jasmine do + /watch/ + /watch/ + /watch/ + /watch/ + end + + guard :rspec, cmd: 'bundle exec rspec' do + require 'guard/rspec/dsl' + dsl = Guard::RSpec::Dsl.new(self) - rspec = dsl.rspec - watch(rspec.spec_helper) { rspec.spec_dir } - watch(rspec.spec_support) { rspec.spec_dir } - watch(rspec.spec_files) + rspec = dsl.rspec + watch(rspec.spec_helper) { rspec.spec_dir } + watch(rspec.spec_support) { rspec.spec_dir } + watch(rspec.spec_files) - ruby = dsl.ruby - dsl.watch_spec_files_for(ruby.lib_files) + ruby = dsl.ruby + dsl.watch_spec_files_for(ruby.lib_files) + end + """ + ) end - """ - ) end end end diff --git a/spec/sinatra/root_files/license_spec.rb b/spec/sinatra/root_files/license_spec.rb index 3163526..b94d726 100644 --- a/spec/sinatra/root_files/license_spec.rb +++ b/spec/sinatra/root_files/license_spec.rb @@ -1,73 +1,75 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - context 'generate a LICENSE' do - it 'plain license' do - Timecop.freeze Time.local 2016, 01, 19 - subject.generate 'dummy-app' - expect('dummy_app/LICENSE.md').to have_content ( - """ - ##Copyright (c) 2016 YOUR-NAME-HERE + context 'generate a LICENSE' do + it 'plain license' do + Timecop.freeze Time.local 2016, 01, 19 + subject.generate 'dummy-app' + expect('dummy_app/LICENSE.md').to have_content ( + """ + ##Copyright (c) 2016 YOUR-NAME-HERE - #MIT License + #MIT License - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - 'Software'), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + 'Software'), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - """ - ) - Timecop.return - end + THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + """ + ) + Timecop.return + end - it 'with a provided name' do - Timecop.freeze Time.local 2016, 01, 19 - subject.options = {licensor: 'Beyoncé'} - subject.generate 'dummy-app' - expect('dummy_app/LICENSE.md').to have_content ( - """ - ##Copyright (c) 2016 Beyoncé + it 'with a provided name' do + Timecop.freeze Time.local 2016, 01, 19 + subject.options = {licensor: 'Beyoncé'} + subject.generate 'dummy-app' + expect('dummy_app/LICENSE.md').to have_content ( + """ + ##Copyright (c) 2016 Beyoncé - #MIT License + #MIT License - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - 'Software'), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + 'Software'), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - """ - ) - Timecop.return + THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + """ + ) + Timecop.return + end end end end diff --git a/spec/sinatra/root_files/procfile_spec.rb b/spec/sinatra/root_files/procfile_spec.rb index d61fca8..03e5946 100644 --- a/spec/sinatra/root_files/procfile_spec.rb +++ b/spec/sinatra/root_files/procfile_spec.rb @@ -1,16 +1,18 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - it 'generates a Procfile' do - subject.generate 'dummy-app' - expect('dummy_app/Procfile').to have_content ( - """ - web: bundle exec rackup -p $PORT - """ - ) + it 'generates a Procfile' do + subject.generate 'dummy-app' + expect('dummy_app/Procfile').to have_content ( + """ + web: bundle exec rackup -p $PORT + """ + ) + end end end end diff --git a/spec/sinatra/root_files/rakefile_spec.rb b/spec/sinatra/root_files/rakefile_spec.rb index 7f4221a..b9d9741 100644 --- a/spec/sinatra/root_files/rakefile_spec.rb +++ b/spec/sinatra/root_files/rakefile_spec.rb @@ -1,41 +1,43 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - it 'generates a Rakefile' do - subject.generate 'dummy-app' - expect('dummy_app/Rakefile').to have_content ( - """ - require File.join(File.dirname(__FILE__), 'lib/dummy_app.rb') + it 'generates a Rakefile' do + subject.generate 'dummy-app' + expect('dummy_app/Rakefile').to have_content ( + """ + require File.join(File.dirname(__FILE__), 'lib/dummy_app.rb') - unless ENV['RACK_ENV'] == 'production' - require 'rspec/core/rake_task' - require 'coveralls/rake/task' - require 'jasmine' - load 'jasmine/tasks/jasmine.rake' + unless ENV['RACK_ENV'] == 'production' + require 'rspec/core/rake_task' + require 'coveralls/rake/task' + require 'jasmine' + load 'jasmine/tasks/jasmine.rake' - RSpec::Core::RakeTask.new - Coveralls::RakeTask.new + RSpec::Core::RakeTask.new + Coveralls::RakeTask.new - task :default => [:spec, 'jasmine:ci', 'coveralls:push'] - end - - namespace :run do - desc 'start app' - task :app do - sh 'rackup -o 0.0.0.0' + task :default => [:spec, 'jasmine:ci', 'coveralls:push'] end - desc 'watch and compile sass' - task :sass do - sh 'sass --update --force public/sass:public/css' - sh 'sass --watch public/sass:public/css' + namespace :run do + desc 'start app' + task :app do + sh 'rackup -o 0.0.0.0' + end + + desc 'watch and compile sass' + task :sass do + sh 'sass --update --force public/sass:public/css' + sh 'sass --watch public/sass:public/css' + end end + """ + ) end - """ - ) end end end diff --git a/spec/sinatra/root_files/rbenv_spec.rb b/spec/sinatra/root_files/rbenv_spec.rb index 017a017..cf71549 100644 --- a/spec/sinatra/root_files/rbenv_spec.rb +++ b/spec/sinatra/root_files/rbenv_spec.rb @@ -1,16 +1,18 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - it 'generates a .ruby-version' do - 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]*/ - """ - ) + it 'generates a .ruby-version' do + 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]*/ + """ + ) + end end end end diff --git a/spec/sinatra/root_files/readme_spec.rb b/spec/sinatra/root_files/readme_spec.rb index a4bbacc..8901c6a 100644 --- a/spec/sinatra/root_files/readme_spec.rb +++ b/spec/sinatra/root_files/readme_spec.rb @@ -1,16 +1,18 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - it 'generates a README' do - subject.generate 'dummy-app' - expect('dummy_app/README.md').to have_content ( - """ - # DummyApp - """ - ) + it 'generates a README' do + subject.generate 'dummy-app' + expect('dummy_app/README.md').to have_content ( + """ + # DummyApp + """ + ) + end end end end diff --git a/spec/sinatra/spec/spec_spec.rb b/spec/sinatra/spec/spec_spec.rb index cc8b8bc..bcfc3c1 100644 --- a/spec/sinatra/spec/spec_spec.rb +++ b/spec/sinatra/spec/spec_spec.rb @@ -1,93 +1,95 @@ module Skellington describe CLI do - let :subject do - described_class.new - end + context 'sinatra' do + let :subject do + described_class.new + end - it 'generates rspec files' do - subject.generate 'dummy-app' - expect('dummy_app/spec/spec_helper.rb').to have_content ( - """ - require 'coveralls' - Coveralls.wear_merged! + it 'generates rspec files' do + subject.generate 'dummy-app' + expect('dummy_app/spec/spec_helper.rb').to have_content ( + """ + require 'coveralls' + Coveralls.wear_merged! - require 'rack/test' - require 'dummy_app' + require 'rack/test' + require 'dummy_app' - RSpec.configure do |config| - config.expect_with :rspec do |expectations| - expectations.include_chain_clauses_in_custom_matcher_descriptions = true - end + RSpec.configure do |config| + config.expect_with :rspec do |expectations| + expectations.include_chain_clauses_in_custom_matcher_descriptions = true + end - config.mock_with :rspec do |mocks| - mocks.verify_partial_doubles = true - end + config.mock_with :rspec do |mocks| + mocks.verify_partial_doubles = true + end - config.order = :random + config.order = :random - include Rack::Test::Methods - def app - DummyApp::App + include Rack::Test::Methods + def app + DummyApp::App + end end - end - """ - ) + """ + ) - expect('dummy_app/spec/dummy_app/dummy_app_spec.rb').to have_content ( - """ - module DummyApp - JSON_HEADERS = { 'HTTP_ACCEPT' => 'application/json' } + expect('dummy_app/spec/dummy_app/dummy_app_spec.rb').to have_content ( + """ + module DummyApp + JSON_HEADERS = { 'HTTP_ACCEPT' => 'application/json' } - describe App do - it 'says hello' do - get '/' - expect(last_response).to be_ok - expect(last_response.body).to match /Hello from DummyApp/ - end + describe App do + it 'says hello' do + get '/' + expect(last_response).to be_ok + expect(last_response.body).to match /Hello from DummyApp/ + end - it 'serves JSON' do - get '/', nil, JSON_HEADERS - expect(last_response).to be_ok - expect(JSON.parse last_response.body).to eq ( - { - 'app' => 'DummyApp' - } - ) + it 'serves JSON' do + get '/', nil, JSON_HEADERS + expect(last_response).to be_ok + expect(JSON.parse last_response.body).to eq ( + { + 'app' => 'DummyApp' + } + ) + end end end - end - """ - ) + """ + ) - expect('dummy_app/spec/dummy_app/helpers_spec.rb').to have_content ( - """ - class TestHelper - include DummyApp::Helpers - end + expect('dummy_app/spec/dummy_app/helpers_spec.rb').to have_content ( + """ + class TestHelper + include DummyApp::Helpers + end - module DummyApp - describe Helpers do - let(:helpers) { TestHelper.new } + module DummyApp + describe Helpers do + let(:helpers) { TestHelper.new } - it 'says hello' do - expect(helpers.hello).to eq 'Hello' - end + it 'says hello' do + expect(helpers.hello).to eq 'Hello' + end - it 'has a config' do - expect(CONFIG).to be_a Hash + it 'has a config' do + expect(CONFIG).to be_a Hash + end end end - end - """ - ) + """ + ) - expect('dummy_app/.rspec').to have_content ( - """ - --color - --require spec_helper - --format documentation - """ - ) + expect('dummy_app/.rspec').to have_content ( + """ + --color + --require spec_helper + --format documentation + """ + ) + end end end end