zotplus-rakehelper 0.0.122 → 0.0.123

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9f2d86e1e5b55e44fd951fe1f8bdda1108087be
-  data.tar.gz: f451f0c2abcc6fd95f41b36d01494986319c4b3f
+  metadata.gz: d79a10b7ceca2fcbedb79a6364e2834590453137
+  data.tar.gz: a80d8118d6acc6c67ae4011a1fb25391b8b1260e
 SHA512:
-  metadata.gz: a50573aa51df43ab69cc136c95589f4d72eeb0ba2882e236e6b7af4fe30425362366a13950411b638cd8a0ab6f5eec8cbcca0e1bb198db167af5559206562826
-  data.tar.gz: c1ca65e02e44b338b4e79a69c21f622d3fbe20986ea15739de42a6669c81aed74aa81a435ad393ac5d0459c0cb754602d8c91fa1cda12bb29bb1dc7741cd1dc5
+  metadata.gz: f21019349c558b9b71027a6c84a0250f640129d5d0c2e62f4932b8b7d42875378286c78c826359b23fb6818db693a25baa522c14497105dbc71330cca65a4489
+  data.tar.gz: 4c5165a59f052f829ea1d16f54148e064a25e0ed592ae129a5ce1125e9be6d33e2a7723301b20303ed7f07558fba05a01ac12ea32b4aa7979fc7470e28a17b65

data/lib/zotplus-rakehelper/version.rb

@@ -1,5 +1,5 @@
 module ZotPlus
   class RakeHelper
-    VERSION = "0.0.122"
+    VERSION = "0.0.123"
   end
 end

data/lib/zotplus-rakehelper.rb

@@ -105,7 +105,64 @@ file GR do
   sh "tar xjf #{tmp} -C bin --strip-components 3"
 end
 
-task :deploy => [XPI, GR] do
+file SIGNED => XPI do
+  token = lambda {
+    payload = {
+      jti: SecureRandom.base64,
+      iss: ENV['MOZJWTissuer'],
+      iat: Time.now.utc.to_i,
+      exp: Time.now.utc.to_i + 60,
+    }
+    return JWT.encode(payload, ENV['MOZJWTsecret'], 'HS256')
+  }
+
+  duration = lambda{|secs|
+    secs = secs.to_i
+    mins  = secs / 60
+    hours = mins / 60
+    days  = hours / 24
+
+    if days > 0
+      "#{days} days and #{hours % 24} hours"
+    elsif hours > 0
+      "#{hours} hours and #{mins % 60} minutes"
+    elsif mins > 0
+      "#{mins} minutes and #{secs % 60} seconds"
+    elsif secs >= 0
+      "#{secs} seconds"
+    end
+  }
+
+  url = "https://addons.mozilla.org/api/v3/addons/#{ID}/versions/#{RELEASE}/"
+
+  begin
+    puts "Submit #{XPI} to #{url} for signing"
+    RestClient.put(url, {upload: File.new(XPI)}, { 'Authorization' => "JWT #{token.call}", 'Content-Type' => 'multipart/form-data' })
+  rescue => RestClient::Conflict
+    puts "#{XPI} already signed"
+  end
+
+  status = {}
+  wait = Time.now.to_i
+  (1..100).each{|attempt|
+    sleep 10
+    status = JSON.parse(RestClient.get(url, { 'Authorization' => "JWT #{token.call}"} ).to_s)
+    files = (status['files'] || []).length
+    signed = (files > 0 ? status['files'][0]['signed'] : false)
+    puts "attempt #{attempt} after #{duration.call(Time.now.to_i - wait)}, #{files} files, signed: #{signed}"
+    break if signed
+  }
+
+  raise "Unexpected response: #{status['files'].inspect}" if !status['files'] || status['files'].length != 1 || !status['files'][0]['download_url']
+  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|
+    f.write(RestClient.get(status['files'][0]['download_url'], { 'Authorization' => "JWT #{token.call}"} ).body)
+  }
+end
+
+task :deploy => [SIGNED, GR] do
   throw "GITHUB_TOKEN not set" unless ENV['GITHUB_TOKEN']
   checkin = `git log -n 1 --pretty=oneline`.strip
 
@@ -113,8 +170,6 @@ task :deploy => [XPI, GR] do
   sha1 = keys.detect{|key| key != ''}
   throw "No SHA1 found in #{keys.inspect}" unless sha1
 
-  xpi = File.exists?(SIGNED) ? SIGNED : XPI
-
   release = "#{sha1} release: #{XPI}"
   STDERR.puts "#{RELEASE}"
   STDERR.puts "  checkin=#{checkin}"
@@ -123,7 +178,7 @@ task :deploy => [XPI, 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 '#{xpi}'"
+    sh "#{GR} upload --user ZotPlus --repo zotero-#{EXTENSION} --tag #{RELEASE} --name '#{XPI}' --file '#{SIGNED}'"
 
     open("www/_includes/#{EXTENSION}-version.html", 'w'){|f| f.write(RELEASE) }
     Dir.chdir('www'){

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zotplus-rakehelper
 version: !ruby/object:Gem::Version
-  version: 0.0.122
+  version: 0.0.123
 platform: ruby
 authors:
 - Emiliano Heyns