github-release-party 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ec1e2b67cc4b6a63da3abadd322402dc34fb44e
-  data.tar.gz: 04b15d9e7bff1230060e3a35c3b4c4a507fe3a82
+  metadata.gz: a24536d487240bee00527dcf0e8d3399a1ceec4f
+  data.tar.gz: 8951cbbf1942ebbf41d697b837d5c0dee7e85006
 SHA512:
-  metadata.gz: de77908cda81ce68ba8737d250a2df96dc974a0fd6cd9bd1b9d1ac619dbe93a11d5c777fbddaaaf83df6c58eb4708480163afcc0f9ccc4f02a1cd2630aa97f54
-  data.tar.gz: 9174e4ace2d9c8758a1c7bfd5259b36b902411c4e42c523d10f9bf06b68912238dca5be1b2bab4d2d8bcf3b059cbae81a49d6ffa6dbd9c3303fabd872dfcf917
+  metadata.gz: 5f5cb1532c190d2b7ca687f3814cd3b51f900bebef9796a49ee6782ed1ce3aeb48b5f139e5708a228c307ae0dfc559ef2a5172f2484ced24f85ade2fb125309d
+  data.tar.gz: 9eac5deead4e1da021b661b2ff6b04ba729095db80291ab38fac3b181990f7565ae49a68c44fdfeb732f91d4c7d6a84670215b315e1ce6e292d37b74466ebfc2

data/lib/github-release-party.rb

@@ -1,21 +1,22 @@
-# This is a GitHub party, and everyone's invited!
+require_relative "http"
 
-require "httparty"
-
-class GithubReleaseParty
-  include HTTParty
-  base_uri "https://api.github.com"
+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 = []
     page = 1
     while true
-      r = self.class.get "/repos/#{self.class.repo}/releases?page=#{page}", self.class.options
-      raise self.class.error(r) if not r.success?
-      break if r.parsed_response.count == 0
+      r = self.class.get("/repos/#{self.class.repo}/releases?page=#{page}")
+      raise(HTTPError, r) if !r.success?
+      break if r.json.length == 0
 
-      @releases = @releases + r.parsed_response
+      @releases = @releases + r.json
       page += 1
     end
   end
@@ -32,7 +33,7 @@ class GithubReleaseParty
   def self.update(id, name, message)
     return unless env_ok
 
-    r = patch "/repos/#{repo}/releases/#{id}", options.merge({
+    r = patch("/repos/#{repo}/releases/#{id}", {
       body: {
         name: name,
         body: message
@@ -55,7 +56,7 @@ class GithubReleaseParty
       body: message
     }
 
-    r = post "/repos/#{repo}/releases", options.merge({
+    r = post("/repos/#{repo}/releases", {
       body: body.to_json
     })
     if r.success?
@@ -66,7 +67,7 @@ class GithubReleaseParty
       puts "Body sent: #{body.to_json}"
       puts
       puts "Failed to create GitHub release!"
-      puts "Create it manually here: https://github.com/#{repo}/releases/new"
+      puts "Create it manually here: https://github.com/#{repo}/releases/new?tag=#{tag_name}"
       puts "Tag version: #{tag_name}"
       puts "Release title: #{tag_name}"
       puts "Message:"
@@ -75,11 +76,11 @@ class GithubReleaseParty
   end
 
   def self.env_ok
-    if not ENV["GITHUB_RELEASE_TOKEN"]
+    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
     end
-    if not repo
+    if !repo
       puts "Can't find the GitHub repo. Please use the remote 'origin'."
       return false
     end
@@ -87,23 +88,12 @@ class GithubReleaseParty
   end
 
   def self.repo
-    `git remote -v`.scan(/^origin\t.*github\.com[:\/](.+)\.git /).uniq.flatten.first
+    @repo ||= `git remote -v`.scan(/^origin\t.*github\.com[:\/](.+)\.git /).uniq.flatten.first
   end
 
   private
 
-  def self.options
-    {
-      query: {
-        access_token: ENV["GITHUB_RELEASE_TOKEN"]
-      },
-      headers: {
-        "User-Agent" => "github-release-party/#{GithubReleaseParty::VERSION}"
-      }
-    }
-  end
-
   def self.error(r)
-    "#{r.request.path.to_s}: #{r.code} #{r.message}: #{r.body}. #{r.headers.to_h.to_json}"
+    "#{r.url}: #{r.code}: #{r.body}. #{r.headers.to_json}"
   end
 end

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

@@ -46,7 +46,7 @@ def github_tag(hash, ver)
   # create GitHub release
   puts
   puts "Waiting 3 seconds to let GitHub process the new tag."
-  sleep 3
+  sleep(3)
   GithubReleaseParty.create(tag_name, ver, message)
 end
 
@@ -90,7 +90,7 @@ namespace :deploy do
     repo = GithubReleaseParty.repo
 
     tags = `git tag -l heroku/v* --sort=version:refname`.split("\n")
-    puts "Found #{tags.count} tags."
+    puts "Found #{tags.length} tags."
     tags.each_with_index do |tag_name, i|
       ver = tag_name[/v(\d+)/]
       last_tag = if i == 0
@@ -124,6 +124,6 @@ namespace :deploy do
   task :changes do
     last_tag = `git describe --tags --abbrev=0 --match 'heroku/v*' 2> /dev/null`.strip
     last_tag = `git rev-list --max-parents=0 HEAD`.strip[0..6] if last_tag.empty?
-    system "git log --oneline --reverse #{last_tag}..HEAD"
+    system "git log --oneline --no-decorate --reverse #{last_tag}..HEAD"
   end
 end

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

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

data/lib/http.rb

@@ -0,0 +1,143 @@
+# 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-release-party
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Stefan Sundin
@@ -31,22 +31,8 @@ cert_chain:
   E04BZKo2WzOTzSDymo97Yu4YFgyc98umMyeaCvPk4YmdNzqSanAXpY2bnsyu0CF5
   Td0=
   -----END CERTIFICATE-----
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-11-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +58,7 @@ 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
@@ -92,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Easily create GitHub releases.