tworingtools 3.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7866367d352702c57d29d4a3ab4047cb515203315d9ca4fed738b870f1302ccb
-  data.tar.gz: 3ef7172b8f3acb80f7bc46a646089390e214dd39409c037a165ba2b33ad07197
+  metadata.gz: e959ca054f860c6b68a13d6485c1fd1ce9b2186d2fe828850fbafef61135fc8b
+  data.tar.gz: 9e7c099aaafa9f4dcb1e4df2f4f537e68c9a0b05cd9a3c8cec089d0b4262df22
 SHA512:
-  metadata.gz: 98f4c27f1f5f5dedf4d1bd3dfa52b59988e2aee2bd0121e455eca8c4692f82c4728c28bc63c599d376fc0796914f78e39b0f1192aae1d3f24ecfd08d2b080860
-  data.tar.gz: a90f88aff5b56b284a83fd05913935c6db5b172110f6b6ce85badf1b0c02a052bc5fab3ac1bbb819e2d0901009c139c773f0e73db4f2d0d3ddbaf014a5005f6b
+  metadata.gz: 9fd5e2331f2f89cfc1083fb172fd5fbec5725d5f62f14de92a72475e76e65c9544b5ad0d3a7ccfdfab0f5a9746eea645125f0fcc91bc8c57ff2391840908253a
+  data.tar.gz: 0a851c08e9a3908a0990fe9a3ec827e1700ad1d8b8154d058d63c065aa346c6bf16b8b31e188acbbc3dd0be38ab3f2a0c22887e8bf9a207ae493ca4c8972019c

data/bin/bumpr

@@ -2,7 +2,7 @@
 
 require 'optparse'
 require_relative '../lib/echoexec'
-require_relative '../lib/error'
+require_relative '../lib/errors'
 require_relative '../lib/git_check'
 
 options = {}
@@ -25,7 +25,7 @@ parser = OptionParser.new do |opts|
 end
 parser.parse!
 
-git_check
+git_check unless options[:no_commit]
 
 component = ARGV[0]
 version_file = ARGV[1]

data/bin/changetag

@@ -2,7 +2,7 @@
 
 require 'optparse'
 require_relative '../lib/echoexec'
-require_relative '../lib/error'
+require_relative '../lib/errors'
 require_relative '../lib/git_check'
 
 options = {}
@@ -15,7 +15,7 @@ parser = OptionParser.new do |opts|
 
            For normal usage, provide the path to the changelog from which to extract release notes, and the git tag name for which you'd like to extract release notes. This pulls the relevant section from your changelog, as long as you adhere to the format described at http://keepachangelog.com/en/1.0.0/.
 
-           Note that the specification requires using the '#' character for hierarchical organization. Conveniently, this also renders different header styles with markdown. Unfortunately, that character is used to denote comments in git tag annotations (similar to git commit messages). So, before using changetag, you must change this to a different character: 
+           Note that the specification requires using the '#' character for hierarchical organization. Conveniently, this also renders different header styles with markdown. Unfortunately, that character is used to denote comments in git tag annotations (similar to git commit messages). So, before using changetag, you must change this to a different character:
 
                 $> git config core.commentchar "@"
 
@@ -37,7 +37,7 @@ parser = OptionParser.new do |opts|
 end
 parser.parse!
 
-git_check
+git_check unless options[:no_commit]
 
 # set valid git message comment character
 
@@ -73,9 +73,9 @@ end
 =end
 
 changelog_contents = File.open(changelog_path).readlines
-if options[:name] != nil then 
+if options[:name] != nil then
   entry_name = options[:name]
-else 
+else
   entry_name = git_tag
 end
 

data/bin/migrate-changelog

@@ -20,7 +20,7 @@ parser = OptionParser.new do |opts|
 end
 parser.parse!
 
-git_check
+git_check unless options[:no_commit]
 
 changelog_path = ARGV[0]
 version = ARGV[1]

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,6 +24,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('-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('-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
@@ -33,9 +35,7 @@ parser = OptionParser.new do |opts|
 end
 parser.parse!
 
-git_check
-
-version_file = "#{podspec}.podspec"
+git_check unless options[:no_commit]
 
 current_version = `vrsn --read --file #{version_file}`.strip
 unless options[:no_branch] then
@@ -75,7 +75,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.
 
@@ -26,20 +27,20 @@ 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', '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('--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 
+  opts.on('-h', '--help', 'Print this help message.') do
     puts opts
     exit
   end
 end
 parser.parse!
 
-git_check
+git_check unless options[:no_commit]
 
 changelog_path = 'CHANGELOG.md'
 if options[:changelog_path] != nil then
   changelog_path = options[:changelog_path]
 end
-version = `vrsn --read --file #{podspec}.podspec`.strip
+version = `vrsn --read --file #{podspec_path}`.strip
 name_prefix = String.new
 if options[:podspec_name_in_tag] then
   name_prefix = podspec + '-'
@@ -51,7 +52,7 @@ end
 echo_and_exec "rbenv exec bundle exec changetag #{changelog_path} #{name_prefix}#{version} #{changelog_entry_name}"
 echo_and_exec 'git push --tags'
 
-spec_lint_flags = Array.new 
+spec_lint_flags = Array.new
 if options[:allow_warnings] != nil then
   spec_lint_flags << '--allow-warnings'
 end
@@ -66,7 +67,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
@@ -80,4 +81,3 @@ if status != 0 then
 else
   puts "Podspec pushed successfully!"
 end
-

data/lib/errors.rb

@@ -0,0 +1,8 @@
+module TwoRingToolError 
+	INVALID_CHANGELOG_PATH = 65
+	UNFORCED_ANNOTATION_OVERWRITE_ATTEMPT = 66
+	CHANGELOG_ENTRY_NOT_FOUND = 67
+	GIT_DIRTY_INDEX = 68
+	PODSPEC_PUSH_FAILED = 69
+	INVALID_SEMVER_COMPONENT = 70
+end

data/lib/git_check.rb

@@ -0,0 +1,10 @@
+require 'open3'
+require_relative 'errors'
+
+def git_check
+    modified_file_count, stderr, status = Open3.capture3("git status --porcelain | egrep '^(M| M)' | wc -l")
+    if modified_file_count.to_i > 0 then
+        puts 'Please commit all changes to working index before proceeding.'
+        exit TwoRingToolError::GIT_DIRTY_INDEX
+    end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tworingtools
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Andrew McKnight
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-04 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
@@ -72,6 +72,8 @@ files:
 - bin/sync-forks
 - bin/xcsims
 - lib/echoexec.rb
+- lib/errors.rb
+- lib/git_check.rb
 homepage: https://github.com/TwoRingSoft/tools
 licenses:
 - MIT