dngg 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd9d121406a49a1a7dae5b56c5e81530773d993123db786f3121fd6e2d852cef
-  data.tar.gz: 5243df3729a8099d5afce4fbfd4d89df0d54177df7bdefdf80c59652dcb8cdaf
+  metadata.gz: 7b591c218e98539ba3f3396920f3599df088792c7d462bcc9f7fba0de7508644
+  data.tar.gz: d570f5aec0942c9d8a1ff09073c5542984bda92d67f9dd2af6e3564ae80264f2
 SHA512:
-  metadata.gz: 8fe67c78d44ee0e0606a7759a35802a7551bf943c6505a5b16dd6e9e4d2757c30e6fa8f4706e97bc8125844345054d2b1093cefdf8dd86c27151537d809f5f50
-  data.tar.gz: 42a2c2d243d42e84333d62658983d57c8226117ea410654e0e23b131a6b8f28b4e30ba1cd6d1a395009f52620d767fc302b3fd86389e72dc9f06afba72a1f8e6
+  metadata.gz: 3ec388bb39d326b157c9a4cc9656637172a9dd524f64542608f803e4e858673a4bbf5e942d3a2e4b4e12c24bea1990d3ef4a0fdc7e8897305fea67a7aef1cf23
+  data.tar.gz: de14584be918991a640729b5c1585d9f04f0946df917715736e06eb2b145fc72f776033267738ea5f7abd6df7d070ee9be6db785559ddda28cee7f9b9c6738e0

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dngg (0.0.2)
+    dngg (0.0.3)
       colorize (= 0.8.1)
       oj (= 3.8.0)
       thor (= 1.0.0)

data/bin/dngg

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
-# require_relative "../lib/dngg.rb"
 
-set -euo pipefail
+# set -euo pipefail
+require_relative '../lib/dngg'
 
-IFS=$'\n\t'
-set -vx
+# IFS=$'\n\t'
+# set -vx
+DNGG::Cli.start(ARGV)
 
-bundle install
+# bundle install
 
 # Do any other automated setup that you need to do here

data/lib/dngg.rb

@@ -1,77 +1,77 @@
-require 'thor'
-require_relative 'dngg/version'
-require_relative 'dngg/command/start'
-require_relative 'dngg/command/sync'
-require_relative 'dngg/command/switch'
-require_relative 'dngg/command/delete'
-require_relative 'dngg/command/foreach'
-require_relative 'dngg/command/merge'
-require_relative 'dngg/command/finish'
-require_relative 'dngg/command/mr'
-
-module DNGG
-  class Cli < Thor
-    include Start
-    include Sync
-    include Switch
-    include Delete
-    include Foreach
-    include Merge
-    include Finish
-    include MR
-    
-    desc 'sync', '当前分支同步(拉取)远程代码'
-    def sync
-      sync_flow
-    end
-
-    desc 'start <branch> [<commit>] [<origin>]', '检出新分支，新功能、修bug务必使用该命令'
-    def start(branch, action='')
-      start_flow(branch, action)
-    end
-
-    desc 'merge <branch> [-r|--rebase]', 'Merge,开发完成后执行; -r：主工程强制rebase'
-    option :rebase, :default => false, :type => :boolean, aliases: '-r'
-    def merge(branch)
-      rebase = options[:rebase]
-      merge_flow(branch, rebase)
-    end
-
-    desc 'finish [-f|--force]', 'Merge后并解决冲突后执行; -f：主工程强制推送'
-    option :force, :default => false, :type => :boolean, aliases: '-f'
-    def finish
-      force = options[:force]
-      finish_flow(force)
-    end
-
-    desc 'mr <branch> <title>', '创建MR'
-    def mr(branch, title)
-      mr_flow(branch, title)
-    end
-
-    desc 'switch <branch>', '切换分支'
-    def switch(branch)
-      switch_flow(branch)
-    end
-
-    desc 'delete <branch> [-r|--remote] [-a|--all]', '删除指定分支'
-    option :remote, :default => false, :type => :boolean, aliases: '-r'
-    option :all, :default => false, :type => :boolean, aliases: '-a'
-    def delete(branch)
-      remote = options[:remote]
-      all = options[:all]
-      delete_flow(branch, remote, all)
-    end
-
-    desc 'foreach [<commands>...]', '所有模块执行git命令(foreach后跟git命令)'
-    def foreach(*commands)
-      foreach_flow(*commands)
-    end
-
-    desc 'v', '查看版本'
-    def version
-      puts VERSION
-    end
-  end
-  # Cli.start(ARGV)
-end
+require 'thor'
+require_relative 'dngg/version'
+require_relative 'dngg/command/start'
+require_relative 'dngg/command/sync'
+require_relative 'dngg/command/switch'
+require_relative 'dngg/command/delete'
+require_relative 'dngg/command/foreach'
+require_relative 'dngg/command/merge'
+require_relative 'dngg/command/finish'
+require_relative 'dngg/command/mr'
+
+module DNGG
+  class Cli < Thor
+    include Start
+    include Sync
+    include Switch
+    include Delete
+    include Foreach
+    include Merge
+    include Finish
+    include MR
+    
+    desc 'sync', '当前分支同步(拉取)远程代码'
+    def sync
+      sync_flow
+    end
+
+    desc 'start <branch> [<commit>] [<origin>]', '检出新分支，新功能、修bug务必使用该命令'
+    def start(branch, action='')
+      start_flow(branch, action)
+    end
+
+    desc 'merge <branch> [-r|--rebase]', 'Merge,开发完成后执行; -r：主工程强制rebase'
+    option :rebase, :default => false, :type => :boolean, aliases: '-r'
+    def merge(branch)
+      rebase = options[:rebase]
+      merge_flow(branch, rebase)
+    end
+
+    desc 'finish [-f|--force]', 'Merge后并解决冲突后执行; -f：主工程强制推送'
+    option :force, :default => false, :type => :boolean, aliases: '-f'
+    def finish
+      force = options[:force]
+      finish_flow(force)
+    end
+
+    desc 'mr <branch> <title>', '创建MR'
+    def mr(branch, title)
+      mr_flow(branch, title)
+    end
+
+    desc 'switch <branch>', '切换分支'
+    def switch(branch)
+      switch_flow(branch)
+    end
+
+    desc 'delete <branch> [-r|--remote] [-a|--all]', '删除指定分支'
+    option :remote, :default => false, :type => :boolean, aliases: '-r'
+    option :all, :default => false, :type => :boolean, aliases: '-a'
+    def delete(branch)
+      remote = options[:remote]
+      all = options[:all]
+      delete_flow(branch, remote, all)
+    end
+
+    desc 'foreach [<commands>...]', '所有模块执行git命令(foreach后跟git命令)'
+    def foreach(*commands)
+      foreach_flow(*commands)
+    end
+
+    desc 'v', '查看版本'
+    def version
+      puts VERSION
+    end
+  end
+  # Cli.start(ARGV)
+end

data/lib/dngg/hook/hooks.rb

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

data/lib/dngg/version.rb

@@ -1,3 +1,3 @@
 module DNGG
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dngg
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - iSnow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -85,7 +85,6 @@ files:
 - lib/dngg/util/stash.rb
 - lib/dngg/util/submodule.rb
 - lib/dngg/version.rb
-- lib/res/install_billow.sh
 homepage: http://rubygems.org/gems/dngg
 licenses:
 - MIT

data/lib/res/install_billow.sh

@@ -1,33 +0,0 @@
-# # 下载
-# 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
-