rake-xpi 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5b5d6978d1160d8340d84e8d195bccd9ddde99a
-  data.tar.gz: 2d635cb311d7e4abcb550725ce25f4908ec3f6b3
+  metadata.gz: dab150f7e6cbf7d252d90ecc591d4c73f5d33e7c
+  data.tar.gz: 3d818873167c8278839749f4942fd1786c7dac53
 SHA512:
-  metadata.gz: 1392bdef04abfd02529d71f056906e66ae6a562a876b2b534554db0c2216f97f054fb552f29799d6c8e19710c1c0b8f2088fcb8bc1d015b034e70c461cdca9c3
-  data.tar.gz: cb1f4343e3183f393b95867deef25acb5f551cecf39feafa28b3bf6ef48b2ffa46375272c7e2f2f595b0e0e7e6243b44db33b96c6d16d2cb8981e17cef0df449
+  metadata.gz: 1d0abd0cf632df0ebfb4bc9b84a4974ce7c3f5e54e768d9db34525471746dfb8d757a18d28f1950346cb93e5e3cfbef0bac4adfedce377b958e333c9a202a7ae
+  data.tar.gz: a7b0bb64243c29231184324238ee85786bca9b5ef8532ad42db728a57adba9d3feca080f72270d995991711e0ecf93922ccd2fdb1b5fa8b94086e2929ac9d642

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    rake-xpi (0.0.17)
+    rake-xpi (0.0.18)
       aws-sdk
-      github_api
       jwt
       multipart-post
       nokogiri
+      octokit
       rake
       recursive-open-struct
       rest-client
@@ -18,48 +18,31 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
-    aws-sdk (2.2.31)
-      aws-sdk-resources (= 2.2.31)
-    aws-sdk-core (2.2.31)
+    aws-sdk (2.2.32)
+      aws-sdk-resources (= 2.2.32)
+    aws-sdk-core (2.2.32)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.2.31)
-      aws-sdk-core (= 2.2.31)
+    aws-sdk-resources (2.2.32)
+      aws-sdk-core (= 2.2.32)
     blockenspiel (0.5.0)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
     domain_name (0.5.20160310)
       unf (>= 0.0.5, < 1.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    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)
-    jmespath (1.2.3)
+    jmespath (1.2.4)
       json_pure (>= 1.8.1)
     json_pure (1.8.3)
-    jwt (1.5.1)
+    jwt (1.5.4)
     mime-types (2.99.1)
     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.2)
       mini_portile2 (~> 2.0.0.rc2)
-    oauth2 (1.1.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0, < 1.5.2)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    rack (1.6.4)
+    octokit (4.3.0)
+      sawyer (~> 0.7.0, >= 0.5.3)
     rake (11.1.2)
     recursive-open-struct (1.0.1)
     rest-client (1.8.0)
@@ -67,7 +50,9 @@ GEM
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     rubyzip (1.2.0)
-    thread_safe (0.3.5)
+    sawyer (0.7.0)
+      addressable (>= 2.3.5, < 2.5)
+      faraday (~> 0.8, < 0.10)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)

data/lib/rake/xpi/github.rb

@@ -1,58 +1,52 @@
-require 'github_api'
-#require 'aws-sdk'
-#require 'fileutils'
-#require 'jwt'
-#require 'nokogiri'
-#require 'open-uri'
-#require 'ostruct'
-#require 'rake'
-#require 'recursive-open-struct'
-#require 'rest-client'
-#require 'securerandom'
-#require 'socket'
-#require 'tempfile'
-#require 'uri'
-#require 'yaml'
-#require 'zip'
+require 'octokit'
 
 module Rake
   module XPI
     class Config
       @@builds = :builds
 
-      def client
-        if @client.nil?
+      def octokit
+        if @initialized.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})
+
+          Octokit.configure{|c|
+            c.access_token = token
+          }
+          Octokit.middleware = Faraday::RackBuilder.new {|builder|
+            builder.use Faraday::HttpCache, shared_cache: false
+            builder.use Octokit::Response::RaiseError
+            builder.adapter Faraday.default_adapter
+          }
+          Octokit.auto_paginate = true
+          @initialized = true
+          @repo = @config.github.user + '/' + @config.github.repo
         end
-        return @client
+        return Octokit
       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.to_s }
+        release = octokit.release_for_tag(@repo, tag.to_s)
         if release
-          raise "Release #{tag}: requested #{is_prerelease ? 'pre' : ''}release, found #{is_prerelease ? 'pre' : ''}release" if is_prerelease ^ release.prerelease
+          raise "Release #{tag}: requested #{is_prerelease ? 'pre' : ''}release, found #{release.prerelease ? 'pre' : ''}release" if is_prerelease ^ release.prerelease
         else
           params = {
-            tag_name: tag.to_s,
             name: tag.to_s,
             body: tag.to_s,
           }
           params[:target_commitish] = `git rev-list --max-parents=0 HEAD`.split(/\n/).collect{|sha| sha.strip}.first if tag.is_a?(Symbol)
           params[:prerelease] = true if is_prerelease
-          release = client.repos.releases.create(@config.github.user, @config.github.repo, params)
+          release = octokit.create_release(@repo, tag.to_s, params)
         end
 
-        client.repos.releases.assets.list(@config.github.user, @config.github.repo, release.id){ |asset|
+        # remove old version
+        octokit.release_assets(release.url).each{|asset|
           next unless asset.name == asset_name
-          client.repos.releases.assets.delete(@config.github.user, @config.github.repo, asset.id)
+          octokit.delete_release_asset(asset.url)
         }
-        client.repos.releases.assets.upload(@config.github.user, @config.github.repo, release.id, content, {
-          name: asset_name,
-          content_type: content_type
-        })
+
+        octokit.upload_asset(release.url, content, name: asset_name, content_type: content_type)
       end
 
       def update_url
@@ -72,11 +66,12 @@ module Rake
 
         # scrub old builds after 7 days
         old = Date.today - 7
-        release = client.repos.releases.list(@config.github.user, @config.github.repo).detect{|rel| rel.tag_name == @@builds.to_s }
+
+        release = octokit.release_for_tag(@repo, @@builds.to_s)
         if release
-          client.repos.releases.assets.list(@config.github.user, @config.github.repo, release.id){ |asset|
+          octokit.release_assets(release.url).each{|asset|
             next if asset.updated_at > old
-            client.repos.releases.assets.delete(@config.github.user, @config.github.repo, asset.id)
+            octokit.delete_release_asset(asset.url)
           }
         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.17'
+  spec.version       = '0.0.18'
   spec.authors       = ["Emiliano Heyns"]
   spec.email         = ["Emiliano.Heyns@iris-advies.com"]
   spec.description   = %q{rake helper to build XPI files}
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
 
   spec.add_runtime_dependency 'aws-sdk'
-  spec.add_runtime_dependency 'github_api'
+  spec.add_runtime_dependency 'octokit'
   spec.add_runtime_dependency 'jwt'
   spec.add_runtime_dependency 'multipart-post'
   spec.add_runtime_dependency 'versionomy'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-xpi
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Emiliano Heyns
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: github_api
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="