orientepodspecpush 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b816e466e1409cf742c4e36856fd65a0e1676aac7bf53fec228fa3e4a64fde7e
-  data.tar.gz: cde6d65974f23244843f910ea946862ea81ba4188fcd9467db8e916a2a25f21b
+  metadata.gz: 23950223ac0cd2ef03664b1ebaed4f481a9f18fa0f75f908da7532f8d493ce6c
+  data.tar.gz: b170454ee1132bdbdca93dbccbdd24f25b53309631033416b3a910265ce9e5df
 SHA512:
-  metadata.gz: 5a0c0e8420aa7bc66a63b726971ef70377405a335407c5528086be7da3dfdddc7457cc4805d50a6a43d23df4b0e484761f38838e65834856633b30b2ab49116a
-  data.tar.gz: 73d1afcd64d5e802744d86060cb811f4eec13835a855ee89423694312517e4dde5af61441eb483ed78e24a46854b84d4ec93baa4e7186443c84892e58171e9f8
+  metadata.gz: 2325cbb186618b628fec5ce4832d4ae6655511c01a0870a52097205cc72bd12fff4ac9a710a7e9479d8e1cedc0afed559f3170f4e4842e4571db145ae8c8130a
+  data.tar.gz: a90c298de7b474f44562632a689c49f4ab692149b174b6462d66e2349dd6cc9d43729e1a73b10206cdafba33daddf830d29bdbe5c5329de0ce5e173b91c84fc2

data/lib/orientepodspecpush.rb

@@ -100,16 +100,16 @@ module Orientepodspecpush
 #
 
       if opts[:versionCommitMsg] == nil
-        system "git tag -a #{opts[:version]} -m 'add new tag'"
+        system "git tag -a #{opts[:tag]} -m 'add new tag'"
       else
-        system "git tag -a #{opts[:version]} -m '#{opts[:versionCommitMsg]}'"
+        system "git tag -a #{opts[:tag]} -m '#{opts[:tagCommitMsg]}'"
       end
       # system "git tag -a #{@podVersion} -m '#{@podVersionMessage}'"
       system "git push --tags"
 
       contents = File.read(specfile)
       oldVersion = Regexp.new('[0-9.]{2,6}').match(Regexp.new('(s.version)\s*=.*\n').match(contents).to_s).to_s
-      File.write(specfile, contents.sub!(oldVersion, opts[:version]))
+      File.write(specfile, contents.sub!(oldVersion, opts[:tag]))
       
 #      cmd = []
 #      cmd << ['bundle exec'] if shouldUseBundleExec
@@ -125,12 +125,12 @@ module Orientepodspecpush
 #      system "git push --tags"
     end
 
-    def rollbackTag
+    def rollbackTag(opts)
       puts "Rolling back git tags".green
 
       system "git checkout ."
-      system "git tag -d #{opts[:version]}"
-      system "git push -d origin #{opts[:version]}"
+      system "git tag -d #{opts[:tag]}"
+      system "git push -d origin #{opts[:tag]}"
       exit
     end
 
@@ -146,10 +146,10 @@ module Orientepodspecpush
       if success == false && withWarnings == false
         # Try again?
         puts "Linting failed, try again by allowing warnings? [Y/n]".blue
-        gets.chomp.downcase == "y" ? executeLint(true,opts) : rollbackTag
+        gets.chomp.downcase == "y" ? executeLint(true,opts) : rollbackTag(opts)
       elsif success == false && withWarnings == true
         puts "Even with warnings, something is wrong. Look for any errors".red
-        rollbackTag
+        rollbackTag(opts)
       else
         unless opts[:noPackage] == true
           package(opts)
@@ -157,13 +157,13 @@ module Orientepodspecpush
       end
     end
 
-    def executePush
+    def executePush(opts)
       puts "Executing: #{@pushCmd}".green
       success = system @pushCmd
 
       if success == false
         puts "Push failed, see errors.".red
-        rollbackTag
+        rollbackTag(opts)
       end
     end
 
@@ -214,7 +214,7 @@ module Orientepodspecpush
 
         # execute
         executeLint(true,opts)
-        executePush
+        executePush(opts)
 
         # Tidy up this repo!!
         commitThisRepo

data/lib/orientepodspecpush/version.rb

@@ -1,3 +1,3 @@
 module Orientepodspecpush
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orientepodspecpush
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - John wang