tworingtools 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6af08c45396b88d1934326b852314dbb5f82b14e2d4fab645ce20b748b73814e
-  data.tar.gz: 65ba5360b292fbbe41a239b7543613639ae653aafcc137bda30d6e3db1310e3c
+  metadata.gz: 381a332e8ac5cf305379f16beb80f7342c857424d4b2552000197ef2a44a188d
+  data.tar.gz: 4b8cefd3d20942b98dd868693cd3c636bddc91df918fdca46d3ce459d6cc341c
 SHA512:
-  metadata.gz: dd068730c8e522849dd7946cf4824b1645cd98c6ef831133e12f4ed5bd121c7dc2ca193e8b1b5fe35d2c7a8533eda71c7aaadf642af31a3704828ea458f8fbdf
-  data.tar.gz: 43637a632b09abbc10d249625875d72f5b787f75d0c0fa24d3c34cd6a95f96462b3558cdffa0067eb9204183a2bf7b37106724bdd2b1ddaef02aa59f031c9dae
+  metadata.gz: b1812fd076ecd5b513d599f5b14a33d0c5679b3dd716de56d3262a6cdcf2d7844101d3cdad33e801b2a30cee9bac976bf5d472beb63b610975f06d95c9dad221
+  data.tar.gz: 9f8c6ed711a989d7003537fc4b08d81683c7a69c019856019255a54663699e156a31be023c19d6016ba734f3f96af1d94f7b0475bba4ab5a726696a9d8b4af98

data/bin/prerelease-podspec

@@ -2,6 +2,7 @@
 
 require 'open3'
 require 'optparse'
+require_relative '../lib/echoexec'
 
 podspec = ARGV[0]
 
@@ -32,16 +33,16 @@ version_file = "#{podspec}.podspec"
 
 current_version = `vrsn --read --file #{version_file}`.strip
 branch = "#{podspec}-#{current_version}-release"
-echoexec "git checkout -b #{branch}"
+echo_and_exec "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}"
-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'
+echo_and_exec "sed -i '' \"s/\\(\\.version *= *'\\).*'/\\1\"#{current_version}-RC#{release_candidate_number}\"\\'/g\" #{version_file}"
+echo_and_exec "git add #{version_file}"
+echo_and_exec "git commit --message 'TEMP: set podspec version to release candidate version'"
+echo_and_exec "git tag #{release_candidate_tag}"
+echo_and_exec 'git push --tags'
 
 puts "About to lint the podspec. This takes a while... (it is now #{Time.now})"
 spec_lint_flags = Array.new 
@@ -53,11 +54,13 @@ if options[:verbose] != nil then
 end
 stdout, stderr, status = Open3.capture3 "rbenv exec bundle exec pod spec lint #{podspec}.podspec #{spec_lint_flags.join ' '}"
 
-echoexec 'git checkout master'
-echoexec "git branch -D #{branch}"
+puts "stdout: #{stdout}"
+
+echo_and_exec 'git checkout master'
+echo_and_exec "git branch -D #{branch}"
 
 if status != 0 then
-  puts "Podspec failed validation:\nstdout: #{stdout}\nstderr: #{stderr}"
+  puts "Podspec failed validation:\nstderr: #{stderr}"
   exit PODSPEC_FAILED_VALIDATION
 else
   puts "Podspec passed validation!"

data/bin/release-podspec

@@ -50,11 +50,4 @@ else
 	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
+echo_and_exec command

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tworingtools
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Andrew McKnight
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2019-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github_api