toppings 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3f7a4fb133bfc1e0daf330640c012f8906dfb3f
-  data.tar.gz: 1ef54690bd2ad07a3abb1b92257739ade3560360
+  metadata.gz: a3c79f2a68559ad6ad67c058132195b4052b988a
+  data.tar.gz: 03519847a84de4ea11e8c48185bda5c554eb7382
 SHA512:
-  metadata.gz: 892ff840033dd63b03f0bb63e4fb812df717466861d0b3d28bd159145b3f94339216c6301cd1a46533e335986e98da1e00bab1d28b79797592d631813fc9b257
-  data.tar.gz: c8b77ccf93bf0c8260106f7727820b101f4c0fffedbef5b9c572a144f5bcd0af01ec70f7f1d7cfc373eb31b196e7f7322dcc68f0b332d6a1b6c240dee182d5ca
+  metadata.gz: 86d52d01967e477d5d8a9ad76e1d38f437d2e3282b1f7dec8ca3e296ba53c315f0ee340dd9b59075b3836c28ad55729971b844fa94865a15216ae4ec0f421cc4
+  data.tar.gz: eb9bdbab502b9d2cde5a5514f210b8383f21bda0fe4ee22ee62212bc7a4ea810f4358d182d3b12710e863cb9f9e9b77915cdfef0b4d2786d98447f989a771d94

data/bin/topping

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 require 'toppings/cli'
-Toppings::CLI.start
+Toppings::CLI.start

data/lib/toppings.rb

@@ -12,7 +12,7 @@ module Toppings
   end
 
   def self.conf
-    @conf ||= Toppings::Config.load
+    @conf = Toppings::Config.load
   end
 end
 

data/lib/toppings/cli.rb

@@ -40,4 +40,4 @@ module Toppings
     end
 
   end
-end
+end

data/lib/toppings/config.rb

@@ -5,6 +5,8 @@ require 'ostruct'
 module Toppings
   class Config < OpenStruct
 
+    CONFIGS = []
+
     def initialize(options = {})
       super()
 
@@ -15,11 +17,22 @@ module Toppings
 
     class << self
       def load
+        @config ||= new(joined_config)
+      end
+
+      def reload
         @config = new(joined_config)
       end
 
       def joined_config
-        default_config.deep_merge(custom_config)
+        configs = CONFIGS.dup
+        configs << custom_config
+        configs.each_with_object({}) { |config, result_config| result_config.deep_merge!(config) }
+      end
+
+      def inject_config(config)
+        CONFIGS << config
+        reload
       end
 
       def custom_config
@@ -63,5 +76,8 @@ module Toppings
         Pathname.new('.').join('config')
       end
     end
+
+    CONFIGS << default_config
+
   end
 end

data/lib/toppings/generators.rb

@@ -8,4 +8,4 @@ require 'toppings/generators/sass_file_generator'
 require 'toppings/generators/install/base_generator'
 require 'toppings/generators/install/group_generator'
 require 'toppings/generators/install_generator'
-require 'toppings/generators/components_generator'
+require 'toppings/generators/components_generator'

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

@@ -40,7 +40,7 @@ module Toppings
           end
 
           def with_template(file, options = {})
-            options = options.reverse_merge({ namespaced: true })
+            options = options.reverse_merge(namespaced: true)
 
             library    = options[:vendor_library]
             namespaced = options[:namespaced]

data/lib/toppings/helper.rb

@@ -7,5 +7,3 @@ end
 Dir.glob(File.join(Toppings.gem_root, '**', 'helper', '*_helper.rb')).each do |helper|
   require helper
 end
-
-

data/lib/toppings/helper/base_file_helper.rb

@@ -40,4 +40,4 @@ module Toppings
       end
     end
   end
-end
+end

data/lib/toppings/helper/generator_registration_helper.rb

@@ -28,4 +28,4 @@ module Toppings
 
     end
   end
-end
+end

data/lib/toppings/helper/index_file_helper.rb

@@ -24,4 +24,4 @@ module Toppings
 
     end
   end
-end
+end

data/lib/toppings/helper/path_helper.rb

@@ -20,4 +20,4 @@ module Toppings
 
     end
   end
-end
+end

data/lib/toppings/helper/sass_content_helper.rb

@@ -35,4 +35,4 @@ module Toppings
       end
     end
   end
-end
+end

data/lib/toppings/helper/sass_conversion_helper.rb

@@ -78,4 +78,4 @@ module Toppings::Helper::SassConversionHelper
     target_file.rewind
     target_file.read
   end
-end
+end

data/lib/toppings/helper/sass_file_helper.rb

@@ -11,4 +11,4 @@ module Toppings::Helper::SassFileHelper
 
     sass_file.join('.')
   end
-end
+end

data/lib/toppings/helper/sass_framework_helper.rb

@@ -27,4 +27,4 @@ module Toppings
       end
     end
   end
-end
+end

data/lib/toppings/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toppings
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Falk Hoppe, Roman Stranghöner