tworingtools 3.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d1e943f0032f7f125bdefd52aebd9c5d6402116c9eb9f79b784e8a3579eb8f8
-  data.tar.gz: e5ca242d35928396d457048f6f0d76a24a3af54f9b7fa17462a9cfa383a7a90f
+  metadata.gz: 16466bf2984dbc3a05e95e3208cad9414c0c94bb87d0c915083774bdd363ecfe
+  data.tar.gz: d8dc97b07602e173dbc040ceb41e5b3d3a7044e829d0344faee012bfacb82881
 SHA512:
-  metadata.gz: 7c4f49838b822c793ca96090ec9bd3851aa923bcd104382c57b861fcfdbf70ecd554f3cfe2b722acaebea081805dbabacddef0c08f08df5a4c16f9252cecdfdd
-  data.tar.gz: ed215d75ba0f9be16868cdc42d5c0f4f1a7086e5ed1fdcf11769a393a6d18753b06b9e2e20c0c697a15233697abb3f85959d2abab082a3b5a244aea6b0fc68d6
+  metadata.gz: cdeb0282e4960dfdb932691fe7b2acf5acdd8c68686c72e0295047e627320a775b9b0dcc100d694d1ba10dad16fb3965e5311ed487e101e11ff39d78ec5cd129
+  data.tar.gz: a771775e2fb4378f3c279916b3c6794cab9005333e0b2b258ce9ada4908d177f8dd845ffa94b20907306d16eae93ef669fe1988e24b0244aa93decc468990055

data/bin/prerelease-podspec

@@ -5,7 +5,8 @@ require 'optparse'
 require_relative '../lib/git_check'
 require_relative '../lib/echoexec'
 
-podspec = ARGV[0]
+version_file = ARGV[0]
+podspec = version_file.split('/')[-1].split('.podspec')[0]
 
 # failure modes
 PODSPEC_FAILED_VALIDATION = 65
@@ -14,7 +15,7 @@ options = {}
 parser = OptionParser.new do |opts|
   opts.banner = <<~BANNER
 
-    Usage: prerelease-podspec [options] <podspec-name>
+    Usage: prerelease-podspec [options] <podspec-path>
 
            Branch and create/push a release candidate tag, modify the podspec to use that version tag, and try linting it.
 
@@ -23,9 +24,11 @@ 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('-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('-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('-h', '--help', 'Print this help message.') do
     puts opts
     exit
@@ -35,8 +38,6 @@ parser.parse!
 
 git_check unless options[:no_commit]
 
-version_file = "#{podspec}.podspec"
-
 current_version = `vrsn --read --file #{version_file}`.strip
 unless options[:no_branch] then
   branch = "#{podspec}-#{current_version}-release"
@@ -48,7 +49,9 @@ release_candidate_number = `git tag --list | grep #{version_root} | wc -l`.strip
 release_candidate_version = "#{version_root}#{release_candidate_number}"
 
 tag_value = String.new
-if options[:podspec_name_in_tag] then
+if options[:tag] then
+  tag_value = options[:tag]
+elsif options[:podspec_name_in_tag] then
   tag_value = "#{podspec}-#{release_candidate_version}"
 else
   tag_value = "#{release_candidate_version}"
@@ -75,7 +78,10 @@ end
 if options[:verbose] != nil then
   spec_lint_flags << '--verbose'
 end
-stdout, stderr, status = Open3.capture3 "rbenv exec bundle exec pod spec lint #{podspec}.podspec #{spec_lint_flags.join ' '}"
+if options[:skip_tests] != nil then
+  spec_lint_flags << '--skip-tests'
+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

@@ -6,13 +6,14 @@ require_relative '../lib/echoexec'
 require_relative '../lib/errors'
 require_relative '../lib/git_check'
 
-podspec = ARGV[0]
+podspec_path = ARGV[0]
+podspec = podspec_path.split('/')[-1].split('.podspec')[0]
 
 options = {}
 parser = OptionParser.new do |opts|
   opts.banner = <<~BANNER
 
-    Usage: release-podspec [options] <podspec-name>
+    Usage: release-podspec [options] <podspec-path>
 
            Form Git tags and push them to remote, then push the podspec to CocoaPods trunk.
 
@@ -21,10 +22,11 @@ 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('-s', '--skip-tests', 'Pass \'--skip-tests\' to \'cocoapods spec lint\'.') do |skip_tests| options[:skip_tests] = 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('-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('-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('-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
     puts opts
@@ -39,16 +41,20 @@ changelog_path = 'CHANGELOG.md'
 if options[:changelog_path] != nil then
   changelog_path = options[:changelog_path]
 end
-version = `vrsn --read --file #{podspec}.podspec`.strip
-name_prefix = String.new
-if options[:podspec_name_in_tag] then
-  name_prefix = podspec + '-'
+version = `vrsn --read --file #{podspec_path}`.strip
+tag_value = String.new
+if options[:tag] then
+  tag_value = options[:tag]
+elsif options[:podspec_name_in_tag] then
+  tag_value = podspec + '-' + version
+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]
 end
-echo_and_exec "rbenv exec bundle exec changetag #{changelog_path} #{name_prefix}#{version} #{changelog_entry_name}"
+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
@@ -66,7 +72,7 @@ command = String.new
 if options[:repo] != nil then
 	command = "rbenv exec bundle exec pod repo push #{options[:repo]} #{spec_lint_flags.join ' '}"
 else
-	command = "rbenv exec bundle exec pod trunk push #{podspec}.podspec #{spec_lint_flags.join ' '}"
+	command = "rbenv exec bundle exec pod trunk push #{podspec_path} #{spec_lint_flags.join ' '}"
 end
 
 puts command

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tworingtools
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Andrew McKnight
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github_api
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement