tworingtools 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a93d5c2fe52f7cdde378dbff7071aa17d7ee1952ce3ab31ed06c89b1cb70818
-  data.tar.gz: 6cb5b3dd0979f338b06576c6e13a9cb56c251022919e8d08d756b55bf2947747
+  metadata.gz: 6af08c45396b88d1934326b852314dbb5f82b14e2d4fab645ce20b748b73814e
+  data.tar.gz: 65ba5360b292fbbe41a239b7543613639ae653aafcc137bda30d6e3db1310e3c
 SHA512:
-  metadata.gz: eb2239f85d86782358fea547f9a4d89485e425effb4915f7c78d1277b30e082357dfff40da04f13fbf1a245170a3c544182ccd6e5f62b49ea974d1da5594232e
-  data.tar.gz: 96aacfc1244788dd80de236314e6e36d54c93d3827f14db51fb00688d120c511993f85a5ec42770c7dccd14a398bc0e1466475353ab284c40dda7c3bcb4fef6d
+  metadata.gz: dd068730c8e522849dd7946cf4824b1645cd98c6ef831133e12f4ed5bd121c7dc2ca193e8b1b5fe35d2c7a8533eda71c7aaadf642af31a3704828ea458f8fbdf
+  data.tar.gz: 43637a632b09abbc10d249625875d72f5b787f75d0c0fa24d3c34cd6a95f96462b3558cdffa0067eb9204183a2bf7b37106724bdd2b1ddaef02aa59f031c9dae

data/bin/bumpr

@@ -0,0 +1,56 @@
+#! /usr/bin/env ruby
+
+require 'open3'
+require 'optparse'
+require_relative '../lib/echoexec'
+
+options = {}
+parser = OptionParser.new do |opts|
+  opts.banner = <<~BANNER
+
+    Usage: bumpr <component> /path/to/../version.file
+
+           Component types:
+
+           - "major", "minor", "patch" semantic version components
+           - "build" numeric build numbers
+
+  BANNER
+  opts.on('-h', '--help', 'Print this help message.') do 
+    puts opts
+    exit
+  end
+end
+parser.parse!
+
+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
+
+component = ARGV[0]
+version_file = ARGV[1]
+
+# map this scripts argument values (key) to vrsnr's argument values (value)
+argument = {
+  'major' => 'major',
+  'minor' => 'minor',
+  'patch' => 'patch',
+  'build' => '--numeric'
+}[component]
+
+if argument == nil then
+  puts 'Unrecognized version component.'
+  exit 1
+end
+
+command = "vrsn #{argument} --file #{version_file}"
+puts command
+stdout, stderr, status = Open3.capture3(command)
+
+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

data/bin/prerelease-podspec

@@ -32,16 +32,16 @@ version_file = "#{podspec}.podspec"
 
 current_version = `vrsn --read --file #{version_file}`.strip
 branch = "#{podspec}-#{current_version}-release"
-`git checkout -b #{branch}`
+echoexec "git checkout -b #{branch}"
 
 tag_root = "#{podspec}-#{current_version}-RC"
 release_candidate_number = `git tag --list | grep #{tag_root} | wc -l`.strip.to_i + 1
 release_candidate_tag = "#{tag_root}#{release_candidate_number}"
-`sed -i '' \"s/\\(\\.version *= *'\\).*'/\\1\"#{current_version}-RC#{release_candidate_number}\"\\'/g\" #{version_file}`
-`git add #{version_file}`
-`git commit --message 'TEMP: set podspec version to release candidate version'`
-`git tag #{release_candidate_tag}`
-`git push --tags`
+echoexec "sed -i '' \"s/\\(\\.version *= *'\\).*'/\\1\"#{current_version}-RC#{release_candidate_number}\"\\'/g\" #{version_file}"
+echoexec "git add #{version_file}"
+echoexec "git commit --message 'TEMP: set podspec version to release candidate version'"
+echoexec "git tag #{release_candidate_tag}"
+echoexec 'git push --tags'
 
 puts "About to lint the podspec. This takes a while... (it is now #{Time.now})"
 spec_lint_flags = Array.new 
@@ -53,8 +53,8 @@ if options[:verbose] != nil then
 end
 stdout, stderr, status = Open3.capture3 "rbenv exec bundle exec pod spec lint #{podspec}.podspec #{spec_lint_flags.join ' '}"
 
-`git checkout master`
-`git branch -D #{branch}`
+echoexec 'git checkout master'
+echoexec "git branch -D #{branch}"
 
 if status != 0 then
   puts "Podspec failed validation:\nstdout: #{stdout}\nstderr: #{stderr}"

data/bin/release-podspec

@@ -1,6 +1,8 @@
 #! /usr/bin/env ruby
 
+require 'open3'
 require 'optparse'
+require_relative '../lib/echoexec'
 
 podspec = ARGV[0]
 
@@ -17,7 +19,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('-rREPO', '--repo=REPO', 'By default, release-podspec pushed 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('-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('-h', '--help', 'Print this help message.') do 
     puts opts
     exit
@@ -27,8 +29,11 @@ parser.parse!
 
 version_file = "#{podspec}.podspec"
 version = `vrsn --read --file #{version_file}`
-`git tag #{podspec}-#{version.strip}`
-`git push --tags`
+stdout, stderr, status = Open3.capture3 "git tag #{podspec}-#{version.strip}"
+if status != 0
+  fail 'Tag already exists.'
+end 
+echo_and_exec 'git push --tags'
 
 spec_lint_flags = Array.new 
 if options[:allow_warnings] != nil then
@@ -38,10 +43,18 @@ if options[:verbose] != nil then
   spec_lint_flags << '--verbose'
 end
 
-repo = String.new
+command = String.new
 if options[:repo] != nil then
-	`rbenv exec bundle exec pod repo push #{options[:repo]} #{podspec}.podspec #{spec_lint_flags.join ' '}`
+	command = "rbenv exec bundle exec pod repo push #{options[:repo]} #{podspec}.podspec #{spec_lint_flags.join ' '}"
 else
-	`rbenv exec bundle exec pod trunk push #{podspec}.podspec #{spec_lint_flags.join ' '}`
+	command = "rbenv exec bundle exec pod trunk push #{podspec}.podspec #{spec_lint_flags.join ' '}"
 end
 
+puts command
+stdout, stderr, status = Open3.capture3 command
+
+unless status == 0 then
+  fail stderr
+else
+  puts 'Successfully pushed spec!'
+end

data/bin/revert-failed-release-tag

@@ -1,6 +1,7 @@
 #! /usr/bin/env ruby
 
 require 'optparse'
+require_relative '../lib/echoexec'
 
 podspec = ARGV[0]
 
@@ -25,5 +26,5 @@ parser.parse!
 version_file = "#{podspec}.podspec"
 version = `vrsn --read --file #{version_file}`.strip
 tag = "#{podspec}-#{version}"
-`git tag --delete #{tag}`
-`git push --delete origin #{tag}`
+echo_and_exec "git tag --delete #{tag}"
+echo_and_exec "git push --delete origin #{tag}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tworingtools
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Andrew McKnight
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github_api
@@ -42,6 +42,10 @@ description: |2
     - rebuild-sims: Delete all simulators and recreate one for each compatible platform and device type pairing.
     - sync-forks: Make sure all your GitHub forks are clones into a given directory, and have “upstream” remotes pointing to the repos that were forked.
     - changetag: Extract changelog entries to write into git tag annotation messages.
+    - prerelease-podspec: Branch and create/push a release candidate tag, modify the podspec to use that version tag, and try linting it.
+    - release-podspec: Create a tag with the version and push it to repo origin, push podspec to CocoaPods trunk.
+    - revert-failed-release-tag: In case `release-podspec` fails, make sure the tag it may have created/pushed is destroyed before trying to run it again after fixing, so it doesn't break due to the tag already existing the second time around.
+    - bumpr: Increment the desired part of a version number (major/minor/patch/build) and write the change to a git commit.
 email: andrew@tworingsoft.com
 executables:
 - rebuild-sims
@@ -50,9 +54,11 @@ executables:
 - prerelease-podspec
 - release-podspec
 - revert-failed-release-tag
+- bumpr
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/bumpr
 - bin/changetag
 - bin/prerelease-podspec
 - bin/rebuild-sims