neat 1.7.4 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eb2762209caf54b43f3de40b58e45e74ab60745
-  data.tar.gz: 595b9703a3de3a9e00ed77b01c453c8b959f4aba
+  metadata.gz: f802639f3eb89eafca425f71ebbfbdb3ed8b1aff
+  data.tar.gz: 59b52dc35945401d1674dbd35c073cc220aebf61
 SHA512:
-  metadata.gz: fcb8d041bc31c465512fc0010af419c261d82f1afb46c2d27f43241a2f64da93968168565c220f8e9dad43bc3bd0bb72af2014a0c75b5b24e8de2fdd29bdbf58
-  data.tar.gz: 5bcce3921f4a9664d5fec025755f31c0e18ea4ebf59743de499879ad5a56f48957bd0b311fed63bb7f9a4609c878d78b4490b933d05b555c2bb841e3aacffeaf
+  metadata.gz: 0ae72e905832fe0dcf0cada066bc786c92b320ae1be4197d8349da3002e7d451f1fda0a627154a2a92e2c24364be45662e1e2dc29d939045465b424578257252
+  data.tar.gz: 7e99d8de395b034489334a65a63fce9bd041823f6c617f1eeaf0205a54837444a7e8da99b971db60a323612a68cecf454973ccd67a231228628dcd1c64c88602

data/Gulpfile.js

@@ -1,5 +1,4 @@
-var bourbon    = require("bourbon").includePaths,
-    autoprefix = require("gulp-autoprefixer"),
+var autoprefix = require("gulp-autoprefixer"),
     connect    = require("gulp-connect"),
     gulp       = require("gulp"),
     sass       = require("gulp-sass");
@@ -13,7 +12,7 @@ var paths = {
 gulp.task("sass", function () {
   return gulp.src(paths.scss)
     .pipe(sass({
-      includePaths: ["styles"].concat(bourbon)
+        sourcemaps: true
     }))
     .pipe(autoprefix("last 2 versions"))
     .pipe(gulp.dest("./contrib"))

data/README.md

@@ -4,9 +4,9 @@
 [![Gitter](http://img.shields.io/badge/gitter-neat-ae3dd2.svg?style=flat)](https://gitter.im/thoughtbot/neat)
 [![Stack Overflow](http://img.shields.io/badge/stack%20overflow-neat-ae3dd2.svg?style=flat)](http://stackoverflow.com/questions/tagged/neat)
 
-## A lightweight, semantic grid framework built with Bourbon
+## A lightweight, semantic grid framework
 
-Neat is a fluid grid framework built with [Bourbon](https://github.com/thoughtbot/bourbon) with the aim of being easy enough to use out of the box and flexible enough to customize down the road.
+Neat is a fluid grid framework with the aim of being easy enough to use out of the box and flexible enough to customize down the road.
 
 - **[Demo](http://neat.bourbon.io)**
 - **[Documentation](http://thoughtbot.github.io/neat-docs/latest)**
@@ -19,7 +19,6 @@ for updates.
 ## Requirements
 
 - [Sass](https://github.com/sass/sass) 3.3+
-- [Bourbon](https://github.com/thoughtbot/bourbon) 4.0+
 - :warning: If you need **Sass 3.2 support**, you should [use Neat 1.5.1](#installing-older-versions-of-neat)
 
 ## Installation
@@ -39,23 +38,16 @@ For command line help, visit our wiki page on Neat’s [command line interface](
   ```bash
   gem install sass # or gem update sass
   ```
-  ```bash
-  gem install bourbon # or gem update bourbon
-  ```
 
 3. Install the Neat library into the current directory:
 
-  ```bash
-  bourbon install # if not already installed
-  ```
   ```bash
   neat install
   ```
 
-4. Import Neat in your stylesheet, after Bourbon:
+4. Import Neat in your stylesheet:
 
   ```scss
-  @import "bourbon/bourbon";
   @import "neat/neat";
   ```
 
@@ -81,10 +73,9 @@ For command line help, visit our wiki page on Neat’s [command line interface](
   bundle update sass
   ```
 
-3.  Import Neat in your `application.scss`, after Bourbon:
+3.  Import Neat in your `application.scss`:
 
   ```scss
-  @import "bourbon";
   @import "neat";
   ```
 
@@ -98,12 +89,11 @@ For command line help, visit our wiki page on Neat’s [command line interface](
   npm install --save bourbon-neat
   ```
 
-1. If you’re using [Eyeglass](http://eyeglass.rocks), skip to Step 3. Otherwise, you’ll need to add Bourbon and Neat to your node-sass `includePaths` option. `require("bourbon-neat").includePaths` is an array of directories that you should pass to node-sass. How you do this depends on how node-sass is integrated into your project. You will also need to ensure that Bourbon is in the `includePaths` passed to node-sass.
+1. If you’re using [Eyeglass](http://eyeglass.rocks), skip to Step 3. Otherwise, you’ll need to add Neat to your node-sass `includePaths` option. `require("bourbon-neat").includePaths` is an array of directories that you should pass to node-sass. How you do this depends on how node-sass is integrated into your project.
 
-1. Import Neat into your Sass files, after Bourbon:
+1. Import Neat into your Sass files:
 
   ```scss
-  @import "bourbon";
   @import "neat";
   ```
 
@@ -128,7 +118,6 @@ For command line help, visit our wiki page on Neat’s [command line interface](
 First off, if you are planning to override the default grid settings (12 columns), it is recommended to create a `_grid-settings.scss` file for that purpose. Make sure to import it right *before* importing Neat:
 
 ```scss
-@import "bourbon/bourbon"; // or "bourbon" when in Rails
 @import "grid-settings";
 @import "neat/neat"; // or "neat" when in Rails
 ```

data/Rakefile

@@ -8,15 +8,11 @@ RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
 task :test do
-  puts "Creating a Bourbon directory..."
-  `bourbon install --path test`
   puts "Generating CSS..."
   `sass -I . --watch test:css/ --style expanded`
 end
 
 task :clean do
-  puts "Deleting Bourbon directory..."
-  `rm -rf test/bourbon`
   puts "Deleting generated CSS..."
   `rm -rf css/`
 end

data/app/assets/stylesheets/_neat-helpers.scss

@@ -1,3 +1,6 @@
+// Mixins
+@import "mixins/clearfix";
+
 // Functions
 @import "functions/private";
 @import "functions/new-breakpoint";

data/app/assets/stylesheets/_neat.scss

@@ -1,4 +1,4 @@
-// Neat 1.7.4
+// Neat 1.8.0
 // http://neat.bourbon.io
 // Copyright 2012-2015 thoughtbot, inc.
 // MIT License

data/app/assets/stylesheets/grid/_outer-container.scss

@@ -13,19 +13,15 @@
 ///
 /// @example css - CSS Output
 ///   .element {
-///     *zoom: 1;
 ///     max-width: 100%;
 ///     margin-left: auto;
 ///     margin-right: auto;
 ///   }
 ///
-///   .element:before, .element:after {
-///     content: " ";
-///     display: table;
-///   }
-///
-///   .element:after {
+///   .element::after {
 ///     clear: both;
+///     content: "";
+///     display: table;
 ///   }
 
 @mixin outer-container($local-max-width: $max-width) {

data/app/assets/stylesheets/mixins/_clearfix.scss

@@ -0,0 +1,25 @@
+@charset "UTF-8";
+
+/// Provides an easy way to include a clearfix for containing floats.
+///
+/// @link http://goo.gl/yP5hiZ
+///
+/// @example scss
+///   .element {
+///     @include clearfix;
+///   }
+///
+/// @example css
+///   .element::after {
+///     clear: both;
+///     content: "";
+///     display: block;
+///   }
+
+@mixin clearfix {
+  &::after {
+    clear: both;
+    content: "";
+    display: block;
+  }
+}

data/app/assets/stylesheets/settings/_grid.scss

@@ -1,16 +1,16 @@
 @charset "UTF-8";
 
-/// Sets the relative width of a single grid column. The unit used should be the same one used to define `$gutter`. To learn more about `modular-scale()` see [Bourbon docs](http://bourbon.io/docs/#modular-scale). Set with a `!global` flag.
+/// Sets the relative width of a single grid column. The unit used should be the same one used to define `$gutter`. Set with a `!global` flag.
 ///
 /// @type Number (Unit)
 
-$column: modular-scale(3, 1em, $golden) !default;
+$column: 4.2358em !default;
 
-/// Sets the relative width of a single grid gutter. The unit used should be the same one used to define `$column`. To learn more about `modular-scale()` see [Bourbon docs](http://bourbon.io/docs/#modular-scale). Set with the `!global` flag.
+/// Sets the relative width of a single grid gutter. The unit used should be the same one used to define `$column`. Set with the `!global` flag.
 ///
 /// @type Number (Unit)
 
-$gutter: modular-scale(1, 1em, $golden) !default;
+$gutter: 1.618em !default;
 
 /// Sets the total number of columns in the grid. Its value can be overridden inside a media query using the `media()` mixin. Set with the `!global` flag.
 ///

data/bin/neat

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "neat"
+require File.dirname(__FILE__) + "/../lib/neat.rb"
 
-Neat::Generator.new(ARGV).run
+Neat::Generator.start

data/bower.json

@@ -1,7 +1,7 @@
 {
   "name": "neat",
-  "description": "A lightweight, semantic grid framework built with Bourbon",
-  "version": "1.7.4",
+  "description": "A lightweight, semantic grid framework",
+  "version": "1.8.0",
   "main": "app/assets/stylesheets/_neat.scss",
   "license": "MIT",
   "ignore": [
@@ -19,7 +19,6 @@
     "test"
   ],
   "keywords": [
-    "bourbon",
     "columns",
     "grid",
     "layout",
@@ -38,8 +37,5 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/thoughtbot/neat.git"
-  },
-  "dependencies": {
-    "bourbon": ">=4.0"
   }
 }

data/contrib/styles.scss

@@ -1,4 +1,3 @@
-@import "bourbon";
 @import "../app/assets/stylesheets/neat";
 
 // Grid Settings
@@ -35,7 +34,7 @@ $darkerblue: #072f44;
 
 body {
   color: $darkerblue;
-  font-family: $helvetica;
+  font-family: sans-serif;
   line-height: $base-line-height;
   margin: 0 0 (1.5rem * 2);
   text-align: center;
@@ -62,17 +61,17 @@ code {
 // ============================================
 
 .container {
-  @include margin(null auto);
-  @include padding(null $gutter);
+  margin: 0 auto;
   max-width: 500px;
+  padding: 0 $gutter;
   position: relative;
 }
 
 .welcome-message {
   @include clearfix();
-  @include padding($base-spacing null);
   background-color: $blue;
   margin-bottom: 1.5rem;
+  padding: $base-spacing 0;
   text-align: center;
 }
 

data/lib/neat.rb

@@ -1,5 +1,4 @@
 require "sass"
-require "bourbon"
 require "neat/generator"
 
 module Neat

data/lib/neat/generator.rb

@@ -1,21 +1,22 @@
+require "neat/version"
 require "fileutils"
+require "thor"
 
 module Neat
-  class Generator
-    def initialize(arguments)
-      @subcommand = arguments.first
-    end
+  class Generator < Thor
+    map ["-v", "--version"] => :version
 
-    def run
-      if @subcommand == "install"
-       install
-      elsif @subcommand == "update"
-        update
-      elsif @subcommand == "remove"
-        remove
+    desc "install", "Install Neat into your project"
+    def install
+      if neat_files_already_exist?
+        puts "Neat files already installed, doing nothing."
+      else
+        install_files
+        puts "Neat files installed to neat/"
       end
     end
 
+    desc "update", "Update Neat"
     def update
       if neat_files_already_exist?
         remove_neat_directory
@@ -26,15 +27,7 @@ module Neat
       end
     end
 
-    def install
-      if neat_files_already_exist?
-        puts "Neat files already installed, doing nothing."
-      else
-        install_files
-        puts "Neat files installed to neat/"
-      end
-    end
-
+    desc "update", "Remove Neat"
     def remove
       if neat_files_already_exist?
         remove_neat_directory
@@ -44,6 +37,11 @@ module Neat
       end
     end
 
+    desc "version", "Show Neat version"
+    def version
+      say "Neat #{Neat::VERSION}"
+    end
+
     private
 
     def neat_files_already_exist?

data/lib/neat/version.rb

@@ -1,3 +1,3 @@
 module Neat
-  VERSION = "1.7.4"
+  VERSION = "1.8.0"
 end

data/lib/tasks/install.rake

@@ -1,20 +1,18 @@
 require "fileutils"
 require "find"
 
-namespace :bourbon do
-  namespace :neat do
-    desc "Copy Neat's files to the Rails assets directory."
-    task :install, [:sass_path] do |t, args|
-      args.with_defaults(:sass_path => 'public/stylesheets/sass')
-      source_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-      FileUtils.mkdir_p("#{Rails.root}/#{args.sass_path}/neat")
-      FileUtils.cp_r("#{source_root}/app/assets/stylesheets/.", "#{Rails.root}/#{args.sass_path}/neat", { :preserve => true })
+namespace :neat do
+  desc "Copy Neat's files to the Rails assets directory."
+  task :install, [:sass_path] do |t, args|
+    args.with_defaults(:sass_path => 'public/stylesheets/sass')
+    source_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+    FileUtils.mkdir_p("#{Rails.root}/#{args.sass_path}/neat")
+    FileUtils.cp_r("#{source_root}/app/assets/stylesheets/.", "#{Rails.root}/#{args.sass_path}/neat", { :preserve => true })
 
-      Find.find("#{Rails.root}/#{args.sass_path}/neat") do |path|
-        if path.end_with?(".css.scss")
-          path_without_css_extension = path.gsub(/\.css\.scss$/, ".scss")
-          FileUtils.mv(path, path_without_css_extension)
-        end
+    Find.find("#{Rails.root}/#{args.sass_path}/neat") do |path|
+      if path.end_with?(".css.scss")
+        path_without_css_extension = path.gsub(/\.css\.scss$/, ".scss")
+        FileUtils.mv(path, path_without_css_extension)
       end
     end
   end

data/neat.gemspec

@@ -9,11 +9,11 @@ Gem::Specification.new do |s|
   s.authors     = ['Joel Oliveira', 'Kyle Fiedler', 'Reda Lemeden']
   s.email       = 'design+bourbon@thoughtbot.com'
   s.homepage    = 'http://neat.bourbon.io'
-  s.summary     = 'A lightweight, semantic grid framework built with Bourbon'
+  s.summary     = 'A lightweight, semantic grid framework'
   s.license     = 'MIT'
   s.description = <<-DESC
-Neat is a fluid grid framework built with Bourbon with the aim of being easy
-enough to use out of the box and flexible enough to customize down the road.
+Neat is a fluid grid framework built with the aim of being easy enough to use
+out of the box and flexible enough to customize down the road.
   DESC
 
   s.rubyforge_project = 'neat'
@@ -24,7 +24,7 @@ enough to use out of the box and flexible enough to customize down the road.
   s.require_paths = ['lib']
 
   s.add_dependency('sass', '>= 3.3')
-  s.add_dependency('bourbon', '>= 4.0')
+  s.add_dependency("thor", "~> 0.19")
 
   s.add_development_dependency("scss_lint", "~> 0.43")
   s.add_development_dependency('aruba', '~> 0.5.0')

data/package.json

@@ -1,9 +1,8 @@
 {
   "name": "bourbon-neat",
-  "version": "1.7.4",
-  "description": "A lightweight, semantic grid framework built with Bourbon",
+  "version": "1.8.0",
+  "description": "A lightweight, semantic grid framework",
   "keywords": [
-    "bourbon",
     "columns",
     "grid",
     "layout",
@@ -34,7 +33,6 @@
     "test": "echo \"No test specified\""
   },
   "dependencies": {
-    "bourbon": "^4.2",
     "node-sass": "^3.4"
   },
   "devDependencies": {

data/sache.json

@@ -1,5 +1,5 @@
 {
   "name": "Neat",
-  "description": "A lightweight, semantic grid framework built with Bourbon",
-  "tags": ["bourbon", "columns", "grid", "layout", "media", "media-queries", "neat", "queries", "sass", "scss", "semantic"]
+  "description": "A lightweight, semantic grid framework",
+  "tags": ["columns", "grid", "layout", "media", "media-queries", "neat", "queries", "sass", "scss", "semantic"]
 }

data/spec/spec_helper.rb

@@ -7,19 +7,16 @@ require "css_parser"
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-  config.include BourbonSupport
   config.include SassSupport
   config.include CssParser
   config.include ParserSupport
   config.include Aruba::Api
 
   config.before(:all) do
-    install_bourbon_files
     generate_css
   end
 
   config.after(:all) do
-    remove_bourbon_files
     clean_up
   end
 end

data/spec/support/matchers/have_rule.rb

@@ -1,14 +1,16 @@
 RSpec::Matchers.define :have_rule do |expected|
-  match do |actual|
-    @rules = rules_from_selector(actual)
+  match do |selector|
+    @rules = rules_from_selector(selector)
     @rules.include? expected
   end
 
-  failure_message do |actual|
+  failure_message do |selector|
     if @rules.empty?
-      %{no CSS rules for selector #{actual} were found}
+      %{no CSS for selector #{selector} were found}
     else
-      %{expected selector #{actual} to have CSS rule "#{expected}"}
+      rules = @rules.join("; ")
+      %{Expected selector #{selector} to have CSS rule "#{expected}".
+        Had "#{rules}".}
     end
   end
 

data/test/_setup.scss

@@ -1,3 +1,2 @@
-@import "bourbon/bourbon";
 @import "../app/assets/stylesheets/neat";
 $disable-warnings: true !global;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neat
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.8.0
 platform: ruby
 authors:
 - Joel Oliveira
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -27,19 +27,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: bourbon
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: scss_lint
   requirement: !ruby/object:Gem::Requirement
@@ -153,8 +153,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: |
-  Neat is a fluid grid framework built with Bourbon with the aim of being easy
-  enough to use out of the box and flexible enough to customize down the road.
+  Neat is a fluid grid framework built with the aim of being easy enough to use
+  out of the box and flexible enough to customize down the road.
 email: design+bourbon@thoughtbot.com
 executables:
 - neat
@@ -191,6 +191,7 @@ files:
 - app/assets/stylesheets/grid/_span-columns.scss
 - app/assets/stylesheets/grid/_to-deprecate.scss
 - app/assets/stylesheets/grid/_visual-grid.scss
+- app/assets/stylesheets/mixins/_clearfix.scss
 - app/assets/stylesheets/settings/_disable-warnings.scss
 - app/assets/stylesheets/settings/_grid.scss
 - app/assets/stylesheets/settings/_visual-grid.scss
@@ -220,7 +221,6 @@ files:
 - spec/neat/row_spec.rb
 - spec/neat/shift_spec.rb
 - spec/spec_helper.rb
-- spec/support/bourbon_support.rb
 - spec/support/matchers/be_contained_in.rb
 - spec/support/matchers/have_rule.rb
 - spec/support/matchers/have_value.rb
@@ -258,10 +258,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: neat
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: A lightweight, semantic grid framework built with Bourbon
+summary: A lightweight, semantic grid framework
 test_files:
 - spec/neat/columns_spec.rb
 - spec/neat/container_spec.rb
@@ -275,7 +275,6 @@ test_files:
 - spec/neat/row_spec.rb
 - spec/neat/shift_spec.rb
 - spec/spec_helper.rb
-- spec/support/bourbon_support.rb
 - spec/support/matchers/be_contained_in.rb
 - spec/support/matchers/have_rule.rb
 - spec/support/matchers/have_value.rb
@@ -293,4 +292,3 @@ test_files:
 - test/row.scss
 - test/shift.scss
 - test/span-columns.scss
-has_rdoc: 

data/spec/support/bourbon_support.rb

@@ -1,9 +0,0 @@
-module BourbonSupport
-  def install_bourbon_files
-    `bundle exec bourbon install --path test`
-  end
-
-  def remove_bourbon_files
-    FileUtils.rm_rf("test/bourbon")
-  end
-end