wwtd 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 216b093f43d1e8dd5cec7d94f29322982eedc551
-  data.tar.gz: 2a5f7e9041767f508c540b30b269855ddad9776b
+  metadata.gz: bb2575e7d6d34ac44d0986c2d6d26b0827823adc
+  data.tar.gz: 136f688b892dadb733d28bf7a00c16c7238c6cb1
 SHA512:
-  metadata.gz: ccda5cd939863342839363fdfd908fe4da45cf0595ff5dab6a1aaca255c3f31d0513b8e7e7339a8f8777722527df40d9859e74aeee8216e16a9731c133d7bf44
-  data.tar.gz: 0dd898a43a59a01177d81427002e2c84704e8dd143961cacb121d7dee8b96e169d6c8eb770fcec57e52046c7ce12cf4687324e93b7fb8722524ec3d0fe0874fe
+  metadata.gz: 6e1b220bfb700ac809ee919ad6753bc3b0efc0496f48c063bad8d02908eb8e46c9baf5207bcf278f3b16ce384ae5fffa8d2457b83ed6c54ea2b5ecddd8ad18c0
+  data.tar.gz: 72883eaf21930e099f083dcfc73ff9c9cb8d60b5c9aa0ff2287daf75bc77b18b5db3361558805091eab9c3a6890494e07150edd3903c3717c46ae380dea21f92

data/lib/wwtd.rb

@@ -19,8 +19,22 @@ module WWTD
       config = (File.exist?(CONFIG) ? YAML.load_file(CONFIG) : {})
       config.delete("source_key") # we don't need that we already have the source
       ignored = (config.keys - UNDERSTOOD) + Array(options[:ignore])
-      ignored.each { |k| config.delete(k) }
-      [matrix(config), ignored]
+
+      calculate_local_ruby_matrix = (
+        ignored.include?("rvm") &&
+        Array(config["rvm"]).include?(RUBY_VERSION) &&
+        config["matrix"]
+      )
+
+      ignored.each { |i| config.delete(i) unless i == "rvm" && calculate_local_ruby_matrix }
+      matrix = matrix(config)
+
+      if calculate_local_ruby_matrix
+        matrix.delete_if { |m| m["rvm"] != RUBY_VERSION }
+        matrix.each { |m| m.delete("rvm") }
+      end
+
+      [matrix, ignored]
     end
 
     def run(matrix, options, &block)

data/lib/wwtd/version.rb

@@ -1,3 +1,3 @@
 module WWTD
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wwtd
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Michael Grosser