tworingtools 4.3.2 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fe07ff31edb8f170c5d7786f26b83b43ae6a22a778a8b3ee28e912c54638776
-  data.tar.gz: 5ce642e594775ac2447db3d9241e1cb31577b8b6c9e53f70a23fa3417da5fe01
+  metadata.gz: 7cca665b04e01ce8a7e1b1ce1159590e69ad16032eb4c396a2eca00085c97a21
+  data.tar.gz: d1515515902f247957f86bbe196d5e59f58965414d8abdb97c39ba51807149c0
 SHA512:
-  metadata.gz: 944ec25caf172ae3559df4a7d5c630f0b9a7eb5e3905ec67507d5f934cc40bb25200145bdf2e03c9983d8daa596d74cf0ac70fe5c9762d09cd241ccf847d647f
-  data.tar.gz: 20758e0eed9eb593bbf2defc56f81c341060c10dee376706fe041f7000e7f973af6627c6a3a77ae07cca8df90c3903da2accbc964b00fb3c221dc6288432a486
+  metadata.gz: 2b6cd1a805b03c3e01cda3c78f4892a1bd85eb426d25fcd55075ba8d3720f4ddeb8288dae77defcc187725acd80005af9e8aadc5c5a08b39a7665e016b4bb644
+  data.tar.gz: 3e28db91c5b3e00fe1b54917f8174a8f39ec211cb5d4d1846a5adb337e898a1c77f2bd18ae4e6bd2acbae7a18a1e4de0f9ab061a402eb5c138f9d3e36db488b8

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('-cCUSTOM', '--custom=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

metadata

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