tworingtools 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7866367d352702c57d29d4a3ab4047cb515203315d9ca4fed738b870f1302ccb
-  data.tar.gz: 3ef7172b8f3acb80f7bc46a646089390e214dd39409c037a165ba2b33ad07197
+  metadata.gz: 0d1e943f0032f7f125bdefd52aebd9c5d6402116c9eb9f79b784e8a3579eb8f8
+  data.tar.gz: e5ca242d35928396d457048f6f0d76a24a3af54f9b7fa17462a9cfa383a7a90f
 SHA512:
-  metadata.gz: 98f4c27f1f5f5dedf4d1bd3dfa52b59988e2aee2bd0121e455eca8c4692f82c4728c28bc63c599d376fc0796914f78e39b0f1192aae1d3f24ecfd08d2b080860
-  data.tar.gz: a90f88aff5b56b284a83fd05913935c6db5b172110f6b6ce85badf1b0c02a052bc5fab3ac1bbb819e2d0901009c139c773f0e73db4f2d0d3ddbaf014a5005f6b
+  metadata.gz: 7c4f49838b822c793ca96090ec9bd3851aa923bcd104382c57b861fcfdbf70ecd554f3cfe2b722acaebea081805dbabacddef0c08f08df5a4c16f9252cecdfdd
+  data.tar.gz: ed215d75ba0f9be16868cdc42d5c0f4f1a7086e5ed1fdcf11769a393a6d18753b06b9e2e20c0c697a15233697abb3f85959d2abab082a3b5a244aea6b0fc68d6

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

@@ -33,7 +33,7 @@ parser = OptionParser.new do |opts|
 end
 parser.parse!
 
-git_check
+git_check unless options[:no_commit]
 
 version_file = "#{podspec}.podspec"
 

data/bin/release-podspec

@@ -26,14 +26,14 @@ 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
@@ -51,7 +51,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
@@ -80,4 +80,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: 3.0.1
 platform: ruby
 authors:
 - Andrew McKnight
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2020-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github_api
@@ -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