tworingtools 5.0.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a9c273d420e81312cd78a3cfb16705daa66c66cb88333b028a99aeead328b57
-  data.tar.gz: bf970bd1d1613d2667f7d5279ec35c5d1bc0ea68b51d07d80bb4246491706320
+  metadata.gz: d2409b0f5d3957d1c4ca4c2c754174a93c802b193994f137480e1e6448f0d233
+  data.tar.gz: 344037994226cac7ed21f59672360ccc160ea110602f35af0b98038847cd4f5a
 SHA512:
-  metadata.gz: e1acd45a72627aa1c61876360907b65715d55afe06c4c398d711476bc06e79baeb806475c1b46e739cecb57f5a13014273f423ff1d3b0d009987dc5e97143dfd
-  data.tar.gz: 6160816443577623849b42d6cd0972b6314dc523bbcdc2295d9501c4d80f6bc1e124831f9aad4d61d27f81dcda68b8bae358869d50f1d4479d06aeedcbc1bb91
+  metadata.gz: 0e59c558135996bc8cdd57031f01b6c7c34aa8968bd068c8796d309e69000871cbd087373e5ce8fd4cd7dc0cc0e0fef609f5acf16a8e523f591bbab6a7f15f6e
+  data.tar.gz: 026e3c1c66a2b84c65d0845b743b82072a40bc8224396c96d506e41b8a43c0b90f071060d2b2045f3e0711ba10642ad309d89b79b330f7cc74394ce007ead10f

data/bin/bumpr

@@ -54,5 +54,5 @@ stdout, stderr, status = Open3.capture3(command)
 
 unless options[:no_commit] then
   echo_and_exec "git add #{version_file}"
-  echo_and_exec "git commit --message \"#{stdout}\""
+  echo_and_exec "git commit --message \"chore: #{stdout}\""
 end

data/bin/release-podspec

@@ -1,4 +1,5 @@
 #! /usr/bin/env ruby
+# coding: utf-8
 
 require 'open3'
 require 'optparse'
@@ -26,6 +27,7 @@ parser = OptionParser.new do |opts|
   opts.on('-n', '--no-changelog', 'Skip operations that would normally update a CHANGELOG.md.') do |skip_changelog| options[:skip_changelog] = true end
   opts.on('-v', '--verbose', 'Pass \'--verbose\' to \'cocoapods spec lint\'.') do |name| options[:verbose] = true end
   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('-k', '--also-push-to-trunk', 'When pushing to a private repo, also push to trunk afterwards. Ignored if not using --repo.') do |also_push_to_trunk| options[:also_push_to_trunk] = true 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
@@ -77,21 +79,26 @@ if options[:skip_import_validation] then
   spec_lint_flags << '--skip-import-validation'
 end
 
-command = String.new
-if options[:repo] != nil then
-	command = "rbenv exec bundle exec pod repo push #{options[:repo]} #{spec_lint_flags.join ' '} #{podspec_path}"
-else
-	command = "rbenv exec bundle exec pod trunk push #{podspec_path} #{spec_lint_flags.join ' '}"
-end
+def execute_command command
+  puts command
+  stdout, stderr, status = Open3.capture3 command
 
-puts command
-stdout, stderr, status = Open3.capture3 command
+  puts stdout
 
-puts stdout
+  if status != 0 then
+    puts "Podspec push failed:\nstderr: #{stderr}"
+    exit TwoRingToolError::PODSPEC_PUSH_FAILED
+  else
+    puts "Podspec pushed successfully!"
+  end
+end
 
-if status != 0 then
-  puts "Podspec push failed:\nstderr: #{stderr}"
-  exit TwoRingToolError::PODSPEC_PUSH_FAILED
+command = String.new
+if options[:repo] != nil then
+  execute_command "rbenv exec bundle exec pod repo push #{options[:repo]} #{spec_lint_flags.join ' '} #{podspec_path}"
+  if options[:also_push_to_trunk] then
+    execute_command "rbenv exec bundle exec pod trunk push #{podspec_path} #{spec_lint_flags.join ' '}"
+  end
 else
-  puts "Podspec pushed successfully!"
+  execute_command "rbenv exec bundle exec pod trunk push #{podspec_path} #{spec_lint_flags.join ' '}"
 end

data/bin/{sync-git → sync-git-remotes}

@@ -6,15 +6,11 @@ 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>
+    Usage: sync-git-remotes [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
@@ -23,25 +19,11 @@ parser = OptionParser.new do |opts|
            <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('-tTOKEN', '--token=TOKEN', 'GitHub personal access token.') do |t| options[:token] = t 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
@@ -53,30 +35,6 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tworingtools
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Andrew McKnight
@@ -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-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.
+    - sync-git-remotes: 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-git
+- sync-git-remotes
 - changetag
 - prerelease-podspec
 - release-podspec
@@ -69,7 +69,7 @@ files:
 - bin/prerelease-podspec
 - bin/release-podspec
 - bin/revert-failed-release-tag
-- bin/sync-git
+- bin/sync-git-remotes
 - bin/xcsims
 - lib/echoexec.rb
 - lib/errors.rb
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A collection of command line tools.