yjcocoa 18.07.31 → 18.09.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdbd2fca228241aba011988455e5b1f67b68831e
-  data.tar.gz: d1108511b8494183b56ae77409b4904786c9b3ba
+  metadata.gz: c1c06714f2303f8c8241e007254d48757331b067
+  data.tar.gz: 1e1189e61471ac473a00537005f541e678747c11
 SHA512:
-  metadata.gz: 45e2b84ce14fb94143d0863da08850eb8bc14355502fedaf017d1b3475ce25f522f34caae8975dfa88a9dd972b995c21a9f02e63c5c5c7d9c4db8a4efd9995b3
-  data.tar.gz: c8534ec06d684f71c8da09e2f6181a1ae002a2d0ea3566f1bb727dada86f54ca563901c2d62a4146c70c250a432c3b421b9cd27bd1a78a2505b23b1148639433
+  metadata.gz: 1560bb219c01ae99e43b6bef13bc479dc74a846ec0d711a12bb3d851843314dc2ba3fc652107acf5a6bdf8168f068e9e54ce1b91d7a9c1de0a49eb510d673f6c
+  data.tar.gz: 8d49b4a640d96160db9d63f59dca02981854c57be9cbf223f9d10a9b0fa924cab6b2c4a340b0f98ef03f782be591792233fd24de2703e7279c5aa1797c957311

data/lib/yjcocoa/git/git_pull.rb

@@ -57,6 +57,7 @@ module YJCocoa
                 Dir.chdir(path) {
                     puts "YJCocoa git pull #{path}/.git".green
                     localChanges = !(`git stash` =~ /No local changes to save/)
+                    `git pull -p`
                     system("git pull")
                     unless self.currentBranch
                         list = (`git branch`).split("\n")

data/lib/yjcocoa/test.rb

@@ -1,14 +1,2 @@
-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"
+`git pull -p`
+system("git pull")

metadata

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