rake-xpi 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af6dbe09c0e5cbce8cadee2b9e730b528c2d6c6c
-  data.tar.gz: 3fa822b452e4ddb279fbad08b4df2392ac6cb992
+  metadata.gz: 1b6aa79b6cb97154aef73f48d45498559935b6e3
+  data.tar.gz: 7d10367b9b0efa17fcef2fa410c2a8df13e2bf7d
 SHA512:
-  metadata.gz: 41ce5f88ae69b0b635cdabad365f74491ec43034ea91f2383d1d95860f9e0ada3cabe69c3aa453dcb497e7c94628f810c30c97f66d5c4f9691c82db91482478e
-  data.tar.gz: b1fae3e25498d67eae626a10910dfbfbe607b087646b0f3bba675963f85ca19accb40044138b39dd4400fbeb38adaae6e2052372896ca2f260acdbc7dd222871
+  metadata.gz: 405ed492deed46dc74c2f20c5ffb12d4c2e1a2a0070f7b02a76611754b2440c51e359d5b3f29495b5f1306f6dc98014994c851603855955abc1176dd77e9acfc
+  data.tar.gz: 8fbfb211c95a3a92f164ddc57fd5c2c3dc23fa5ffc87344f1f36e7e6e0b0e691fd6c9b0c44ee04f60268d3bde82c6faf2afee93a742a971de09e555cf4759ed8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake-xpi (0.0.8)
+    rake-xpi (0.0.9)
       aws-sdk
       github_api
       jwt
@@ -17,12 +17,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
-    aws-sdk (2.2.30)
-      aws-sdk-resources (= 2.2.30)
-    aws-sdk-core (2.2.30)
+    aws-sdk (2.2.31)
+      aws-sdk-resources (= 2.2.31)
+    aws-sdk-core (2.2.31)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.2.30)
-      aws-sdk-core (= 2.2.30)
+    aws-sdk-resources (2.2.31)
+      aws-sdk-core (= 2.2.31)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     domain_name (0.5.20160310)
@@ -76,6 +76,3 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.3)
   rake-xpi!
-
-BUNDLED WITH
-   1.11.2

data/lib/rake/xpi/github.rb

@@ -19,17 +19,39 @@ module Rake
   module XPI
     class Config
       @@builds = 'builds'
-      def get_stable_release(tag, prerelease)
-        release = @releases.list(@config.github.user, @config.github.repo).detect{|rel| rel.tag_name == tag }
-        return release if release
 
-        sha = `git rev-list --max-parents=0 HEAD`.split(/\n/).collect{|sha| sha.strip}.first
-        release = @releases.create(@config.github.user, @config.github.repo, {
-          tag_name: tag,
-          target_commitish: sha,
-          name: tag,
-          body: tag,
-          prerelease: prerelease
+      def client
+        if @client.nil?
+          raise "Github publishing not configured" unless @config.github && @config.github.user && @config.github.token
+          token = ENV[@config.github.token]
+          raise "Github publishing not configured" unless token
+          @client = Github.new({oauth_token: token})
+        end
+        return @client
+      end
+
+      def add_asset(tag, is_prerelease, asset_name, content, content_type)
+        release = client.repos.releases.list(@config.github.user, @config.github.repo).detect{|rel| rel.tag_name == tag }
+        if release
+          raise "Release #{tag}: requested #{is_prerelease ? 'pre' : ''}release, found #{is_prerelease ? 'pre' : ''}release" if is_prerelease ^ release.prerelease
+        else
+          sha = `git rev-list --max-parents=0 HEAD`.split(/\n/).collect{|sha| sha.strip}.first
+          release = client.repos.releases.create(@config.github.user, @config.github.repo, {
+            tag_name: tag,
+            target_commitish: sha,
+            name: tag,
+            body: tag,
+            prerelease: !!is_prerelease
+          })
+        end
+
+        client.repos.releases.assets.list(@config.github.user, @config.github.repo, release.id){ |asset|
+          next unless asset.name == asset_name
+          client.repos.releases.assets.delete(@config.github.user, @config.github.repo, asset.id)
+        }
+        client.repos.releases.assets.upload(@config.github.user, @config.github.repo, release.id, content, {
+          name: asset_name,
+          content_type: content_type
         })
       end
 
@@ -45,40 +67,8 @@ module Rake
         token = ENV[@config.github.token]
         raise "Github publishing not configured" unless token
 
-        @github = Github.new({oauth_token: token})
-        @releases = @github.repos.releases
-
-        release = nil
-        if release_build?
-          # create release and upload assets
-          release = @releases.create(@config.github.user, @config.github.repo, {
-            tag_name: self.release,
-            name: self.release,
-            body: self.release
-          })
-        else
-          release = get_stable_release(@@builds, true)
-        end
-
-        @releases.assets.upload(@config.github.user, @config.github.repo, release.id, self.xpi, {
-          name: self.versioned_xpi,
-          content_type: 'application/x-xpinstall'
-        })
-
-        if release_build?
-          release = get_stable_release('update.rdf', false)
-          # Remove any existing assets
-          @github.repos.releases.assets.list(@config.github.user, @config.github.repo, release.id){ |asset|
-            @github.repos.releases.assets.delete(@config.github.user, @config.github.repo, asset.id)
-          }
-
-          update_rdf{|update|
-            @releases.assets.upload(@config.github.user, @config.github.repo, release.id, update, {
-              name: 'update.rdf',
-              content_type: 'application/rdf+xml'
-            })
-          }
-        end
+        add_asset(release_build? ? self.release : @@builds, !release_build?, self.versioned_xpi, self.xpi, 'application/x-xpinstall')
+        update_rdf{|update| add_asset('update.rdf', false, 'update.rdf', update, 'application/rdf+xml') } if release_build?
       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.8'
+  spec.version       = '0.0.9'
   spec.authors       = ["Emiliano Heyns"]
   spec.email         = ["Emiliano.Heyns@iris-advies.com"]
   spec.description   = %q{rake helper to build XPI files}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-xpi
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Emiliano Heyns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler