sjpush 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c958e01a8f908e6dc0f76a7f538a3d8bfcfc769f429500ae48cd93e791a40ba2
-  data.tar.gz: f468b7abc920e9669288c6b5cac5ae5262910393df29e7d8f4b2889883e187df
+  metadata.gz: a57927d6cb2608a9a10693bae413c6e5f0929340988c4e0115ab425c708b28da
+  data.tar.gz: '0148f1aacb820624a783dd5622b40240fd19f764d7df8a1729bb8accb75519e6'
 SHA512:
-  metadata.gz: 9b2d001a3e75a261f3fc961bba1bbbd4b0bf934c78bedc780cdac7d41905b03ce1608f866dd1899d67199873a7d1462e7331b2e20d7362cc896937129b7e3a6f
-  data.tar.gz: dcc8906d1b03e4f1b25f7dce61b257249070a63cab60bad00dd931520b98c8f989dcb76f691e5aea35567e8d8af820cedd3c444713fcf4ee16331267639e7744
+  metadata.gz: 4913e10cf41fb859cde03a14286c9c03f380f5ef43f857b68224537dbc7932a22cb9f7b039dfe02979e815e4fcc58d7d68828a4e8c5e997f556a94a37eec2cdb
+  data.tar.gz: 2780a0cd4b6fc903c66019c94dac9015c6844f260435fce665f42fa3bd8e8a8e7a9b6332c94c532ebd13de89f7bd56c997c7ca0eca80ff1edda95815f8a6ca7b

data/lib/sjpush.rb

@@ -17,13 +17,19 @@ class ActionHandler
             Dir["*.podspec"].last
         end
 
-        def updatePodspecVerAction()
+        def searchPodspec()
             s = ActionHandler.getPodspec()
             if s.nil?
                 puts "\n已退出, 未搜索到 podspec 文件"
                 exit
             end
             
+            return s
+        end
+
+        def updatePodspecVerAction()
+            s = searchPodspec()
+            
             contents = String.new
             File.new(s, "r").each_line do |line|
                 regex = "s.version([^']+)'([^']+)'*"
@@ -43,21 +49,31 @@ class ActionHandler
         end
 
         def getPodspecVersion()
-            s = ActionHandler.getPodspec()
-            if s.nil?
-                puts "\n已退出, 未搜索到 podspec 文件"
-                exit
+            s = searchPodspec()
+
+            File.new(s, "r").each_line do |line|
+                regex = "s.version(?:[^']+)'([^']+)'*"
+                if /#{regex}/ =~ line
+                    @version = $1.to_i
+                    break
+                end
             end
             
+            return @version
+        end
+
+        def getPodspecName()
+            s = searchPodspec()
+            
             File.new(s, "r").each_line do |line|
-                regex = "s.version([^']+)'([^']+)'*"
+                regex = "s.name(?:[^']+)'([^']+)'*"
                 if /#{regex}/ =~ line
-                    @version = $2.to_i
+                    @name = $1
                     break
                 end
             end
             
-            return @version
+            return @name
         end
     end
 
@@ -111,10 +127,12 @@ class ActionHandler
     end
 
     def addNewTagForPodspecVersionAction()
-        version = ActionHandler.getPodspecVersion()
         submit = getSubmitInfo()
-        addCommand "git tag -a '#{version}' -m '#{submit}'"
-        addCommand "git push origin #{version}"
+        version = ActionHandler.getPodspecVersion()
+        name = ActionHandler.getPodspecName()
+        tag = "#{name}-#{version}"
+        addCommand "git tag -a '#{tag}' -m '#{submit}'"
+        addCommand "git push origin #{tag}"
     end
     
     def deleteTagAction()
@@ -125,14 +143,14 @@ class ActionHandler
     end
     
     def podReleaseAction()
-        s = ActionHandler.getPodspec()
-        if s.nil?
+        spec = ActionHandler.getPodspec()
+        if spec.nil?
             puts "\n已退出, 未搜索到 podspec 文件"
             exit
         end
         
         repo = getCocoapodsRepo()
-        addCommand "pod repo push #{repo} #{s} --allow-warnings --use-libraries"
+        addCommand "pod repo push #{repo} #{spec} --allow-warnings --use-libraries"
     end
 
     def executeCommands

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sjpush
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - SanJiang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies: []
 description: 用于辅助git提交
 email: