clash 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95b434cfec8a2697c71f6d5aabde95aca01c76b8
-  data.tar.gz: a1809611f2166330a4c2402001dfa9f9fe1dc6a2
+  metadata.gz: 1af24fd9be1cacbd8588d59a091226d49d3b60c9
+  data.tar.gz: 7212d84833009308ea769b0e5922207cf8f22cf0
 SHA512:
-  metadata.gz: 5ddc76b14f92704d5078a3ce29d28a48fa1ff89d5a7c40133f84a5d50b7b57ea85e5879f4d17cdd11350c40553905e22b3fbb891a0fa7ce1cdfe6ef77c3caa03
-  data.tar.gz: 3766ddcea298bbbaa9cd00cfacc4e843c136780308fb0aa674e851767c6e9b72eed3c01c2f7775619ca63344270e221d047f97748459ae47194100418c794be8
+  metadata.gz: cb2bd9704d1c1e35921f6f48ec6f52dd20be25733f2db647eccb11efa58c0fbbd55184d90347f654c65930d29cc9e8d0113798e8856435325b0962535ebaaeaf
+  data.tar.gz: 010f674e43fd04e54d98f1ad16ac0e425fd26e1e18255fd4e5cfc83995996ffbb0341e542f497dae40292fab1bbcf4d00d9359bb7c09c5855ae7b114219936c4

data/lib/clash/test.rb

@@ -80,7 +80,13 @@ module Clash
 
     def system_cmd(cmds)
       cmds = default_array(cmds)
-      cmds.each {|cmd| system(cmd) }
+      cmds.each {|cmd| 
+        if @options['tasks'].include?(cmd)
+          system_cmd(@options['tasks'][cmd])
+        else
+          system(cmd) 
+        end
+      }
     end
 
     def compare

data/lib/clash/tests.rb

@@ -11,6 +11,7 @@ module Clash
       @results = []
       @passed = []
       @failed = []
+      @tasks = {}
 
       @options[:only]    ||= []
       @options[:exit]    ||= true
@@ -38,6 +39,7 @@ module Clash
 
       options['index'] = index + 1
       options['context'] = @options[:context]
+      options['tasks'] = @tasks
 
       results = Test.new(options).run
 
@@ -53,21 +55,29 @@ module Clash
       return [] unless File.file?(@options[:file])
       tests = SafeYAML.load_file(@options[:file])
       index = 0
+      delete_tests = []
 
-      default_array(tests).map do |test|
-        index += 1
-
-        # Admit all tests if no tests are excluded
-        if @options[:only].empty?
-          test
-        # Only admit selected tests
-        elsif @options[:only].include?(index)
-          test
-        # Remove tests not selected
+      tests = default_array(tests).map do |test|
+        if !test['tasks'].nil?
+          @tasks.merge! test['tasks']
+          delete_tests << test
         else
-          nil
+          index += 1
+
+          # Admit all tests if no tests are excluded
+          if @options[:only].empty?
+            test
+          # Only admit selected tests
+          elsif @options[:only].include?(index)
+            test
+          # Remove tests not selected
+          else
+            nil
+          end
         end
       end
+      tests - [delete_tests]
+
     end
 
     def print_results

data/lib/clash/version.rb

@@ -1,3 +1,3 @@
 module Clash
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clash
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy