tworingtools 4.4.1 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 385ea4238321cf778b1412ed2a9e6eaa5550be15b7c5aeaad86e2f6aaef1a9ab
-  data.tar.gz: 03bbbb6a58db914009a96ea709624480aee3c1c6c9f71d0c8caf30e57e0ab1b6
+  metadata.gz: ab98c6a76083beb69e5321318a516f318c978c52fae24bf2cb1a7c4ff0f0da56
+  data.tar.gz: 3e4b33808f476411d426dcc5c01f5cb43769384128f7631b295e0713eccb6626
 SHA512:
-  metadata.gz: bf1fc845bb26f6873fb3046a73d91bee3c9c0936a23fe15875672245d476efb2f6ce384b3eb1e21a5179afe4b377bfeb9711532ec994f55fb7886398ca4a6ee6
-  data.tar.gz: 633394bd194098ef47e88b7cca40a708fa3a30828dc19f29c9fc988aebc480c72cc9a997d8e28bcc5446533d1b66aa92fcb8b67f4f112dad19ff46e7e49ddb6d
+  metadata.gz: c88c9a7ff566bdef41e3201b0871466a760fff3f9faf48c1133fda4a136ba1758bb87cbfa0a955380b4e9c90bc3b8fad2a5c95570c774146436fce7d5885bdcb
+  data.tar.gz: ccec1349aa05d908361c0d35d64b1546748f3d089529a191348c8424facd1e25180adf826bbabfa86d959a377e907e126d692d8c5a0a17dfdd37fceaad4985c8

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/changetag

@@ -37,7 +37,7 @@ parser = OptionParser.new do |opts|
 end
 parser.parse!
 
-git_check unless options[:no_commit]
+git_check
 
 # set valid git message comment character
 

data/bin/migrate-changelog

@@ -13,7 +13,8 @@ parser = OptionParser.new do |opts|
            Move any contents in Unreleased under a new heading for the specified version with current date.
 
   BANNER
-  opts.on('-h', '--help', 'Print this help message.') do
+    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('-h', '--help', 'Print this help message.') do
     puts opts
     exit
   end
@@ -39,5 +40,7 @@ File.open(changelog_path, 'w+') do |writable_changelog|
 	writable_changelog << changelog_contents.join('')
 end
 
-`git add #{changelog_path}`
-`git commit --message "chore(changelog): moved Unreleased entries to #{version}"`
+unless options[:no_commit] then
+  `git add #{changelog_path}`
+  `git commit --message "chore(changelog): moved Unreleased entries to #{version}"`
+end

data/bin/prerelease-podspec

@@ -31,6 +31,7 @@ parser = OptionParser.new do |opts|
   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('-q', '--quick', 'Perform quick podspec lint only.') do |quick| options[:quick] = true end
   opts.on('-h', '--help', 'Print this help message.') do
     puts opts
     exit
@@ -64,7 +65,7 @@ else
   tag_value = "#{release_candidate_version}"
 end
 
-echo_and_exec "sed -i '' \"s/\\(\\.version *= *'\\).*'/\\1\"#{tag_value}\"\\'/g\" #{version_file}"
+echo_and_exec "sed -i '' \"s/\\(\\.version *= *'\\).*'/\\1\"#{release_candidate_version}\"\\'/g\" #{version_file}"
 echo_and_exec "git add #{version_file}"
 echo_and_exec "git commit --message 'chore(#{podspec}): set to release candidate version'"
 
@@ -81,15 +82,18 @@ end
 
 puts "About to lint the podspec. This takes a while... (it is now #{Time.now})"
 spec_lint_flags = Array.new
-if options[:allow_warnings] != nil then
+if options[:allow_warnings] then
   spec_lint_flags << '--allow-warnings'
 end
-if options[:verbose] != nil then
+if options[:verbose] then
   spec_lint_flags << '--verbose'
 end
-if options[:skip_tests] != nil then
+if options[:skip_tests] then
   spec_lint_flags << '--skip-tests'
 end
+if options[:quick] then
+  spec_lint_flags << '--quick'
+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

@@ -28,7 +28,8 @@ parser = OptionParser.new do |opts|
   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', '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('-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('-i', '--skip-import-validation', 'Skip building/testing importability of podspec as part of pushing it to source.') do |skip_import_validation| options[:skip_import_validation] = true end
   opts.on('-h', '--help', 'Print this help message.') do
     puts opts
     exit
@@ -63,15 +64,18 @@ end
 echo_and_exec 'git push --tags'
 
 spec_lint_flags = Array.new
-if options[:allow_warnings] != nil then
+if options[:allow_warnings] then
   spec_lint_flags << '--allow-warnings'
 end
-if options[:verbose] != nil then
+if options[:verbose] then
   spec_lint_flags << '--verbose'
 end
-if options[:skip_tests] != nil then
+if options[:skip_tests] then
   spec_lint_flags << '--skip-tests'
 end
+if options[:skip_import_validation] then
+  spec_lint_flags << '--skip-import-validation'
+end
 
 command = String.new
 if options[:repo] != nil then

metadata

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