skellington 0.8.9 → 0.9.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 50b127a00258af2f899764047c927e6f81f878e8
-  data.tar.gz: 827930856592777a9edc3329bc577dd17251b3e8
+SHA256:
+  metadata.gz: b93cba8c6741eb8256132fda075be09b20636f7ff8c7e30c70a9d1e139e2e981
+  data.tar.gz: f43be91e030d031caadb5b3543e5a937580e87a8381799cf006ca5a981eb0c7e
 SHA512:
-  metadata.gz: 75597f17117a80f7519b2ff167aff6fa34aa793c53e97fb67bfa54c40bf7833a9b2e70efc974d266e2589268adb703c60a7f835603d44270f2896b76f33d8811
-  data.tar.gz: e55fd9cebdad14a5c8e98d74b1ecbd17f9212e464cac506d330535d96f035d254c96031e95e09ee8ca2b243eee6c8a32e826edfad0c9f2f710f5ff24d90e89ef
+  metadata.gz: 3be4edae0dcfadab80e5fffcc018d93697b3e9df23776cbfcff2bf9f7023ac59773c154ce2af4f0013a02f6affc8ea198a022c9d00d7588420bd59bc3c5ed228
+  data.tar.gz: 390e53231a4722844e2c2e4aa2ac71d253cd8f44244458c12881bd55bc026303b764ff9b4309aa0eb74d6e904cc049c6723b82d5f85c8a4b5ab7d899fb1521c0

data/.ruby-version

@@ -0,0 +1 @@
+2.5.0

data/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
 

data/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']

data/config/config.yaml

@@ -15,7 +15,7 @@ sinatra:
       rack-tracker:
       rake:
       compass:
-      bootstrap-sass:
+      bootstrap:
       erubis:
       puma:
     test:
@@ -41,7 +41,6 @@ sinatra:
     Procfile:
     .rspec:
     config.ru:
-    config.rb:
     config/config.yml:
     # the template has this name
     lib/app.rb:
@@ -98,12 +97,10 @@ sinatra:
     public/sass/_colours.scss:
       common: sass/colours
     public/sass/styles.scss:
-      common: sass/styles
 
 jekyll:
   gems:
     github-pages:
-  #  bootstrap: '4.0.0.alpha4'
     rake:
 
   files:
@@ -118,16 +115,15 @@ 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:
-      common: sass/styles
     _sass/variables.scss:
       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:
@@ -139,3 +135,21 @@ jekyll:
     js/app.js:
       outpath: app/wormname
       common: js/app.js
+
+bootstrap:
+  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

data/lib/skellington/cli.rb

@@ -11,10 +11,6 @@ module Skellington
                   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'

data/lib/skellington/generator.rb

@@ -6,13 +6,11 @@ module Skellington
                 :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)
@@ -46,18 +44,11 @@ module Skellington
     end
 
     def strap_boots
-      if @framework == 'jekyll'
-        if @bootstrap == '4'
-          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

data/lib/skellington/helpers.rb

@@ -7,4 +7,21 @@ module Skellington
     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

data/lib/skellington/version.rb

@@ -1,3 +1,3 @@
 module Skellington
-  VERSION = '0.8.9'
+  VERSION = '0.9.0-rc1'
 end

data/lib/skellington.rb

@@ -3,7 +3,7 @@ require 'yaml'
 require 'fileutils'
 require 'erubis'
 require 'git'
-require 'bootstrap-sass'
+require 'bootstrap'
 
 require 'skellington/version'
 require 'skellington/generator'

data/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 %>'

data/lib/templates/common/includes/footer

@@ -1,4 +1,4 @@
-<div class='footer'>
+<div class='footer p-2'>
   Generated with
   <a href='http://sam.pikesley.org/projects/skellington/' alt='Skellington' title='Skellington'>
     Skellington

data/lib/templates/common/includes/header

@@ -12,21 +12,7 @@
 <% when 'jekyll' %>
   {% include ie-cruft.html %}
 
-  {% for lib in site.data.libs.js %}
-  <!-- {{ lib.name }} -->
-  <script src='{{ lib.url }}'></script>
-  {% endfor %}
-
-  {% for lib in site.data.libs.css %}
-  <!-- {{ lib.name }} -->
-  <link rel='stylesheet' href='{{ lib.url }}'>
-  {% endfor %}
-
-  {% for font in site.data.libs.fonts %}
-  <!-- {{ font.name }} -->
-  <link rel='stylesheet' href='{{ font.url }}'>
-  {% endfor %}
-<% end %>
+  {% include libs.html %}<% end %>
 <% prefix = '{{ site.baseurl }}' if @gen.framework == 'jekyll' %>
 
   <link rel='icon' type='image/png' href='<%= prefix %>/assets/favicon.ico' />

data/lib/templates/common/includes/libs

@@ -0,0 +1,14 @@
+{% for lib in site.data.libs.js %}
+<!-- {{ lib.name }} -->
+<script src='{{ lib.url }}' integrity='{{ lib.hash }}' crossorigin='anonymous'></script>
+{% endfor %}
+
+{% for lib in site.data.libs.css %}
+<!-- {{ lib.name }} -->
+<link rel='stylesheet' href='{{ lib.url }}'>
+{% endfor %}
+
+{% for font in site.data.libs.fonts %}
+<!-- {{ font.name }} -->
+<link rel='stylesheet' href='{{ font.url }}'>
+{% endfor %}

data/lib/templates/common/includes/nav

@@ -1,27 +1,14 @@
 <% if @gen.framework == 'jekyll' %>
   <% prefix = '{{ site.baseurl }}' %>
 <% end %>
-<nav class='navbar navbar-default navbar-static-top'>
-  <div class='container-fluid'>
-    <div class='navbar-header'>
-      <button type='button'
-              class='navbar-toggle collapsed'
-              data-toggle='collapse'
-              data-target='#navbar'
-              aria-expanded='false'
-              aria-controls='navbar'>
-        <span class='sr-only'>Toggle navigation</span>
-        <span class='icon-bar'></span>
-        <span class='icon-bar'></span>
-        <span class='icon-bar'></span>
-      </button>
-      <a class='navbar-brand' href='<%= prefix %>/'>Home</a>
-    </div>
-    <div id='navbar' class='navbar-collapse collapse'>
-      <ul class='nav navbar-nav'>
-        <li><a href='<%= prefix %>/foo/'>Foo</a></li>
-        <li><a href='<%= prefix %>/bar/'>Bar</a></li>
-      </ul>
-    </div>
-  </div>
-</nav>
+<ul class='nav nav-pills nav-fill p-3'>
+  <li class='nav-item'>
+    <a class='nav-link active' href='<%= prefix %>/'>Home</a>
+  </li>
+  <li class='nav-item'>
+    <a class='nav-link' href='<%= prefix %>/foo/'>Foo</a>
+  </li>
+  <li class='nav-item'>
+    <a class='nav-link' href='<%= prefix %>/bar/'>Bar</a>
+  </li>
+</ul>

data/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
+)

data/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;
@@ -25,19 +14,15 @@ body {
 
   text-align: center;
 
-  margin-top: $padding-large-vertical;
-  background: $brand-primary;
+  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 %>

data/lib/templates/jekyll/_data/libs.yml

@@ -1,15 +1,10 @@
 js:
-  - name: jquery
-    url:  //ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js
-  - name: bootstrap
-    url:  //maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js
+<%= @gen.config['bootstrap']['js'].map { |js| Skellington.js_for_jekyll js }.join "\n" %>
 
 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

data/lib/templates/{common/sass/styles → jekyll/css/styles.scss}

@@ -1,5 +1,5 @@
-<% if @gen.framework == 'jekyll' %>---
----<% end %>
+---
+---
 @import 'variables';
 @import 'colours';
 @import 'fonts';
@@ -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;
 }

data/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
 

data/lib/templates/sinatra/Rakefile

@@ -18,8 +18,9 @@ namespace :run 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 --update --force public/sass:public/css'
+    sh 'sass --watch public/sass:public/css'
   end
 end

data/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
 

data/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;
+}

data/lib/templates/sinatra/views/includes/js-libs.erb

@@ -1,8 +1,9 @@
-<%%
+<%= "<%" %>
 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| %>
-  <!-- <%%= name %> -->
-  <script src='<%%= url %>'></script>
+<%= @gen.config['bootstrap']['js'].map { |js| Skellington.js_for_sinatra js }.join ",\n" %>
+}
+
+libs.each do |lib| %>
+  <!-- <%%= lib[0] %> -->
+  <script src='<%%= lib[1][:url] %>' integrity='<%%= lib[1][:hash] %>' crossorigin='anonymous'></script>
 <%% end %>

data/skellington.gemspec

@@ -20,15 +20,14 @@ 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 'bootstrap-sass'
-  spec.add_dependency 'bootstrap', '~> 4.0.0.alpha4'
+  spec.add_dependency 'git', '~> 1.3'
+  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

data/spec/hyphens_spec.rb

@@ -16,7 +16,7 @@ Your new Sinatra app HyphenatedName has been created
 
 Now do
 
-    cd hyphenated_name
+    cd \.\/hyphenated_name
     bundle
     bundle exec rake
 

data/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

data/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