bug fix

Author: mmoaay

Gemfile

@@ -1,4 +1,4 @@
-source "https://gems.ruby-china.org/"
+source "https://gems.ruby-china.com/"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bigkeeper (0.8.6)
+    bigkeeper (0.8.7)
       big_resources
       big_stash (~> 0.1)
       cocoapods
@@ -10,7 +10,7 @@ PATH
       plist
 
 GEM
-  remote: https://gems.ruby-china.org/
+  remote: https://gems.ruby-china.com/
   specs:
     CFPropertyList (2.3.3)
     activesupport (4.2.7.1)
@@ -120,4 +120,4 @@ DEPENDENCIES
   rubocop (~> 0.50.0)
 
 BUNDLED WITH
-   1.16.2
+   1.16.4

lib/big_keeper/command/feature&hotfix/finish.rb

@@ -37,15 +37,15 @@ def self.finish(path, user, type)
 
       Logger.highlight("Finish branch '#{branch_name}' for 'Home'")
 
+      # Delete all path modules
+      ModuleCacheOperator.new(path).cache_path_modules([], [], [])
+
       # Install
       DepService.dep_operator(path, user).install(false)
 
       # Open home workspace
       DepService.dep_operator(path, user).open
 
-      # Delete all path modules
-      ModuleCacheOperator.new(path).cache_path_modules([], [], [])
-
       # Push home changes to remote
       GitService.new.verify_push(path, "finish branch #{branch_name}", branch_name, 'Home')
     ensure

lib/big_keeper/command/feature&hotfix/start.rb

@@ -40,9 +40,8 @@ def self.start(path, version, user, name, modules, type)
       # Start home feature
       GitService.new.start(path, full_name, type)
 
-      if FileOperator.definitely_exists?("#{path}/.bigkeeper")
-         p "rm -rf #{path}/.bigkeeper"
-      end
+      # Clean module cache
+      ModuleCacheOperator.new(path).clean_modules
 
       # Cache all path modules
       ModuleCacheOperator.new(path).cache_path_modules(modules, modules, [])

lib/big_keeper/util/cache_operator.rb

@@ -102,6 +102,11 @@ def del_path_module(module_name)
       cache_modules
     end
 
+    def clean_modules
+      @modules = {"git" => {"all" => [], "current" => []}, "path" => {"all" => [], "add" => [], "del" => [], "current" => []}}
+      cache_modules
+    end
+
     def cache_modules
       file = File.new("#{@cache_path}/module.cache", 'w')
       file << @modules.to_json

lib/big_keeper/util/xcode_operator.rb

@@ -4,12 +4,12 @@ module BigKeeper
   class XcodeOperator
     def self.open_workspace(path)
       # Close Xcode
-      `pkill Xcode`
+      # `pkill Xcode`
 
-      sleep 0.5
+      # sleep 0.5
 
       # Open home workspace
-      `open #{path}/*.xcworkspace`
+      # `open #{path}/*.xcworkspace`
     end
   end
 end