tworingtools 4.3.1 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2174408f19044e8e91f1658e7dcc4bc28ae44ff0b0fdfeab9766e3314c937535
-  data.tar.gz: f91a05154a329e8529a679d66adf651b66f71b8e7c542b15d82de397d9fa1f41
+  metadata.gz: c53b0fa06130b5f11b2e688a6857abe68f1f28b49c2752899f34e052693f764c
+  data.tar.gz: dd9f84545c8e68e375379e203b357aedb0cdb7b50f6126057dd921804ecb4702
 SHA512:
-  metadata.gz: a624262d5ecbfbd226a1f3bd5c3a3e135e1287499a1fef85893a42eaacbff19b8d2ad6688ea4f481743b98030836fa30620a26237bf7eea256e70266dbba2113
-  data.tar.gz: d4390c3b4cf36b0575c3b461f6a32f9b5d76bb49994c0e81ea65aea632d0ecf75ea8143eea6a57f33ff9a673f4e6bf4ead46f2225818b15d340e316df6d25786
+  metadata.gz: 2fbf9378305e000180ff7238c4b4b44d757d9e75f137e27e96a5148c70e63d5e230f4c95934b74a071bc46285817478d364f21b52f91c531156a5fee42202b5b
+  data.tar.gz: 9e30706e07c4f0321a97d752fd302f07e2f2e6531e1b01c9ab9f117b2075eb52eba82cb9d0df04c6b8d1f135e50b7c3c9fb4690d609ec3acf0aafef1735df090

data/bin/bumpr

@@ -18,6 +18,7 @@ parser = OptionParser.new do |opts|
 
   BANNER
   opts.on('-n', '--no-commit', 'Leave changes in the git working index instead of committing them.') do |no_commit| options[:no_commit] = true end
+  opts.on('-c', '--custom', 'Custom version to use for semantic component (or build number for "build" component).') do |custom| options[:custom] = custom end
   opts.on('-h', '--help', 'Print this help message.') do
     puts opts
     exit
@@ -43,7 +44,11 @@ if argument == nil then
   exit TwoRingToolError::INVALID_SEMVER_COMPONENT
 end
 
-command = "vrsn #{argument} --file #{version_file}"
+invocation_options = Array.new
+unless options[:custom] == nil then
+  invocation_options += ['--custom', options[:custom]]
+end
+command = "vrsn #{argument} --file #{version_file} #{invocation_options.join(' ')}"
 puts command
 stdout, stderr, status = Open3.capture3(command)
 

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]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tworingtools
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.5.0
 platform: ruby
 authors:
 - Andrew McKnight