zotplus-rakehelper 0.0.97 → 0.0.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6a678cde3e49fd40942aa0138d5c507087efbb6
-  data.tar.gz: 77ef6be92862e376dd2d43126cb973f2b2146922
+  metadata.gz: 8af5f68c8121807d2e6157ed20fcb230cd2dc9a1
+  data.tar.gz: 342e3c79453604cc0708a1628dc242e4cc08d67a
 SHA512:
-  metadata.gz: 98dfe45d2a4b48ecae2cb60638ef301b8318f175500d41a4df44a869009ccc9a584f14d2483928caa94fab7af358443551c27190fe8ca1717945052a9d075dab
-  data.tar.gz: f2a1e21b81cefe8bb0432f44f1929f25f2f0ce8f980c739a6935881f848373a759339ddf388f0f6ba845b148eb8d32148148dfbb9f58efad21d2cd14e183e7e5
+  metadata.gz: a4c42237ef9ca34a3a91a8f94c3efae2747064036662c43f434ea04b0400244f9341cb84a952f7f5f9bfc04e25e7b94b1f8d543106a49bea66ef9306783eda5f
+  data.tar.gz: 91e6ccaca328ec25ce3968d9bd9a752f5d0444085751e7fed1cae014bdc54bd45505704009442b6901d372d8736cdffc846f2014ab76273de4b2e0132627e0e1

data/lib/zotplus-rakehelper.rb

@@ -113,14 +113,19 @@ task :deploy => [XPI, GR] do
   end
 end
 
-task :plugins do
+task :plugins, :zotero do |t, args|
   if File.file?('features/plugins.yml')
     plugins = YAML.load_file('features/plugins.yml')
   else
     plugins = []
   end
   plugins << 'https://zotplus.github.io/debug-bridge/update.rdf'
-  plugins << 'https://www.zotero.org/download/update.rdf'
+
+  if args[:zotero] == 'master'
+    plugins << 'https://github.com/zotero/zotero/zipball/master'
+  else
+    plugins << 'https://www.zotero.org/download/update.rdf'
+  end
   plugins.uniq!
   ZotPlus::RakeHelper.getxpis(plugins, 'test/fixtures/plugins')
 end
@@ -144,6 +149,8 @@ module ZotPlus
     def self.resolvexpi(source)
       STDERR.puts "Resolving #{source}"
 
+      xpi = nil
+
       if source =~ /update\.rdf$/
         update_rdf = Nokogiri::XML(self.geturl(source))
         update_rdf.remove_namespaces!
@@ -163,14 +170,18 @@ module ZotPlus
           final_uri = h.base_uri
         end
         url = final_uri.to_s
+      elsif source =~ /^https:\/\/github\.com\/zotero/([^\/]+)\/zipball\/master$/
+        url = source
+        xpi = "#{$1}-master.xpi"
       elsif source =~ /^file:/ || source =~ /\.xpi(\?|$)/
         url = source
       else
         throw "Unsupported XPI source #{source}"
       end
 
+      xpi ||= url.sub(/.*\//, '').sub(/\?.*$/, '')
       STDERR.puts "Resolved to #{url}"
-      return OpenStruct.new(url: url, xpi: url.sub(/.*\//, '').sub(/\?.*$/, ''))
+      return OpenStruct.new(url: url, xpi: xpi)
     end
 
     def self.getxpis(sources, dir)

data/lib/zotplus-rakehelper/version.rb

@@ -1,5 +1,5 @@
 module ZotPlus
   class RakeHelper
-    VERSION = "0.0.97"
+    VERSION = "0.0.98"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zotplus-rakehelper
 version: !ruby/object:Gem::Version
-  version: 0.0.97
+  version: 0.0.98
 platform: ruby
 authors:
 - Emiliano Heyns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler