minable 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2d18c239e232ca1a47f747d1846aa3933e70436
-  data.tar.gz: 5443ddfca107210dfc07f42f8e251046057d27df
+  metadata.gz: 222ec6cdcdd263d74c32391e7de004846b48a139
+  data.tar.gz: 8e1b3983459da8e1d728dc3c64f7ac241b464203
 SHA512:
-  metadata.gz: df63bad0528b2065c2cc22ccd08494e2346345e3edf09f13b9f8923daaab3c484fa4af9ce7c1ec89b089604fca6bd2cd0e34b2be2f1fa9441bbcb4fb4f55a9a7
-  data.tar.gz: c376c26f6c204e2817fbc8e7dd1c477dcd1dab9f0d20737c33b8c5b99e38a47b5a7d1999541b31ce28f0d6230c0c3f87a8ffe348230fb4c7616b65f6abfc8d0b
+  metadata.gz: 2d1a24940a949e752fd342e2684e05c67cc2a279cc41b1df66efc6318eb11face6aa724e9c427e7ece26692e3d0a4ecfe3f4f776f352e0f23ad3b5f75e1c4c4d
+  data.tar.gz: 085a0a3752c406d2759766fe4c853fb16415e58f8d92f0e4160d24bcccdef35749c805fe0a4ab044894b3579587b26b46cf5381f2ec4ffce3ec967771504c22d

data/Gemfile.lock

@@ -1,35 +1,37 @@
 PATH
   remote: .
   specs:
-    minable (0.1.1)
+    minable (0.1.2)
       sass (~> 3.2.14)
-      thor
+      thor (~> 0.19.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aruba (0.5.4)
+    aruba (0.6.1)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     builder (3.2.2)
-    childprocess (0.4.0)
+    childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.10)
+    cucumber (1.3.17)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.0.2)
+      multi_test (>= 0.1.1)
     diff-lcs (1.2.5)
-    ffi (1.9.3)
+    ffi (1.9.6)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    multi_json (1.8.4)
-    multi_test (0.0.3)
-    rake (10.1.1)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    rake (10.3.2)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
     sass (3.2.19)
     thor (0.19.1)
 
@@ -37,6 +39,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (~> 0.4)
+  aruba (~> 0.6.1)
   minable!
-  rake
+  rake (~> 10.3.2)

data/app/assets/stylesheets/minable/_all.scss

@@ -1 +1,3 @@
-@import "grid";
+@import "common/all";
+@import "layout/all";
+@import "ui/all";

data/app/assets/stylesheets/minable/_layout-only.scss

@@ -0,0 +1,2 @@
+@import "common/all";
+@import "layout/all";

data/app/assets/stylesheets/minable/_ui-only.scss

@@ -0,0 +1,2 @@
+@import "common/all";
+@import "ui/all";

data/app/assets/stylesheets/minable/{framework → common}/_all.scss

@@ -1,10 +1,10 @@
-// Import the core Minable Framework core stuff!
+@import "global-settings";
 
 // Import Normalize (git.io/normalize)
 @import "normalize";
 
-// Import the Minable grid components
-@import "grid/all";
-
 // Import the TypeCSSet (https://github.com/csswizardry/typecsset)
-@import "typecsset";
+@import "typecsset";
+
+// Import helpers
+@import "helpers/all";

data/app/assets/stylesheets/minable/common/_global-settings.scss

@@ -0,0 +1,2 @@
+$min-browser-default-font-size: 16px !default;
+$min-grid-ie7-support-enable: false !default;

data/app/assets/stylesheets/minable/{helpers → common/helpers}/_all.scss

@@ -1,5 +1,4 @@
 // Import helper files, useful functions such as px to rem mixins and text replacement classes. SVG fallback class coming soon!
-
 @import "classes/all";
 @import "functions/all";
 @import "mixins/all";

data/app/assets/stylesheets/minable/{_grid.scss → layout/_all.scss}

@@ -1,11 +1,8 @@
 // Import Framework settings
 @import "settings";
 
-// Import Framwork Helpers
-@import "helpers/all";
-
 // Import Minable Framework
-@import "framework/all";
+@import "grid/all";
 
 // Import Global styles
 @import "global.scss";

data/app/assets/stylesheets/minable/{_settings.scss → layout/_settings.scss}

@@ -1,9 +1,4 @@
-$min-browser-default-font-size: 16px !default;
-
-
 $min-grid-output-classes: false !default;
-$min-grid-ie7-support-enable: false !default;
-
 
 $min-wrapper-width: 960px !default;
 $min-wrapper-wide-width: false !default;

data/app/assets/stylesheets/minable/layout/grid/_all.scss

@@ -0,0 +1,2 @@
+@import "grid-core";
+@import "grid-unit";

data/features/step_definitions/minable_steps.rb

@@ -6,13 +6,13 @@ Given /^I install minable to "([^"]*)"$/ do |path|
 end
 
 Then /^the sass directories(?: with "([^"]+)" prefix)? should have been generated$/ do |prefix|
-  sass_directories = ['minable', 'minable-ui']
+  sass_directories = ['minable']
   sass_directories.map!{ |directory| minable_path(prefix, directory) }
   check_directory_presence(sass_directories, true)
 end
 
 Then /^the master minable partial should have been generated(?: within "([^"]+)" directory)?$/ do |prefix|
-  check_file_presence([minable_path(prefix, '_all.scss')], true)
+  check_file_presence([minable_path(prefix, 'minable/_all.scss')], true)
 end
 
 Then /^minable should not have been generated$/ do

data/features/update.feature

@@ -3,17 +3,17 @@ Feature: Update minable files
 
   Scenario: Updating updates an existing minable install
     Given minable is already installed
-    When I write to "minable/_minable.scss" with:
+    When I write to "minable/_all.scss" with:
       """
       foobar
       """
     And I run `bundle exec minable update`
     Then the output should contain "Minable files updated."
-    And the file "minable/_minable.scss" should not contain "foobar"
+    And the file "minable/_all.scss" should not contain "foobar"
 
   Scenario: Updating with a --path option
     Given I install minable to "custom_path"
-    When I write to "custom_path/minable/_minable.scss" with:
+    When I write to "custom_path/minable/_all.scss" with:
       """
       foobar
       """
@@ -22,7 +22,7 @@ Feature: Update minable files
 
     When I run `bundle exec minable update --path custom_path`
     Then the output should contain "Minable files updated."
-    And the file "custom_path/minable/_minable.scss" should not contain "foobar"
+    And the file "custom_path/minable/_all.scss" should not contain "foobar"
 
   Scenario: Updating does not generate a new minable install
     And I run `bundle exec minable update`

data/lib/minable/generator.rb

@@ -13,7 +13,7 @@ module Minable
         puts 'Minable files already installed, doing nothing.'
       else
         install_files
-        puts 'Minable files installed to #{install_path}/'
+        puts "Minable files installed to #{install_path}/"
       end
     end
 
@@ -31,7 +31,7 @@ module Minable
 
     desc 'version', 'Show Minable version'
     def version
-      say 'Minable #{Minable::VERSION}'
+      say "Minable #{Minable::VERSION}"
     end
 
     private
@@ -42,9 +42,9 @@ module Minable
 
     def install_path
       @install_path ||= if options[:path]
-          Pathname.new(File.join(options[:path], '.'))
+          Pathname.new(File.join(options[:path], 'minable'))
         else
-          Pathname.new('.')
+          Pathname.new('minable')
         end
     end
 
@@ -66,11 +66,11 @@ module Minable
     end
 
     def all_stylesheets
-      Dir['#{stylesheets_directory}/*']
+      Dir["#{stylesheets_directory}/*"]
     end
 
     def stylesheets_directory
-      File.join(top_level_directory, 'app', 'assets', 'stylesheets')
+      File.join(top_level_directory, 'app', 'assets', 'stylesheets', 'minable')
     end
 
     def top_level_directory

data/lib/minable/version.rb

@@ -1,3 +1,3 @@
 module Minable
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/minable.gemspec

@@ -7,11 +7,11 @@ Gem::Specification.new do |s|
   s.version     = Minable::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Joe Dinsdale', 'Luke Barratt']
-  s.email       = ['digital@bolser.co.uk']
+  s.email       = ['digital@bolser.co.uk', 'luke@barratt.me']
   s.license     = 'MIT'
   s.homepage    = 'https://github.com/bolser/minable'
   s.summary     = 'Sass Mixins using SCSS syntax.'
-  s.description = 'Minable is a minimal CSS framework written in SCSS.'
+  s.description = 'Minable is a minimal Sass mixin and UI framework written in SCSS.'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency('sass', '~> 3.2.14')
-  s.add_dependency('thor')
+  s.add_dependency('thor', '~> 0.19.1')
 
-  s.add_development_dependency('aruba', '~> 0.4')
-  s.add_development_dependency('rake')
+  s.add_development_dependency('aruba', '~> 0.6.1')
+  s.add_development_dependency('rake', '~> 10.3.2')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minable
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Joe Dinsdale
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -29,47 +29,48 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Minable is a minimal CSS framework written in SCSS.
+        version: 10.3.2
+description: Minable is a minimal Sass mixin and UI framework written in SCSS.
 email:
 - digital@bolser.co.uk
+- luke@barratt.me
 executables:
 - minable
 extensions: []
@@ -80,42 +81,45 @@ files:
 - Gemfile.lock
 - LICENSE
 - Rakefile
-- app/assets/stylesheets/minable-ui/_all.scss
-- app/assets/stylesheets/minable-ui/buttons/_all.scss
-- app/assets/stylesheets/minable-ui/buttons/_button-colors.scss
-- app/assets/stylesheets/minable-ui/buttons/_button-core.scss
-- app/assets/stylesheets/minable-ui/buttons/_button-group.scss
-- app/assets/stylesheets/minable-ui/buttons/_button-icon.scss
-- app/assets/stylesheets/minable-ui/buttons/_button-settings.scss
-- app/assets/stylesheets/minable-ui/forms/_all.scss
-- app/assets/stylesheets/minable-ui/forms/_form-core.scss
-- app/assets/stylesheets/minable-ui/forms/_form-grouped.scss
-- app/assets/stylesheets/minable-ui/forms/_form-responsive.scss
-- app/assets/stylesheets/minable-ui/forms/_form-settings.scss
-- app/assets/stylesheets/minable-ui/forms/_form-stacked.scss
-- app/assets/stylesheets/minable-ui/tables/_all.scss
-- app/assets/stylesheets/minable-ui/tables/_tables-core.scss
-- app/assets/stylesheets/minable-ui/tables/_tables-settings.scss
 - app/assets/stylesheets/minable/_all.scss
-- app/assets/stylesheets/minable/_global.scss
-- app/assets/stylesheets/minable/_grid.scss
-- app/assets/stylesheets/minable/_settings.scss
-- app/assets/stylesheets/minable/framework/_all.scss
-- app/assets/stylesheets/minable/framework/_normalize.scss
-- app/assets/stylesheets/minable/framework/_typecsset.scss
-- app/assets/stylesheets/minable/framework/grid/_all.scss
-- app/assets/stylesheets/minable/framework/grid/_grid-core.scss
-- app/assets/stylesheets/minable/framework/grid/_grid-unit.scss
-- app/assets/stylesheets/minable/helpers/_all.scss
-- app/assets/stylesheets/minable/helpers/classes/_all.scss
-- app/assets/stylesheets/minable/helpers/classes/_clearfix.scss
-- app/assets/stylesheets/minable/helpers/classes/_display-classes.scss
-- app/assets/stylesheets/minable/helpers/functions/_all.scss
-- app/assets/stylesheets/minable/helpers/functions/_strip-unit.scss
-- app/assets/stylesheets/minable/helpers/mixins/_all.scss
-- app/assets/stylesheets/minable/helpers/mixins/_opacity.scss
-- app/assets/stylesheets/minable/helpers/mixins/_rem-fallback.scss
-- app/assets/stylesheets/minable/helpers/mixins/_replace-text.scss
+- app/assets/stylesheets/minable/_layout-only.scss
+- app/assets/stylesheets/minable/_ui-only.scss
+- app/assets/stylesheets/minable/common/_all.scss
+- app/assets/stylesheets/minable/common/_global-settings.scss
+- app/assets/stylesheets/minable/common/_normalize.scss
+- app/assets/stylesheets/minable/common/_typecsset.scss
+- app/assets/stylesheets/minable/common/helpers/_all.scss
+- app/assets/stylesheets/minable/common/helpers/classes/_all.scss
+- app/assets/stylesheets/minable/common/helpers/classes/_clearfix.scss
+- app/assets/stylesheets/minable/common/helpers/classes/_display-classes.scss
+- app/assets/stylesheets/minable/common/helpers/functions/_all.scss
+- app/assets/stylesheets/minable/common/helpers/functions/_strip-unit.scss
+- app/assets/stylesheets/minable/common/helpers/mixins/_all.scss
+- app/assets/stylesheets/minable/common/helpers/mixins/_opacity.scss
+- app/assets/stylesheets/minable/common/helpers/mixins/_rem-fallback.scss
+- app/assets/stylesheets/minable/common/helpers/mixins/_replace-text.scss
+- app/assets/stylesheets/minable/layout/_all.scss
+- app/assets/stylesheets/minable/layout/_global.scss
+- app/assets/stylesheets/minable/layout/_settings.scss
+- app/assets/stylesheets/minable/layout/grid/_all.scss
+- app/assets/stylesheets/minable/layout/grid/_grid-core.scss
+- app/assets/stylesheets/minable/layout/grid/_grid-unit.scss
+- app/assets/stylesheets/minable/ui/_all.scss
+- app/assets/stylesheets/minable/ui/buttons/_all.scss
+- app/assets/stylesheets/minable/ui/buttons/_button-colors.scss
+- app/assets/stylesheets/minable/ui/buttons/_button-core.scss
+- app/assets/stylesheets/minable/ui/buttons/_button-group.scss
+- app/assets/stylesheets/minable/ui/buttons/_button-icon.scss
+- app/assets/stylesheets/minable/ui/buttons/_button-settings.scss
+- app/assets/stylesheets/minable/ui/forms/_all.scss
+- app/assets/stylesheets/minable/ui/forms/_form-core.scss
+- app/assets/stylesheets/minable/ui/forms/_form-grouped.scss
+- app/assets/stylesheets/minable/ui/forms/_form-responsive.scss
+- app/assets/stylesheets/minable/ui/forms/_form-settings.scss
+- app/assets/stylesheets/minable/ui/forms/_form-stacked.scss
+- app/assets/stylesheets/minable/ui/tables/_all.scss
+- app/assets/stylesheets/minable/ui/tables/_tables-core.scss
+- app/assets/stylesheets/minable/ui/tables/_tables-settings.scss
 - bin/minable
 - features/install.feature
 - features/step_definitions/minable_steps.rb

data/app/assets/stylesheets/minable/framework/grid/_all.scss

@@ -1,4 +0,0 @@
-// Import Grid elements
-
-@import "grid-core";
-@import "grid-unit";