Rake tweaks

Author: djbe

.github/workflows/danger.yml

@@ -20,6 +20,6 @@ jobs:
           bundler-cache: true
       -
         name: Run Danger
-        run: bundle exec danger --verbose
+        run: bundle exec danger --verbose --dangerfile=rakelib/Dangerfile
         env:
           DANGER_GITHUB_API_TOKEN: ${{ secrets.danger_github_api_token }}

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ---
 
-## Stable
+## Stable Branch
 
 ### Breaking Changes
 

Dangerfile renamed to rakelib/Dangerfile

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'rakelib/check_changelog'
+require_relative 'check_changelog'
+
+is_release = github.branch_for_head.start_with?('release/')
+is_hotfix = github.branch_for_head.start_with?('hotfix/')
 
 ################################################
 # Welcome message
@@ -19,6 +22,34 @@ warn('PR is classed as Work in Progress') if github.pr_title.include? '[WIP]'
 # Warn when there is a big PR
 warn('Big PR') if git.lines_of_code > 500 && !is_release
 
+################################################
+# Check for correct base branch
+if is_release
+  message('This is a Release PR')
+
+  require 'open3'
+
+  stdout, _, status = Open3.capture3('bundle', 'exec', 'rake', 'changelog:check')
+  markdown [
+    '',
+    '### ChangeLog check',
+    '',
+    stdout
+  ]
+  need_fixes << fail('Please fix the CHANGELOG errors') unless status.success?
+
+  stdout, _, status = Open3.capture3('bundle', 'exec', 'rake', 'release:check_versions')
+  markdown [
+    '',
+    '### Release version check',
+    '',
+    stdout
+  ]
+  need_fixes << fail('Please fix the versions inconsistencies') unless status.success?
+elsif is_hotfix
+  message('This is a Hotfix PR')
+end
+
 ################################################
 # Check for a CHANGELOG entry
 declared_trivial = github.pr_title.include? '#trivial'

rakelib/changelog.rake

@@ -9,14 +9,14 @@ namespace :changelog do
   desc 'Add the empty CHANGELOG entries after a new release'
   task :reset do
     changelog = File.read('CHANGELOG.md')
-    abort('A Develop entry already exists') if changelog =~ /^##\s*Develop$/
+    abort('A Stable entry already exists') if changelog =~ /^##\s*Stable Branch$/
     changelog.sub!(/^##[^#]/, "#{header}\\0")
     File.write('CHANGELOG.md', changelog)
   end
 
   def header
     <<-HEADER.gsub(/^\s*\|/, '')
-      |## Stable
+      |## Stable Branch
       |
       |### Breaking Changes
       |
@@ -70,18 +70,4 @@ namespace :changelog do
       |* [SwiftGen #{swiftgen}](https://github.com/SwiftGen/SwiftGen/blob/#{swiftgen}/CHANGELOG.md)
     LINKS
   end
-
-  desc "Push the CHANGELOG's top section as a GitHub release"
-  task :push_github_release do
-    require 'octokit'
-
-    client = Utils.octokit_client
-    tag = Utils.top_changelog_version
-    body = Utils.top_changelog_entry
-
-    repo_name = File.basename(`git remote get-url origin`.chomp, '.git').freeze
-    puts "Pushing release notes for tag #{tag}:"
-    puts body
-    client.create_release("SwiftGen/#{repo_name}", tag, name: tag, body: body)
-  end
 end

rakelib/lint.rake

@@ -4,7 +4,7 @@
 # - BUILD_DIR
 
 namespace :lint do
-  SWIFTLINT = 'Scripts/SwiftLint.sh'
+  SWIFTLINT = 'rakelib/lint.sh'
   SWIFTLINT_VERSION = '0.47.1'
 
   task :install do |task| 

Scripts/SwiftLint.sh renamed to rakelib/lint.sh

@@ -4,8 +4,8 @@
 # - MIN_XCODE_VERSION
 
 require 'json'
-require 'pathname'
 require 'open3'
+require 'pathname'
 
 # Utility functions to run Xcode commands, extract versionning info and logs messages
 #
@@ -40,14 +40,43 @@ class Utils
     File.open('Package.swift').read()
       .match(/https:\/\/.*artifactbundle.zip/)[0]
       .match(/\d+\.\d+\.\d+/)[0]
+  end
+
+  def self.podspec_as_json(file)
+    file += '.podspec' unless file.include?('.podspec')
+    json, _, _ = Open3.capture3('bundle', 'exec', 'pod', 'ipc', 'spec', file)
+    JSON.parse(json)
+  end
+
+  def self.podspec_version(file)
+    podspec_as_json(file)['version']
+  end
+
+  def self.pod_trunk_last_version(pod)
+    require 'yaml'
+    stdout, _, _ = Open3.capture3('bundle', 'exec', 'pod', 'trunk', 'info', pod)
+    stdout.sub!("\n#{pod}\n", '')
+    last_version_line = YAML.safe_load(stdout).first['Versions'].last
+    /^[0-9.]*/.match(last_version_line)[0] # Just the 'x.y.z' part
+  end
+
+  def self.spm_own_version(dep)
+    dependencies = JSON.load(File.new('Package.resolved'))['object']['pins']
+    dependencies.find { |d| d['package'] == dep }['state']['version']
   end  
 
+  def self.spm_resolved_version(dep)
+    dependencies = JSON.load(File.new('Package.resolved'))['object']['pins']
+    dependencies.find { |d| d['package'] == dep }['state']['version']
+  end
+
   def self.last_git_tag_version
     `git describe --tags --abbrev=0`.strip
   end
 
   def self.octokit_client
-    token   = File.exist?('.apitoken') && File.read('.apitoken')
+    token   = ENV['DANGER_GITHUB_API_TOKEN']
+    token ||= File.exist?('.apitoken') && File.read('.apitoken')
     token ||= File.exist?('../.apitoken') && File.read('../.apitoken')
     Utils.print_error('No .apitoken file found') unless token
     require 'octokit'