ggsm 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05c8795b96d0aa91153b1ba4e4d78aa378f49261
-  data.tar.gz: e00c2d488a3cb08f3936e3bf063ce7573b8393e9
+  metadata.gz: 996c39374cb11250d79913de7faf12ae2730290b
+  data.tar.gz: 5045631bff91d67cf68cf1595869b5dc0715094d
 SHA512:
-  metadata.gz: cf1bfd574589d40f400b6f87765d8192505dfa0551542d0cfd1e4ce14a4115d27129ca0f8c61ddec4c9ae2cd28e7bc8e357a8eca3c0039ef40581edf48fb93f5
-  data.tar.gz: f1593b8be071bf1b649519b1439bc173fb8d3e7daf8bf8b920aa0e2e7d9ca3fade2473e1fc1131f4010eb439482ea27b77006b2c3dca99b5eff11e53e7877f54
+  metadata.gz: fd593cfc4cb21c7fc66f51fcacb431ab913f44fd4f58bd95449ec0323de2a3f00e34776a7ac1e50939d62a4df68bb0f1d0226b90f1b367d1335cfd30f9067c8e
+  data.tar.gz: 648ea7a0822727659814fdb4938a1767a1368f955d0b78a2dbf52d055d39990ad254c11edc6a2c169049f286fc841319660499b0819ce35287550ac0d0752da7

data/lib/ggsm.rb

@@ -29,9 +29,9 @@ module GGSM
     end
 
     desc 'merge <branch> [-r|--rebase]', 'Merge,开发完成后执行; --rebase：主工程强制rebase'
-    option :rebase, :default => false, :type => :boolean, aliases: '-r'
+    option :can_rebase, :default => false, :type => :boolean, aliases: '-r'
     def merge(branch)
-      rebase = options[:rebase]
+      rebase = options[:can_rebase]
       merge_flow(branch, rebase)
     end
 

data/lib/ggsm/command/finish.rb

@@ -29,9 +29,9 @@ module GGSM
       end
 
       if force
-        system "git push origin #{get_current_branch} -f"
+        system "git push -u origin #{get_current_branch} -f"
       else
-        system "git push origin #{get_current_branch}"
+        system "git push -u origin #{get_current_branch}"
       end
     end
   end

data/lib/ggsm/command/merge.rb

@@ -69,20 +69,31 @@ module GGSM
       pattern = /[0-9a-z]{7}(?=\s)/
       current_branch = get_current_branch
 
-      remote = `git config --get branch.#{current_branch}.remote`
-      if remote == ''
-        return true
-      end
-
-      diff_logs = `git log --oneline #{branch}..#{current_branch}`.split("\n").reverse
+      can_rebase(current_branch) {|remote|
+        diff_logs = `git log --oneline #{branch}..#{current_branch}`.split("\n").reverse
+
+        if diff_logs.length > 0
+          commit = pattern.match(diff_logs[0].strip)[0]
+          result = `git log #{remote}/#{current_branch} |grep #{commit}`
+          if `git log --oneline #{current_branch}..#{branch}`.split("\n").length > 0 && result.strip != ''
+            return false
+          end
+        end
+      }
+    end
 
-      diff_logs.each do |log|
-        commit = pattern.match(log.strip)[0]
-        result = `git log #{remote}/#{current_branch} |grep #{commit}`
+    def can_rebase(current_branch)
+      remote = `git config --get branch.#{current_branch}.remote`
 
-        if result.strip != ''
-          return false
+      if remote == ''
+        `git branch -r`.split("\n").each do |branch|
+          if branch.strip == "origin/#{current_branch}"
+            remote = 'origin'
+            yield remote
+          end
         end
+      else
+        yield remote
       end
       true
     end

data/lib/ggsm/version.rb

@@ -1,3 +1,3 @@
 module GGSM
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - YoKey