rake-xpi 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d60a684cce8c1c3c3b07d86dc84d5999e3deef03
-  data.tar.gz: ffe2f1f3b458222908d9150a8faf1a2cbf840ab8
+  metadata.gz: 31379f61ff042eb9ab89212a8de7144ab1430511
+  data.tar.gz: b37f74ad3dcbedd3920e15d3b85b6a4b4b14d766
 SHA512:
-  metadata.gz: 3b49f20dc385004ca62d5f375af31f0620de1e77b75d7931f3934acfa3e306261b348af05057f93f860270910370854230e32093613ebe92eabd999b7305091f
-  data.tar.gz: c3620afe3546bb7f3d7baa02c9c5d47c7e5763e50c60284e929b019b4a1db4c338fe9f9e0283c479f209c8dc6463bb687262c4f92e832406a878e92ce86501f6
+  metadata.gz: c71f05fb95eac19dd0463f7f7a25c956003b669859113e30a8cdb55fc990660127939457573e5b3d699cf1408009372008ef11d35844779ae38ff7fa0acc9483
+  data.tar.gz: a6022bd8b44504e1e2cf625b132af25a8118841be8197c060843969da3ac0705aea994479cacf44b8a70a424764ff920caf49a4b7734be30a8fb0c1f1f12714c

data/.gitignore

@@ -1,3 +1,4 @@
 pkg
 test.*
 install.rdf
+xpi.yml

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake-xpi (0.0.6)
+    rake-xpi (0.0.7)
       aws-sdk
       github_api
       jwt

data/lib/rake/xpi.rb

@@ -68,10 +68,11 @@ module Rake
         end
       end
 
-      def update_rdf(link)
+      def update_rdf
         _id = self.id
         _release = self.release
         _changelog = self.changelog
+        _link = self.xpi_url
 
         update = Nokogiri::XML::Builder.new { |xml|
           xml.RDF('xmlns:RDF'=>'http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'xmlns:em' =>
@@ -90,7 +91,7 @@ module Rake
                             xml['em'].id { xml.text target.at('./em:id').inner_text }
                             xml['em'].minVersion { xml.text target.at('./em:minVersion').inner_text }
                             xml['em'].maxVersion { xml.text target.at('./em:maxVersion').inner_text }
-                            xml['em'].updateLink { xml.text link }
+                            xml['em'].updateLink { xml.text _link }
                             xml['em'].updateInfoURL { xml.text _changelog }
                           }
                         }
@@ -324,6 +325,7 @@ file XPI.xpi => XPI.files do |t|
       when 'install.rdf'
         install_rdf = Nokogiri::XML(File.open(src))
         install_rdf.at('//em:version').content = XPI.version
+        install_rdf.at('//em:updateURL').content = XPI.update_url
         zipfile.get_output_stream(src){|f| install_rdf.write_xml_to f }
       else
         zipfile.add(src, src)
@@ -365,6 +367,7 @@ end
 task :publish => XPI.xpi do
   if !XPI.pull_request
     STDERR.puts "Publishing #{XPI.release_build? ? 'release' : 'debug'} build #{XPI.versioned_xpi}"
-    STDERR.puts "Published to " + XPI.publish
+    XPI.publish
+    STDERR.puts "Published to #{XPI.xpi_url}"
   end
 end

data/lib/rake/xpi/github.rb

@@ -32,6 +32,13 @@ module Rake
         })
       end
 
+      def update_url
+        return "https://github.com/#{@config.github.user}/#{@config.github.repo}/releases/download/update.rdf/update.rdf"
+      end
+      def xpi_url
+        return "https://github.com/#{@config.github.user}/#{@config.github.repo}/releases/download/#{release.name}/#{self.versioned_xpi}"
+      end
+
       def publish
         raise "Github publishing not configured" unless @config.github && @config.github.user && @config.github.token
         token = ENV[@config.github.token]
@@ -57,7 +64,6 @@ module Rake
           content_type: 'application/x-xpinstall'
         })
 
-        download = "https://github.com/#{@config.github.user}/#{@config.github.repo}/releases/download/#{release.name}/#{self.versioned_xpi}"
         if release_build?
           release = get_stable_release('update.rdf', false)
           # Remove any existing assets
@@ -65,15 +71,13 @@ module Rake
             @github.repos.releases.assets.delete(@config.github.user, @config.github.repo, asset.id)
           }
 
-          update_rdf(download){|update|
+          update_rdf{|update|
             @releases.assets.upload(@config.github.user, @config.github.repo, release.id, update, {
               name: 'update.rdf',
               content_type: 'application/rdf+xml'
             })
           }
         end
-
-        return download
       end
     end
   end

data/rake-xpi.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rake-xpi"
-  spec.version       = '0.0.6'
+  spec.version       = '0.0.7'
   spec.authors       = ["Emiliano Heyns"]
   spec.email         = ["Emiliano.Heyns@iris-advies.com"]
   spec.description   = %q{rake helper to build XPI files}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-xpi
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Emiliano Heyns