sjpush 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eec91405cf58e55fc5bd6de23cfc5f14a53bd99d897d65665472f97bcdc9278
-  data.tar.gz: 2488a3f7ddc0f1b54b83f129446bc9733ae2ca8d1ef2bab3135b4bbeaef84042
+  metadata.gz: 9e1f8e002e9f71c269fc7d6ea03a49ff826073c2188551c67302cd5241a0750c
+  data.tar.gz: 96d0bae632e7786bd741df69dd10328e9f54c04b4d5bdb043fdca48ca01f5174
 SHA512:
-  metadata.gz: 5cc6cf529702494115988457d12f73d9bea4169c2c7c17bbf18e5039a89dcc7bc4d2c13f67d0a557e46754d24d8d190c8cc34228a53371b95e30bb85aa7a329b
-  data.tar.gz: 4a0c750272518cb84eb9607bce90dc1ddcf58219e8e1a91bfaed416ebef89259409df0e12ccab1a643d984b2eac95f4267e593c092d575c1c4ae100921497ca4
+  metadata.gz: d51fc71d1b75a2838adad014563ce560820a4f730048ff0e59c717957374267314893ecdde3e02723c93d0ad9b4957d26c27e40954a390b4a74541069ae0dd37
+  data.tar.gz: 6a2056029e7fb080d0c3f0e6a0a5aa3b44daf218f731753f7d3cf4f22a2f6402355ce2e333fd49269f14ef5a00e0302b2579ebf5463535abc16e2d7eaaf2b0e6

data/lib/sjpush.rb

@@ -1,84 +1,132 @@
 #require "sjpush/version"
 #!/usr/bin/env ruby
 
-puts <<-DESC
-===============================================
-请输入操作序号:
-1. 提交变更(git commit -m '..')
-2. 推送到主干上(git push origin master)
-3. 添加新的标签(git tag -a '..' -m '..')
-4. pod发布(pod repo push ..repo ..podspec)
-5. 删除标签(git -d .., git push origin :..)
-
-补全代码:
--1. 自动写协议
--2. 自动补全懒加载
-
-输入`exit`退出脚本
-===============================================
-DESC
-
-$seq_git_commit         = 1
-$seq_git_push_master    = 2
-$seq_git_add_tag        = 3
-$seq_pod_release        = 4
-$seq_git_delete_tag     = 5
-
-$seq_lazy_protocol      = -1
-$seq_lazy_property      = -2
+class ActionHandler
+    # 定义类方法
+    class << self
+        # 获取当前的分支
+        def getCurBranch()
+            # strip! 删除开头和末尾的空白字符
+            commands = IO.readlines(".git/HEAD").first.strip!;
+            commands.sub!(/ref: refs\/heads\//, "")
+        end
+    end
 
-seq = gets
+    class << self
+        def getPodspec()
+            Dir["*.podspec"].last
+        end
 
-exit if seq.casecmp('exit') == 1
+        def updatePodspecVerAction()
+            s = ActionHandler.getPodspec()
+            if s.nil?
+                puts "已退出, 未搜索到 podspec 文件"
+                exit
+            end
+            
+            contents = String.new
+            File.new(s, "r").each_line do |line|
+                regex = "s.version([^']+)'([^']+)'*"
+                if /#{regex}/ =~ line
+                    v = ($2.to_i + 1).to_s
+                    regex = "'[^']+'"
+                    line = line.sub!(/#{regex}/, "'#{v}'")
+                end
+                
+                contents += line
+            end
+            file = File.new(s, "w")
+            file.syswrite(contents)
+            file.close
+            
+            puts "podspec 版本已更新"
+        end
+
+        def getPodspecVersion()
+            s = ActionHandler.getPodspec()
+            if s.nil?
+                puts "已退出, 未搜索到 podspec 文件"
+                exit
+            end
+            
+            File.new(s, "r").each_line do |line|
+                regex = "s.version([^']+)'([^']+)'*"
+                if /#{regex}/ =~ line
+                    @version = $2.to_i
+                    break
+                end
+            end
+            
+            return @version
+        end
+    end
 
-class Git
     def initialize()
-        @content = String.new
+        @commands = String.new
     end
     
-    def appendExeorder(order)
-        if @content.length == 0
-            @content << order
-            else
-            @content << " && #{order}"
+
+    # - Actions -
+
+    def addCommand(order)
+        if @commands.length == 0
+            @commands << order
+        else
+            @commands << " && #{order}"
         end
     end
-    
-    def commit()
-        puts "请输入此次提交信息:"
-        @commitInfo = gets.strip!
-        appendExeorder "git add ."
-        appendExeorder "git commit -m '#{@commitInfo}'"
+
+    def submitInfoAction()
+        if @commitInfo.nil?
+            puts "请输入提交信息:"
+            @commitInfo = gets.strip!
+        end
+        return @commitInfo
+    end
+
+    def commitAction()
+        submit = submitInfoAction()
+        addCommand "git add ."
+        addCommand "git commit -m '#{submit}'"
     end
     
-    def pushMaster()
-        appendExeorder "git push origin master"
+    def pushAction()
+        addCommand "git push origin #{ActionHandler.getCurBranch()}"
     end
     
-    def addNewTag()
+    def addNewTagAction()
         puts "请输入新的标签:"
         newTag = gets.strip!
-        appendExeorder "git tag -a '#{newTag}' -m '#{@commitInfo}'"
-        appendExeorder "git push origin #{newTag}"
+        
+        submit = submitInfoAction()
+        addCommand "git tag -a '#{newTag}' -m '#{submit}'"
+        addCommand "git push origin #{newTag}"
+    end
+
+    def addNewTagForPodspecVersionAction()
+        version = ActionHandler.getPodspecVersion()
+        submit = submitInfoAction()
+        addCommand "git tag -a '#{version}' -m '#{submit}'"
+        addCommand "git push origin #{version}"
     end
     
-    def deleteTag()
+    def deleteTagAction()
         puts "请输入要删除的标签:"
         tag = gets.strip!
-        appendExeorder "git tag -d #{tag}"
-        appendExeorder "git push origin :#{tag}"
+        addCommand "git tag -d #{tag}"
+        addCommand "git push origin :#{tag}"
     end
     
-    def podRelease()
-        currentDir = Dir["*.podspec"].last
-        if currentDir.nil?
-            puts "已退出, 未搜索到 podsspec 文件"
+    def podReleaseAction()
+        s = ActionHandler.getPodspec()
+        if s.nil?
+            puts "已退出, 未搜索到 podspec 文件"
             exit
         end
-        appendExeorder "pod repo push lanwuzheRepo #{currentDir} --allow-warnings --use-libraries"
+        addCommand "pod repo push lanwuzheRepo #{s} --allow-warnings --use-libraries"
     end
-    
-    def exec
+
+    def executeCommands
         puts <<-DESC
         
         
@@ -87,85 +135,108 @@ class Git
         
         
         DESC
-        system @content
+        system @commands
         puts "操作完成"
     end
-end
 
 
-def whetherToPushMaster(git)
-    # 询问是否推送到主干上
-    # Git - Push
-    puts "\n是否推送到 Master? [ Yes / NO ]"
-    needPush = gets
-    if needPush.casecmp("Yes") != 1
-        git.exec
-        exit
+    def handleSeq(seq)
+        if seq == $seq_commit.to_i
+            commitAction()
+        elsif seq == $seq_push_current_branch.to_i
+            pushAction()
+        elsif seq == $seq_add_tag.to_i
+            puts "\n是否使用Podspec中的版本作为标签? [ Yes / NO ]"
+            r = gets
+            if r.casecmp("Yes") == 1
+                addNewTagForPodspecVersionAction()
+            else
+                addNewTagAction()
+            end
+        elsif seq == $seq_release.to_i
+            podReleaseAction()
+        elsif seq == $seq_delete_tag.to_i
+            deleteTagAction()
+        elsif seq == $seq_update_podspec_version.to_i
+            ActionHandler.updatePodspecVerAction()
+        elsif seq == $seq_lazy_protocol.to_i
+            require 'sjProtocol'
+            exit
+        elsif seq == $seq_lazy_property.to_i
+            require 'sjScript'
+            exit
+        end
+        
+        nextCommand(seq)
     end
-    git.pushMaster
-end
 
-def whetherAddNewTag(git)
-    # 询问是否添加新的标签
-    # Git - Add Tag
-    puts "\n是否添加标签? [ Yes / NO ]"
-    needAddTag = gets
-    if needAddTag.casecmp("Yes") != 1
-        git.exec
-        exit
-    end
-    git.addNewTag
-end
 
-def whetherReleasePod(git)
-    # 询问是否发布pod
-    # Pod - Release
-    puts "\n是否发布pod版本? [ Yes / NO ]"
-    needRelease = gets
-    if needRelease.casecmp("Yes") != 1
-        git.exec
-        exit
+    def nextCommand(beforeSeq)
+        if beforeSeq == $seq_commit.to_i
+            # 询问是否推送到主干上
+            # ActionHandler - Push
+            puts "\n是否推送到 #{ActionHandler.getCurBranch()}? [ Yes / NO ]"
+            r = gets
+            if r.casecmp("Yes") == 1
+                handleSeq($seq_push_current_branch.to_i)
+            end
+        elsif beforeSeq == $seq_push_current_branch.to_i
+            puts "\n是否添加标签? [ Yes / NO ]"
+            r = gets
+            if r.casecmp("Yes") == 1
+                handleSeq($seq_add_tag.to_i)
+            end
+        elsif beforeSeq == $seq_add_tag.to_i
+            # 询问是否发布pod
+            # Pod - Release
+            puts "\n是否发布pod版本? [ Yes / NO ]"
+            r = gets
+            if r.casecmp("Yes") == 1
+                handleSeq($seq_release.to_i)
+            end
+        elsif beforeSeq == $seq_update_podspec_version.to_i
+            puts "\n是否提交变更? [ Yes / NO ]"
+            r = gets
+            if r.casecmp("Yes") == 1
+                handleSeq($seq_commit.to_i)
+            end
+        end
     end
-    git.podRelease
 end
 
-def considerNextTask(beforeSeq, git)
-    if beforeSeq == $seq_git_commit
-        whetherToPushMaster(git)
-        whetherAddNewTag(git)
-        whetherReleasePod(git)
-    elsif beforeSeq == $seq_git_push_master
-        whetherAddNewTag(git)
-        whetherReleasePod(git)
-    elsif beforeSeq == $seq_git_add_tag
-        whetherReleasePod(git)
-    end
-end
+seqs = [
+$seq_update_podspec_version = "0. Podspec版本+1",
+$seq_commit                 = "1. 提交变更",
+$seq_push_current_branch    = "2. 推送到当前分支(#{ActionHandler.getCurBranch()})",
+$seq_add_tag                = "3. 添加新的标签",
+$seq_release                = "4. pod发布(pod repo push ..repo ..podspec)",
+$seq_delete_tag             = "5. 删除标签",
+$seq_lazy_protocol          = "6. 自动写协议",
+$seq_lazy_property          = "7. 自动补全懒加载",
+]
 
-def handleSeq(seq)
-    puts "\n\n"
-    
-    git = Git.new
-    if seq == $seq_git_commit
-        git.commit
-    elsif seq == $seq_git_push_master
-        git.pushMaster
-    elsif seq == $seq_git_add_tag
-        git.addNewTag
-    elsif seq == $seq_pod_release
-        git.podRelease
-    elsif seq == $seq_git_delete_tag
-        git.deleteTag
-    elsif seq == $seq_lazy_protocol
-        require 'sjProtocol'
-        exit
-    elsif seq == $seq_lazy_property
-        require 'sjScript'
-        exit
-    end
-    
-    considerNextTask(seq, git)
-    git.exec
+require "pp"
+
+# - seqs -
+puts "\n"
+puts "请输入操作序号:"
+puts "\n"
+seqs.each do |s|
+    puts s
 end
+puts "\n"
+
+# - exit -
+puts "输入`exit`退出脚本"
+
+puts "\n"
+puts "================== 等待操作 =================="
+
+seq = gets
+
+exit if seq.casecmp('exit') == 1
 
-handleSeq(seq.to_i)
+handler = ActionHandler.new
+puts "\n\n"
+handler.handleSeq(seq.to_i)
+handler.executeCommands()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sjpush
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - SanJiang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies: []
 description: 用于辅助git提交
 email: