rake-xpi 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15209b03b9db8cb0865ab051441dd86a61c5079a
-  data.tar.gz: 7a1882d28170909e5711367a3594070b4985cdad
+  metadata.gz: e215b03a3fce37d639f9dc672b9c00eca1b3a6d1
+  data.tar.gz: 804316c64309e52b5903d8a660054c158748a3ce
 SHA512:
-  metadata.gz: c99a47e11acd1015b0f1075ee5a0bcc729301c7aea830bd163cbd190a9b351b589af5b6e3bd18eb5a6cb0da3dc7fb32931331c260b6d32f479f070a6a79fff21
-  data.tar.gz: 9cfa3577968ace5127c2d79e10639b1216603a053b58bee7fa58d2dfe94e2500317a8ff22743d12e217a4fc4e45734d651830e1a47e23cb66b12f0930a3ecb71
+  metadata.gz: e71af34e81468c77930f7315b06f7ea0b223f52ca9472e016c36072ff076d77ec1302529abeb3b07c263d0c961ea13b01d7ad06bc5a6d0c96eea38b7e15d24dc
+  data.tar.gz: d02faf5d0c575dfc5cac0ec5e2510f7ae326c4d3406670f2f866f3a007d74e1289f5106f66017d8b3a317dc15ad8b950b7a6da12e56d150c4ebc35da158e946c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake-xpi (0.0.30)
+    rake-xpi (0.0.31)
       aws-sdk
       faraday-http-cache
       jwt
@@ -20,26 +20,26 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
-    aws-sdk (2.3.15)
-      aws-sdk-resources (= 2.3.15)
-    aws-sdk-core (2.3.15)
+    aws-sdk (2.5.11)
+      aws-sdk-resources (= 2.5.11)
+    aws-sdk-core (2.5.11)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.15)
-      aws-sdk-core (= 2.3.15)
+    aws-sdk-resources (2.5.11)
+      aws-sdk-core (= 2.5.11)
     blockenspiel (0.5.0)
-    domain_name (0.5.20160615)
+    domain_name (0.5.20160826)
       unf (>= 0.0.5, < 1.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    faraday-http-cache (1.3.0)
+    faraday-http-cache (1.3.1)
       faraday (~> 0.8)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    jmespath (1.2.4)
-      json_pure (>= 1.8.1)
-    json_pure (1.8.3)
+    jmespath (1.3.1)
     jwt (1.5.4)
-    mime-types (2.99.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     multipart-post (2.0.0)
     netrc (0.11.0)
@@ -51,10 +51,10 @@ GEM
     pkg-config (1.1.7)
     rake (11.2.2)
     recursive-open-struct (1.0.1)
-    rest-client (1.8.0)
+    rest-client (2.0.0)
       http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     rubyzip (1.2.0)
     sawyer (0.7.0)
       addressable (>= 2.3.5, < 2.5)

data/lib/rake/xpi.rb

@@ -235,7 +235,20 @@ module Rake
         FileUtils.mkdir_p(dir)
         installed = Dir["#{dir}/*.xpi"].collect{|f| File.basename(f) }
 
-        sources = (@config.test.xpis.download || []).collect{|s| resolvexpi(s) }
+        sources = []
+        default = []
+        (@config.test.xpis.download || []).each{|source|
+          if source.is_a?(Hash)
+            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]
+          end
+          sources = sources.concat(source)
+        }
+        sources = sources.concat(default) if default
+        sources = sources.collect{|url| resolvexpi(url)}
 
         (installed - sources.collect{|s| s.xpi}).each{|xpi|
           STDERR.puts "Removing #{xpi}" unless ENV['VERBOSE'] == 'false'

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.30'
+  spec.version       = '0.0.31'
   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.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Emiliano Heyns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler