tworingtools 2.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa051c082a7a4d50d9d1a9cb4d8ed6d8120d8c6603c448bc805d0ffd5aadedd9
-  data.tar.gz: 416758fc09f842303e0a57dc9a110446e6d6631292d6d30ed81f21ca3107b1c2
+  metadata.gz: 7866367d352702c57d29d4a3ab4047cb515203315d9ca4fed738b870f1302ccb
+  data.tar.gz: 3ef7172b8f3acb80f7bc46a646089390e214dd39409c037a165ba2b33ad07197
 SHA512:
-  metadata.gz: b6afd2b4fdb92dd274d20bb6a6d1f8d6eea35ac1b7fee0288175756253d329b7161ff5efd88b2a97f5011a201da7c8f3f1f702d239e52bdafd8cb7543bc759ab
-  data.tar.gz: f2f7750b13633ced10d9523a3ab9f6d9be21be09f35a73d5d82f4389390330efdd88275b14ab7fdff0196b4ba60e4e5d8662a27d190653ac2807eef9a9abe2bb
+  metadata.gz: 98f4c27f1f5f5dedf4d1bd3dfa52b59988e2aee2bd0121e455eca8c4692f82c4728c28bc63c599d376fc0796914f78e39b0f1192aae1d3f24ecfd08d2b080860
+  data.tar.gz: a90f88aff5b56b284a83fd05913935c6db5b172110f6b6ce85badf1b0c02a052bc5fab3ac1bbb819e2d0901009c139c773f0e73db4f2d0d3ddbaf014a5005f6b

data/bin/bumpr

@@ -1,8 +1,9 @@
 #! /usr/bin/env ruby
 
-require 'open3'
 require 'optparse'
 require_relative '../lib/echoexec'
+require_relative '../lib/error'
+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
 
 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/error'
+require_relative '../lib/git_check'
 
 options = {}
 parser = OptionParser.new do |opts|
@@ -41,6 +37,8 @@ parser = OptionParser.new do |opts|
 end
 parser.parse!
 
+git_check
+
 # 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)
@@ -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
+
 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]
@@ -32,6 +33,8 @@ parser = OptionParser.new do |opts|
 end
 parser.parse!
 
+git_check
+
 version_file = "#{podspec}.podspec"
 
 current_version = `vrsn --read --file #{version_file}`.strip

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]
 
@@ -31,6 +33,8 @@ parser = OptionParser.new do |opts|
 end
 parser.parse!
 
+git_check
+
 changelog_path = 'CHANGELOG.md'
 if options[:changelog_path] != nil then
   changelog_path = options[:changelog_path]
@@ -72,7 +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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tworingtools
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Andrew McKnight