zotplus-rakehelper 0.0.131 → 0.0.132

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aac41b635a7733aee9687f12d57364f89e2d12dd
-  data.tar.gz: b7675381ad7194a26bc10508642a951805cedf4c
+  metadata.gz: 6097fe13f40f850ecd68ac72572f47a5949e5174
+  data.tar.gz: 474ab278b6ca561f67dac196eb5024b31204005d
 SHA512:
-  metadata.gz: 115f0477ab49d7a03b2b89eb9dcf2243c94fd24c7d4b7409bd1fbf4aaa07b0f6e769e383a55c0494206d88c8e9869a142a8c4b63cb22584f41f030146151f062
-  data.tar.gz: 5cc6163414072d8e8d0ee7ad8cba0794770ac60be861976d4b08e993eafb0693b83efcc4f64eb9ece79b5fcd344261cc30ac1a124826f9a0b42dde2b8867f46d
+  metadata.gz: 07d832f5a0dd413908ce7735c8ae3ac222c834c7a938649063d5d11aa3b11ba47f5d3ba5be1c68ef9729b47ea929d7a38e91109292b1bb644cf506c08d3375e0
+  data.tar.gz: ad95cca6719dc288aed2353fee1261ac23b9d4d1768836b1be0c06b68d8c648fd0ada90a9101e22cc6a4656d757a94d43b2345712989b7a44e2d371f6c3fa4ee

data/lib/zotplus-rakehelper/version.rb

@@ -1,5 +1,5 @@
 module ZotPlus
   class RakeHelper
-    VERSION = "0.0.131"
+    VERSION = "0.0.132"
   end
 end

data/lib/zotplus-rakehelper.rb

@@ -22,7 +22,6 @@ ID = Nokogiri::XML(File.open('install.rdf')).at('//em:id').inner_text
 EXTENSION = ID.gsub(/@.*/, '')
 RELEASE = Nokogiri::XML(File.open('install.rdf')).at('//em:version').inner_text + DEBUGBUILD
 XPI = "zotero-#{EXTENSION}-#{RELEASE}.xpi"
-SIGNED = "zotero-#{EXTENSION}-#{RELEASE}-signed.xpi"
 NODEBIN="node_modules/.bin"
 
 task :default => XPI do
@@ -45,6 +44,12 @@ task XPI => ZIPFILES do
       end
     }
   end
+
+  begin
+    sign
+  rescue
+    FileUtils.rm_f(XPI)
+  end
 end
 
 rule '.js' => '.pegjs' do |t|
@@ -104,7 +109,7 @@ file GR do
   sh "tar xjf #{tmp} -C bin --strip-components 3"
 end
 
-file SIGNED => XPI do
+def sign
   token = lambda {
     payload = {
       jti: SecureRandom.base64,
@@ -159,12 +164,12 @@ file SIGNED => XPI do
   raise "Not signed: #{status['files'][0].inspect}" unless status['files'][0]['signed']
 
   puts "\ngetting signed XPI from #{status['files'][0]['download_url']}"
-  File.open(SIGNED, 'wb'){|f|
+  File.open(XPI, 'wb'){|f|
     f.write(RestClient.get(status['files'][0]['download_url'], { 'Authorization' => "JWT #{token.call}"} ).body)
   }
 end
 
-task :deploy => [SIGNED, GR] do
+task :deploy => [XPI, GR] do
   throw "GITHUB_TOKEN not set" unless ENV['GITHUB_TOKEN']
   checkin = `git log -n 1 --pretty=oneline`.strip
 
@@ -180,7 +185,7 @@ task :deploy => [SIGNED, GR] do
     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 '#{SIGNED}'"
+    sh "#{GR} upload --user ZotPlus --repo zotero-#{EXTENSION} --tag #{RELEASE} --name '#{XPI}' --file '#{XPI}'"
 
     open("www/_includes/#{EXTENSION}-version.html", 'w'){|f| f.write(RELEASE) }
     Dir.chdir('www'){

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zotplus-rakehelper
 version: !ruby/object:Gem::Version
-  version: 0.0.131
+  version: 0.0.132
 platform: ruby
 authors:
 - Emiliano Heyns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler