tworingtools 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d5ba068c26f5404bb471ff620f0319663a18844d650f6d940a0820bfe9c1e5a
-  data.tar.gz: 5b99e3580f0c348d4a988a68b21e851d3730daca051830e24a7029dc67434851
+  metadata.gz: f148163f729f26925e2bf9f8e1af2df7481069fa0a465e78e46a88bef71cce5e
+  data.tar.gz: b7035c0068f523eefb50fd8de3ca529aefa5655193f5d6f547e169efa7e22196
 SHA512:
-  metadata.gz: eb6513944b8be8052f394659bf64eb277e678c4ce083c9b105a2ef1b796119db6d68b6e1b8379ab9cf22d79e2a9ffd71241a775f812b5282e98cb01a01759633
-  data.tar.gz: 532052a792f881fe971d21f0ff617345e302d6852586081f92964bf050c9ae9ff168e61ed5f8268ed85668c6ca5636d2fb70d63ded231d5f0252d807a18169c1
+  metadata.gz: 7fd004a9c0c81b2bd858647f806f6f978e47670283aed074a1fc15280dfcd904e28bafe0f7c60b809453990737fd35287760d1d75d154f827d35fa6e4135ebfc
+  data.tar.gz: 61bb02fbcde991cc829af25754495131a9541b569c5218edaf46a32c446f30f28b6dd21f685a953e87dfdb3e30e1b619e15e4e0c343c88a47446c8471efe0e83

data/bin/prerelease-podspec

@@ -22,6 +22,7 @@ parser = OptionParser.new do |opts|
   BANNER
   opts.on('-w', '--allow-warnings', 'Pass \'--allow-warnings\' to \'cocoapods spec lint\'.') do |force| options[:allow_warnings] = true end
   opts.on('-v', '--verbose', 'Pass \'--verbose\' to \'cocoapods spec lint\'.') do |name| options[:verbose] = true end
+  opts.on('-n', '--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('-h', '--help', 'Print this help message.') do 
     puts opts
     exit
@@ -35,13 +36,20 @@ current_version = `vrsn --read --file #{version_file}`.strip
 branch = "#{podspec}-#{current_version}-release"
 echo_and_exec "git checkout -b #{branch}"
 
-tag_root = "#{podspec}-#{current_version}-RC"
-release_candidate_number = `git tag --list | grep #{tag_root} | wc -l`.strip.to_i + 1
-release_candidate_tag = "#{tag_root}#{release_candidate_number}"
-echo_and_exec "sed -i '' \"s/\\(\\.version *= *'\\).*'/\\1\"#{current_version}-RC#{release_candidate_number}\"\\'/g\" #{version_file}"
+version_root = "#{current_version}-RC"
+release_candidate_number = `git tag --list | grep #{version_root} | wc -l`.strip.to_i + 1
+
+tag_value = String.new
+if options[:podspec_name_in_tag] then
+  tag_value = "#{podspec}-#{version_root}#{release_candidate_number}"
+else
+  tag_value = "#{version_root}#{release_candidate_number}"
+end
+
+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 'TEMP: set podspec version to release candidate version'"
-echo_and_exec "git tag #{release_candidate_tag}"
+echo_and_exec "git tag #{tag_value}"
 echo_and_exec 'git push --tags'
 
 puts "About to lint the podspec. This takes a while... (it is now #{Time.now})"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tworingtools
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Andrew McKnight
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github_api