skellington 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b50b2eec1d522ee4eeab3f06d1c55ba7b079b528
-  data.tar.gz: 88f2d32e777704babeb7254bcaa746d350ae5723
+  metadata.gz: 8a7028bcf25ec372455d53550889c479e3f617cd
+  data.tar.gz: 3636e5fc091105437222fd201a3c74098a8570ef
 SHA512:
-  metadata.gz: 50570283354192b4468f7654a024ce046b6cd12de08689faf629e2ccea2830fd8de6e7bbb560f4a837ccc596adfc647d25a70bfbbc810b6fd8ce9a27d6f6b351
-  data.tar.gz: 5ce77b92c120b8248adb15e121ad0abc4d4542361fde18deaf4305cc4a93711a4335cce22d4d9ea874bc77186a7cfa82c7313f43d14348cdcfade4a0cfe4fb7e
+  metadata.gz: e82d7b50817d06e14f8407508ba45a5c44f5f73070f9c9620e0787d25fa056c78cfdc306592be9bdaec7373b66ed74d0022ace363465adcf3a40d7c3c81a8777
+  data.tar.gz: 4b521d0ae78e5f1472dab29f869ae7f5609f3bd9c16447b7ccc1340a7944f75fbac632157690dd324cf1e9b3439549123a6b8dc29ac76577655f850ec2ff59b0

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.2.3
+  - 2.2.5
   - 2.3.0

data/README.md

@@ -1,10 +1,10 @@
 [![Build Status](http://img.shields.io/travis/pikesley/skellington.svg?style=flat-square)](https://travis-ci.org/pikesley/skellington)
 [![Dependency Status](http://img.shields.io/gemnasium/pikesley/skellington.svg?style=flat-square)](https://gemnasium.com/pikesley/skellington)
+[![Dependency CI](http://dependencyci.com/github/pikesley/skellington/badge?style=flat-square)](http://dependencyci.com/github/pikesley/skellington)
 [![Coverage Status](http://img.shields.io/coveralls/pikesley/skellington.svg?style=flat-square)](https://coveralls.io/r/pikesley/skellington)
 [![Code Climate](http://img.shields.io/codeclimate/github/pikesley/skellington.svg?style=flat-square)](https://codeclimate.com/github/pikesley/skellington)
 [![Gem Version](http://img.shields.io/gem/v/skellington.svg?style=flat-square)](https://rubygems.org/gems/skellington)
 [![License](http://img.shields.io/:license-mit-blue.svg?style=flat-square)](http://pikesley.mit-license.org)
-[![Badges](http://img.shields.io/:badges-7/7-ff6799.svg?style=flat-square)](https://github.com/badges/badgerbadgerbadger)
 
 # Skellington
 

data/config/config.yaml

@@ -2,11 +2,12 @@ gems:
   production:
     sinatra: 1.4
     rack-conneg:
-    rack-google-analytics:
+    rack-tracker:
     rake:
-    puma:
     compass:
     bootstrap-sass:
+    erubis:
+    puma:
   test:
     rspec:
     guard:
@@ -29,6 +30,7 @@ files:
   .gitignore:
   config.ru:
   config.rb:
+  config/config.yml:
   # the template has this name
   lib/app.rb:
     # but the output file substitutes it like this, where wormname is an attribute
@@ -41,6 +43,8 @@ files:
   views/default.erb:
   views/index.erb:
   views/includes/header.erb:
+  views/includes/footer.erb:
+  views/includes/github-corner.erb:
   spec/spec_helper.rb:
   spec/app/helpers_spec.rb:
     outpath: app/wormname
@@ -54,4 +58,7 @@ files:
   public/css/styles.css:
   public/js/app.js:
     outpath: app/wormname
+  public/sass/_footer.scss:
+  public/sass/_github-corner.scss:
+  public/sass/_variables.scss:
   public/sass/styles.scss:

data/lib/skellington/version.rb

@@ -1,3 +1,3 @@
 module Skellington
-  VERSION = '0.7.0'
+  VERSION = '0.7.2'
 end

data/lib/templates/config/config.yml.eruby

@@ -0,0 +1,2 @@
+#google-analytics-tag: UA-00000000-0
+#github_url: https://github.com

data/lib/templates/lib/app.rb.eruby

@@ -1,9 +1,10 @@
 require 'sinatra/base'
 require 'tilt/erubis'
 require 'json'
+require 'yaml'
 
-require_relative '<%= @gen.wormname %>/racks'
 require_relative '<%= @gen.wormname %>/helpers'
+require_relative '<%= @gen.wormname %>/racks'
 
 module <%= @gen.camelname %>
   class App < Sinatra::Base
@@ -18,6 +19,7 @@ module <%= @gen.camelname %>
         wants.html do
           @content = '<h1>Hello from <%= @gen.camelname %></h1>'
           @title = '<%= @gen.camelname %>'
+          @github_url = CONFIG['github_url'] || 'https://github.com'
           erb :index, layout: :default
         end
 

data/lib/templates/lib/app/helpers.rb.eruby

@@ -1,4 +1,6 @@
 module <%= @gen.camelname %>
+  CONFIG = YAML.load_file('config/config.yml') || {}
+
   module Helpers
     def hello
       'Hello'

data/lib/templates/lib/app/racks.rb.eruby

@@ -1,10 +1,17 @@
 require 'rack/conneg'
+require 'rack/tracker'
 
 module <%= @gen.camelname %>
   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'] }
+      end
+    end
+
     use Rack::Conneg do |conneg|
       conneg.set :accept_all_extensions, true
       conneg.set :fallback, :html

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

@@ -0,0 +1,25 @@
+html {
+  position: relative;
+  min-height: 100%;
+}
+
+body {
+  margin-bottom: $footer-height;
+}
+
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+
+  margin-top: $padding-large-vertical;
+  background: $brand-primary;
+  color: white;
+  height: $footer-height;
+
+  padding: $padding-large-vertical $padding-large-horizontal;
+
+  a {
+    color: white;
+  }
+}

data/lib/templates/public/sass/_github-corner.scss.eruby

@@ -0,0 +1,7 @@
+.octo-background {
+  fill: $brand-primary;
+}
+
+.octo-arm, .octo-body {
+  fill: white;
+}

data/lib/templates/public/sass/_variables.scss.eruby

@@ -0,0 +1,2 @@
+$footer-height: 40px;
+$brand-primary: #fa8100;

data/lib/templates/public/sass/styles.scss.eruby

@@ -1 +1,8 @@
 @import 'bootstrap';
+@import 'variables';
+@import 'footer';
+@import 'github-corner';
+
+h1 {
+  color: $brand-primary;
+}

data/lib/templates/spec/app/helpers_spec.rb.eruby

@@ -9,5 +9,9 @@ module <%= @gen.camelname %>
     it 'says hello' do
       expect(helpers.hello).to eq 'Hello'
     end
+
+    it 'has a config' do
+      expect(CONFIG).to be_a Hash
+    end
   end
 end

data/lib/templates/views/default.erb.eruby

@@ -2,6 +2,7 @@
 <html lang='en'>
   <%%= erb :'includes/header' %>
   <body>
+    <%%= erb :'includes/github-corner' %>
     <div class='container'>
       <div class='row'>
         <div class='col-md-2'></div>
@@ -11,5 +12,6 @@
         <div class='col-md-2'></div>
       </div>
     </div>
+    <%%= erb :'includes/footer' %>
   </body>
 </html>

data/lib/templates/views/includes/footer.erb.eruby

@@ -0,0 +1,10 @@
+<div class='footer'>
+  <div class='row'>
+    <div class='col-md-12 text-center bottom'>
+      Generated with
+      <a href='http://sam.pikesley.org/projects/skellington/' alt='Skellington' title='Skellington'>
+        Skellington
+      </a>
+    </div>
+  </div>
+</div>

data/lib/templates/views/includes/github-corner.erb.eruby

@@ -0,0 +1,9 @@
+<?xml version='1.0' standalone='no'?>
+<?xml-stylesheet type='text/css' href='styles.css'?>
+<a href='<%%= @github_url %>' class='github-corner' aria-label='Fork me on Github'>
+  <svg xmlns='http://www.w3.org/2000/svg' width='80' height='80' viewBox='0 0 250 250' fill='#151513' style='position: absolute; top: 0; right: 0'>
+    <path class='octo-background' d='M0 0l115 115h15l12 27 108 108V0z' fill='#fff'/>
+    <path class='octo-arm' d='M128 109c-15-9-9-19-9-19 3-7 2-11 2-11-1-7 3-2 3-2 4 5 2 11 2 11-3 10 5 15 9 16' style='-webkit-transform-origin: 130px 106px; transform-origin: 130px 106px'/>
+    <path class='octo-body' d='M115 115s4 2 5 0l14-14c3-2 6-3 8-3-8-11-15-24 2-41 5-5 10-7 16-7 1-2 3-7 12-11 0 0 5 3 7 16 4 2 8 5 12 9s7 8 9 12c14 3 17 7 17 7-4 8-9 11-11 11 0 6-2 11-7 16-16 16-30 10-41 2 0 3-1 7-5 11l-12 11c-1 1 1 5 1 5z'/>
+  </svg>
+</a>

data/spec/cli/app_spec.rb

@@ -11,9 +11,10 @@ module Skellington
       require 'sinatra/base'
       require 'tilt/erubis'
       require 'json'
+      require 'yaml'
 
-      require_relative 'dummy_app/racks'
       require_relative 'dummy_app/helpers'
+      require_relative 'dummy_app/racks'
 
       module DummyApp
         class App < Sinatra::Base
@@ -28,6 +29,7 @@ module Skellington
               wants.html do
                 @content = '<h1>Hello from DummyApp</h1>'
                 @title = 'DummyApp'
+                @github_url = CONFIG['github_url'] || 'https://github.com'
                 erb :index, layout: :default
               end
 
@@ -45,47 +47,6 @@ module Skellington
       end
       """
       )
-
-      expect('dummy_app/lib/dummy_app/racks.rb').to have_content (
-      """
-      require 'rack/conneg'
-
-      module DummyApp
-        class App < Sinatra::Base
-          set :public_folder, 'public'
-          set :views, 'views'
-
-          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
-            end
-          end
-        end
-      end
-      """
-      )
-
-      expect('dummy_app/lib/dummy_app/helpers.rb').to have_content (
-      """
-      module DummyApp
-        module Helpers
-          def hello
-            'Hello'
-          end
-        end
-      end
-      """
-      )
     end
   end
 end

data/spec/cli/config_yml_spec.rb

@@ -0,0 +1,17 @@
+module Skellington
+  describe CLI 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
+      """
+      )
+    end
+  end
+end

data/spec/cli/gemfile_spec.rb

@@ -14,11 +14,12 @@ module Skellington
 
       gem 'sinatra', '~> 1.4'
       gem 'rack-conneg'
-      gem 'rack-google-analytics'
+      gem 'rack-tracker'
       gem 'rake'
-      gem 'puma'
       gem 'compass'
       gem 'bootstrap-sass'
+      gem 'erubis'
+      gem 'puma'
 
       group :test do
         gem 'rspec'

data/spec/cli/helpers_spec.rb

@@ -0,0 +1,24 @@
+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/helpers.rb').to have_content (
+      """
+      module DummyApp
+        CONFIG = YAML.load_file('config/config.yml') || {}
+
+        module Helpers
+          def hello
+            'Hello'
+          end
+        end
+      end
+      """
+      )
+    end
+  end
+end

data/spec/cli/{bootstrap_spec.rb → includes_spec.rb}

@@ -4,27 +4,8 @@ module Skellington
       described_class.new
     end
 
-    it 'generates a bootstrap template' do
+    it 'generates some includes' do
       subject.generate 'dummy_app'
-      expect('dummy_app/views/default.erb').to have_content (
-      """
-      <!DOCTYPE html>
-      <html lang='en'>
-        /erb.*'includes/header'/
-        <body>
-          <div class='container'>
-            <div class='row'>
-              <div class='col-md-2'></div>
-              <div class='col-md-8'>
-                <%= yield %>
-              </div>
-              <div class='col-md-2'></div>
-            </div>
-          </div>
-        </body>
-      </html>
-      """
-      )
 
       expect('dummy_app/views/includes/header.erb').to have_content (
       """
@@ -57,6 +38,35 @@ module Skellington
       <%= @content %>
       """
       )
+
+      expect('dummy_app/views/includes/footer.erb').to have_content (
+      """
+      <div class='footer'>
+        <div class='row'>
+          <div class='col-md-12 text-center bottom'>
+            Generated with
+            <a href='http://sam.pikesley.org/projects/skellington/' alt='Skellington' title='Skellington'>
+              Skellington
+            </a>
+          </div>
+        </div>
+      </div>
+      """
+      )
+
+      expect('dummy_app/views/includes/github-corner.erb').to have_content (
+      """
+      <?xml version='1.0' standalone='no'?>
+      <?xml-stylesheet type='text/css' href='styles.css'?>
+      <a href='<%= @github_url %>' class='github-corner' aria-label='Fork me on Github'>
+        <svg xmlns='http://www.w3.org/2000/svg' width='80' height='80' viewBox='0 0 250 250' fill='#151513' style='position: absolute; top: 0; right: 0'>
+          <path class='octo-background' d='M0 0l115 115h15l12 27 108 108V0z' fill='#fff'/>
+          <path class='octo-arm' d='M128 109c-15-9-9-19-9-19 3-7 2-11 2-11-1-7 3-2 3-2 4 5 2 11 2 11-3 10 5 15 9 16' style='-webkit-transform-origin: 130px 106px; transform-origin: 130px 106px'/>
+          <path class='octo-body' d='M115 115s4 2 5 0l14-14c3-2 6-3 8-3-8-11-15-24 2-41 5-5 10-7 16-7 1-2 3-7 12-11 0 0 5 3 7 16 4 2 8 5 12 9s7 8 9 12c14 3 17 7 17 7-4 8-9 11-11 11 0 6-2 11-7 16-16 16-30 10-41 2 0 3-1 7-5 11l-12 11c-1 1 1 5 1 5z'/>
+        </svg>
+      </a>
+      """
+      )
     end
   end
 end

data/spec/cli/layout_spec.rb

@@ -0,0 +1,32 @@
+module Skellington
+  describe CLI do
+    let :subject do
+      described_class.new
+    end
+
+    it 'generates a default layout' do
+      subject.generate 'dummy_app'
+      expect('dummy_app/views/default.erb').to have_content (
+      """
+      <!DOCTYPE html>
+      <html lang='en'>
+        /erb.*'includes/header'/
+        <body>
+          /erb.*'includes/github-corner'/
+          <div class='container'>
+            <div class='row'>
+              <div class='col-md-2'></div>
+              <div class='col-md-8'>
+                <%= yield %>
+              </div>
+              <div class='col-md-2'></div>
+            </div>
+          </div>
+          /erb.*:'includes/footer'/
+        </body>
+      </html>
+      """
+      )
+    end
+  end
+end

data/spec/cli/non_local_path_spec.rb

@@ -11,9 +11,10 @@ module Skellington
       require 'sinatra/base'
       require 'tilt/erubis'
       require 'json'
+      require 'yaml'
 
-      require_relative 'some_app/racks'
       require_relative 'some_app/helpers'
+      require_relative 'some_app/racks'
 
       module SomeApp
         class App < Sinatra::Base
@@ -28,6 +29,7 @@ module Skellington
               wants.html do
                 @content = '<h1>Hello from SomeApp</h1>'
                 @title = 'SomeApp'
+                @github_url = CONFIG['github_url'] || 'https://github.com'
                 erb :index, layout: :default
               end
 

data/spec/cli/public_spec.rb

@@ -11,6 +11,62 @@ module Skellington
       expect('dummy_app/public/sass/styles.scss').to have_content (
       """
       @import 'bootstrap';
+      @import 'variables';
+      @import 'footer';
+      @import 'github-corner';
+
+      h1 {
+        color: $brand-primary;
+      }
+      """
+      )
+
+      expect('dummy_app/public/sass/_variables.scss').to have_content (
+      """
+      $footer-height: 40px;
+      $brand-primary: #fa8100;
+      """
+      )
+
+      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%;
+
+        margin-top: $padding-large-vertical;
+        background: $brand-primary;
+        color: white;
+        height: $footer-height;
+
+        padding: $padding-large-vertical $padding-large-horizontal;
+
+        a {
+          color: white;
+        }
+      }
+      """
+      )
+
+      expect('dummy_app/public/sass/_github-corner.scss').to have_content (
+      """
+      .octo-background {
+        fill: $brand-primary;
+      }
+
+      .octo-arm, .octo-body {
+        fill: white;
+      }
       """
       )
     end

data/spec/cli/racks_spec.rb

@@ -0,0 +1,46 @@
+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/racks.rb').to have_content (
+      """
+      require 'rack/conneg'
+      require 'rack/tracker'
+
+      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'] }
+            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
+
+          before do
+            if negotiated?
+              content_type negotiated_type
+            end
+          end
+        end
+      end
+      """
+      )
+    end
+  end
+end

data/spec/cli/spec_spec.rb

@@ -72,6 +72,10 @@ module Skellington
           it 'says hello' do
             expect(helpers.hello).to eq 'Hello'
           end
+
+          it 'has a config' do
+            expect(CONFIG).to be_a Hash
+          end
         end
       end
       """

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skellington
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - pikesley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -184,6 +184,7 @@ files:
 - lib/templates/Rakefile.eruby
 - lib/templates/config.rb.eruby
 - lib/templates/config.ru.eruby
+- lib/templates/config/config.yml.eruby
 - lib/templates/lib/app.rb.eruby
 - lib/templates/lib/app/helpers.rb.eruby
 - lib/templates/lib/app/racks.rb.eruby
@@ -191,6 +192,9 @@ files:
 - lib/templates/public/assets/favicon.ico.eruby
 - lib/templates/public/css/styles.css.eruby
 - lib/templates/public/js/app.js.eruby
+- lib/templates/public/sass/_footer.scss.eruby
+- lib/templates/public/sass/_github-corner.scss.eruby
+- lib/templates/public/sass/_variables.scss.eruby
 - lib/templates/public/sass/styles.scss.eruby
 - lib/templates/spec/app/app_spec.rb.eruby
 - lib/templates/spec/app/helpers_spec.rb.eruby
@@ -199,21 +203,27 @@ files:
 - lib/templates/spec/javascripts/support/jasmine_helper.rb.eruby
 - lib/templates/spec/spec_helper.rb.eruby
 - lib/templates/views/default.erb.eruby
+- lib/templates/views/includes/footer.erb.eruby
+- lib/templates/views/includes/github-corner.erb.eruby
 - lib/templates/views/includes/header.erb.eruby
 - lib/templates/views/index.erb.eruby
 - skellington.gemspec
 - spec/cli/app_spec.rb
-- spec/cli/bootstrap_spec.rb
 - spec/cli/config_rb_spec.rb
 - spec/cli/config_ru_spec.rb
+- spec/cli/config_yml_spec.rb
 - spec/cli/gemfile_spec.rb
 - spec/cli/git_spec.rb
 - spec/cli/guardfile_spec.rb
+- spec/cli/helpers_spec.rb
+- spec/cli/includes_spec.rb
 - spec/cli/javascript_spec.rb
+- spec/cli/layout_spec.rb
 - spec/cli/license_spec.rb
 - spec/cli/non_local_path_spec.rb
 - spec/cli/procfile_spec.rb
 - spec/cli/public_spec.rb
+- spec/cli/racks_spec.rb
 - spec/cli/rakefile_spec.rb
 - spec/cli/rbenv_spec.rb
 - spec/cli/spec_spec.rb
@@ -247,17 +257,21 @@ specification_version: 4
 summary: Opinionated boilerplate skeleton generator for a Sinatra app
 test_files:
 - spec/cli/app_spec.rb
-- spec/cli/bootstrap_spec.rb
 - spec/cli/config_rb_spec.rb
 - spec/cli/config_ru_spec.rb
+- spec/cli/config_yml_spec.rb
 - spec/cli/gemfile_spec.rb
 - spec/cli/git_spec.rb
 - spec/cli/guardfile_spec.rb
+- spec/cli/helpers_spec.rb
+- spec/cli/includes_spec.rb
 - spec/cli/javascript_spec.rb
+- spec/cli/layout_spec.rb
 - spec/cli/license_spec.rb
 - spec/cli/non_local_path_spec.rb
 - spec/cli/procfile_spec.rb
 - spec/cli/public_spec.rb
+- spec/cli/racks_spec.rb
 - spec/cli/rakefile_spec.rb
 - spec/cli/rbenv_spec.rb
 - spec/cli/spec_spec.rb