tworingtools 4.0.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c1071bbf100e0bf1aba6e043d1fbf1c847f7bc300bfdcb08f682dba1dd0a7cb
-  data.tar.gz: 8a4872e2c877d033b7f7ed7f1b837243b6ec2c8b85b7b046790a320e24733c89
+  metadata.gz: 2174408f19044e8e91f1658e7dcc4bc28ae44ff0b0fdfeab9766e3314c937535
+  data.tar.gz: f91a05154a329e8529a679d66adf651b66f71b8e7c542b15d82de397d9fa1f41
 SHA512:
-  metadata.gz: 14ef19e616343b8ac899a7105668ce8677acf37d66228a6917f99d6cf665b7366719d68aa3a6ac025ef37d504fb8394c94b989a226ce435f63290074c4721ee3
-  data.tar.gz: c17c74ae18617edd1d70ec1afb7c000ee45e700b2d5e0e7373a0b295ea0635447530b308485e429c5cf503a7c02b9b6ad1da9cc2ab426c0f8456051a5a7b14e1
+  metadata.gz: a624262d5ecbfbd226a1f3bd5c3a3e135e1287499a1fef85893a42eaacbff19b8d2ad6688ea4f481743b98030836fa30620a26237bf7eea256e70266dbba2113
+  data.tar.gz: d4390c3b4cf36b0575c3b461f6a32f9b5d76bb49994c0e81ea65aea632d0ecf75ea8143eea6a57f33ff9a673f4e6bf4ead46f2225818b15d340e316df6d25786

data/bin/prerelease-podspec

@@ -24,9 +24,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('-v', '--verbose', 'Pass \'--verbose\' to \'cocoapods spec lint\'.') do |name| options[:verbose] = 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('-s', '--skip-tests', 'Pass \'--skip-tests\' to \'cocoapods spec lint\'.') do |skip_tests| options[:skip_tests] = 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
@@ -43,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}"
@@ -74,6 +84,9 @@ end
 if options[:verbose] != nil then
   spec_lint_flags << '--verbose'
 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 #{version_file} #{spec_lint_flags.join ' '}"
 
 puts "stdout: #{stdout}"

data/bin/release-podspec

@@ -22,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
@@ -41,15 +43,23 @@ if options[:changelog_path] != nil then
   changelog_path = options[:changelog_path]
 end
 version = `vrsn --read --file #{podspec_path}`.strip
-name_prefix = String.new
-if options[:podspec_name_in_tag] then
-  name_prefix = podspec + '-'
+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
@@ -65,7 +75,7 @@ end
 
 command = String.new
 if options[:repo] != nil then
-	command = "rbenv exec bundle exec pod repo push #{options[:repo]} #{spec_lint_flags.join ' '}"
+	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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tworingtools
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.3.1
 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