slining 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c23bdf9d0691542e9d1ec9bc98fb272c2978a25
-  data.tar.gz: ea7dd374360216e252d758694a7beaf766f49a21
+  metadata.gz: 972c6a92854641e7b46c0f0c3f256135576f65bc
+  data.tar.gz: 0b1c182f4447b13d01cf414f97ca7da37218ddfb
 SHA512:
-  metadata.gz: 64c8fc1614624bfaec02e8e45bf0fa30f85214b2fe5ce55cac8eceb7f529fccadc2d8734ca5beebbefbc5324e348f7e63a53958acb215fa8ac99879b149defa5
-  data.tar.gz: c5f65db9f20698d711718b24646c9207c55a21862ae59d5208a1f574ec9675d192d6ab0d0c7abda2cb20d4f7eb0f949215523bca6f1a6d374730ebb05682a969
+  metadata.gz: c76e65fcb2b9bf07644ea139a6fe5fe6515d169a10fba40a3ffdfbd24e07d4ed3d5d6df3daca4c51f4aab6c6d3cc89e54d77727b502228eeafb712442a729272
+  data.tar.gz: 5941faec56ed4fe5f34fa454fca9c3a41887b33d8717647524c3b3a4b2541c816420cb7fb21f0957db929bad8e81c45d3bc4d6cf3935da078206b3fe2218e233

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slining (1.0.0)
+    slining (1.0.1)
       bundler (~> 1.3)
       rails (= 4.2.1)
 
@@ -118,3 +118,6 @@ PLATFORMS
 DEPENDENCIES
   rspec (~> 3.2)
   slining!
+
+BUNDLED WITH
+   1.10.4

data/LICENSE

@@ -1,8 +1,7 @@
-## SLINING LICENSE
-
 The MIT License
 
 Copyright (c) 2015+ and vaporware, inc.
+Copyright (c) 2010-2012 Mike Burns and thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -21,20 +20,3 @@ 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.
-
-
-## SUSPENDERS LICENSE
-
-The MIT License
-
-Copyright (c) 2010-2012 Mike Burns and thoughtbot, inc.
-
-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.

data/NEWS.md

@@ -1,5 +1,9 @@
+1.1.0 (June 23, 2015)
+* Added HAML and HAML Rails
+* Added Twitter Bootstrap
+
 1.0.1 (June 16, 2015)
 * Removed Bourbon / thoughtbot front-end frameworks
 
-1.0 (June 16, 2015)
+1.0.0 (June 16, 2015)
 * Forked from thoughtbot/suspenders and released without material changes

data/README.md

@@ -1,4 +1,4 @@
-# Slining [![Build Status](https://secure.travis-ci.org/vaporware/slining.svg?branch=master)](http://travis-ci.org/vaporware/slining)
+# Slining [![Build Status](https://secure.travis-ci.org/vaporware/slining.svg?branch=master)](http://travis-ci.org/vaporware/slining) [![Gem Version](https://badge.fury.io/rb/slining.svg)](http://badge.fury.io/rb/slining) [![Gem Version](https://badge.fury.io/rb/slining.svg)](http://badge.fury.io/rb/slining) [![Code Climate](https://codeclimate.com/github/vaporware/slining/badges/gpa.svg)](https://codeclimate.com/github/vaporware/slining) [![Test Coverage](https://codeclimate.com/github/vaporware/slining/badges/coverage.svg)](https://codeclimate.com/github/vaporware/slining/coverage) 
 
 Slining is the Silver Lining to Vaporware's Rails development, i.e. the base Rails application used at
 [vaporware](http://vaporwa.re). It's a forked project from [thoughtbot's suspenders](http://github.com/thoughtbot/suspenders).
@@ -25,12 +25,14 @@ It includes application gems like:
 
 * [Airbrake](https://github.com/airbrake/airbrake) for exception notification
 * [Autoprefixer Rails](https://github.com/ai/autoprefixer-rails) for CSS vendor prefixes
+* [Bootstrap](getbootstrap.com) for fast frontend prototyping
 * [Delayed Job](https://github.com/collectiveidea/delayed_job) for background
   processing
 * [Email Validator](https://github.com/balexand/email_validator) for email
   validation
 * [Flutie](https://github.com/thoughtbot/flutie) for `page_title` and `body_class` view
   helpers
+* [HAML](http://haml.info/) for cleaner view code
 * [High Voltage](https://github.com/thoughtbot/high_voltage) for static pages
 * [jQuery Rails](https://github.com/rails/jquery-rails) for jQuery
 * [New Relic RPM](https://github.com/newrelic/rpm) for monitoring performance
@@ -46,7 +48,7 @@ It includes application gems like:
   and style
 * [Title](https://github.com/calebthompson/title) for storing titles in
   translations
-* [Unicorn](https://github.com/defunkt/unicorn) to serve HTTP requests
+* [Unicorn](https://github.com/defunkt/unicorn) to serve HTTP requests.
 
 And development gems like:
 

data/lib/slining/app_builder.rb

@@ -293,16 +293,6 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
                 "app/assets/stylesheets/application.scss"
     end
 
-    def install_refills
-      run "rails generate refills:import flashes"
-      run "rm app/views/refills/_flashes.html.erb"
-      run "rmdir app/views/refills"
-    end
-
-    def install_bitters
-      run "bitters install --path app/assets/stylesheets"
-    end
-
     def gitignore_files
       remove_file '.gitignore'
       copy_file 'slining_gitignore', '.gitignore'

data/lib/slining/generators/app_generator.rb

@@ -39,8 +39,6 @@ module Slining
       invoke :create_slining_views
       invoke :configure_app
       invoke :setup_stylesheets
-      invoke :install_bitters
-      invoke :install_refills
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
       invoke :remove_routes_comment_lines
@@ -147,16 +145,6 @@ module Slining
       build :setup_stylesheets
     end
 
-    def install_bitters
-      say 'Install Bitters'
-      build :install_bitters
-    end
-
-    def install_refills
-      say "Install Refills"
-      build :install_refills
-    end
-
     def setup_git
       if !options[:skip_git]
         say 'Initializing git'

data/lib/slining/version.rb

@@ -1,5 +1,5 @@
 module Slining
   RAILS_VERSION = "4.2.1"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/templates/Gemfile.erb

@@ -4,10 +4,12 @@ ruby "<%= Slining::RUBY_VERSION %>"
 
 gem "airbrake"
 gem "autoprefixer-rails"
+gem "bootstrap-sass", "~> 3.3.5"
 gem "coffee-rails", "~> 4.1.0"
 gem "delayed_job_active_record"
 gem "email_validator"
 gem "flutie"
+gem "haml-rails", "~> 0.9"
 gem "high_voltage"
 gem "i18n-tasks"
 gem "jquery-rails"

data/templates/application.scss

@@ -1,3 +1,5 @@
 @charset "utf-8";
 
 @import "normalize-rails";
+@import "bootstrap-sprockets";
+@import "bootstrap";

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slining
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - vaporware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using vaporware's best practices.