tworingtools 4.4.2 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8859999037d1edd2c81b33358b8c77ea66eb3199d77e1556efe445f4e442127f
-  data.tar.gz: 7fa2a8328f322eab2d614f92ba252a146e5e29ee134414d9bb332591fcf1c862
+  metadata.gz: 8a9c273d420e81312cd78a3cfb16705daa66c66cb88333b028a99aeead328b57
+  data.tar.gz: bf970bd1d1613d2667f7d5279ec35c5d1bc0ea68b51d07d80bb4246491706320
 SHA512:
-  metadata.gz: d58734ba15e37cd18d69b396519c4dde656a1601388aeacf16031d378a193f9fbce7f6d71cd0ebd8d473cdf6d8f3647805956771ff4c5a8b71a460f93080dc88
-  data.tar.gz: 57cae9321468c8d298776eeb8b96c295f760329870049620738865f840d959a36b25605f928931b163124d29877c396571a8116ac35940f7511ca7c9239bac4a
+  metadata.gz: e1acd45a72627aa1c61876360907b65715d55afe06c4c398d711476bc06e79baeb806475c1b46e739cecb57f5a13014273f423ff1d3b0d009987dc5e97143dfd
+  data.tar.gz: 6160816443577623849b42d6cd0972b6314dc523bbcdc2295d9501c4d80f6bc1e124831f9aad4d61d27f81dcda68b8bae358869d50f1d4479d06aeedcbc1bb91

data/bin/bumpr

@@ -18,6 +18,7 @@ parser = OptionParser.new do |opts|
 
   BANNER
   opts.on('-n', '--no-commit', 'Leave changes in the git working index instead of committing them.') do |no_commit| options[:no_commit] = true end
+  opts.on('-cCUSTOM', '--custom=CUSTOM', 'Custom version to use for semantic component (or build number for "build" component).') do |custom| options[:custom] = custom end
   opts.on('-h', '--help', 'Print this help message.') do
     puts opts
     exit
@@ -43,7 +44,11 @@ if argument == nil then
   exit TwoRingToolError::INVALID_SEMVER_COMPONENT
 end
 
-command = "vrsn #{argument} --file #{version_file}"
+invocation_options = Array.new
+unless options[:custom] == nil then
+  invocation_options += ['--custom', options[:custom]]
+end
+command = "vrsn #{argument} --file #{version_file} #{invocation_options.join(' ')}"
 puts command
 stdout, stderr, status = Open3.capture3(command)
 

data/bin/changetag

@@ -37,7 +37,7 @@ parser = OptionParser.new do |opts|
 end
 parser.parse!
 
-git_check unless options[:no_commit]
+git_check
 
 # set valid git message comment character
 

data/bin/migrate-changelog

@@ -13,7 +13,8 @@ parser = OptionParser.new do |opts|
            Move any contents in Unreleased under a new heading for the specified version with current date.
 
   BANNER
-  opts.on('-h', '--help', 'Print this help message.') do
+    opts.on('-n', '--no-commit', 'Leave changes in the git working index instead of committing them.') do |no_commit| options[:no_commit] = true end
+    opts.on('-h', '--help', 'Print this help message.') do
     puts opts
     exit
   end
@@ -39,5 +40,7 @@ File.open(changelog_path, 'w+') do |writable_changelog|
 	writable_changelog << changelog_contents.join('')
 end
 
-`git add #{changelog_path}`
-`git commit --message "chore(changelog): moved Unreleased entries to #{version}"`
+unless options[:no_commit] then
+  `git add #{changelog_path}`
+  `git commit --message "chore(changelog): moved Unreleased entries to #{version}"`
+end

data/bin/prerelease-podspec

@@ -31,6 +31,7 @@ parser = OptionParser.new do |opts|
   opts.on('-tTAG', '--tag=TAG', 'Override for the name of the git tag to form. If set, --podspec-name-in-tag is ignored.') do |tag| options[:tag] = tag end
   opts.on('-t', '--no-tag', 'Don\'t create a git tag to push. Usually used if this will be invoked again for another spec that will create and use the same tag.') do |no_tag| options[:no_tag] = true end
   opts.on('-rRC', '--release-candidate=RC', 'Override for the release candidate number, which is otherwise formulated by counting the previous amount of tags with the same version number and incrementing by one.') do |rc| options[:rc] = rc end
+  opts.on('-q', '--quick', 'Perform quick podspec lint only.') do |quick| options[:quick] = true end
   opts.on('-h', '--help', 'Print this help message.') do
     puts opts
     exit
@@ -81,15 +82,18 @@ end
 
 puts "About to lint the podspec. This takes a while... (it is now #{Time.now})"
 spec_lint_flags = Array.new
-if options[:allow_warnings] != nil then
+if options[:allow_warnings] then
   spec_lint_flags << '--allow-warnings'
 end
-if options[:verbose] != nil then
+if options[:verbose] then
   spec_lint_flags << '--verbose'
 end
-if options[:skip_tests] != nil then
+if options[:skip_tests] then
   spec_lint_flags << '--skip-tests'
 end
+if options[:quick] then
+  spec_lint_flags << '--quick'
+end
 stdout, stderr, status = Open3.capture3 "rbenv exec bundle exec pod spec lint #{version_file} #{spec_lint_flags.join ' '}"
 
 puts "stdout: #{stdout}"

data/bin/release-podspec

@@ -28,7 +28,8 @@ parser = OptionParser.new do |opts|
   opts.on('-rREPO', '--repo=REPO', 'By default, release-podspec pushes the podspec to CocoaPods trunk. By supplying this argument, instead of \`pod trunk push\`, \`pod repo push\` is used instead.') do |repo| options[:repo] = repo end
   opts.on('-cCHANGELOG_PATH', '--changelog-path=CHANGELOG_PATH', 'Location of a CHANGELOG document adhering to https://keepachangelog.com/en/1.0.0/ whose version entry should be extracted into an annotated tag for this release candidate. By default, release-podspec looks for //CHANGELOG.md. You can specify another location with this option.') do |changelog_path| options[:changelog_path] = changelog_path end
   opts.on('-tTAG', '--tag=TAG', 'Override for the name of the git tag to form. If set, --podspec-name-in-tag is ignored.') do |tag| options[:tag] = tag end
-  opts.on('--e', '--changelog-entry=CHANGELOG_ENTRY', 'The name of the changelog entry, if it differs from the tag name.') do |changelog_entry_name_override| options[:changelog_entry_name_override] = changelog_entry_name_override end
+  opts.on('-e', '--changelog-entry=CHANGELOG_ENTRY', 'The name of the changelog entry, if it differs from the tag name.') do |changelog_entry_name_override| options[:changelog_entry_name_override] = changelog_entry_name_override end
+  opts.on('-i', '--skip-import-validation', 'Skip building/testing importability of podspec as part of pushing it to source.') do |skip_import_validation| options[:skip_import_validation] = true end
   opts.on('-h', '--help', 'Print this help message.') do
     puts opts
     exit
@@ -63,15 +64,18 @@ end
 echo_and_exec 'git push --tags'
 
 spec_lint_flags = Array.new
-if options[:allow_warnings] != nil then
+if options[:allow_warnings] then
   spec_lint_flags << '--allow-warnings'
 end
-if options[:verbose] != nil then
+if options[:verbose] then
   spec_lint_flags << '--verbose'
 end
-if options[:skip_tests] != nil then
+if options[:skip_tests] then
   spec_lint_flags << '--skip-tests'
 end
+if options[:skip_import_validation] then
+  spec_lint_flags << '--skip-import-validation'
+end
 
 command = String.new
 if options[:repo] != nil then

data/bin/sync-git

@@ -0,0 +1,109 @@
+#! /usr/bin/env ruby
+
+require 'octokit'
+require 'json'
+require 'optparse'
+require_relative '../lib/echoexec'
+require_relative '../lib/git_helpers'
+
+# failure modes
+FURTHER_REQUESTS_REQUIRE_TOKEN = 65
+MISSING_REQUIRED_CREDENTIALS = 66
+
+options = {}
+parser = OptionParser.new do |opts|
+  opts.banner = <<~BANNER
+
+    Usage: sync-git [options] <directory>
+
+           For each of your GitHub forks, clone your forked version, then go in and add a remote
+           to the upstream version, and set up local tracking branches for both remotes' default
+           branches. Then fast-forward them both, fetch all tags etc.
+
+           <directory> is the path containing the directories holding your forks, and/or
+           to where those you don't yet have should be cloned.
+
+           Examples:
+
+           sync-git -u/--username <user> -p/--password <pass> [-o/--one-time-pw <otp>] .
+           sync-git -u/--username <user> -t/--token <token> .
+           sync-git -u/--username <user> -t/--token -n/--repo-name that-one-repo-I-forked <token> .
+
+           If you already have a Personal Access Token, provide it in the second form.
+           Otherwise, use the first form, which will register a new token for you named
+           “sync-git”. Then use that to invoke the program again. This is because
+           requests using basic authentication (user/pass) are too rate limited.
+
+           Options:
+
+  BANNER
+
+  opts.on('-uUSERNAME', '--username=USERNAME', 'GitHub username. Required for all invocations.') do |user| options[:username] = user end
+  opts.on('-tTOKEN', '--token=TOKEN', 'GitHub personal access token. The primary way to use this program.') do |t| options[:token] = t end
+  opts.on('-pPASSWORD', '--password=PASSWORD', 'GitHub password.') do |pass| options[:password] = pass end
+  opts.on('-oOTP', '--one-time-pw=OTP', 'GitHub 2FA token, if you have it enabled.') do |otp| options[:otp] = otp end
+  opts.on('-rREPO', '--repo-name=REPO', 'The name of a particular repository to sync.') do |repo| options[:repo] = repo end
+  opts.on('-v', '--verbose', 'Enable verbose logging.') do options[:verbose] = true end
+end
+parser.parse!
+root_dir_path = ARGV[0]
+
+# authenticate the github client, producing a token for callers to use if they try with user/pass, as that is rate limited
+github = nil
+if nil != options[:token] then
+  github = Octokit::Client.new(:access_token => options[:token])
+  puts 'Running with provided token...'
+elsif nil != options[:username] && nil != options[:password]
+  github = Octokit::Client.new \
+    :login    => options[:username],
+    :password => options[:password]
+
+  headers = Hash.new
+  if nil != options[:otp] then
+    headers['X-GitHub-OTP'] = options[:otp]
+  end
+
+  token = github.create_authorization \
+    :scopes => ["user"],
+    :note => "sync-git",
+    :headers => headers
+
+  puts "Created new token, use it to call sync-git again:"
+  puts
+  puts "\tsync-git -u #{user} -t #{token.token}"
+  puts
+  exit FURTHER_REQUESTS_REQUIRE_TOKEN
+else
+  puts "Must provide either a username/token or username/password/otp combination to authenticate."
+  puts parser
+  exit MISSING_REQUIRED_CREDENTIALS
+end
+
+github.auto_paginate = true
+
+repos = github.repos
+
+# sync owned repos
+owned_repos = repos.select {|x| !x.fork}
+if options[:repo] != nil then
+  owned_repos.select! {|x| x.name == options[:repo]}
+end
+owned_repos.each do |owned_repo|
+  puts '---'
+  owned_repo_info = github.repo(owned_repo.id)
+  sync_repo(owned_repo_info, root_dir_path)
+end
+
+# get the list of forks to sync
+forks = repos.select {|x| x.fork}
+if options[:repo] != nil then
+  forks.select! {|x| x.name == options[:repo]}
+end
+
+# sync the forks
+forks.each do |forked_repo|
+  puts '---'
+
+  forked_repo_info = github.repo(forked_repo.id)
+  sync_fork(forked_repo_info, root_dir_path)
+end

data/lib/git_helpers.rb

@@ -0,0 +1,77 @@
+require 'octokit'
+require_relative 'echoexec'
+
+def sync_repo repo_info, root_dir_path
+  name = repo_info.name
+  ssh_url = repo_info.ssh_url
+
+  path = "#{root_dir_path}/#{name}"
+  already_cloned = Dir.exist?(path)
+
+  # clone any forks not already cloned
+  unless already_cloned then
+    echo_and_exec "git clone #{ssh_url} #{path}"
+  end
+
+  # for repos that were cloned previously, update them by fast-forwarding the default branch and fetch all tags
+  if already_cloned then
+    Dir.chdir path do
+      echo_and_exec "git fetch && git fetch --tags && git pull --ff-only"
+    end
+  end
+end
+
+
+def sync_fork forked_repo_info, root_dir_path
+  upstream_ssh_url = forked_repo_info.source.ssh_url
+  original_owner = forked_repo_info.source.owner.login
+  name = forked_repo_info.name
+  fork_ssh_url = forked_repo_info.ssh_url
+
+  upstream_remote_name = 'upstream'
+  fork_remote_name = 'fork'
+  path = "#{root_dir_path}/_Forks/#{original_owner}/#{name}"
+  already_cloned = Dir.exist?(path)
+
+  # clone any forks not already cloned
+  unless already_cloned then
+    echo_and_exec "git clone #{fork_ssh_url} #{path}"
+  end
+
+  Dir.chdir path do
+    # if we just cloned the repo locally, set up both remotes
+    unless already_cloned then
+      echo_and_exec "git remote add #{upstream_remote_name} #{upstream_ssh_url}"
+      echo_and_exec "git remote rename origin #{fork_remote_name}"
+    end
+
+    # get the names of the default branches
+    fork_default_branch_name = `git remote show #{fork_remote_name} | grep "HEAD branch" | cut -d ":" -f 2`.strip
+    fork_default_local_branch_name = "#{fork_remote_name}_#{fork_default_branch_name}"
+    upstream_default_branch_name = `git remote show #{upstream_remote_name} | grep "HEAD branch" | cut -d ":" -f 2`.strip
+    upstream_default_local_branch_name = "#{upstream_remote_name}_#{upstream_default_branch_name}"
+
+    # if we just cloned the repo locally, set local default tracking branches
+    unless already_cloned then
+      # rename the cloned local default branch to reflect that it's tracking the fork remote's version
+      echo_and_exec "git branch -m #{fork_default_branch_name} #{fork_default_local_branch_name}"
+
+      # set up a local branch to track the upstream remote's default branch
+      echo_and_exec "git fetch #{upstream_remote_name}"
+      echo_and_exec "git checkout -b #{upstream_default_local_branch_name} #{upstream_remote_name}/#{upstream_default_branch_name}"
+
+      # push the local upstream default tracking branch to the fork's remote, so it also has a copy alongside it's default branch
+      echo_and_exec "git push #{fork_remote_name} HEAD:#{upstream_default_local_branch_name}"
+    end
+
+    # for repos that were cloned previously, update them by fast-forwarding both default branches and fetch all tags
+    if already_cloned then
+      echo_and_exec "git checkout #{fork_default_local_branch_name}"
+      echo_and_exec "git pull --ff-only #{fork_remote_name}"
+      echo_and_exec "git fetch --tags #{fork_remote_name}"
+
+      echo_and_exec "git checkout #{upstream_default_local_branch_name}"
+      echo_and_exec "git pull --ff-only #{upstream_remote_name}"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tworingtools
 version: !ruby/object:Gem::Version
-  version: 4.4.2
+  version: 5.0.0
 platform: ruby
 authors:
 - Andrew McKnight
@@ -11,19 +11,19 @@ cert_chain: []
 date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: github_api
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 4.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 4.20.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +40,7 @@ dependencies:
         version: '2.1'
 description: |2
     - xcsims: Delete all simulators and recreate one for each compatible platform and device type pairing.
-    - sync-forks: Make sure all your GitHub forks are clones into a given directory, and have “upstream” remotes pointing to the repos that were forked.
+    - sync-git: Make sure all your GitHub repos are cloned into a given directory and keep them synced with upstream. Forks are maintained with a remote for both the fork and upstream, both remotes' default branches are tracked in local counterparts, and the upstream default branch is also pushed to the fork.
     - changetag: Extract changelog entries to write into git tag annotation messages.
     - prerelease-podspec: Branch and create/push a release candidate tag, modify the podspec to use that version tag, and try linting it.
     - release-podspec: Create a tag with the version and push it to repo origin, push podspec to CocoaPods trunk.
@@ -52,7 +52,7 @@ email: andrew@tworingsoft.com
 executables:
 - clean-rc-tags
 - xcsims
-- sync-forks
+- sync-git
 - changetag
 - prerelease-podspec
 - release-podspec
@@ -69,11 +69,12 @@ files:
 - bin/prerelease-podspec
 - bin/release-podspec
 - bin/revert-failed-release-tag
-- bin/sync-forks
+- bin/sync-git
 - bin/xcsims
 - lib/echoexec.rb
 - lib/errors.rb
 - lib/git_check.rb
+- lib/git_helpers.rb
 homepage: https://github.com/TwoRingSoft/tools
 licenses:
 - MIT

data/bin/sync-forks

@@ -1,90 +0,0 @@
-#! /usr/bin/env ruby
-
-require 'github_api'
-require 'json'
-require 'optparse'
-require_relative '../lib/echoexec'
-
-# failure modes
-FURTHER_REQUESTS_REQUIRE_TOKEN = 65
-MISSING_REQUIRED_CREDENTIALS = 66
-
-options = {}
-parser = OptionParser.new do |opts|
-  opts.banner = <<~BANNER
-  
-    Usage: sync-forks [options] <directory>
-           
-           <directory> is the path containing the directories holding your forks, and/or
-           to where those you don't yet have should be cloned.
-           
-           Examples:
-    
-           sync-forks -u/--username <user> -p/--password <pass> [-o/--one-time-pw <otp>] .
-           sync-forks -u/--username <user> -t/--token <token> .
-           sync-forks -u/--username <user> -t/--token -n/--repo-name that-one-repo-I-forked <token> .
-           
-           If you already have a Personal Access Token, provide it in the second form. 
-           Otherwise, use the first form, which will register a new token for you named
-           “sync-forks”. Then use that to invoke the program again. This is because
-           requests using basic authentication (user/pass) are too rate limited.
-           
-           Options:
-           
-  BANNER
-
-  opts.on('-uUSERNAME', '--username=USERNAME', 'GitHub username. Required for all invocations.') do |user| options[:username] = user end
-  opts.on('-tTOKEN', '--token=TOKEN', 'GitHub personal access token. The primary way to use this program.') do |t| options[:token] = t end
-  opts.on('-pPASSWORD', '--password=PASSWORD', 'GitHub password.') do |pass| options[:password] = pass end
-  opts.on('-oOTP', '--one-time-pw=OTP', 'GitHub 2FA token, if you have it enabled.') do |otp| options[:otp] = otp end
-  opts.on('-rREPO', '--repo-name=REPO', 'The name of a particular repository to sync.') do |repo| options[:repo] = repo end
-end
-parser.parse!
-
-github = nil
-if nil != options[:token] && nil != options[:username] then
-  github = Github.new oauth_token: options[:token]
-elsif nil != options[:username] && nil != options[:password]
-  github = Github.new do |config|
-     config.basic_auth = "#{options[:username]}:#{options[:password]}"
-     if nil != options[:otp] then
-       config.connection_options = {headers: {"X-GitHub-OTP" => options[:otp]}}
-     end
-  end
-  token = github.auth.create scopes: ['repo'], note: 'sync-forks3'
-  puts "Created new token, use it to call sync-forks again:"
-  puts
-  puts "\tsync-forks -u #{user} -t #{token.token}"
-  puts
-  exit FURTHER_REQUESTS_REQUIRE_TOKEN
-else
-  puts "Must provide either a username/token or username/password/otp combination to authenticate."
-  puts parser
-  exit MISSING_REQUIRED_CREDENTIALS
-end
-
-repos = github.repos.list user: options[:username], auto_pagination: true
-forks = repos.select {|x| x.fork}
-
-if options[:repo] != nil then
-  forks.select! {|x| x.name == options[:repo]}
-end
-
-current_dir = Dir.new(ARGV[0])
-Dir.chdir current_dir
-forks.each do |forked|
-  info = github.repos(user: options[:username], repo: forked.name).get
-  fork_url = info.source.ssh_url
-  name = forked.name
-  url = forked.ssh_url
-  
-  puts '---'
-  if current_dir.entries.include? name then
-    puts "#{name} already exists."
-  else
-    echo_and_exec "git clone #{url}"
-    Dir.chdir "#{name}"
-    echo_and_exec "git remote add upstream #{fork_url}"
-    Dir.chdir ".."
-  end
-end