github-release-party 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36e90a03908ef079b264f0e8159049566e4f94acf164dfbcdd5c360936856729
-  data.tar.gz: 2d3d346a630f2afe897f30b9aba7e6623a9fec2fc3b8794962c9fed8c2ff3e77
+  metadata.gz: d5daa687ea156f731f143bce3dc98a1fcc4a07464a793eb475f1b8d7ba55acc6
+  data.tar.gz: c75ed78a66ceff740603553d0ef81a2d6874d17ffefa63faf60ea7351f223b9c
 SHA512:
-  metadata.gz: c2339bf5e9a31063e2292488431cda41aab6b342dc272c19821152cac54f1544848492d5cb5089ca09a5ae78b18597b4fff34bee24e510831dbc0017990ef8e3
-  data.tar.gz: '08ccc13edd9326240bcda6fa0a2d9735bba3cd65a8436a3af73c5a9d8711d84d57a25399493a57ef010697b3c138062acdebb232b7cbfe6d1f716adf80767b96'
+  metadata.gz: 641bd4382b4c0e3974e12b218dd75099afc3bb2b8bfb651d750c4ce6f486060f9c6c8aae8570435209431766340f8d282660e8d7c9a0e46429f7202528bc1c65
+  data.tar.gz: edcd80c9993c93c0f0f95ae6fedfb2b33cfefa67e4fbe8a5233dfcab12e5473066a54312414624ec7bb7b3b9e705819fd016a78d7f9d2a2bd21d32007e628e85

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

@@ -0,0 +1,129 @@
+require "open3"
+require "shellwords"
+require "github-release-party"
+
+def fly_deploy(args=[])
+  # grab the new version number from the "fly deploy" output
+  cmd = %w[fly deploy] + args
+  ver = Open3.popen2e(*cmd) do |stdin, output, thread|
+    v = nil
+    output.each do |line|
+      puts line
+      if /--> release (v\d+) created/ =~ line
+        v = $~[1]
+      end
+    end
+    v
+  end
+  return ver
+end
+
+def github_tag(hash, ver)
+  # build tag message
+  repo = GithubReleaseParty.repo
+  tag_name = "fly/#{ver}"
+  last_tag = `git describe --tags --abbrev=0 --match 'fly/v*' 2> /dev/null`.strip
+  if last_tag.empty?
+    # first deploy, use root hash
+    last_tag = `git rev-list --max-parents=0 HEAD`.strip[0..6]
+    first_deploy = true
+  end
+  commits = `git log #{last_tag}..#{hash} --reverse --first-parent --pretty=format:"- [%s](https://github.com/#{repo}/commit/%H)"`
+  message = "Deploy #{hash[0..6]}\n\nDiff: https://github.com/#{repo}/compare/#{last_tag}...#{tag_name}\n#{commits}"
+
+  if first_deploy
+    message = "#{message.strip}\n"+`git show #{last_tag} -s --pretty=format:"- [%s](https://github.com/#{repo}/commit/%H)"`
+  end
+
+  # tag and push new tag
+  puts
+  puts "Tagging #{tag_name}."
+  success = system "git tag -a -m #{Shellwords.shellescape(message)} #{tag_name} #{hash}"
+  abort if not success
+  puts
+  success = system "git push origin #{tag_name}"
+  abort if not success
+
+  # create GitHub release
+  puts
+  puts "Waiting 3 seconds to let GitHub process the new tag."
+  sleep(3)
+  GithubReleaseParty.create(tag_name, message)
+end
+
+
+desc "Deploy a new version to Fly"
+task :deploy do
+  GithubReleaseParty.check_env!
+  ver = fly_deploy() or abort("Deploy failed.")
+  hash = `git rev-parse HEAD`.strip
+  github_tag(hash, ver)
+end
+
+namespace :deploy do
+  desc "Tag last release"
+  task :tag do
+    GithubReleaseParty.check_env!
+
+    # get fly version number
+    begin
+      fly_releases = JSON.parse(`fly releases --json`)
+      ver = fly_releases[0]["Version"]
+      hash = `git rev-parse HEAD`.strip
+    rescue
+      abort "There was a problem getting the release number. Have you logged in with flyctl? Try again with 'rake deploy:tag'."
+    end
+
+    github_tag(hash, ver)
+  end
+
+  desc "Rebuild all the release tags"
+  task :retag do
+    GithubReleaseParty.check_env!
+    releases = GithubReleaseParty.releases
+    repo = GithubReleaseParty.repo
+
+    tags = `git tag -l fly/v* --sort=version:refname`.split("\n")
+    puts "Found #{tags.length} tags."
+    tags.each_with_index do |tag_name, i|
+      puts
+      last_tag = if i == 0
+        `git rev-list --max-parents=0 HEAD`.strip
+      else
+        tags[i-1]
+      end
+
+      hash = `git rev-list --max-count=1 #{tag_name}`.strip
+      date = `git show --pretty="format:%ai" -s --no-color #{tag_name} | tail -1`.strip
+      commits = `git log #{last_tag}..#{tag_name} --reverse --pretty=format:"- [%s](https://github.com/#{repo}/commit/%H)"`
+      message = "Deploy #{hash[0..6]}\n\nDiff: https://github.com/#{repo}/compare/#{last_tag}...#{tag_name}\n#{commits}"
+
+      if i == 0
+        message += "\n"+`git show #{last_tag} -s --pretty=format:"- [%s](https://github.com/#{repo}/commit/%H)"`
+      end
+
+      success = system "GIT_COMMITTER_DATE='#{date}' git tag -f -a -m #{Shellwords.shellescape(message)} #{tag_name} #{tag_name}^{}"
+      abort if not success
+      success = system "git push -f origin #{tag_name}"
+      abort if not success
+
+      # update or create GitHub release
+      release = releases.find { |rel| rel["tag_name"] == tag_name }
+      if release
+        GithubReleaseParty.update(release["id"], tag_name, message)
+      else
+        GithubReleaseParty.create(tag_name, message)
+      end
+    end
+
+    puts
+    puts "Done"
+  end
+
+  desc "List the new commits since last deploy (you might want to pull first to ensure you have the latest tag)"
+  task :changes do
+    last_tag = `git describe --tags --abbrev=0 --match 'fly/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 --no-decorate --reverse #{last_tag}..HEAD"
+  end
+end

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

@@ -28,7 +28,7 @@ def github_tag(hash, ver)
     last_tag = `git rev-list --max-parents=0 HEAD`.strip[0..6]
     first_deploy = true
   end
-  commits = `git log #{last_tag}..#{hash} --first-parent --pretty=format:"- [%s](https://github.com/#{repo}/commit/%H)"`
+  commits = `git log #{last_tag}..#{hash} --reverse --first-parent --pretty=format:"- [%s](https://github.com/#{repo}/commit/%H)"`
   message = "Deploy #{hash[0..6]}\n\nDiff: https://github.com/#{repo}/compare/#{last_tag}...#{tag_name}\n#{commits}"
 
   if first_deploy
@@ -48,7 +48,7 @@ def github_tag(hash, ver)
   puts
   puts "Waiting 3 seconds to let GitHub process the new tag."
   sleep(3)
-  GithubReleaseParty.create(tag_name, ver, message)
+  GithubReleaseParty.create(tag_name, message)
 end
 
 
@@ -95,7 +95,6 @@ namespace :deploy do
     puts "Found #{tags.length} tags."
     tags.each_with_index do |tag_name, i|
       puts
-      ver = tag_name[/v(\d+)/]
       last_tag = if i == 0
         `git rev-list --max-parents=0 HEAD`.strip
       else
@@ -104,7 +103,7 @@ namespace :deploy do
 
       hash = `git rev-list --max-count=1 #{tag_name}`.strip
       date = `git show --pretty="format:%ai" -s --no-color #{tag_name} | tail -1`.strip
-      commits = `git log #{last_tag}..#{tag_name} --pretty=format:"- [%s](https://github.com/#{repo}/commit/%H)"`
+      commits = `git log #{last_tag}..#{tag_name} --reverse --pretty=format:"- [%s](https://github.com/#{repo}/commit/%H)"`
       message = "Deploy #{hash[0..6]}\n\nDiff: https://github.com/#{repo}/compare/#{last_tag}...#{tag_name}\n#{commits}"
 
       if i == 0
@@ -119,9 +118,9 @@ namespace :deploy do
       # update or create GitHub release
       release = releases.find { |rel| rel["tag_name"] == tag_name }
       if release
-        GithubReleaseParty.update(release["id"], ver, message)
+        GithubReleaseParty.update(release["id"], tag_name, message)
       else
-        GithubReleaseParty.create(tag_name, ver, message)
+        GithubReleaseParty.create(tag_name, message)
       end
     end
 

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

@@ -1,3 +1,3 @@
 class GithubReleaseParty
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

data/lib/github-release-party.rb

@@ -20,10 +20,10 @@ class GithubReleaseParty
     return releases
   end
 
-  def self.update(id, name, message)
-    r = GitHub.patch("/repos/#{repo}/releases/#{id}", {
+  def self.update(release_id, name, message)
+    r = GitHub.patch("/repos/#{repo}/releases/#{release_id}", {
       name: name,
-      body: message
+      body: message,
     }.to_json)
     if r.success?
       puts "GitHub release #{name} updated!"
@@ -33,11 +33,11 @@ class GithubReleaseParty
     end
   end
 
-  def self.create(tag_name, name, message)
+  def self.create(tag_name, message)
     body = {
       tag_name: tag_name,
-      name: name,
-      body: message
+      name: tag_name,
+      body: message,
     }
 
     r = GitHub.post("/repos/#{repo}/releases", body.to_json)
@@ -48,7 +48,7 @@ class GithubReleaseParty
       puts
       puts "Body sent: #{body.to_json}"
       puts
-      puts "Failed to create GitHub release!"
+      puts "Failed to create a GitHub release!"
       puts "Create it manually here: https://github.com/#{repo}/releases/new?tag=#{tag_name}"
       puts "Tag version: #{tag_name}"
       puts "Release title: #{tag_name}"
@@ -62,7 +62,7 @@ class GithubReleaseParty
       abort "Configure GITHUB_RELEASE_TOKEN to create GitHub releases. See https://github.com/stefansundin/github-release-party#setup"
     end
     if !repo
-      abort "Can't find the GitHub repo. Please use the remote 'origin'."
+      abort "Can't find the GitHub repository. Please use the remote 'origin'."
     end
   end
 
@@ -103,7 +103,6 @@ class GithubReleaseParty
           "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)

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: github-release-party
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Stefan Sundin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -31,7 +31,7 @@ cert_chain:
   E04BZKo2WzOTzSDymo97Yu4YFgyc98umMyeaCvPk4YmdNzqSanAXpY2bnsyu0CF5
   Td0=
   -----END CERTIFICATE-----
-date: 2019-12-23 00:00:00.000000000 Z
+date: 2022-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -47,8 +47,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '12'
-description: I use this gem to automatically create GitHub releases when I deploy
-  to Heroku. See the GitHub page for usage.
+description: I use this gem to automatically create GitHub releases when I deploy.
+  See the GitHub page for usage.
 email:
 - rubygems@stefansundin.com
 executables: []
@@ -56,13 +56,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/github-release-party.rb
+- lib/github-release-party/tasks/fly.rb
 - lib/github-release-party/tasks/heroku.rb
 - lib/github-release-party/version.rb
 homepage: https://github.com/stefansundin/github-release-party
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -77,8 +78,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.11
+signing_key:
 specification_version: 4
 summary: Easily create GitHub releases.
 test_files: []