tworingtools 3.1.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9b1c737a275e5641827ae194527d442e3b66193aa207f04986fde49baf4347b
-  data.tar.gz: 9fa221d0138418902b99203f7ad06929c8b87e7d2b270fcce6a09996659c7c47
+  metadata.gz: d572bbbaf9d0cfe054678d11b46de1e9a15f01fad9758178f214b76e56199d9f
+  data.tar.gz: be7c5b255b83ee2db03e556eb44d2f163badea2fbaa4b0d82d05b16a66630e8d
 SHA512:
-  metadata.gz: 52ca1d901b65ddac44e48ca3232104f7473be210bce899d919432e6debc6d9b23c77e2e0406dfc3d8ac8180f3eed7dca6f5ca45d5371cf8d723b62d606eaac5e
-  data.tar.gz: 5fc053973986ad6b0ea4139be05dc8f062e328604ddcc59a62f4518bdf2b6c6335120263c864b1b0b3c9c9f6bc31974a6dbe56b5948f44ad761d734263659774
+  metadata.gz: 97d3914b21dcccaf2f2e1f261a3c1a217fdc6a30263a32b8ce905d1e9d5a0e2fe78764abd289309c87c9f995ed870650c97e1334a5c23d3965541ddac4f627ef
+  data.tar.gz: c0fcd5ddb92eda302ff0a77fe394e0d85144c689765c664cc4eea8baa18b801885f64017ad5e7bcb218540559c51ebcec7a59ca8e31c4fd32fa4a04c56bd02dd

data/bin/prerelease-podspec

@@ -5,7 +5,8 @@ require 'optparse'
 require_relative '../lib/git_check'
 require_relative '../lib/echoexec'
 
-podspec = ARGV[0]
+version_file = ARGV[0]
+podspec = version_file.split('/')[-1].split('.podspec')[0]
 
 # failure modes
 PODSPEC_FAILED_VALIDATION = 65
@@ -14,7 +15,7 @@ options = {}
 parser = OptionParser.new do |opts|
   opts.banner = <<~BANNER
 
-    Usage: prerelease-podspec [options] <podspec-name>
+    Usage: prerelease-podspec [options] <podspec-path>
 
            Branch and create/push a release candidate tag, modify the podspec to use that version tag, and try linting it.
 
@@ -24,9 +25,11 @@ parser = OptionParser.new do |opts|
   opts.on('-w', '--allow-warnings', 'Pass \'--allow-warnings\' to \'cocoapods spec lint\'.') do |force| options[:allow_warnings] = true end
   opts.on('-v', '--verbose', 'Pass \'--verbose\' to \'cocoapods spec lint\'.') do |name| options[:verbose] = true end
   opts.on('-s', '--skip-tests', 'Pass \'--skip-tests\' to \'cocoapods spec lint\'.') do |skip_tests| options[:skip_tests] = true end
-  opts.on('-n', '--podspec-name-in-tag', 'When forming the tag name for a release candidate, prefix the podspec‘s name to the version string. Helps when you have multiple podspecs in a repository and tag versions for each.') do |podspec_name_in_tag| options[:podspec_name_in_tag] = true end
+  opts.on('-p', '--podspec-name-in-tag', 'When forming the tag name for a release candidate, prefix the podspec‘s name to the version string. Helps when you have multiple podspecs in a repository and tag versions for each.') do |podspec_name_in_tag| options[:podspec_name_in_tag] = true end
   opts.on('-n', '--no-branch', 'Make any changes on the current branch instead of creating a temporary new branch.') do |no_branch| options[:no_branch] = true end
   opts.on('-cCHANGELOG', '--changelog=CHANGELOG', '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.') do |changelog| options[:changelog] = changelog 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('-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('-h', '--help', 'Print this help message.') do
     puts opts
     exit
@@ -36,8 +39,6 @@ parser.parse!
 
 git_check unless options[:no_commit]
 
-version_file = "#{podspec}.podspec"
-
 current_version = `vrsn --read --file #{version_file}`.strip
 unless options[:no_branch] then
   branch = "#{podspec}-#{current_version}-release"
@@ -45,11 +46,18 @@ unless options[:no_branch] then
 end
 
 version_root = "#{current_version}-RC"
-release_candidate_number = `git tag --list | grep #{version_root} | wc -l`.strip.to_i + 1
+release_candidate_number = String.new
+if options[:rc] then
+  release_candidate_number = options[:rc]
+else
+  release_candidate_number = `git tag --list | grep #{version_root} | wc -l`.strip.to_i + 1
+end
 release_candidate_version = "#{version_root}#{release_candidate_number}"
 
 tag_value = String.new
-if options[:podspec_name_in_tag] then
+if options[:tag] then
+  tag_value = options[:tag]
+elsif options[:podspec_name_in_tag] then
   tag_value = "#{podspec}-#{release_candidate_version}"
 else
   tag_value = "#{release_candidate_version}"
@@ -79,7 +87,7 @@ end
 if options[:skip_tests] != nil then
   spec_lint_flags << '--skip-tests'
 end
-stdout, stderr, status = Open3.capture3 "rbenv exec bundle exec pod spec lint #{podspec}.podspec #{spec_lint_flags.join ' '}"
+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

@@ -6,13 +6,14 @@ require_relative '../lib/echoexec'
 require_relative '../lib/errors'
 require_relative '../lib/git_check'
 
-podspec = ARGV[0]
+podspec_path = ARGV[0]
+podspec = podspec_path.split('/')[-1].split('.podspec')[0]
 
 options = {}
 parser = OptionParser.new do |opts|
   opts.banner = <<~BANNER
 
-    Usage: release-podspec [options] <podspec-name>
+    Usage: release-podspec [options] <podspec-path>
 
            Form Git tags and push them to remote, then push the podspec to CocoaPods trunk.
 
@@ -21,10 +22,12 @@ parser = OptionParser.new do |opts|
   BANNER
   opts.on('-w', '--allow-warnings', 'Pass \'--allow-warnings\' to \'cocoapods spec lint\'.') do |force| options[:allow_warnings] = true end
   opts.on('-s', '--skip-tests', 'Pass \'--skip-tests\' to \'cocoapods spec lint\'.') do |skip_tests| options[:skip_tests] = true end
-  opts.on('-n', '--podspec-name-in-tag', 'When forming the tag name for a release candidate, prefix the podspec‘s name to the version string. Helps when you have multiple podspecs in a repository and tag versions for each.') do |podspec_name_in_tag| options[:podspec_name_in_tag] = true end
+  opts.on('-p', '--podspec-name-in-tag', 'When forming the tag name for a release candidate, prefix the podspec‘s name to the version string. Helps when you have multiple podspecs in a repository and tag versions for each.') do |podspec_name_in_tag| options[:podspec_name_in_tag] = true end
+  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('-cCHANGELOG_PATH', '--changelog-path=CHANGELOG_PATH', '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('-h', '--help', 'Print this help message.') do
     puts opts
@@ -39,16 +42,24 @@ changelog_path = 'CHANGELOG.md'
 if options[:changelog_path] != nil then
   changelog_path = options[:changelog_path]
 end
-version = `vrsn --read --file #{podspec}.podspec`.strip
-name_prefix = String.new
-if options[:podspec_name_in_tag] then
-  name_prefix = podspec + '-'
+version = `vrsn --read --file #{podspec_path}`.strip
+tag_value = String.new
+if options[:tag] then
+  tag_value = options[:tag]
+elsif options[:podspec_name_in_tag] then
+  tag_value = podspec + '-' + version
+else
+  tag_value = version
 end
-changelog_entry_name = String.new
-if options[:changelog_entry_name_override] != nil then
-  changelog_entry_name = "--name " + options[:changelog_entry_name_override]
+if options[:skip_changelog] then
+  changelog_entry_name = String.new
+  if options[:changelog_entry_name_override] != nil then
+    changelog_entry_name = "--name " + options[:changelog_entry_name_override]
+  end
+  echo_and_exec "rbenv exec bundle exec changetag #{changelog_path} #{tag_value} #{changelog_entry_name}"
+else
+  echo_and_exec "git tag #{tag_value}"
 end
-echo_and_exec "rbenv exec bundle exec changetag #{changelog_path} #{name_prefix}#{version} #{changelog_entry_name}"
 echo_and_exec 'git push --tags'
 
 spec_lint_flags = Array.new
@@ -66,7 +77,7 @@ command = String.new
 if options[:repo] != nil then
 	command = "rbenv exec bundle exec pod repo push #{options[:repo]} #{spec_lint_flags.join ' '}"
 else
-	command = "rbenv exec bundle exec pod trunk push #{podspec}.podspec #{spec_lint_flags.join ' '}"
+	command = "rbenv exec bundle exec pod trunk push #{podspec_path} #{spec_lint_flags.join ' '}"
 end
 
 puts command

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tworingtools
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Andrew McKnight
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github_api