tworingtools 4.3.0 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d572bbbaf9d0cfe054678d11b46de1e9a15f01fad9758178f214b76e56199d9f
-  data.tar.gz: be7c5b255b83ee2db03e556eb44d2f163badea2fbaa4b0d82d05b16a66630e8d
+  metadata.gz: 8859999037d1edd2c81b33358b8c77ea66eb3199d77e1556efe445f4e442127f
+  data.tar.gz: 7fa2a8328f322eab2d614f92ba252a146e5e29ee134414d9bb332591fcf1c862
 SHA512:
-  metadata.gz: 97d3914b21dcccaf2f2e1f261a3c1a217fdc6a30263a32b8ce905d1e9d5a0e2fe78764abd289309c87c9f995ed870650c97e1334a5c23d3965541ddac4f627ef
-  data.tar.gz: c0fcd5ddb92eda302ff0a77fe394e0d85144c689765c664cc4eea8baa18b801885f64017ad5e7bcb218540559c51ebcec7a59ca8e31c4fd32fa4a04c56bd02dd
+  metadata.gz: d58734ba15e37cd18d69b396519c4dde656a1601388aeacf16031d378a193f9fbce7f6d71cd0ebd8d473cdf6d8f3647805956771ff4c5a8b71a460f93080dc88
+  data.tar.gz: 57cae9321468c8d298776eeb8b96c295f760329870049620738865f840d959a36b25605f928931b163124d29877c396571a8116ac35940f7511ca7c9239bac4a

data/bin/prerelease-podspec

@@ -27,8 +27,9 @@ parser = OptionParser.new do |opts|
   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('-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. Ignored if --no-tag is specified.') 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('-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('-h', '--help', 'Print this help message.') do
     puts opts
@@ -67,14 +68,16 @@ echo_and_exec "sed -i '' \"s/\\(\\.version *= *'\\).*'/\\1\"#{release_candidate_
 echo_and_exec "git add #{version_file}"
 echo_and_exec "git commit --message 'chore(#{podspec}): set to release candidate version'"
 
-if options[:changelog] then
-  echo_and_exec 'git config core.commentchar @'
-  echo_and_exec "rbenv exec bundle exec changetag --name #{current_version} #{options[:changelog]} #{tag_value}"
-  echo_and_exec 'git config core.commentchar #'
-else
-  echo_and_exec "git tag #{tag_value}"
+unless options[:no_tag] then
+  if options[:changelog] then
+    echo_and_exec 'git config core.commentchar @'
+    echo_and_exec "rbenv exec bundle exec changetag --name #{current_version} #{options[:changelog]} #{tag_value}"
+    echo_and_exec 'git config core.commentchar #'
+  else
+    echo_and_exec "git tag #{tag_value}"
+  end
+  echo_and_exec 'git push --tags'
 end
-echo_and_exec 'git push --tags'
 
 puts "About to lint the podspec. This takes a while... (it is now #{Time.now})"
 spec_lint_flags = Array.new

data/bin/release-podspec

@@ -26,7 +26,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('-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('-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('-h', '--help', 'Print this help message.') do
@@ -51,7 +51,7 @@ elsif options[:podspec_name_in_tag] then
 else
   tag_value = version
 end
-if options[:skip_changelog] then
+unless 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]
@@ -75,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tworingtools
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.2
 platform: ruby
 authors:
 - Andrew McKnight