wwtd 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72359d60792ff8beecbd7ba0d3f73e935d5a8827
-  data.tar.gz: fa78422745883e6a44cad469c82a86ef28f73c28
+  metadata.gz: 8100516d49389256a9f198f600212230d36d986c
+  data.tar.gz: bc89e3f3e5e999f1e524e4fae2bbd61bd3d92cfa
 SHA512:
-  metadata.gz: 66a6b38295b69343be3cd7f5d5ee5b95b670d2110f6894490371b0acbacd7ec8de020c636d5e7b465fc8f70ae4dcc41d4406c5f9c051934bd7803938aa0a078a
-  data.tar.gz: f8c5596b70130d5d104d9683c201cfeb5bdc2b481b1ab7b7939dfe72b6cec6669708a3ac7b5f46d6b8237e583e83b1654c5db4867d9accdde4cc060e4af34fd7
+  metadata.gz: bd95705875e7e95fa238413c8dfb8177fad6de7ed6203426e76246f41132c5d6e78fbe8302b46d3d884739d0cd031a8ec82956075cb19cdea7b1aa4716d19862
+  data.tar.gz: be1775f02c64bed218edb42797969de58604b842fcf004221398baf3d75c705851d82b4cbc2c832014ba164580e0ff6847e8510797d74ef6c6c1c6870828e9a9

data/lib/wwtd.rb

@@ -97,16 +97,16 @@ module WWTD
     end
 
     def matrix(config)
-      components = COMBINATORS.map do |multiplier|
+      matrix = [{}]
+      COMBINATORS.each do |multiplier|
         next unless values = config[multiplier]
-        Array(values).map { |v| {multiplier => v} }
-      end.compact
+        matrix = Array(values).map { |value| matrix.map { |c| c.merge(multiplier => value) } }.flatten
+      end
 
-      components = components.inject([{}]) { |all, v| all.product(v).map! { |values| merge_hashes(values) } }
       if config["matrix"] && config["matrix"]["exclude"]
-        components -= config.delete("matrix").delete("exclude")
+        matrix -= config.delete("matrix").delete("exclude")
       end
-      components.map! { |c| config.merge(c) }
+      matrix.map! { |c| config.merge(c) }
     end
 
     def truncate(value, number)
@@ -118,14 +118,6 @@ module WWTD
       end
     end
 
-    def clone(object)
-      Marshal.load(Marshal.dump(object))
-    end
-
-    def merge_hashes(array)
-      array.inject({}) { |all, v| all.merge!(v); all }
-    end
-
     def run_config(config, lock)
       if gemfile = config["gemfile"]
         ENV["BUNDLE_GEMFILE"] = gemfile

data/lib/wwtd/version.rb

@@ -1,3 +1,3 @@
 module WWTD
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wwtd
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Michael Grosser
@@ -29,7 +29,7 @@ cert_chain:
   y0kCSWmK6D+x/SbfS6r7Ke07MRqziJdB9GuE1+0cIRuFh8EQ+LN6HXCKM5pon/GU
   ycwMXfl0
   -----END CERTIFICATE-----
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel