zotplus-rakehelper 0.0.135 → 0.0.136

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5668b6cf0487a4831a5a7671823c90820d6b867
-  data.tar.gz: 34cc77083be1172ceafac8b140bcb56f3e548656
+  metadata.gz: 24b7f4fc1e5502636e041d1e3a43f03e02e53889
+  data.tar.gz: 4f8ecf49ff197a0a68c2019daf5008a1911ba989
 SHA512:
-  metadata.gz: 26e9668e3f9f1dcef17a35140df4cfc189881293662280bfd814b21f03289886f01d384180f2c2df2466c75c16f04a9127317c8dfbd93659ab76ef283bf153fc
-  data.tar.gz: 6573acdf57e993e41e5d0f5fd5516991bdb0ecff2d4261911a91c42173f9bc325f77ff91fe35a5cc701531f4218109515907bb19a4fe44d6a713f6f2f4e63f05
+  metadata.gz: a28e612f3298489388dd0222ad292caa0292024d68b3f822b13ca86fcdca8e37b324fce48ea80cec362c57452da54bf7dd181239ce10c48b12f6f781fdf9271a
+  data.tar.gz: 00a2fcb3092a7100406c7be59dc187f5f21bed84b95a60771793c8ad546d1472b8ca669054e80ce5f56a3105f29ca0f28c8126986e5fe622b69494aa60543d1a

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    zotplus-rakehelper (0.0.123)
+    zotplus-rakehelper (0.0.135)
+      github_api
       nokogiri
       rake
       rest-client
@@ -12,18 +13,42 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.4.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
     ethon (0.8.0)
       ffi (>= 1.3.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.10)
+    github_api (0.13.1)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      multi_json (>= 1.7.5, < 2.0)
+      oauth2
+    hashie (3.4.3)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
+    jwt (1.5.2)
     mime-types (2.99)
     mini_portile2 (2.0.0)
+    multi_json (1.11.2)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
     netrc (0.11.0)
-    nokogiri (1.6.7)
+    nokogiri (1.6.7.1)
       mini_portile2 (~> 2.0.0.rc2)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.6.4)
     rake (10.4.2)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -31,6 +56,7 @@ GEM
       netrc (~> 0.7)
     rickshaw (0.3.1)
     rubyzip (1.1.7)
+    thread_safe (0.3.5)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
     unf (0.1.4)

data/lib/zotplus-rakehelper/version.rb

@@ -1,5 +1,5 @@
 module ZotPlus
   class RakeHelper
-    VERSION = "0.0.135"
+    VERSION = "0.0.136"
   end
 end

data/lib/zotplus-rakehelper.rb

@@ -1,16 +1,16 @@
-require 'nokogiri'
-require 'zip'
-require 'rake'
-require 'rickshaw'
-require 'uri'
 require 'fileutils'
+require 'github_api'
+require 'jwt'
+require 'nokogiri'
 require 'open-uri'
 require 'ostruct'
-require 'open-uri'
+require 'rake'
 require 'rest-client'
+require 'rickshaw'
 require 'securerandom'
-require 'jwt'
-require 'rest-client'
+require 'tempfile'
+require 'uri'
+require 'zip'
 
 case ENV['DEBUGBUILD']
   when 'true'
@@ -39,6 +39,7 @@ task XPI => ZIPFILES do
       if File.basename(src) == 'install.rdf' && DEBUGBUILD != ''
         install_rdf = Nokogiri::XML(File.open('install.rdf'))
         install_rdf.at('//em:version').content = RELEASE
+        # TODO: update to https://github.com/ZotPlus/zotero-#{EXTENSION}/releases/download/update.rdf/update.rdf
         install_rdf.at('//em:updateURL').content = "https://zotplus.github.io/#{EXTENSION}/update.rdf"
 
         zipfile.get_output_stream(src){|f| install_rdf.write_xml_to f }
@@ -84,7 +85,6 @@ task :bump, :what do |t, args|
 
   install_rdf = Nokogiri::XML(File.open('install.rdf'))
   install_rdf.at('//em:version').content = release
-  install_rdf.at('//em:updateURL').content = "https://zotplus.github.io/#{EXTENSION}/update.rdf"
   File.open('install.rdf','w') {|f| install_rdf.write_xml_to f}
 
   md = open("https://raw.githubusercontent.com/ZotPlus/ZotPlus.github.io/master/#{EXTENSION}/index.md").read
@@ -104,15 +104,6 @@ task :bump, :what do |t, args|
   sh "git tag #{release}"
 end
 
-GR="bin/github-release"
-file GR do
-  FileUtils.mkdir_p('bin')
-  FileUtils.mkdir_p('tmp')
-  tmp = 'tmp/github-release.tar.bz2'
-  ZotPlus::RakeHelper.download('https://github.com/aktau/github-release/releases/download/v0.5.3/linux-amd64-github-release.tar.bz2', tmp)
-  sh "tar xjf #{tmp} -C bin --strip-components 3"
-end
-
 def sign
   token = lambda {
     payload = {
@@ -173,7 +164,7 @@ def sign
   }
 end
 
-task :deploy => [XPI, GR] do
+task :deploy => XPI do
   throw "GITHUB_TOKEN not set" unless ENV['GITHUB_TOKEN']
   checkin = `git log -n 1 --pretty=oneline`.strip
 
@@ -188,8 +179,74 @@ task :deploy => [XPI, GR] do
   if checkin == release
     STDERR.puts "Deploying #{RELEASE} (#{sha1})"
 
-    sh "#{GR} release --user ZotPlus --repo zotero-#{EXTENSION} --tag #{RELEASE} --name 'v#{RELEASE}'"
-    sh "#{GR} upload --user ZotPlus --repo zotero-#{EXTENSION} --tag #{RELEASE} --name '#{XPI}' --file '#{XPI}'"
+    raise "GITHUB_TOKEN not set" unless GITHUB_TOKEN
+    github = Github.new({oauth_token: ENV['GITHUB_TOKEN']})
+
+    # create release and upload assets
+
+    release = github.repos.releases.create('ZotPlus', "zotero-#{EXTENSION}", {
+      tag_name: RELEASE,
+      name: RELEASE,
+      body: RELEASE
+    })
+
+    github.repos.releases.assets.upload('ZotPlus', "zotero-#{EXTENSION}", release.id, "zotero-#{EXTENSION}-#{RELEASE}.xpi", {
+      name: "zotero-#{EXTENSION}-#{RELEASE}.xpi",
+      content_type: 'application/x-xpinstall'
+    })
+
+    # point update.rdf to the right place
+    release = github.repos.releases.list('ZotPlus', "zotero-#{EXTENSION}").detect{|rel| rel.name == 'update.rdf' }
+
+    ## Remove any existing assets
+    github.repos.releases.assets.list('ZotPlus', "zotero-#{EXTENSION}", release.id){ |asset|
+      github.repos.releases.assets.delete 'ZotPlus', "zotero-#{EXTENSION}", asset.id
+    }
+
+    update_rdf = Nokogiri::XML::Builder.new { |xml|
+      xml.RDF('xmlns:RDF'=>'http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'xmlns:em' => 'http://www.mozilla.org/2004/em-rdf#') {
+        xml.parent.namespace = xml.parent.namespace_definitions.find{|ns|ns.prefix=='RDF'}
+        xml['RDF'].Description(about: "urn:mozilla:extension:#{EXTENSION_ID}") {
+          xml['em'].updates {
+            xml['RDF'].Seq {
+              xml['RDF'].li {
+                xml['RDF'].Description {
+                  xml['em'].version { xml.text RELEASE }
+                  xml['em'].targetApplication {
+                    xml['RDF'].Description {
+                      xml['em'].id { xml.text "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" }
+                      xml['em'].minVersion { xml.text "17.0" }
+                      xml['em'].maxVersion { xml.text "43.*" }
+                      xml['em'].updateLink { xml.text "https://github.com/ZotPlus/zotero-better-bibtex/releases/download/#{RELEASE}/zotero-#{EXTENSION}-#{RELEASE}.xpi" }
+                      xml['em'].updateInfoURL { xml.text "https://zotplus.github.io/better-bibtex/CHANGELOG.html" }
+                    }
+                  }
+                  xml['em'].targetApplication {
+                    xml['RDF'].Description {
+                      xml['em'].id { xml.text "zotero@chnm.gmu.edu" }
+                      xml['em'].minVersion { "3.0" }
+                      xml['em'].maxVersion { "4.0.*" }
+                      xml['em'].updateLink{ xml.text "https://github.com/ZotPlus/zotero-better-bibtex/releases/download/#{RELEASE}/zotero-#{EXTENSION}-#{RELEASE}.xpi" }
+                      xml['em'].updateInfoURL { xml.text "https://zotplus.github.io/better-bibtex/CHANGELOG.html" }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+    Tempfile.create('update_rdf') do |tmp|
+      File.open(tmp, 'wb') {|f| f.write update_rdf.to_xml }
+
+      ## upload new update.rdf
+      github.repos.releases.assets.upload('ZotPlus', "zotero-#{EXTENSION}", release.id, tmp.path, {
+        name: 'update.rdf',
+        content_type: 'application/rdf+xml'
+      })
+    end
 
     open("www/_includes/#{EXTENSION}-version.html", 'w'){|f| f.write(RELEASE) }
     Dir.chdir('www'){

data/zotplus-rakehelper.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rubyzip', '>= 1.0.0' # will load new rubyzip version
   spec.add_runtime_dependency 'rickshaw'
   spec.add_runtime_dependency 'rest-client'
+  spec.add_runtime_dependency 'github_api'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zotplus-rakehelper
 version: !ruby/object:Gem::Version
-  version: 0.0.135
+  version: 0.0.136
 platform: ruby
 authors:
 - Emiliano Heyns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: github_api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ZotPlus rake helper
 email:
 - Emiliano.Heyns@iris-advies.com