zotplus-rakehelper 0.0.35 → 0.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17c286f99fa205d3bd90d31612c6b5a8b2dd074c
-  data.tar.gz: a3a6fb989e31b0cf9fd74c18e679e292b8e8b7e2
+  metadata.gz: f6e1837201152a2f2e4ac8d1f61698befaf1e8e4
+  data.tar.gz: 9bc9ddfd4ceee2d52d05bfec475d199ad09737c4
 SHA512:
-  metadata.gz: 96767ef85bf97b1b8e5f4e4ad1e2f87aa553bb9ac4b01b5200f60f52b1dfc90b6defaf6d8da8ec69dc2f2ae779df1d99deebc12d8556f5430ee7340d476c2050
-  data.tar.gz: d75fea922ff3a1f4a6fa80ff94df03f72c40b2a4c105cfee13c93300e074b82b075b5652dfc84fc8fc388a0d1d3fadca8e24ad9fc3c55980fcec9c8df1bde791
+  metadata.gz: 162789ee4724b5a03bf2220382ec8349576ae47b9c52732657f595ab57c3220e4176829759b977b6c9b510aed9432a40eb47ff9d643fb6b9dd563fba3d0f0879
+  data.tar.gz: 7d8603e3d8e425029cf85c6043f98dabc821de009f362131bc8ba105ae62f94fa75eeeb0ae8080afa2a323016f5e77d26cad0fafd44c2c03420b477e68b019bf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zotplus-rakehelper (0.0.35)
+    zotplus-rakehelper (0.0.47)
       nokogiri
       rake
       rickshaw

data/lib/zotplus-rakehelper.rb

@@ -1,8 +1,11 @@
-require 'typhoeus'
 require 'nokogiri'
 require 'zip'
 require 'rake'
 require 'rickshaw'
+require 'uri'
+require 'fileutils'
+require 'open-uri'
+require 'ostruct'
 
 SOURCES ||= []
 
@@ -47,13 +50,6 @@ task 'update.rdf' => [XPI, 'install.rdf'] do |t|
   File.open(t.name, 'w') {|f| rdf.write_xml_to f}
 end
 
-task :debugbridge do
-  update = Nokogiri::XML(ZotPlus::RakeHelper.geturl('http://zotplus.github.io/debug-bridge/update.rdf')).at('//em:updateLink').inner_text
-  debug_bridge = Dir['tmp/zotero-debug-bridge-*.xpi']
-  debug_bridge.each{|f| File.unlink(f)} if debug_bridge.size != 1 || update.sub(/.*\//, '') != File.basename(debug_bridge[0])
-  ZotPlus::RakeHelper.download(update, "tmp/#{update.sub(/.*\//, '')}") unless File.file?("tmp/#{update.sub(/.*\//, '')}")
-end
-
 task XPI => SOURCES + ['install.rdf'] do
   puts "Building #{XPI}"
   Dir["*.xpi"].each{|f| File.unlink(f) }
@@ -107,27 +103,69 @@ end
 
 module ZotPlus
   class RakeHelper
+
     def self.geturl(url)
-      response = Typhoeus.get(url, {followlocation: true})
-      raise "Request failed" unless response.success?
-      return response.body
+      return open(url).read
+      #OpenURI::HTTPError
     end
 
     def self.download(url, file)
       puts "Downloading #{url} to #{file}"
-      target = File.open(file, 'wb')
-      request = Typhoeus::Request.new(url, {followlocation: true})
-      request.on_headers do |response|
-        raise "Request failed: #{response.code.to_s}" unless response.code == 200 # response.success?
-      end
-      request.on_body do |chunk|
-        target.write(chunk)
-      end
-      request.on_complete do |response|
-        target.close
-        throw "download failed" unless response.success?
+      FileUtils.mkdir_p File.dirname(file)
+
+      data = open(url)
+      File.open(file, 'wb'){|f| f.write(data.read) }
+    end
+
+    def self.resolvexpi(source)
+      if source =~ /update\.rdf$/
+        update_rdf = Nokogiri::XML(self.geturl(source))
+        update_rdf.remove_namespaces!
+        url = update_rdf.at('//updateLink').inner_text
+      elsif source =~ /^https:\/\/addons\.mozilla\.org\//
+        page = self.geturl(source)
+        page = Nokogiri::HTML(page)
+        url = page.at_css('p.install-button').at_css('a')['href']
+
+        url = URI.join(source, url ).to_s if url !~ /^http/
+
+        return self.resolvexpi(url) if url =~ /\/contribute\/roadblock\//
+
+        # AMO uses redirects, so I can't write the file to the final name just yet
+        final_uri = nil
+        open(url) do |h|
+          final_uri = h.base_uri
+        end
+        url = final_uri.to_s
+      elsif source =~ /^file:/ || source =~ /\.xpi(\?|$)/
+        url = source
+      else
+        throw "Unsupported XPI source #{source}"
       end
-      request.run
+
+      return OpenStruct.new(url: url, xpi: url.sub(/.*\//, '').sub(/\?.*$/, ''))
+    end
+
+    def self.getxpis(sources, dir)
+      installed = Dir["#{dir}/*.xpi"].collect{|f| File.basename(f) }
+
+      sources = sources.collect{|s| self.resolvexpi(s) }
+
+      (installed - sources.collect{|s| s.xpi}).each{|xpi|
+        puts "Removing #{xpi}"
+        File.unlink("#{dir}/#{xpi}")
+      }
+      sources.reject{|s| installed.include?(s.xpi) && s.url !~ /^file:/ }.each{|s|
+        if s.url =~ /^file:/
+          puts "Copying #{s.xpi}"
+          path = s.url.sub(/^file:/, '')
+          FileUtils.cp(path, "#{dir}/#{s.xpi}")
+        else
+          puts "Downloading #{s.xpi}"
+          self.download(s.url, "#{dir}/#{s.xpi}")
+        end
+      }
     end
   end
+
 end

data/lib/zotplus-rakehelper/version.rb

@@ -1,5 +1,5 @@
 module ZotPlus
   class RakeHelper
-    VERSION = "0.0.35"
+    VERSION = "0.0.47"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zotplus-rakehelper
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.47
 platform: ruby
 authors:
 - Emiliano Heyns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler