ggsm 1.8.6 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bf01e7e872c9a986eb541f88c2814a20aa72484
-  data.tar.gz: 4f0b93ba4f7dfe2626015eb95228294e1dcfa71c
+  metadata.gz: 71e1029697a1eead63ca6f7ebb9f438081cee594
+  data.tar.gz: 706371f506f149e9536f1b67175e76678af6bd46
 SHA512:
-  metadata.gz: a3c234f89a7d8f8e449f0b35dcc94a122d93d404e0fd503c58aa75d5f8c9edf6fc8ff6aa6152c512fcea3bc18dccef6f1c9572ed838035fad16206ffd0ed1109
-  data.tar.gz: ab00085fa3f5e662c343fe37b8672805de34cb492abedfcb8b9f67914ff117c45dc148eee6d3c3f87b2db761ff476c24b18844298466e26ed7ed86daabb281fb
+  metadata.gz: ff228d1a643376b269b30c33d64cda00a4c871765d8747c2ce01b607d5c36aff33b4f95ef7aa6a75c91846d14fcdbaebffe18571752efcce8fde3f140267f9f2
+  data.tar.gz: 2c7c0f0c86c47253e062ed08fc1a29b45874dfb85cd8ce5aa881ce161fe0c4795bc3986ea1c58a46316ac42930f92acb7040adecfe06656c9c01f5098556e926

data/lib/ggsm/command/mr.rb

@@ -20,7 +20,7 @@ module GGSM
     @@user = ''
 
     def mr_flow(target_branch, msg)
-      check_submodule
+      check_submodule(false)
 
       @@current_branch = get_current_branch
       @@target_branch = target_branch

data/lib/ggsm/hook/hooks.rb

@@ -2,6 +2,7 @@ module GGSM
   module Hooks
     def check_hooks
       if update_hooks
+        install_billow
         subs = get_submodule
         subs.each do |sub|
           cp_hooks(sub)
@@ -9,6 +10,11 @@ module GGSM
       end
     end
 
+    def install_billow
+      path = `gem which ggsm`.split('/ggsm.rb')[0]
+      `sudo sh #{path}/res/install_billow.sh`
+    end
+
     def update_hooks
       version = `ggsm v`
       ggsm_path = '.git/ggsm'

data/lib/ggsm/util/submodule.rb

@@ -4,9 +4,9 @@ module GGSM
   module Submodule
     include Hooks
 
-    def check_submodule
+    def check_submodule(check=true)
       sub_str = `git submodule`
-      if sub_str.empty?
+      if check && sub_str.empty?
         puts '所在目录工程下不存在Submodule，请检查所在目录！'.red
         exit 1
       end
@@ -73,7 +73,7 @@ module GGSM
       status.each do |sub|
         array_name = sub.split(' ')
         name = array_name[array_name.size-1]
-        if subs.include?name
+        if subs.include? name
           result.push(name)
         end
       end

data/lib/ggsm/version.rb

@@ -1,3 +1,3 @@
 module GGSM
-  VERSION = '1.8.6'
+  VERSION = '1.9.0'
 end

data/lib/res/install_billow.sh

@@ -0,0 +1,33 @@
+# 下载
+curl -o ~/billow.zip http://7xq884.com1.z0.glb.clouddn.com/Billow.zip
+
+pushd ~/Library/Application\ Support
+
+# 解压到Application Support/AS
+for file in ./AndroidStudio*
+do
+    if test -d $file
+    then
+         pushd ~/Library/Application\ Support/$file
+		 unzip -o ~/billow.zip
+		 popd
+    fi
+done
+
+popd
+
+# 修改Preferences，开启插件
+for file in ~/Library/Preferences/AndroidStudio*
+do
+    if test -d $file
+    then
+		 sed '/^com.souche.plugin.billow/'d $file/disabled_plugins.txt > disabled_plugins_billow.txt
+ 		 cp disabled_plugins_billow.txt $file/disabled_plugins.txt
+ 		 rm -rf disabled_plugins_billow.txt
+    fi
+done
+
+rm -rf ~/billow.zip
+
+echo Billow安装成功，请重新启动AndroidStudio
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.9.0
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,6 +115,7 @@ files:
 - lib/ggsm/util/stash.rb
 - lib/ggsm/util/submodule.rb
 - lib/ggsm/version.rb
+- lib/res/install_billow.sh
 homepage: http://rubygems.org/gems/ggsm
 licenses:
 - MIT