orientepodspecpush 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: febaada3fa09e21f240f81e29f14f33ede491ff6c3f3fc604b6dbe3cd0f8090e
-  data.tar.gz: f2df7d6e631b0c3821b595c7e79d46e9a8ea55b0c1e5f7f71e78650c9bc44310
+  metadata.gz: 5c6397f9344c7b8830cd1787c3205f8366979260289ee793fe7483399d76f3bd
+  data.tar.gz: f34cd8c29d9bc592afd25add9a9c958c1d7159eb98873917b0307d36ab29b8b3
 SHA512:
-  metadata.gz: 411dde01beecf8e68d721afdf9e186c94127a3128281ca69b968e0d7552856dc056588ddf9a01d2962912d6990af82c0e789a15e1716a499b994b42e2edcd5d6
-  data.tar.gz: 49f0f4bdb71f5d46fcb924620fbf36e70e76e95659bf64d5a1e5e3fe5d10ffb6c7ad06a7c13d85903dce1fc32cd0ae2d51a910a540fb551dd678e0977a3517ac
+  metadata.gz: e7488f27982e79261ed997508b9642a607d682eb8da1c14611a2722a08b956e30b949c4302922b5aaf33fe0ceebf48e1a610aaac1e741b3ab8100c9ce9ed82ee
+  data.tar.gz: 10c168a613096654908addc5b17fe0eb1878ed9f36378db123a26b415203645d3dc7be8a85b1885e020240ca8ea3cc7b4a886bf17b7993f7aa62af803f0db56b

data/lib/orientepodspecpush.rb

@@ -88,7 +88,7 @@ module Orientepodspecpush
       cmd.join(' ')
     end
 
-    def updateVersion(opts)
+    def updateVersion
 #      puts "Please enter new version of the pod so we can tag, lint and push it! (e.g. 1.2.0)".blue
 #      @podVersion = gets.chomp.downcase
 #
@@ -109,7 +109,7 @@ module Orientepodspecpush
       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
+      oldVersion = Regexp.new('[0-9.]{2,8}').match(Regexp.new('(s.version)\s*=.*\n').match(contents).to_s).to_s
       File.write(specfile, contents.sub!(oldVersion, @podVersion))
       
 #      cmd = []
@@ -126,12 +126,12 @@ module Orientepodspecpush
 #      system "git push --tags"
     end
 
-    def rollbackTag(opts)
+    def rollbackTag
       puts "Rolling back git tags".green
 
       system "git checkout ."
-      system "git tag -d #{opts[:tag]}"
-      system "git push -d origin #{opts[:tag]}"
+      system "git tag -d #{@podVersion}"
+      system "git push -d origin #{@podVersion}"
       exit
     end
 
@@ -147,10 +147,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(opts)
+        gets.chomp.downcase == "y" ? executeLint(true,opts) : rollbackTag
       elsif success == false && withWarnings == true
         puts "Even with warnings, something is wrong. Look for any errors".red
-        rollbackTag(opts)
+        rollbackTag
       else
         unless opts[:noPackage] == true
           package(opts)
@@ -164,7 +164,7 @@ module Orientepodspecpush
 
       if success == false
         puts "Push failed, see errors.".red
-        rollbackTag(opts)
+        rollbackTag
       end
     end
 
@@ -209,10 +209,7 @@ module Orientepodspecpush
         # User input
         @podVersion = opts[:tag]
         @podVersionMessage = opts[:tagCommitMsg]
-        puts "----------------------------"
-        puts @podVersion
-        puts "------------------------------------------------"
-        updateVersion(opts)
+        updateVersion
 
         # Cmds
         @lintCmd = makeLintCmd(opts)

data/lib/orientepodspecpush/version.rb

@@ -1,3 +1,3 @@
 module Orientepodspecpush
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

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