tworingtools 4.2.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8bc4d66ed425f70865ff455a17d5f0cc03af48003f7e994d7cad3d7a4708a4b
-  data.tar.gz: 2f030b6eb9d7fc50105fb91af19ca1d6abf226e896d035665497f2b497e223bd
+  metadata.gz: 385ea4238321cf778b1412ed2a9e6eaa5550be15b7c5aeaad86e2f6aaef1a9ab
+  data.tar.gz: 03bbbb6a58db914009a96ea709624480aee3c1c6c9f71d0c8caf30e57e0ab1b6
 SHA512:
-  metadata.gz: 55a216baf1583ebab6759bc0a425079841f1f5ad92fa50301623f7997b2a2ef537e3cca6e956f77e5aacaf2809168f4b0e342c3c28478d6f6a5c253a0ffad5cc
-  data.tar.gz: 468218eb24849365f2482d50fdafe29eafdafcd7fc45e004f5e2a92719b834e8ec2ea2087bbf5b1a753cbec311914f7aebadcef94d0d43d7b47e9a15ac968ae6
+  metadata.gz: bf1fc845bb26f6873fb3046a73d91bee3c9c0936a23fe15875672245d476efb2f6ce384b3eb1e21a5179afe4b377bfeb9711532ec994f55fb7886398ca4a6ee6
+  data.tar.gz: 633394bd194098ef47e88b7cca40a708fa3a30828dc19f29c9fc988aebc480c72cc9a997d8e28bcc5446533d1b66aa92fcb8b67f4f112dad19ff46e7e49ddb6d

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
@@ -63,18 +64,20 @@ else
   tag_value = "#{release_candidate_version}"
 end
 
-echo_and_exec "sed -i '' \"s/\\(\\.version *= *'\\).*'/\\1\"#{release_candidate_version}\"\\'/g\" #{version_file}"
+echo_and_exec "sed -i '' \"s/\\(\\.version *= *'\\).*'/\\1\"#{tag_value}\"\\'/g\" #{version_file}"
 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

@@ -23,9 +23,10 @@ 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('-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-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
@@ -50,11 +51,15 @@ elsif options[:podspec_name_in_tag] then
 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]
+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]
+  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} #{tag_value} #{changelog_entry_name}"
 echo_and_exec 'git push --tags'
 
 spec_lint_flags = Array.new
@@ -70,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.2.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Andrew McKnight