github-release-party 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fa7914c15856ac4340ed49321dac940ce4ede6935bee5c3d763991f404fd772
-  data.tar.gz: 21ecb0ffb5ec34a11ffc30398010192fa0dbc8b3cefa7c79a76584d0afb9811f
+  metadata.gz: 46459e03534d4da5df10a808417f51a63861b1afe9ed97d3d800fe99a66473f3
+  data.tar.gz: 0ca9805a23cbe728b590f670d20e5775f1c38b567f076451fe3677af006c41d5
 SHA512:
-  metadata.gz: 8a25013adc2fc2517b6da7f3ebb8aaf86691ec31808b5110f28cd343af3addcc137528f13a8078ebeca8d47162c28d7bd9b6df9db99980c6d6f06a082fc055c8
-  data.tar.gz: 8354ff1610d4b61e4c7b981fcc5d520b41d8e88bcd1b4f32bc2a559e19b2d9c0cc9fc83aa0801bbf8116844c679370acd0c0dbf5daae55c651f69aae487ed410
+  metadata.gz: '08fe94d85b1a42f13691b5a48350e2f2b7b9f5d82be8997870bf36fb583879a1ca004e6165f6f3e88ade5a30e2d4de144cab2ab138419fe64a4e4cf971d48fce'
+  data.tar.gz: 24c33ae1483107e18925678c27058a098cd298f69e16e9b50cc0dc7cf006fd3f8a9522a8a98ec9968395a4c8472a58aec379daf0ef7777295d1cd67837db0f39

data/lib/github-release-party.rb

@@ -1,65 +1,44 @@
-require_relative "http"
 require_relative "github-release-party/version"
 
-class GithubReleaseParty < HTTP
-  BASE_URL = "https://api.github.com"
-  PARAMS = "access_token=#{ENV["GITHUB_RELEASE_TOKEN"]}"
-  HEADERS = {
-    "User-Agent" => "github-release-party/#{GithubReleaseParty::VERSION}",
-  }
-
-  def initialize
-    return unless self.class.env_ok
-    @releases = []
+class GithubReleaseParty
+  def self.releases
+    releases = []
     page = 1
     while true
-      r = self.class.get("/repos/#{self.class.repo}/releases?page=#{page}")
-      raise(HTTPError, r) if !r.success?
+      r = GitHub.get("/repos/#{repo}/releases?page=#{page}")
+      if !r.success?
+        puts "Error occurred when fetching releases:"
+        puts error(r)
+        abort
+      end
       break if r.json.length == 0
-
-      @releases = @releases + r.json
+      releases = releases + r.json
       page += 1
     end
-  end
-
-  def update_or_create(tag_name, name, message)
-    release = @releases.find { |rel| rel["tag_name"] == tag_name }
-    if release
-      self.class.update(release["id"], name, message)
-    else
-      self.class.create(tag_name, name, message)
-    end
+    return releases
   end
 
   def self.update(id, name, message)
-    return unless env_ok
-
-    r = patch("/repos/#{repo}/releases/#{id}", {
-      body: {
-        name: name,
-        body: message
-      }.to_json
-    })
+    r = GitHub.patch("/repos/#{repo}/releases/#{id}", {
+      name: name,
+      body: message
+    }.to_json)
     if r.success?
       puts "GitHub release #{name} updated!"
     else
-      puts "Failed to update GitHub release #{tag_name}!"
+      puts "Failed to update GitHub release #{name}!"
       puts error(r)
     end
   end
 
   def self.create(tag_name, name, message)
-    return unless env_ok
-
     body = {
       tag_name: tag_name,
       name: name,
       body: message
     }
 
-    r = post("/repos/#{repo}/releases", {
-      body: body.to_json
-    })
+    r = GitHub.post("/repos/#{repo}/releases", body.to_json)
     if r.success?
       puts "GitHub release #{tag_name} created!"
     else
@@ -76,16 +55,13 @@ class GithubReleaseParty < HTTP
     end
   end
 
-  def self.env_ok
+  def self.check_env!
     if !ENV["GITHUB_RELEASE_TOKEN"]
-      puts "Configure GITHUB_RELEASE_TOKEN to create GitHub releases. See https://github.com/stefansundin/github-release-party#setup"
-      return false
+      abort "Configure GITHUB_RELEASE_TOKEN to create GitHub releases. See https://github.com/stefansundin/github-release-party#setup"
     end
     if !repo
-      puts "Can't find the GitHub repo. Please use the remote 'origin'."
-      return false
+      abort "Can't find the GitHub repo. Please use the remote 'origin'."
     end
-    return true
   end
 
   def self.repo
@@ -95,6 +71,74 @@ class GithubReleaseParty < HTTP
   private
 
   def self.error(r)
-    "#{r.url}: #{r.code}: #{r.body}. #{r.headers.to_json}"
+    "#{r.request_uri}: #{r.code}: #{r.body}\nHeaders: #{r.headers.to_json}"
+  end
+
+  class GitHub
+    def self.get(*args)
+      request(:request_get, *args)
+    end
+
+    def self.post(*args)
+      request(:request_post, *args)
+    end
+
+    def self.patch(*args)
+      request(:patch, *args)
+    end
+
+    private
+
+    def self.request(method, request_uri, body=nil)
+      opts = {
+        use_ssl: true,
+        open_timeout: 10,
+        read_timeout: 10,
+      }
+      Net::HTTP.start("api.github.com", 443, opts) do |http|
+        headers = {
+          "Authorization" => "token #{ENV["GITHUB_RELEASE_TOKEN"]}",
+          "User-Agent" => "github-release-party/#{GithubReleaseParty::VERSION}",
+        }
+        if method == :request_post or method == :patch
+          # response = http.send(:request_get, "/", headers)
+          response = http.send(method, request_uri, body, headers)
+        else
+          response = http.send(method, request_uri, headers)
+        end
+        return HTTPResponse.new(response, request_uri)
+      end
+    end
+  end
+
+  class HTTPResponse
+    def initialize(response, request_uri)
+      @response = response
+      @request_uri = request_uri
+    end
+
+    def request_uri
+      @request_uri
+    end
+
+    def body
+      @response.body
+    end
+
+    def json
+      @json ||= JSON.parse(@response.body)
+    end
+
+    def headers
+      @response.to_hash
+    end
+
+    def code
+      @response.code.to_i
+    end
+
+    def success?
+      @response.is_a?(Net::HTTPSuccess)
+    end
   end
 end

data/lib/github-release-party/tasks/heroku.rb

@@ -54,7 +54,7 @@ end
 
 desc "Deploy a new version to Heroku"
 task :deploy do
-  abort if not GithubReleaseParty.env_ok
+  GithubReleaseParty.check_env!
   ver = heroku_push() or abort("Deploy failed.")
   hash = `git rev-parse HEAD`.strip
   github_tag(hash, ver)
@@ -63,7 +63,7 @@ end
 namespace :deploy do
   desc "Deploy a new version to Heroku using --force"
   task :force do
-    abort if not GithubReleaseParty.env_ok
+    GithubReleaseParty.check_env!
     ver = heroku_push(%w[--force]) or abort("Deploy failed.")
     hash = `git rev-parse HEAD`.strip
     github_tag(hash, ver)
@@ -71,7 +71,7 @@ namespace :deploy do
 
   desc "Tag last release"
   task :tag do
-    abort if not GithubReleaseParty.env_ok
+    GithubReleaseParty.check_env!
 
     # get heroku version number
     begin
@@ -87,7 +87,8 @@ namespace :deploy do
 
   desc "Rebuild all the release tags"
   task :retag do
-    github = GithubReleaseParty.new
+    GithubReleaseParty.check_env!
+    releases = GithubReleaseParty.releases
     repo = GithubReleaseParty.repo
 
     tags = `git tag -l heroku/v* --sort=version:refname`.split("\n")
@@ -116,7 +117,12 @@ namespace :deploy do
       abort if not success
 
       # update or create GitHub release
-      github.update_or_create(tag_name, ver, message)
+      release = releases.find { |rel| rel["tag_name"] == tag_name }
+      if release
+        GithubReleaseParty.update(release["id"], ver, message)
+      else
+        GithubReleaseParty.create(tag_name, ver, message)
+      end
     end
 
     puts

data/lib/github-release-party/version.rb

@@ -1,5 +1,3 @@
-require_relative "../http"
-
-class GithubReleaseParty < HTTP
-  VERSION = "0.3.3"
+class GithubReleaseParty
+  VERSION = "0.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-release-party
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Stefan Sundin
@@ -31,7 +31,7 @@ cert_chain:
   E04BZKo2WzOTzSDymo97Yu4YFgyc98umMyeaCvPk4YmdNzqSanAXpY2bnsyu0CF5
   Td0=
   -----END CERTIFICATE-----
-date: 2019-09-29 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -47,20 +47,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '12'
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
 description: I use this gem to automatically create GitHub releases when I deploy
   to Heroku. See the GitHub page for usage.
 email:
@@ -72,7 +58,6 @@ files:
 - lib/github-release-party.rb
 - lib/github-release-party/tasks/heroku.rb
 - lib/github-release-party/version.rb
-- lib/http.rb
 homepage: https://github.com/stefansundin/github-release-party
 licenses:
 - GPL-3.0

data/lib/http.rb

@@ -1,143 +0,0 @@
-# frozen_string_literal: true
-
-require "net/http"
-require "addressable/uri"
-require "json"
-
-class HTTP
-  def self.request(method, url, options={body: nil, headers: nil, query: nil})
-    relative_url = (url[0] == "/")
-
-    if defined?(self::BASE_URL) and relative_url
-      url = self::BASE_URL+url
-    end
-
-    if defined?(self::PARAMS) and relative_url
-      if url["?"]
-        url += "&"+self::PARAMS
-      else
-        url += "?"+self::PARAMS
-      end
-    end
-
-    if options[:query]
-      params = options[:query].map { |k,v| "#{k}=#{v}" }.join("&")
-      if url["?"]
-        url += "&"+params
-      else
-        url += "?"+params
-      end
-    end
-
-    uri = Addressable::URI.parse(url).normalize
-    opts = {
-      use_ssl: uri.scheme == "https",
-      open_timeout: 10,
-      read_timeout: 10,
-    }
-    Net::HTTP.start(uri.host, uri.port, opts) do |http|
-      headers = {}
-      headers.merge!(self::HEADERS) if defined?(self::HEADERS) and relative_url
-      headers.merge!(options[:headers]) if options[:headers]
-      if method == :request_post or method == :patch
-        response = http.send(method, uri.request_uri, options[:body], headers)
-      else
-        response = http.send(method, uri.request_uri, headers)
-      end
-      return HTTPResponse.new(response, uri.to_s)
-    end
-  end
-
-  def self.get(*args)
-    request(:request_get, *args)
-  end
-
-  def self.post(*args)
-    request(:request_post, *args)
-  end
-
-  def self.patch(*args)
-    request(:patch, *args)
-  end
-end
-
-class HTTPResponse
-  def initialize(response, url)
-    @response = response
-    @url = url
-  end
-
-  def raw
-    @response
-  end
-
-  def url
-    @url
-  end
-
-  def body
-    @response.body
-  end
-
-  def json
-    @json ||= JSON.parse(@response.body)
-  end
-
-  def parsed_response
-    json
-  end
-
-  def headers
-    @response.header
-  end
-
-  def code
-    @response.code.to_i
-  end
-
-  def success?
-    @response.is_a?(Net::HTTPSuccess)
-  end
-
-  def redirect?
-    @response.is_a?(Net::HTTPRedirection)
-  end
-
-  def redirect_url
-    raise("not a redirect") if !redirect?
-    url = @response.header["location"]
-    if url[0] == "/"
-      # relative redirect
-      uri = Addressable::URI.parse(@url)
-      url = uri.scheme + "://" + uri.host + url
-    elsif /^https?:\/\/./ !~ url
-      raise("bad redirect: #{url}")
-    end
-    Addressable::URI.parse(url).normalize.to_s # Some redirects do not url encode properly, such as http://amzn.to/2aDg49F
-  end
-
-  def redirect_same_origin?
-    return false if !redirect?
-    uri = Addressable::URI.parse(@url).normalize
-    new_uri = Addressable::URI.parse(redirect_url).normalize
-    uri.origin == new_uri.origin
-  end
-end
-
-class HTTPError < StandardError
-  def initialize(obj)
-    @obj = obj
-  end
-
-  def request
-    @obj
-  end
-
-  def data
-    @obj.json
-  end
-
-  def message
-    "#{@obj.code}: #{@obj.body}"
-  end
-end