rake-xpi 0.0.37 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac39c43b20ac853a847c5a488a259471dc86caf9
-  data.tar.gz: b41799ce5044775ae6f9b3223f93f4a95b554d1f
+  metadata.gz: a460c4e48abf36806dd929705990b586bbaa1d19
+  data.tar.gz: b42a72652f3055d3e84b2b932f85a831d1e36404
 SHA512:
-  metadata.gz: 6acff378405892ae419c99d5c54a40f068ea27ff4a2c7720116564c1c48ec55a444996d8e66d9057b217b5bc900d08d9bcccf1dfad572858541aaec1dcb5034c
-  data.tar.gz: a27b6858ff7e2081e2c46a94cf20ff8368f136fea65ddb27e0047b8a9c4717157b28b22bc499229ba95ed213522db6601f9f94100bed10fe61281af81825243f
+  metadata.gz: 258d3c5e77a9088e378230fb53b52921719971306d13ab89b5e1130c24e8afbbfcf6164cd102a7593addbaff3ec876fdbe2b667c00ba702298a49d892d242c5f
+  data.tar.gz: a245c340fbcdb1c37376ccb22343cd844f6d5069e48c9b51949e8ccd49951379c1b7c1d99dedb520de8d4b5dc923b29a440c972a16ac1c75edd6c5c258c9be70

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake-xpi (0.0.37)
+    rake-xpi (0.0.38)
       aws-sdk
       faraday-http-cache
       jwt

data/lib/rake/xpi.rb

@@ -237,27 +237,29 @@ module Rake
         FileUtils.mkdir_p(dir)
         installed = Dir["#{dir}/*.xpi"].collect{|f| File.basename(f) }
 
-        sources = []
-        default = []
-        (@config.test.xpis.download || []).each{|source|
-          if source.is_a?(Hash) || source.is_a?(RecursiveOpenStruct)
-            source = source.to_h.collect{|k, v| [k.to_s, v]}.to_h
-            default = default.concat(source.select{|env, url| env == 'default'}.values) if default
-            source = source.select{|env, url| env != 'default' && ENV[env.upcase] == 'true'}.values
-            default = nil if source.length > 0
-          elsif source.is_a?(String)
-            source = [source]
+        xpis = []
+        optional = {}
+        (@config.test.xpis.download || []).each{|xpi|
+          if xpi.is_a?(Hash) || xpi.is_a?(RecursiveOpenStruct)
+            xpi.each_pair{|env, link|
+              next unless ENV[env.upcase] == 'true' || env == 'default'
+              optional[env] ||= []
+              optional[env] << link
+            }
+          else
+            xpis << xpi
           end
-          sources = sources.concat(source)
         }
-        sources = sources.concat(default) if default
-        sources = sources.collect{|url| resolvexpi(url)}
+        optional.delete('default') if optional.keys.length > 1
+        xpis << optional.values 
+        xpis.flatten!
+        xpis = xpis.collect{|url| resolvexpi(url)}
 
-        (installed - sources.collect{|s| s.xpi}).each{|xpi|
+        (installed - xpis.collect{|s| s.xpi}).each{|xpi|
           STDERR.puts "Removing #{xpi}" unless ENV['VERBOSE'] == 'false'
           File.unlink("#{dir}/#{xpi}")
         }
-        sources.reject{|s| installed.include?(s.xpi) && s.url !~ /^file:/ }.each{|s|
+        xpis.reject{|s| installed.include?(s.xpi) && s.url !~ /^file:/ }.each{|s|
           # https://github.com/zotero/zotero/zipball/master for zotero master
           if s.xpi =~ /(.*)-master-.*.xpi$/
             src = $1

data/rake-xpi.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rake-xpi"
-  spec.version       = '0.0.37'
+  spec.version       = '0.0.38'
   spec.authors       = ["Emiliano Heyns"]
   spec.email         = ["Emiliano.Heyns@iris-advies.com"]
   spec.description   = %q{rake helper to build XPI files}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-xpi
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.38
 platform: ruby
 authors:
 - Emiliano Heyns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-05 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler