toppings 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e88a64a2288a9b9e618d111bdf57a9b86838f5c9
-  data.tar.gz: d772d402779d3522fdfd2f302e9ebc39b972e654
+  metadata.gz: 56484c28f58c0c21601a3e47c67e0bb5a3e740dd
+  data.tar.gz: 71596ea54d14949614bddd047375d90a05c20103
 SHA512:
-  metadata.gz: 7b333da53099c5d4af9b693e6d97ef33175958b8744a8858134977c37e68fe221108207aad09ee56f5c7a3083e5bad36f975938ad66905886b3d17ffb70fd8eb
-  data.tar.gz: ac066c0041a2df5215efafc979236d7646a90966d6222e02898dba372d0911431cbc7aa39ee6e7981c6867a2f147b0fcbd4e5d4be2b4fb4bf98a360afd7ea3a6
+  metadata.gz: 63a7dd810d0288c094d9e64882061e98ad6f5c759a3b72ce149534160fbe56a9236b89e99094c994a947a9e52430c09dfee6cd1ece8d977e6265765351f21c63
+  data.tar.gz: 5c760ab90ff2356c904dcc5a51c51fd3c13ba4c691c42bee56d184e7b55ecd5945e3a08df390d30b82a51dff9d2e13409ef93a397ec8d380e2dfe562d3860498

data/README.md

@@ -1,7 +1,7 @@
 [![Build Status](https://travis-ci.org/toppings/toppings.png)](https://travis-ci.org/toppings/toppings)
 [![Coverage Status](https://coveralls.io/repos/toppings/toppings/badge.png)](https://coveralls.io/r/toppings/toppings)
-[![Code Climate](https://codeclimate.com/github/toppings/toppings.png)](https://codeclimate.com/github/mechanoid/toppings)
-[![Dependency Status](https://gemnasium.com/toppings/toppings.png)](https://gemnasium.com/mechanoid/toppings)
+[![Code Climate](https://codeclimate.com/github/toppings/toppings.png)](https://codeclimate.com/github/toppings/toppings)
+[![Dependency Status](https://gemnasium.com/toppings/toppings.png)](https://gemnasium.com/toppings/toppings)
 [![Gem Version](https://badge.fury.io/rb/toppings.png)](http://badge.fury.io/rb/toppings)
 
 ## Welcome to Toppings
@@ -18,7 +18,6 @@ While we try to make this gem highly configurable in later versions, we want to
 
 Installing toppings should be easy with standard gem mananig, because it does not carry any native dependencies until now :). So just try to run `gem install toppings` (with sudo, when you are not running without ruby version management) or add the gem to your Gemfile with `gem 'toppings'`.
 
-
 ### Usage
 
 The toppings gem ships with a binary called `topping` which is basically a wrapper for some) [Thor LINK IS MISSING](…)-tasks and provides a similar syntax as the rails binary does for generation tasks.
@@ -63,33 +62,3 @@ That means you will find a bunch of imports including compass, your grid framewo
 t.b.d
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

data/lib/toppings/generators/install/group_generator.rb

@@ -40,10 +40,14 @@ module Toppings
           end
 
           def with_template(file, options = {})
-            library = options[:vendor_library]
-            path    = options[:template_folder]
+            options = options.reverse_merge({ namespaced: true })
+
+            library    = options[:vendor_library]
+            namespaced = options[:namespaced]
+            path       = options[:template_folder]
+
             Toppings::SASS_DEPENDENCIES.add(library) if library
-            file = library ? "#{library}.#{file}" : file.to_s
+            file = library && namespaced ? "#{library}.#{file}" : file.to_s
             file = Pathname.new(path).join(file) if path
             templates << file
           end
@@ -87,9 +91,9 @@ module Toppings
 
 
         def parse_file_name(file)
-          file = file.to_s
+          file      = file.to_s
           path_name = Pathname.new(file)
-          dir_name = path_name.dirname.to_s != '.' ? path_name.dirname : nil
+          dir_name  = path_name.dirname.to_s != '.' ? path_name.dirname : nil
           [path_name.basename, dir_name]
         end
       end

data/lib/toppings/generators/install_generator.rb

@@ -6,8 +6,10 @@ Dir.glob(File.join(Toppings.gem_root, '**', 'install', '*_generator.rb')).each d
   require generator
 end
 
-Toppings.conf.required_vendors.each do |vendor|
-  require vendor
+if Toppings.conf.required_vendors
+  Toppings.conf.required_vendors.each do |vendor|
+    require vendor
+  end
 end
 
 module Toppings

data/lib/toppings/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Toppings
-  VERSION = '0.0.5'
+  VERSION = '0.0.7'
 end

data/toppings.gemspec

@@ -32,7 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor", ">= 0.18.1"
   spec.add_dependency "activesupport", ">= 3.2"
   spec.add_dependency "compass", ">= 0.12.2"
-  spec.add_dependency "modular-scale"
   spec.add_dependency "toppings-normalize", "~> 0.0.3"
   spec.add_dependency "toppings-singularity"
   spec.add_dependency "toppings-modular_scale"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toppings
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Falk Hoppe, Roman Stranghöner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,20 +136,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.12.2
-- !ruby/object:Gem::Dependency
-  name: modular-scale
-  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: toppings-normalize
   requirement: !ruby/object:Gem::Requirement