skellington 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 886c478b322c50a0f3c3a8e29e1bc3ce56dd59e3
-  data.tar.gz: 705530bf4057bc67968e1606bd7cb13691e622f9
+  metadata.gz: 113e8c6cf5e0914cb28a30647331f69579609a97
+  data.tar.gz: ea3bd20b869960dd4f9e3362cb1087be2db29ddb
 SHA512:
-  metadata.gz: e012948ea968469cf6f322c3808258b6eca2d32ca1e494e7a499019315c02b4f89b3e78b0c7303850df41eea76bc1b58dfafe1a37f926578382436614fde33b1
-  data.tar.gz: 35ccdd189ca0ddeb9f06f11dc0ac1ca3248aeca35de1b8f8fe5dffec82ab3e4c81ed816d5de295ff90a86f26f7f004cfe1128335b743a16b73280893b3d79568
+  metadata.gz: 2c53c3d061340979780bf3e2d28177199ddca62a775915f41ebfc7d983625e85511af9838026574aeca842800b031d0b31a89af3146d6164daa5d201a817e10b
+  data.tar.gz: 02f17f219534be565b415fb9166b026423f64786ac8f9b5a8be1da9c98e691cee3f0fa8854e57f57b1732c10f39e1b3de004fae643effd3d5664d8e51966fcc2

data/README.md

@@ -18,12 +18,28 @@ Extremely opinionated generator for your [Sinatra](http://www.sinatrarb.com/)  a
   * An MIT License file
 
 * Jekyll
+  * [Jekyll](https://jekyllrb.com/)
   * [Bootstrap](http://getbootstrap.com/)
   * Reasonable default things
 
 Should work fine for both RVM- and rbenv-based setups
 
-    $ gem install skellington
+## Installation
+
+    git clone https://github.com/pikesley/skellington
+    cd skellington
+    bundle
+    rake
+    rake install
+
+or just
+
+    gem install skellington
+
+## Usage
+
+### Sinatra
+
     $ skellington generate naming-things-is-hard --licensor 'Beyoncé'
     Generating <lots of stuff>... done
 
@@ -52,20 +68,21 @@ Should work fine for both RVM- and rbenv-based setups
 
         skellington postinstall
 
-or
+### Jekyll
 
-    skellington generate jekyll-site --framework jekyll
+    $ gem install skellington
+    $ skellington generate hello-from-the-magic-tavern --framework jekyll
     Generating <lots of stuff>... done
 
-    Your new Jekyll site JekyllSite has been created
+    Your new Jekyll site HelloFromTheMagicTavern has been created
 
-    (Note that 'jekyll-site' has been changed to 'jekyll_site' because Ruby finds '-'s troubling)
+    (Note that 'hello-from-the-magic-tavern' has been changed to 'hello_from_the_magic_tavern' because Ruby finds '-'s troubling)
 
     Now do
 
-        cd jekyll_site
+        cd hello_from_the_magic_tavern
         bundle
-        bundle exec jekyll
+        bundle exec jekyll serve
 
     which will launch the site (at http://localhost:4000)
 
@@ -74,7 +91,26 @@ or
         git add .
         git commit -m 'First commit'
 
-This assumes a bunch of things, at least:
+    You should also fill in your name in LICENSE.md
+
+### Options
+
+* --framework
+  * Framework for which to generate
+  * Default: sinatra
+  * Possible values: sinatra, jekyll
+
+* --bootstrap
+  * Bootstrap major version to include
+  * Default: 3
+  * Possible values: 3, 4
+
+* --licensor
+  * Name to include in the license file
+
+---
+
+This all assumes a bunch of things, at least:
 
 * That you have a reasonable git installation
 

data/Rakefile

@@ -3,6 +3,36 @@ require 'rspec/core/rake_task'
 require 'coveralls/rake/task'
 
 Coveralls::RakeTask.new
-RSpec::Core::RakeTask.new
 
-task :default => [:spec, 'coveralls:push']
+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']

data/config/config.yaml

@@ -68,7 +68,7 @@ sinatra:
 jekyll:
   gems:
     github-pages:
-    bootstrap: '4.0.0.alpha4'
+  #  bootstrap: '4.0.0.alpha4'
     rake:
 
   files:

data/lib/jekyll/templates/post-run.eruby

@@ -9,7 +9,7 @@ Now do
 
     cd <%= @gen.wormname %>
     bundle
-    bundle exec jekyll
+    bundle exec jekyll serve
 
 which will launch the site (at http://localhost:4000)
 

data/lib/sinatra/templates/Gemfile.eruby

@@ -1,3 +1,7 @@
+<% if @gen.bootstrap == '4' %>
+  <% @gen.gems['production'].delete 'bootstrap-sass' %>
+  <% @gen.gems['production']['bootstrap'] = '4.0.0.alpha4' %>
+<% end %>
 source 'https://rubygems.org'
 
 ruby '<%= RUBY_VERSION %>'

data/lib/sinatra/templates/config.rb.eruby

@@ -1,4 +1,4 @@
-require 'bootstrap-sass'
+require 'bootstrap<%= '-sass' if @gen.bootstrap == '3' %>'
 
 css_dir = 'public/css'
 sass_dir = 'public/sass'

data/lib/sinatra/templates/public/sass/_footer.scss.eruby

@@ -7,6 +7,17 @@ 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;
@@ -23,3 +34,4 @@ body {
     color: white;
   }
 }
+<% end %>

data/lib/skellington.rb

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

data/lib/skellington/cli.rb

@@ -14,6 +14,10 @@ module Skellington
                     'sinatra',
                     'jekyll'
                   ]
+    method_option :bootstrap,
+                  default: '3',
+                  description: 'Bootstrap major version to use',
+                  enum: ['3', '4']
     method_option :licensor,
                   aliases: '-l',
                   description: 'Name to insert into the license file'

data/lib/skellington/generator.rb

@@ -1,10 +1,12 @@
 module Skellington
   class Generator
-    attr_reader :path, :filename, :camelname, :files, :gems, :framework
+    attr_reader :path, :filename, :camelname, :files, :gems, :framework, :bootstrap
     attr_accessor :licensor
 
     def initialize path, options = {}
-      @framework = options[:framework] ? options[:framework] : 'sinatra'
+    #  @framework = options[:framework] ? options[:framework] : 'sinatra'
+      @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)
@@ -24,6 +26,7 @@ module Skellington
       end
 
       generate
+      strap_boots
       git_init
       post_run
     end
@@ -33,8 +36,15 @@ module Skellington
         t = Template.new k, self
         t.write
       end
+    end
 
+    def strap_boots
       if @framework == 'jekyll'
+        if @bootstrap == '4'
+          Object.send(:remove_const, :Bootstrap)
+          require 'bootstrap'
+        end
+        
         root = "#{self.path}/#{self.wormname}"
 
         FileUtils.mkdir_p "#{root}/javascripts"

data/lib/skellington/version.rb

@@ -1,3 +1,3 @@
 module Skellington
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

data/skellington.gemspec

@@ -21,6 +21,7 @@ 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_development_dependency 'coveralls', '~> 0.7'

data/spec/jekyll/cli/assets_css_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'sets us sass' do
-      subject.options = { framework: 'jekyll' }
+      subject.options = { 'framework' => 'jekyll' }
       subject.generate 'dummy_app'
 
       expect('dummy_app/assets/application.scss').to have_content (

data/spec/jekyll/cli/bootstrap_4_spec.rb

@@ -0,0 +1,48 @@
+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/javascripts/bootstrap'
+      expect('dummy_app/javascripts/bootstrap.min.js').to have_content (
+      """
+      /*!
+       * Bootstrap v4.0.0-alpha.4 (http://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.4 (http://getbootstrap.com)
+       * Copyright 2011-2016 The Bootstrap Authors
+       * Copyright 2011-2016 Twitter, Inc.
+       * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+       */
+      """
+      )
+      expect('dummy_app/_sass/bootstrap-custom.scss').to have_content (
+      """
+      $brand-primary: #fa8100;
+      """
+      )
+      expect('dummy_app/_sass/fonts.scss').to have_content (
+      """
+      @import url(http://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css);
+      @import url(http://fonts.googleapis.com/css?family=Ubuntu+Mono);
+
+      $font-family-san-serif: 'Ubuntu Mono'
+      """
+      )
+    end
+  end
+end

data/spec/jekyll/cli/bootstrap_spec.rb

@@ -5,16 +5,16 @@ module Skellington
     end
 
     it 'installs bootstrap' do
-      subject.options = { framework: 'jekyll' }
+      subject.options = { 'framework' => 'jekyll' }
       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.4 (http://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)
+       * Bootstrap v3.3.7 (http://getbootstrap.com)
+       * Copyright 2011-2016 Twitter, Inc.
+       * Licensed under the MIT license
        */
       """
       )
@@ -23,8 +23,7 @@ module Skellington
       expect('dummy_app/_sass/bootstrap.scss').to have_content (
       """
       /*!
-       * Bootstrap v4.0.0-alpha.4 (http://getbootstrap.com)
-       * Copyright 2011-2016 The Bootstrap Authors
+       * Bootstrap v3.3.7 (http://getbootstrap.com)
        * Copyright 2011-2016 Twitter, Inc.
        * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
        */

data/spec/jekyll/cli/config_yml_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates a _config.yml file' do
-      subject.options = { framework: 'jekyll' }
+      subject.options = { 'framework' => 'jekyll' }
       subject.generate 'dummy_app'
       expect('dummy_app/_config.yml').to have_content (
       """

data/spec/jekyll/cli/gemfile_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates a Gemfile' do
-      subject.options = { framework: 'jekyll' }
+      subject.options = { 'framework' => 'jekyll' }
       subject.generate 'dummy_app'
       expect('dummy_app/Gemfile').to have_content (
       """
@@ -14,7 +14,6 @@ module Skellington
       /ruby '[0-9]*\\.[0-9]*\\.[0-9]*'/
 
       gem 'github-pages'
-      gem 'bootstrap', '~> 4.0.0.alpha4'
       gem 'rake'
       """
       )

data/spec/jekyll/cli/git_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'initialises a git repo' do
-      subject.options = { framework: 'jekyll' }
+      subject.options = { 'framework' => 'jekyll' }
       subject.generate 'dummy_app'
       expect(Dir).to exist 'dummy_app/.git'
 

data/spec/jekyll/cli/index_md.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'creates a default index page' do
-      subject.options = { framework: 'jekyll' }
+      subject.options = { 'framework' => 'jekyll' }
       subject.generate 'dummy_app'
       expect(Dir).to exist 'dummy_app/index.md'
 

data/spec/jekyll/cli/layout_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates a default layout' do
-      subject.options = { framework: 'jekyll' }
+      subject.options = { 'framework' => 'jekyll' }
       subject.generate 'dummy_app'
       expect('dummy_app/_layouts/default.html').to have_content (
       """

data/spec/jekyll/cli/license_spec.rb

@@ -7,7 +7,7 @@ module Skellington
     context 'generate a LICENSE' do
       it 'plain license' do
         Timecop.freeze Time.local 2016, 01, 19
-        subject.options = { framework: 'jekyll' }
+        subject.options = { 'framework' => 'jekyll' }
         subject.generate 'dummy_app'
         expect('dummy_app/LICENSE.md').to have_content (
         """

data/spec/jekyll/cli/rbenv_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates a .ruby-version' do
-      subject.options = { framework: 'jekyll' }
+      subject.options = { 'framework' => 'jekyll' }
       expect { subject.generate 'dummy_app' }.to produce_file 'dummy_app/.ruby-version'
       expect('dummy_app/.ruby-version').to have_content (
       """

data/spec/jekyll/cli_spec.rb

@@ -5,7 +5,7 @@ module Skellington
     end
 
     it 'generates correct output' do
-      subject.options = { framework: 'jekyll' }
+      subject.options = { 'framework' => 'jekyll' }
       expect { subject.generate 'dummy_app' }.to output(/
 Your new Jekyll site DummyApp has been created
 
@@ -13,7 +13,7 @@ Now do
 
     cd dummy_app
     bundle
-    bundle exec jekyll
+    bundle exec jekyll serve
 
 which will launch the site \(at http:\/\/localhost:4000\)
 

data/spec/sinatra/cli/config_rb_bootstrap_4_spec.rb

@@ -0,0 +1,20 @@
+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

data/spec/sinatra/cli/gemfile_bootstrap_4_spec.rb

@@ -0,0 +1,40 @@
+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.alpha4'
+
+      group :test do
+        gem 'rspec'
+        gem 'guard'
+        gem 'guard-rspec'
+        gem 'guard-jasmine'
+        gem 'capybara'
+        gem 'coveralls'
+        gem 'jasmine'
+        gem 'pry'
+        gem 'actionpack'
+      end
+      """
+      )
+    end
+  end
+end

data/spec/sinatra/cli/public_bootstrap_4_spec.rb

@@ -0,0 +1,35 @@
+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%;
+        height: $footer-height;
+        line-height: $footer-height;
+        text-align: center;
+        background: $brand-primary;
+      }
+      """
+      )
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skellington
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - pikesley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: bootstrap-sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -236,6 +250,7 @@ files:
 - skellington.gemspec
 - spec/hyphens_spec.rb
 - spec/jekyll/cli/assets_css_spec.rb
+- spec/jekyll/cli/bootstrap_4_spec.rb
 - spec/jekyll/cli/bootstrap_spec.rb
 - spec/jekyll/cli/config_yml_spec.rb
 - spec/jekyll/cli/gemfile_spec.rb
@@ -248,9 +263,11 @@ files:
 - spec/no-clobber_spec.rb
 - spec/non_local_path_spec.rb
 - spec/sinatra/cli/app_spec.rb
+- spec/sinatra/cli/config_rb_bootstrap_4_spec.rb
 - spec/sinatra/cli/config_rb_spec.rb
 - spec/sinatra/cli/config_ru_spec.rb
 - spec/sinatra/cli/config_yml_spec.rb
+- spec/sinatra/cli/gemfile_bootstrap_4_spec.rb
 - spec/sinatra/cli/gemfile_spec.rb
 - spec/sinatra/cli/git_spec.rb
 - spec/sinatra/cli/guardfile_spec.rb
@@ -260,6 +277,7 @@ files:
 - spec/sinatra/cli/layout_spec.rb
 - spec/sinatra/cli/license_spec.rb
 - spec/sinatra/cli/procfile_spec.rb
+- spec/sinatra/cli/public_bootstrap_4_spec.rb
 - spec/sinatra/cli/public_spec.rb
 - spec/sinatra/cli/racks_spec.rb
 - spec/sinatra/cli/rakefile_spec.rb
@@ -295,6 +313,7 @@ summary: Opinionated boilerplate skeleton generator for a Sinatra app
 test_files:
 - spec/hyphens_spec.rb
 - spec/jekyll/cli/assets_css_spec.rb
+- spec/jekyll/cli/bootstrap_4_spec.rb
 - spec/jekyll/cli/bootstrap_spec.rb
 - spec/jekyll/cli/config_yml_spec.rb
 - spec/jekyll/cli/gemfile_spec.rb
@@ -307,9 +326,11 @@ test_files:
 - spec/no-clobber_spec.rb
 - spec/non_local_path_spec.rb
 - spec/sinatra/cli/app_spec.rb
+- spec/sinatra/cli/config_rb_bootstrap_4_spec.rb
 - spec/sinatra/cli/config_rb_spec.rb
 - spec/sinatra/cli/config_ru_spec.rb
 - spec/sinatra/cli/config_yml_spec.rb
+- spec/sinatra/cli/gemfile_bootstrap_4_spec.rb
 - spec/sinatra/cli/gemfile_spec.rb
 - spec/sinatra/cli/git_spec.rb
 - spec/sinatra/cli/guardfile_spec.rb
@@ -319,6 +340,7 @@ test_files:
 - spec/sinatra/cli/layout_spec.rb
 - spec/sinatra/cli/license_spec.rb
 - spec/sinatra/cli/procfile_spec.rb
+- spec/sinatra/cli/public_bootstrap_4_spec.rb
 - spec/sinatra/cli/public_spec.rb
 - spec/sinatra/cli/racks_spec.rb
 - spec/sinatra/cli/rakefile_spec.rb