tworingtools 2.1.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86ce3aef521a0acfe1eff300796855bebbd7287246c0d24c100ed2f573886a25
-  data.tar.gz: f39a86ba830b3526467b3eadfe16870716c05a45aa6029c970c43de52c6063bc
+  metadata.gz: d9b1c737a275e5641827ae194527d442e3b66193aa207f04986fde49baf4347b
+  data.tar.gz: 9fa221d0138418902b99203f7ad06929c8b87e7d2b270fcce6a09996659c7c47
 SHA512:
-  metadata.gz: a482e2f09a123e18dd7e2884bbc12445266adc92fbed2e06c21877fec727ba53a3069c24d5b65e0d5eb0a5723c61c35666e8ef3bd3a5ffaa0ce279db86db8c47
-  data.tar.gz: 5050203feb8c97bd4cb5186d0fed9b608c4ee382e521584f5d95fab70234c865ae47a830a01a3316dd0d28b6070bfbf4a0d013a1584d51e80302f4b52915cd47
+  metadata.gz: 52ca1d901b65ddac44e48ca3232104f7473be210bce899d919432e6debc6d9b23c77e2e0406dfc3d8ac8180f3eed7dca6f5ca45d5371cf8d723b62d606eaac5e
+  data.tar.gz: 5fc053973986ad6b0ea4139be05dc8f062e328604ddcc59a62f4518bdf2b6c6335120263c864b1b0b3c9c9f6bc31974a6dbe56b5948f44ad761d734263659774

data/bin/bumpr

@@ -1,8 +1,9 @@
 #! /usr/bin/env ruby
 
-require 'open3'
 require 'optparse'
 require_relative '../lib/echoexec'
+require_relative '../lib/errors'
+require_relative '../lib/git_check'
 
 options = {}
 parser = OptionParser.new do |opts|
@@ -24,12 +25,7 @@ parser = OptionParser.new do |opts|
 end
 parser.parse!
 
-unless options[:no_commit] then
-  modified_file_count, stderr, status = Open3.capture3("git status --porcelain | egrep '^(M| M)' | wc -l")
-  if modified_file_count.to_i > 0 then
-      echo_and_exec 'git stash'
-  end
-end
+git_check unless options[:no_commit]
 
 component = ARGV[0]
 version_file = ARGV[1]
@@ -44,7 +40,7 @@ argument = {
 
 if argument == nil then
   puts 'Unrecognized version component.'
-  exit 1
+  exit TwoRingToolError::INVALID_SEMVER_COMPONENT
 end
 
 command = "vrsn #{argument} --file #{version_file}"
@@ -54,8 +50,4 @@ stdout, stderr, status = Open3.capture3(command)
 unless options[:no_commit] then
   echo_and_exec "git add #{version_file}"
   echo_and_exec "git commit --message \"#{stdout}\""
-
-  if modified_file_count.to_i > 0 then
-      echo_and_exec "git stash pop"
-  end
 end

data/bin/changetag

@@ -2,12 +2,8 @@
 
 require 'optparse'
 require_relative '../lib/echoexec'
-
-# failure modes
-ILLEGAL_COMMENT_CHAR = 65
-INVALID_CHANGELOG_PATH = 66
-UNFORCED_ANNOTATION_OVERWRITE_ATTEMPT = 67
-CHANGELOG_ENTRY_NOT_FOUND = 68
+require_relative '../lib/errors'
+require_relative '../lib/git_check'
 
 options = {}
 parser = OptionParser.new do |opts|
@@ -19,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 "@"
 
@@ -41,6 +37,8 @@ parser = OptionParser.new do |opts|
 end
 parser.parse!
 
+git_check unless options[:no_commit]
+
 # set valid git message comment character
 
 echo_and_exec "git config core.commentchar '@'"
@@ -50,7 +48,7 @@ echo_and_exec "git config core.commentchar '@'"
 changelog_path = ARGV[0]
 unless File.file?(changelog_path) then
   puts "The path '#{changelog_path}' does not point to a valid file."
-  exit INVALID_CHANGELOG_PATH
+  exit TwoRingToolError::INVALID_CHANGELOG_PATH
 end
 
 git_tag = ARGV[1]
@@ -58,7 +56,7 @@ current_git_tag_annotation = `git tag -n #{git_tag}`.strip
 git_tag_exists = current_git_tag_annotation != ''
 if git_tag_exists and current_git_tag_annotation != git_tag and options[:force] != true then
   puts "The tag #{git_tag} already has an annotation. To overwrite it, call changetag with the -f/--force option."
-  exit UNFORCED_ANNOTATION_OVERWRITE_ATTEMPT
+  exit TwoRingToolError::UNFORCED_ANNOTATION_OVERWRITE_ATTEMPT
 end
 
 # Extract the relevant section from the changelog, which should have the following format: (square brackets should be present, chevrons are to denote content descriptions)
@@ -75,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
 
@@ -92,7 +90,7 @@ end
 
 if entry_start_idx == -1 then
   puts "Could not find an entry in the changelog named '#{entry_name}'."
-  exit CHANGELOG_ENTRY_NOT_FOUND
+  exit TwoRingToolError::CHANGELOG_ENTRY_NOT_FOUND
 end
 
 entry_end_idx = -1

data/bin/clean-rc-tags

@@ -2,4 +2,4 @@
 #
 # Deletes any release candidate tags leftover after prerelease testing.
 
-`git tag --list | grep '\-RC[0-9]\+' | xargs -tI @ bash -c "git tag --delete @ && git push --delete origin @"`
+`git tag --list | grep '\\\-RC[0-9]\\\+' | xargs -tI @ bash -c \"git tag --delete @ && git push --delete origin @\"`

data/bin/migrate-changelog

@@ -2,6 +2,7 @@
 
 require 'optparse'
 require_relative '../lib/echoexec'
+require_relative '../lib/git_check'
 
 options = {}
 parser = OptionParser.new do |opts|
@@ -19,13 +20,13 @@ parser = OptionParser.new do |opts|
 end
 parser.parse!
 
+git_check unless options[:no_commit]
+
 changelog_path = ARGV[0]
 version = ARGV[1]
 
 new_entry = "\n\#\# [#{version}] #{Time.now.strftime("%Y-%m-%d")}\n"
 
-`git stash`
-
 # read in the changelog file contents
 changelog_contents = File.open(changelog_path).readlines
 
@@ -40,4 +41,3 @@ end
 
 `git add #{changelog_path}`
 `git commit --message "chore(changelog): moved Unreleased entries to #{version}"`
-`git stash pop`

data/bin/prerelease-podspec

@@ -2,6 +2,7 @@
 
 require 'open3'
 require 'optparse'
+require_relative '../lib/git_check'
 require_relative '../lib/echoexec'
 
 podspec = ARGV[0]
@@ -22,6 +23,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
@@ -32,6 +34,8 @@ parser = OptionParser.new do |opts|
 end
 parser.parse!
 
+git_check unless options[:no_commit]
+
 version_file = "#{podspec}.podspec"
 
 current_version = `vrsn --read --file #{version_file}`.strip
@@ -72,6 +76,9 @@ end
 if options[:verbose] != nil then
   spec_lint_flags << '--verbose'
 end
+if options[:skip_tests] != nil then
+  spec_lint_flags << '--skip-tests'
+end
 stdout, stderr, status = Open3.capture3 "rbenv exec bundle exec pod spec lint #{podspec}.podspec #{spec_lint_flags.join ' '}"
 
 puts "stdout: #{stdout}"

data/bin/release-podspec

@@ -3,6 +3,8 @@
 require 'open3'
 require 'optparse'
 require_relative '../lib/echoexec'
+require_relative '../lib/errors'
+require_relative '../lib/git_check'
 
 podspec = ARGV[0]
 
@@ -23,19 +25,21 @@ parser = OptionParser.new do |opts|
   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('--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] = true end
-  opts.on('-h', '--help', 'Print this help message.') do 
+  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
     exit
   end
 end
 parser.parse!
 
+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`
+version = `vrsn --read --file #{podspec}.podspec`.strip
 name_prefix = String.new
 if options[:podspec_name_in_tag] then
   name_prefix = podspec + '-'
@@ -47,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
@@ -72,8 +76,7 @@ puts stdout
 
 if status != 0 then
   puts "Podspec push failed:\nstderr: #{stderr}"
-  exit 1
+  exit TwoRingToolError::PODSPEC_PUSH_FAILED
 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: 2.1.0
+  version: 3.1.0
 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
@@ -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