yjcocoa 18.07.17 → 18.07.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 468dc9c57201b9d39c26c51c9e7b7aa683d1c2e4
-  data.tar.gz: a5ca566d3435ac11207a5c95add930a69399e8d3
+  metadata.gz: fdbd2fca228241aba011988455e5b1f67b68831e
+  data.tar.gz: d1108511b8494183b56ae77409b4904786c9b3ba
 SHA512:
-  metadata.gz: 4eda8132e956e71098abc1dd49198652034c06a611d09cd93f942f5b49e70a0e9cce60c7cbaffc62ca6ca26f3daafcdd98d464da33ce3c1091e45bbc5a6c0d08
-  data.tar.gz: a7a9d834f2d6bbc331a93c3e76474f537e30591317609db0ae8ffecf2824043a5e557e4e395e9f4f88b84b4117dc4783ba9cb4031057d44dbf717fec708e850a
+  metadata.gz: 45e2b84ce14fb94143d0863da08850eb8bc14355502fedaf017d1b3475ce25f522f34caae8975dfa88a9dd972b995c21a9f02e63c5c5c7d9c4db8a4efd9995b3
+  data.tar.gz: c8534ec06d684f71c8da09e2f6181a1ae002a2d0ea3566f1bb727dada86f54ca563901c2d62a4146c70c250a432c3b421b9cd27bd1a78a2505b23b1148639433

data/README.md

@@ -2,7 +2,7 @@
 
 [![Language: Ruby](https://img.shields.io/badge/language-Ruby-orange.svg?style=flat)](https://www.ruby-lang.org/zh_cn/) 
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/937447974/YJCocoaGem/blob/master/LICENSE) 
-[![](https://img.shields.io/badge/gem-17.8.26-orange.svg?style=flat)](https://rubygems.org/gems/yjcocoa) 
+[![](https://img.shields.io/badge/gem-18.07.17-orange.svg?style=flat)](https://rubygems.org/gems/yjcocoa) 
 ![QQ群](https://img.shields.io/badge/QQ群-557445088-blue.svg?style=flat)
 
 # YJCocoaGem

data/lib/yjcocoa/git/git_cache.rb

@@ -26,7 +26,11 @@ module YJCocoa
         DESC
         
         def self.options
-            [['--delete-path', '删除的文件路径，多个路径用‘,’隔开']]
+            if self == YJCocoa::GitCache
+                [['--delete-path', '删除的文件路径，多个路径用‘,’隔开']] + super
+            else
+                super
+            end
         end
         
         # property
@@ -51,7 +55,7 @@ module YJCocoa
         
         def run
             self.cleanWorkDirectory
-            answer = self.askWithAnswers("强制推动您的本地更改覆盖您的GitHub仓库", ["Yes", "No"])
+            answer = self.askWithAnswers("强制推动您的本地更改覆盖您的远端仓库", ["Yes", "No"])
             if answer == "yes"
                 self.pushOrigin
                 self.cleanRepository

data/lib/yjcocoa/git/git_tag_add.rb

@@ -16,23 +16,33 @@ module YJCocoa
         
         self.abstract_command = false
         self.command = 'add'
-        self.summary = '添加默认 tag(git库名-%Y%m%d%H%M)'
-        self.description = '添加默认 tag(git库名-%Y%m%d%H%M)'
+        self.summary = '添加默认 tag(git库名-branch-%Y%m%d%H%M)'
+        self.description = '添加默认 tag(git库名-branch-%Y%m%d%H%M)'
         
         def run
             if File.exist?(".git")
+                current_branch = self.current_branch
                 tag = File.basename(Dir.pwd)
-                tag << '-'
-                tag << Time.now.strftime("%Y%m%d%H%M")
+                tag << "-#{current_branch}" unless current_branch =~ /master/
+                tag << "-#{Time.now.strftime('%Y%m%d%H%M')}"
                 puts "YJCocoa build tag #{tag}".green
                 system("yjcocoa git tag --add=#{tag}")
-                else
+            else
                 Dir.chdir("..") {
                     self.run
                 }
             end
         end
         
+        def current_branch
+            list = (`git branch`).split("\n")
+            for item in list
+                if item =~ /\* /
+                    return item.gsub(/\* /, "")
+                end
+            end
+        end
+        
     end
     
 end

data/lib/yjcocoa/test.rb

@@ -1 +1,14 @@
-Dir.chdir("..") { system("yjcocoa git pull") }
+def current_branch
+    list = (`git branch`).split("\n")
+    for item in list
+        if item =~ /\* /
+            return item.gsub(/\* /, "")
+        end
+    end
+end
+
+unless current_branch =~ /master/
+    puts "current_branch1"
+end
+
+puts "current_branch"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yjcocoa
 version: !ruby/object:Gem::Version
-  version: 18.07.17
+  version: 18.07.31
 platform: ruby
 authors:
 - 阳君
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide