clash 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39d92dbce4ec886753820de001ead65ecc70c7ab
-  data.tar.gz: 5bf66afe83d476c95eb86698958e6433253b612c
+  metadata.gz: 5ad6ce60bb860188e99c74a0ee961fd7d878b44a
+  data.tar.gz: b865f8229a54faf93bf24c269c998ca54f1638d6
 SHA512:
-  metadata.gz: 7997bbf948e49ec53adf60f533f123f53aca55e337fcfa6025f653901ea7a62c99694a0a629b541d1642a3a3facd706e999a54662b40fc6d25ac390e4ea1186e
-  data.tar.gz: bc012514d2a41d416ee165f6eaea817ad0b624d8a89ff4eac74587b534f40ba62aa909b2c529e082568f6090af04969edf61c40951269a3046aca14c96a0d698
+  metadata.gz: f751c8e84d26366758b3c481b8519b736dd794ed5ebca0bb1a31c8177dac1122fc50591ece110a10ec142bd2b78514f6d387207588833bb26fb9a2bbf726e093
+  data.tar.gz: a5e2c48a11643a84a3f08ec0fd3b9223928c184a2f512f90a5eab51b68b603783de59eec343167d3b46b7507d47ca4d10d2e6c486316e683b4b4debd3e3c0550

data/lib/clash/helpers.rb

@@ -63,12 +63,6 @@ module Clash
       end
     end
 
-    def default_array(option)
-      o = option || []
-      o = [o] unless o.is_a?(Array)
-      o
-    end
-
     def colorize(str, color)
       if STDOUT.tty?
         str.send(color)

data/lib/clash/test.rb

@@ -46,12 +46,24 @@ module Clash
       end
     end
 
-    def config_octopress(file)
-      copy_config(file, '_octopress.yml')
+    def config_plugin(name, file)
+      copy_config(file, "#{plugins_path}/#{name}/config.yml")
     end
 
-    def config_plugin(name, file)
-      copy_config(file, "_plugins/#{name}/config.yml")
+    def plugins_path
+      jekyll_site.plugin_manager.plugins_path.first
+    end
+
+    def jekyll_site
+      require 'jekyll'
+      config = {}
+      Array(@options['config']['jekyll'] || '_config.yml').each do |c| 
+        config.merge!SafeYAML.load_file(c)
+      end
+      Jekyll.logger.log_level = :error
+      site = Jekyll::Site.new(Jekyll.configuration(config))
+      Jekyll.logger.log_level = :info
+      site
     end
 
     def copy_config(file, target)
@@ -75,15 +87,15 @@ module Clash
     def build
       options = "--trace"
 
-      if jekyll_config = @options['config']['jekyll']
-        options << " --config #{default_array(jekyll_config).join(',')}"
+      if config = @options['config']['jekyll']
+        options << " --config #{Array(config).join(',')}"
       end
 
       system "jekyll build #{options}"
     end
 
     def system_cmd(cmds)
-      cmds = default_array(cmds)
+      cmds = Array(cmds)
       cmds.each {|cmd| 
         if @options['tasks'].include?(cmd)
           system_cmd(@options['tasks'][cmd])
@@ -94,7 +106,7 @@ module Clash
     end
 
     def compare
-      default_array(@options['compare']).each do |files|
+      Array(@options['compare']).each do |files|
         f = files.gsub(',',' ').split
 
         differ = Diff.new(f.first, f.last, context: @options['context'])
@@ -109,7 +121,7 @@ module Clash
     end
 
     def enforce_missing
-      default_array(@options['enforce_missing']).each do |file|
+      Array(@options['enforce_missing']).each do |file|
         if File.exists?(file)
           message = yellowit("\nFile #{file} shouldn't exist.") + "\n  But it does!"
           @test_failures << message

data/lib/clash/tests.rb

@@ -77,7 +77,7 @@ module Clash
       delete_tests = []
       @options[:only] = expand_list_of_numbers(@options[:only])
 
-      tests = default_array(@clashfile).map do |test|
+      tests = @clashfile.map do |test|
         if !test['tasks'].nil?
           @tasks.merge! test['tasks']
           delete_tests << test
@@ -104,7 +104,9 @@ module Clash
       # Find the config file (fall back to legacy filename)
       if path = config_path || config_path('.clash.yml')
         read_test_line_numbers(path)
-        SafeYAML.load_file(path)
+        config = SafeYAML.load_file(path)
+        config = [config] unless config.is_a?(Array)
+        config
       else
         # If config file still not found, complain
         raise "Config file #{@options[:file]} not found."

data/lib/clash/version.rb

@@ -1,3 +1,3 @@
 module Clash
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clash
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy