dngg 0.0.1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d89252c4d511fbf2c7d1430f96f988258fd30e01f472b0752d25ecafc4605314
-  data.tar.gz: 0d3e6baa8f093d8fd35a79e80ceb691cddec7f07e1a4ae55ab6b2bd51994ee5e
+  metadata.gz: ed83c69c8ffd9f281d9bda6d8d0a2534f5f543b80052dc9b445c49a99144ce5d
+  data.tar.gz: 2406d79be38a740e8ed633c4c89efab8ba1036d524405cdb8972e9a1136a15db
 SHA512:
-  metadata.gz: f9061d9ee4d13281d26b8c0cbed1d3be5838b3dd97545168e415d7fe85fa532dcdbbbe44a93a7bbd3eb01d3bd568552f93ec33ad1bf95d16ac45dc9711bc30c6
-  data.tar.gz: 45a01ba0259eef2ccf01e6db69f2a0c5d3c1de35e51d21dfa2236bbffb588a052e04308c0947eac91fa85e7c7418e7ad08ccd4341344651edd2d1fd0f2a534c2
+  metadata.gz: cc0258704a57f9703daf63be525ca98f7b8065c4c392cbcd8814972116b5d9542439b829579011c3436da2d273830ad4eda4e236a0eaa686e72450af35301d21
+  data.tar.gz: df102c00a4c7b29081032559a9797f6f03a75d4226af1f71841c082f3c3f9ce9da4ccd61d077864f8a9533bbb4eb5ea8e7a09561bfb068e0e0833e0c4e2616ce

data/.gitignore

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dngg (0.0.1)
+    dngg (0.0.5)
       colorize (= 0.8.1)
       oj (= 3.8.0)
       thor (= 1.0.0)
@@ -22,4 +22,4 @@ DEPENDENCIES
   rake (~> 13.0)
 
 BUNDLED WITH
-   2.2.23
+   2.2.24

data/bin/dngg

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

data/lib/dngg.rb

@@ -1,77 +1,80 @@
-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
+    
+    def self.exit_on_failure?
+      true
+    end
+
+    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
+end

data/lib/dngg/command/mr.rb

@@ -80,8 +80,8 @@ module DNGG
 
       if current_branch_head_commit!="origin/#{@@current_branch}" && # 判断远程分支是否存在
           get_head_commit("origin/#{@@current_branch}") != get_head_commit("origin/#{@@target_branch}")
-        # origin	git@git.souche.com:Destiny_Android/Destiny_Android.git (push)
-        # origin	http://git.souche.com/Destiny_Android/Mine.git (push)
+        # origin	git@gitlab.qima-inc.com:guang-mobile-shop/AiGuangMaxApp.git (push)
+        # origin	https://gitlab.qima-inc.com/guang-mobile-shop/AiGuangMaxApp.git (push)
         result = `git remote -v | grep push`
         project_name = result.split('.com/')[1]
         if project_name == nil || project_name.strip == ''
@@ -90,14 +90,13 @@ module DNGG
 
         if project_name != nil
           project_name = project_name.split('.git')[0].gsub('/', '%2F')
-
           begin
             params = {}
             params['source_branch'] = @@current_branch
             params['target_branch'] = @@target_branch
             params['title'] = @@msg
             # params['remove_source_branch'] = true
-            uri = URI.parse("https://git.souche-inc.com/api/v4/projects/#{project_name}/merge_requests?private_token=#{@@token}")
+            uri = URI.parse("https://gitlab.qima-inc.com/api/v4/projects/#{project_name}/merge_requests?private_token=#{@@token}")
             response = Net::HTTP.post_form(uri, params)
             result = Oj.load(response.body)
 
@@ -121,6 +120,8 @@ module DNGG
                 @@token = init_check_token
                 create_mr(sub)
                 return
+              when Net::HTTPForbidden then
+                puts response.body.red
             end
           rescue => e
             puts "error: #{e}".red

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/mr/email.rb

@@ -4,18 +4,21 @@ require 'net/smtp'
 module DNGG
   module Email
     def send_email(user,title,msg)
+      user_mail = `git config user.email`
       message = <<END_OF_MESSAGE
-DNGG Merge Request <android.dev@guang.com>
+DNGG Merge Request <team_android@aiguang.com>
+From: #{user}
 To: Guang Android Team
 Subject: [#{user}] #{title}
 
 #{msg}
+
 END_OF_MESSAGE
 
-      Net::SMTP.start('smtp.exmail.qq.com', 25, 'iSnow',
-                      'zhuruixue@aiguang.com', 'wwL9RS9cLeBxv7co') do |smtp|
-        smtp.send_message message,
-                          'android.dev@guang.com'
+      Net::SMTP.start('smtp.exmail.qq.com',25,'zhuruixue',
+        'zhuruixue@aiguang.com','wwL9RS9cLeBxv7co', :plain) do |smtp|
+        smtp.send_message message, 'zhuruixue@aiguang.com',
+                                  'team_android@aiguang.com'
       end
     end
   end

data/lib/dngg/version.rb

@@ -1,3 +1,3 @@
 module DNGG
-  VERSION = '0.0.1'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dngg
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors:
 - iSnow
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-17 00:00:00.000000000 Z
+date: 2021-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -55,8 +55,7 @@ dependencies:
 description: A submodule tools for Guang-Teams
 email: schnee1109@163.com
 executables:
-- console
-- setup
+- dngg
 extensions: []
 extra_rdoc_files: []
 files:
@@ -65,8 +64,7 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
+- bin/dngg
 - dngg.gemspec
 - lib/dngg.rb
 - lib/dngg/command/delete.rb
@@ -85,12 +83,11 @@ 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
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,8 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: dngg
 test_files: []

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "dngg"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

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
-