yjcocoa 18.07.31 → 18.09.30

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: fdbd2fca228241aba011988455e5b1f67b68831e
4
- data.tar.gz: d1108511b8494183b56ae77409b4904786c9b3ba
3
+ metadata.gz: c1c06714f2303f8c8241e007254d48757331b067
4
+ data.tar.gz: 1e1189e61471ac473a00537005f541e678747c11
5
5
  SHA512:
6
- metadata.gz: 45e2b84ce14fb94143d0863da08850eb8bc14355502fedaf017d1b3475ce25f522f34caae8975dfa88a9dd972b995c21a9f02e63c5c5c7d9c4db8a4efd9995b3
7
- data.tar.gz: c8534ec06d684f71c8da09e2f6181a1ae002a2d0ea3566f1bb727dada86f54ca563901c2d62a4146c70c250a432c3b421b9cd27bd1a78a2505b23b1148639433
6
+ metadata.gz: 1560bb219c01ae99e43b6bef13bc479dc74a846ec0d711a12bb3d851843314dc2ba3fc652107acf5a6bdf8168f068e9e54ce1b91d7a9c1de0a49eb510d673f6c
7
+ data.tar.gz: 8d49b4a640d96160db9d63f59dca02981854c57be9cbf223f9d10a9b0fa924cab6b2c4a340b0f98ef03f782be591792233fd24de2703e7279c5aa1797c957311
@@ -57,6 +57,7 @@ module YJCocoa
57
57
  Dir.chdir(path) {
58
58
  puts "YJCocoa git pull #{path}/.git".green
59
59
  localChanges = !(`git stash` =~ /No local changes to save/)
60
+ `git pull -p`
60
61
  system("git pull")
61
62
  unless self.currentBranch
62
63
  list = (`git branch`).split("\n")
data/lib/yjcocoa/test.rb CHANGED
@@ -1,14 +1,2 @@
1
- def current_branch
2
- list = (`git branch`).split("\n")
3
- for item in list
4
- if item =~ /\* /
5
- return item.gsub(/\* /, "")
6
- end
7
- end
8
- end
9
-
10
- unless current_branch =~ /master/
11
- puts "current_branch1"
12
- end
13
-
14
- puts "current_branch"
1
+ `git pull -p`
2
+ system("git pull")
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: yjcocoa
3
3
  version: !ruby/object:Gem::Version
4
- version: 18.07.31
4
+ version: 18.09.30
5
5
  platform: ruby
6
6
  authors:
7
7
  - 阳君
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-07-31 00:00:00.000000000 Z
11
+ date: 2018-09-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: claide