wwtd 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 61da2cf51ba1d01d93f74f8979a6114f74863592
-  data.tar.gz: ead0ba73395bb7f8180aece8665dbbbcbc5536a8
+SHA256:
+  metadata.gz: 3f879eb786d4c99eaab557a1f69617b6b40b87ecd5c57f350b7385b3ac6884da
+  data.tar.gz: 4a6b5ddb9aebb3c2d4acc275cf540518b72045ea933b96f680d868b7f843dfb9
 SHA512:
-  metadata.gz: 07e972cabce7d8256374fd796f148c10cc827a7def79fc20079377ee6b844db1ebdaae4d504038253e7f7b15cee446b223e01cfdc8d84636a1f9fa99566246d5
-  data.tar.gz: d07e181e39e27b68816b2b3e8bcac1580b50abc3c64f2877fd7f01ff3f0f848400a0bf4e91ff314571b782ebfbea7f0165e3ffaec03cc5be3936477e7b130252
+  metadata.gz: 2a7816bb69d5ee736ad46d06142087919c8c3b5ed136d8a3029c55e44917c83e919f7aaee8713bdc0cf456c1205ee76f90d40824956a624cdf1df3ab40d87b6a
+  data.tar.gz: 84da9fad28b046493fcd983cc2fa3f424068842db008ddd724c2d949d3d7fb5ae240108c31f6d4d7c2ec10d3e9cf83fe2d10b1ae88d52a0bb51921b35ef652e0

data/lib/wwtd.rb

@@ -117,7 +117,9 @@ module WWTD
 
       if matrix_config = config.delete("matrix")
         if exclude = matrix_config["exclude"]
-          matrix -= exclude
+          exclude.each do |exclude_cell|
+            matrix.delete_if { |cell| matrix_match?(cell, exclude_cell) }
+          end
         end
         if include = matrix_config["include"]
           if matrix == [{}]
@@ -130,6 +132,10 @@ module WWTD
       matrix.map! { |c| config.merge(c) }
     end
 
+    def matrix_match?(cell, exclude)
+      cell.values_at(*exclude.keys) == exclude.values
+    end
+
     def with_clean_env(&block)
       if defined?(Bundler)
         Bundler.with_clean_env(&block)

data/lib/wwtd/run.rb

@@ -48,13 +48,10 @@ module WWTD
         end
       end
 
-      SCRIPT_SECTIONS.each do |section|
-        if env_and_command = env_and_command_for_section(section)
-          return unless sh(*env_and_command)
-        end
+      SCRIPT_SECTIONS.all? do |section|
+        env_and_command = env_and_command_for_section(section)
+        !env_and_command || sh(*env_and_command)
       end
-
-      true
     end
 
     def wants_bundle?

data/lib/wwtd/version.rb

@@ -1,3 +1,3 @@
 module WWTD
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wwtd
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2019-08-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -43,8 +43,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Travis simulator so you do not need to wait for the build