bigkeeper 0.9.13 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e751a206b1442e0848d2b6dfacc760f5d656bfc17b1274841a2091a62e6514b
-  data.tar.gz: 22fc192c12e254bf5d449f7681d49bf0b10cf68774b209f2be04c3af95cd55ce
+  metadata.gz: 8cae335c4028f88931e908c5e06e46be79e64ff6c18940ddec9be8da644a696c
+  data.tar.gz: 7afc0960f5701b2119235863982fc9bbc86468c621062df8c2b6af3c1ebe3810
 SHA512:
-  metadata.gz: da2b7fdf30d1c5e1f196b9c63b73c393c2816ac9a53c60479333d9168d8adce26406083f10a12788365ff7b6dcec89e23d06bbc9bac9a23662f05917af7801f5
-  data.tar.gz: 3f8171e5002173aac2cc02b53eff96d388019f958b8b55d11bd596b490e455df4143eb281c4e65319f0622bfb120987915d5365084631bb0826078414c3b1579
+  metadata.gz: 93726a66acd35be37a9552c3c5b47edb41a67cc354289addd3bd5dc28e3b17c9a8d876e49a01c439b9c0adf44c13d0323294a467e85da55b1470aa3ac9b6b69f
+  data.tar.gz: f9c36337abf07d8c51289d174010e0faee47e67219d7ee0b1374a2b7da9a48c274011ca11ff1866734c991ca749bab2d308d234aa1e821911115c4264d34e06e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bigkeeper (0.9.12)
+    bigkeeper (0.9.13)
       big_resources
       big_stash (~> 0.1)
       cocoapods

data/bin/big

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-#require "bundler/setup"
+# require "bundler/setup"
 require "big_keeper"
 
 # You can add fixtures and/or initialization code here to make experimenting

data/lib/big_keeper/command/feature&hotfix/module.rb

@@ -25,20 +25,21 @@ module BigKeeper
 
     full_name = branch_name.gsub(/#{GitflowType.name(type)}\//, '')
 
-    current_modules = ModuleCacheOperator.new(path).current_path_modules
-
     # Verify input modules
     modules = BigkeeperParser.verify_modules(modules)
 
-    Logger.highlight("Start to update modules for branch '#{branch_name}'...")
+    current_modules = ModuleCacheOperator.new(path).current_path_modules
+
+    ModuleCacheOperator.new(path).clean_modules
+    ModuleCacheOperator.new(path).cache_path_modules(current_modules + modules, modules, [])
 
-    add_modules = modules - current_modules
-    
-    if add_modules.empty?
+    Logger.highlight("Start to add modules for branch '#{branch_name}'...")
+
+    if modules.empty?
       Logger.default("There is nothing changed with modules #{modules}.")
     else
       # Modify podfile as path and Start modules feature
-      add_modules.each do |module_name|
+      modules.each do |module_name|
         ModuleCacheOperator.new(path).add_path_module(module_name)
         ModuleService.new.add(path, user, module_name, full_name, type)
       end
@@ -64,7 +65,10 @@ module BigKeeper
     # Verify input modules
     modules = BigkeeperParser.verify_modules(modules)
 
-    Logger.highlight("Start to update modules for branch '#{branch_name}'...")
+    ModuleCacheOperator.new(path).clean_modules
+    ModuleCacheOperator.new(path).cache_path_modules(current_module + modules, [], modules)
+
+    Logger.highlight("Start to delete modules for branch '#{branch_name}'...")
 
     if modules.empty?
       Logger.default("There is nothing changed with modules #{modules}.")

data/lib/big_keeper/dependency/dep_pod_operator.rb

@@ -150,7 +150,7 @@ module BigKeeper
       GitOperator.new.check_diff(path, "develop", "master")
 
       #checkout release branch
-      Logger.highlight(%Q(Start to checkout Branch release/#{version}))
+      Logger.highlight(%Q(Start to checkout Home Branch release/#{version}))
 
       GitService.new.verify_checkout(path, "release/#{version}")
 
@@ -161,14 +161,13 @@ module BigKeeper
       modules.each do |module_name|
         Logger.highlight("release checkout release/#{version} for #{module_name}")
         module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
-        ModuleService.new.release_start(path, user, modules, module_name, version)
 
         if GitOperator.new.has_branch(module_full_path, "release/#{version}")
+          Logger.highlight("#{module_name} has release/#{version}")
           GitOperator.new.checkout(module_full_path, "release/#{version}")
         else
-          GitflowOperator.new.start(path, version, GitflowType::RELEASE)
-          GitOperator.new.push_to_remote(path, "release/#{version}")
-
+          Logger.highlight("#{module_name} dont have release/#{version}")
+          ModuleService.new.release_start(path, user, modules, module_name, version)
           Logger.highlight("Push branch release/'#{version}' for #{module_name}...")
           GitOperator.new.push_to_remote(module_full_path, "release/#{version}")
         end

data/lib/big_keeper/service/git_service.rb

@@ -169,7 +169,7 @@ module BigKeeper
           git.push_to_remote(path, branch_name)
         end
 
-        GitOperator.new.check_push_success(path, branch_name, "origin/#{branch_name}")
+        GitOperator.new.check_push_success(path, branch_name, "#{GitOperator.remote_local_name(path)}/#{branch_name}")
       else
         Logger.default("Nothing to push for '#{name}'.")
       end

data/lib/big_keeper/util/git_operator.rb

@@ -51,13 +51,13 @@ module BigKeeper
 
     def fetch(path)
       Dir.chdir(path) do
-        `git fetch origin`
+        `git fetch #{GitOperator.remote_local_name(path)}`
       end
     end
 
     def rebase(path, branch_name)
       Dir.chdir(path) do
-        `git rebase origin/#{branch_name}`
+        `git rebase #{GitOperator.remote_local_name(path)}/#{branch_name}`
       end
     end
 
@@ -76,9 +76,9 @@ module BigKeeper
 
     def push_to_remote(path, branch_name)
       Dir.chdir(path) do
-        `git push -u origin #{branch_name}`
+        `git push -u #{GitOperator.remote_local_name(path)} #{branch_name}`
       end
-      GitOperator.new.check_push_success(path, branch_name, "origin/#{branch_name}")
+      GitOperator.new.check_push_success(path, branch_name, "#{GitOperator.remote_local_name(path)}/#{branch_name}")
     end
 
     def pull(path)
@@ -122,7 +122,7 @@ module BigKeeper
 
     def del_remote(path, branch_name)
       Dir.chdir(path) do
-        `git push origin --delete #{branch_name}`
+        `git push #{GitOperator.remote_local_name(path)} --delete #{branch_name}`
       end
     end
 
@@ -184,7 +184,7 @@ module BigKeeper
     def check_remote_branch_diff(path, branch, compare_branch)
       fetch(path)
       compare_branch_commits = Array.new
-      IO.popen("cd '#{path}';git log --left-right #{branch}...origin/#{compare_branch} --pretty=oneline") do |io|
+      IO.popen("cd '#{path}';git log --left-right #{branch}...#{GitOperator.remote_local_name(path)}/#{compare_branch} --pretty=oneline") do |io|
         io.each do |line|
           compare_branch_commits.push(line) unless (line.include? '>') && (line.include? "Merge branch \'#{branch}\'")
         end
@@ -196,6 +196,17 @@ module BigKeeper
       end
     end
 
+    def self.remote_local_name(path)
+      Dir.chdir(path) do
+        IO.popen("git remote") do |io|
+          io.each do |line|
+            Logger.error("Check git remote setting.") if line.length == 0
+            return line.chomp
+          end
+        end
+      end
+    end
+
     # TODO: 需要改造，util方法不应该有业务逻辑
     def check_diff(path, branch, compare_branch)
       compare_branch_commits = Array.new

data/lib/big_keeper/util/list_generator.rb

@@ -51,7 +51,7 @@ module BigKeeper
             branch_dic["is_remote"] = true
           end
 
-          if home_branch_name =~ /^origin\//
+          if home_branch_name =~ /^#{GitOperator.remote_local_name(path)}\//
             home_branch_name = $~.post_match
           end
 

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.9.13"
+  VERSION = "0.9.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli