bigkeeper 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da570e5e33eb967d29da59f451cdf6e0576296e3
-  data.tar.gz: 042531a18b3acf3acb37dceb2635599e17de7c86
+  metadata.gz: 4edeeb8d082f8fb0f11ead86d138df2495d7d95f
+  data.tar.gz: 453186ec769bb6796be140554f744b1058f4769a
 SHA512:
-  metadata.gz: c4dae8988e739591c9f831067ed27d094ecc4ab36a0a278b49c734eaff7d41eb4485ba05fe1c068e91c222f0dfb31050ea984d8af2f63dd07174efbb385d8f22
-  data.tar.gz: a086662146ebe5a2618dd78e1eec97c5010c17790a91bb419c7845586c451c9ad7044eb71b3fe4203ff271dc3c7ae8c3619b4af5664f0bd567cb94fd98264506
+  metadata.gz: 5d0a063e3a386f4bda808202e6caf49054fb62f0c0cf2eafe98e172762f2ecd71f622c147d5d38f75422e2e4f1689db111776a0460a48064c2717b52eaa5676a
+  data.tar.gz: d08a0e038c04cbf4203215c458f96abf3c7e02751b6c9d5baefaab2aa793bdfef82fb60037b0e26bdaa984f3e392377e222e73ffd8e2e14459dbb8185f22ccb6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bigkeeper (0.7.4)
+    bigkeeper (0.7.5)
       big_stash (~> 0.1)
       cocoapods
       colorize

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

@@ -36,7 +36,7 @@ module BigKeeper
       Logger.highlight("Publish branch '#{branch_name}' for 'Home'")
 
       # pod install
-      DepService.dep_operator(path).install(false)
+      DepService.dep_operator(path).install(false, user)
 
       # Recover podfile
       DepService.dep_operator(path).recover

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

@@ -3,7 +3,7 @@ require 'big_keeper/util/logger'
 require 'big_keeper/dependency/dep_service'
 
 module BigKeeper
-  def self.reabse(path, user, type)
+  def self.rebase(path, user, type)
     begin
       # Parse Bigkeeper file
       BigkeeperParser.parse("#{path}/Bigkeeper")
@@ -18,9 +18,12 @@ module BigKeeper
         ModuleService.new.rebase(path, user, module_name, branch_name, type)
       end
 
+      Logger.highlight("Rebase '#{GitflowType.base_branch(type)}' "\
+        "to branch '#{branch_name}' for 'Home'...")
+
       # Rebase Home
-      Logger.error("You have some changes in branch '#{home_branch_name}' \
-        for 'Home'. Use 'push' first please") if GitOperator.new.has_changes(path)
+      Logger.error("You have some changes in branch '#{branch_name}' "\
+        "for 'Home'. Use 'push' first please") if GitOperator.new.has_changes(path)
 
       GitService.new.verify_rebase(path, GitflowType.base_branch(type), 'Home')
     ensure

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

@@ -60,13 +60,16 @@ module BigKeeper
       end
 
       # pod install
-      DepService.dep_operator(path).install(true) unless modules.empty?
+      DepService.dep_operator(path).install(true, user)
 
       # Open home workspace
       DepService.dep_operator(path).open
 
       # Push home changes to remote
-      GitService.new.verify_push(path, "init #{GitflowType.name(type)} #{full_name}", branch_name, 'Home')
+      GitService.new.verify_push(path,
+        "init #{GitflowType.name(type)} #{full_name}",
+        branch_name,
+        'Home')
     ensure
     end
   end

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

@@ -39,7 +39,7 @@ module BigKeeper
       end
 
       # pod install
-      DepService.dep_operator(path).install(false)
+      DepService.dep_operator(path).install(false, user)
 
       # Open home workspace
       DepService.dep_operator(path).open

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

@@ -60,7 +60,7 @@ module BigKeeper
         end
 
         # pod install
-        DepService.dep_operator(path).install(false)
+        DepService.dep_operator(path).install(false, user)
 
         # Open home workspace
         DepService.dep_operator(path).open

data/lib/big_keeper/command/release/home.rb

@@ -59,7 +59,7 @@ module BigKeeper
       # step 3 change Info.plist value
       InfoPlistOperator.new.change_version_build(project_path, version)
 
-      DepService.dep_operator(project_path).install(true)
+      DepService.dep_operator(project_path).install(true, user)
       `open #{project_path}/*.xcworkspace`
     end
   end

data/lib/big_keeper/dependency/dep_gradle_operator.rb

@@ -26,14 +26,14 @@ module BigKeeper
     end
 
     def modules_with_branch(modules, branch_name)
-      snapshot_name = "#{branch_name}_SNAPSHOT"
+      full_name = branch_name.sub(/([\s\S]*)\/([\s\S]*)/){ $2 }
       file = "#{@path}/app/build.gradle"
 
       matched_modules = []
       File.open(file, 'r') do |file|
         file.each_line do |line|
           modules.each do |module_name|
-            if line =~ /compile\s*'\S*#{module_name.downcase}:#{snapshot_name}'\S*/
+            if line =~ /compile\s*'\S*#{module_name.downcase}:#{full_name}'\S*/
               matched_modules << module_name
               break
             end
@@ -43,14 +43,14 @@ module BigKeeper
       matched_modules
     end
 
-    def modules_with_type(modules, type)
+    def modules_with_type(modules, module_type)
       file = "#{@path}/app/build.gradle"
 
       matched_modules = []
       File.open(file, 'r') do |file|
         file.each_line do |line|
           modules.each do |module_name|
-            if line =~ regex(type, module_name)
+            if line =~ regex(module_type, module_name)
               matched_modules << module_name
               break
             end
@@ -60,19 +60,19 @@ module BigKeeper
       matched_modules
     end
 
-    def regex(type, module_name)
-      if ModuleType::PATH == type
+    def regex(module_type, module_name)
+      if ModuleType::PATH == module_type
         /compile\s*project\('\S*#{module_name.downcase}'\)\S*/
-      elsif ModuleType::GIT == type
+      elsif ModuleType::GIT == module_type
         /compile\s*'\S*#{module_name.downcase}\S*'\S*/
-      elsif ModuleType::SPEC == type
+      elsif ModuleType::SPEC == module_type
         /compile\s*'\S*#{module_name.downcase}\S*'\S*/
       else
         //
       end
     end
 
-    def find_and_replace(module_name, module_type, source)
+    def update_module_config(module_name, module_type, source)
       Dir.glob("#{@path}/*/build.gradle").each do |file|
         temp_file = Tempfile.new('.build.gradle.tmp')
         begin
@@ -90,7 +90,7 @@ module BigKeeper
       end
     end
 
-    def install(addition)
+    def install(should_update, user)
       modules = modules_with_type(BigkeeperParser.module_names, ModuleType::PATH)
 
       CacheOperator.new(@path).load('settings.gradle')
@@ -98,9 +98,10 @@ module BigKeeper
       begin
         File.open("#{@path}/settings.gradle", 'a') do |file|
           modules.each do |module_name|
-            module_path = BigkeeperParser.module_path(user, module_name)
-            file.puts "include '#{prefix_of_module(module_name)}#{module_name.downcase}'\r\n"
-            file.puts "project('#{prefix_of_module(module_name)}#{module_name.downcase}').projectDir = new File(rootProject.projectDir, '../#{module_name}/#{module_name.downcase}-lib')\r\n"
+            file.puts "include ':#{module_name.downcase}'\r\n"
+            file.puts "project(':#{module_name.downcase}')." \
+              "projectDir = new File(rootProject.projectDir," \
+              "'#{BigkeeperParser.module_path(user, module_name)}/#{module_name.downcase}-lib')\r\n"
           end
         end
       ensure
@@ -108,7 +109,7 @@ module BigKeeper
     end
 
     def prefix_of_module(module_name)
-      file = "#{@path}/app/build.gradle"
+      file = "#{@path}/.bigkeeper/app/build.gradle"
       prefix = ''
 
       File.open(file, 'r') do |file|
@@ -129,35 +130,31 @@ module BigKeeper
 
     def generate_build_config(line, module_name, module_type, source)
       if ModuleType::PATH == module_type
-        line.sub(/(\s*)compile(\s*)'(\S*)#{module_name.downcase}(\S*)'(\S*)/){
-          "#{$1}compile project('#{$3}#{module_name.downcase}')"
+        line.sub(/(\s*)([\s\S]*)'(\S*)#{module_name.downcase}(\S*)'(\S*)/){
+          "#{$1}compile project(':#{module_name.downcase}')"
         }
       elsif ModuleType::GIT == module_type
         branch_name = GitOperator.new.current_branch(@path)
-        snapshot_name = "SNAPSHOT"
+        full_name = ''
 
         # Get version part of source.addition
         if 'develop' == source.addition || 'master' == source.addition
-          snapshot_name = branch_name.sub(/([\s\S]*)\/(\d+.\d+.\d+)_([\s\S]*)/){
-            "#{$2}_SNAPSHOT"
-          }
+          full_name = branch_name.sub(/([\s\S]*)\/(\d+.\d+.\d+)_([\s\S]*)/){ $2 }
         else
-          snapshot_name = branch_name.sub(/([\s\S]*)\/([\s\S]*)/){
-            "#{$2}_SNAPSHOT"
-          }
+          full_name = branch_name.sub(/([\s\S]*)\/([\s\S]*)/){ $2 }
         end
         line.sub(/(\s*)([\s\S]*)'(\S*)#{module_name.downcase}(\S*)'(\S*)/){
-          "#{$1}compile '#{$3}#{module_name.downcase}:#{snapshot_name}'"
+          "#{$1}compile '#{prefix_of_module(module_name)}#{module_name.downcase}:#{full_name}'"
         }
       elsif ModuleType::SPEC == module_type
         line.sub(/(\s*)([\s\S]*)'(\S*)#{module_name.downcase}(\S*)'(\S*)/){
-          "#{$1}compile '#{$3}#{module_name.downcase}:#{source}'"
+          "#{$1}compile '#{prefix_of_module(module_name)}#{module_name.downcase}:#{source}'"
         }
       else
         line
       end
     end
 
-    private :generate_build_config, :regex
+    private :generate_build_config, :regex, :prefix_of_module
   end
 end

data/lib/big_keeper/dependency/dep_operator.rb

@@ -19,15 +19,15 @@ module BigKeeper
       raise "You should override this method in subclass."
     end
 
-    def modules_with_type(modules, type)
+    def modules_with_type(modules, module_type)
       raise "You should override this method in subclass."
     end
 
-    def find_and_replace(module_name, module_type, source)
+    def update_module_config(module_name, module_type, source)
       raise "You should override this method in subclass."
     end
 
-    def install(addition)
+    def install(should_update, user)
       raise "You should override this method in subclass."
     end
 

data/lib/big_keeper/dependency/dep_pod_operator.rb

@@ -33,13 +33,13 @@ module BigKeeper
       matched_modules
     end
 
-    def modules_with_type(modules, type)
+    def modules_with_type(modules, module_type)
       file = "#{@path}/Podfile"
       matched_modules = []
       File.open(file, 'r') do |file|
         file.each_line do |line|
           modules.each do |module_name|
-            if line =~ /pod\s*'#{module_name}'\s*,#{regex(type)}/
+            if line =~ /pod\s*'#{module_name}'\s*,#{regex(module_type)}/
               matched_modules << module_name
               break
             end
@@ -49,19 +49,19 @@ module BigKeeper
       matched_modules
     end
 
-    def regex(type)
-      if ModuleType::PATH == type
+    def regex(module_type)
+      if ModuleType::PATH == module_type
         "\s*:path\s*=>\s*"
-      elsif ModuleType::GIT == type
+      elsif ModuleType::GIT == module_type
         "\s*:git\s*=>\s*"
-      elsif ModuleType::SPEC == type
+      elsif ModuleType::SPEC == module_type
         "\s*'"
       else
         ""
       end
     end
 
-    def find_and_replace(module_name, module_type, source)
+    def update_module_config(module_name, module_type, source)
       file = "#{@path}/Podfile"
       temp_file = Tempfile.new('.Podfile.tmp')
 
@@ -79,8 +79,8 @@ module BigKeeper
       end
     end
 
-    def install(addition)
-      PodOperator.pod_install(@path, addition)
+    def install(should_update, user)
+      PodOperator.pod_install(@path, should_update)
     end
 
     def open

data/lib/big_keeper/service/git_service.rb

@@ -162,26 +162,25 @@ module BigKeeper
       Dir.chdir(path) do
         IO.popen("git rebase #{branch_name} --ignore-whitespace") do |io|
           unless io.gets
-            Logger.error("#{name} is already in a rebase-apply, Please:\n\
-                          1.Resolve it;\n\
-                          2.Commit the changes;\n\
-                          3.Push to remote;\n\
-                          4.Create a MR;\n\
-                          5.Run 'finish' again.")
+            Logger.error("#{name} is already in a rebase-apply, Please:\n"\
+                         "  1.Resolve it;\n"\
+                         "  2.Commit the changes;\n"\
+                         "  3.Push to remote;\n"\
+                         "  4.Create a MR;\n"\
+                         "  5.Run 'finish' again.")
           end
           io.each do |line|
             next unless line.include? 'Merge conflict'
-            Logger.error("Merge conflict in #{name}, Please:\n\
-                          1.Resolve it;\n\
-                          2.Commit the changes;\n\
-                          3.Push to remote;\n\
-                          4.Create a MR;\n\
-                          5.Run 'finish' again.")
+            Logger.error("Merge conflict in #{name}, Please:\n"\
+                         "  1.Resolve it;\n"\
+                         "  2.Commit the changes;\n"\
+                         "  3.Push to remote;\n"\
+                         "  4.Create a MR;\n"\
+                         "  5.Run 'finish' again.")
           end
         end
         if GitOperator.new.current_branch(path) != 'develop' && GitOperator.new.current_branch(path) != 'master'
           `git push -f`
-          GitOperator.new.checkout(path, branch_name)
         else
           Logger.error("You should not push 'master' or 'develop'")
         end

data/lib/big_keeper/service/module_service.rb

@@ -37,17 +37,17 @@ module BigKeeper
     end
 
     def rebase(path, user, module_name, home_branch_name, type)
-      Logger.highlight("Rebase '#{GitflowType.base_branch(type)}'\
-                        to branch '#{home_branch_name}' for module \
-                        '#{module_name}'...")
+      Logger.highlight("Rebase '#{GitflowType.base_branch(type)}' "\
+        "to branch '#{home_branch_name}' for module "\
+        "'#{module_name}'...")
 
       verify_module(path, user, module_name, home_branch_name, type)
 
       module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
 
-      Logger.error("You have some changes in branch \
-        '#{home_branch_name}' for module '#{module_name}'. \
-        Use 'push' first please") if GitOperator.new.has_changes(module_full_path)
+      Logger.error("You have some changes in branch "\
+        "'#{home_branch_name}' for module '#{module_name}'. "\
+        "Use 'push' first please") if GitOperator.new.has_changes(module_full_path)
 
       GitService.new.verify_rebase(module_full_path, GitflowType.base_branch(type), module_name)
     end
@@ -89,7 +89,7 @@ module BigKeeper
       GitService.new.verify_push(module_full_path, "finish branch #{home_branch_name}", home_branch_name, module_name)
 
       module_git = BigkeeperParser.module_git(module_name)
-      DepService.dep_operator(path).find_and_replace(
+      DepService.dep_operator(path).update_module_config(
                                            module_name,
                                            ModuleType::GIT,
                                            GitInfo.new(module_git, GitType::BRANCH, home_branch_name))
@@ -103,7 +103,7 @@ module BigKeeper
       verify_module(path, user, module_name, home_branch_name, type)
 
       module_path = BigkeeperParser.module_path(user, module_name)
-      DepService.dep_operator(path).find_and_replace(
+      DepService.dep_operator(path).update_module_config(
                                            module_name,
                                            ModuleType::PATH,
                                            module_path)
@@ -123,7 +123,7 @@ module BigKeeper
 
       module_git = BigkeeperParser.module_git(module_name)
 
-      DepService.dep_operator(path).find_and_replace(
+      DepService.dep_operator(path).update_module_config(
                                            module_name,
                                            ModuleType::GIT,
                                            GitInfo.new(module_git, GitType::BRANCH, GitflowType.base_branch(type)))

data/lib/big_keeper/util/bigkeeper_parser.rb

@@ -16,8 +16,8 @@ module BigKeeper
     BigkeeperParser.parse_home(name, params)
   end
 
-  def self.pod(name, params)
-    BigkeeperParser.parse_pod(name, params)
+  def self.mod(name, params)
+    BigkeeperParser.parse_mod(name, params)
   end
 
   def self.modules
@@ -43,7 +43,7 @@ module BigKeeper
         content.gsub!(/version\s/, 'BigKeeper::version ')
         content.gsub!(/user\s/, 'BigKeeper::user ')
         content.gsub!(/home\s/, 'BigKeeper::home ')
-        content.gsub!(/pod\s/, 'BigKeeper::pod ')
+        content.gsub!(/mod\s/, 'BigKeeper::mod ')
         content.gsub!(/modules\s/, 'BigKeeper::modules ')
         content.gsub!(/source\s/, 'BigKeeper::source ')
         eval content
@@ -75,27 +75,27 @@ module BigKeeper
       @@config[:name] = name
     end
 
-    def self.parse_pod(name, params)
+    def self.parse_mod(name, params)
       if params[:path]
-        parse_user_pod(name, params)
+        parse_user_mod(name, params)
       elsif params[:git]
-        parse_modules_pod(name, params)
+        parse_modules_mod(name, params)
       else
-        Logger.error(%(There should be ':path =>' or ':git =>' for pod #{name}))
+        Logger.error(%(There should be ':path =>' or ':git =>' for mod #{name}))
       end
     end
 
-    def self.parse_user_pod(name, params)
+    def self.parse_user_mod(name, params)
       users = @@config[:users]
       user = users[@@current_user]
-      pods = user[:pods]
-      pods = {} if pods.nil?
-      pods[name] = params
-      user[:pods] = pods
+      mods = user[:mods]
+      mods = {} if mods.nil?
+      mods[name] = params
+      user[:mods] = mods
       @@config[:users] = users
     end
 
-    def self.parse_modules_pod(name, params)
+    def self.parse_modules_mod(name, params)
       modules = @@config[:modules]
       modules[name] = params
       @@config[:modules] = modules
@@ -134,10 +134,10 @@ module BigKeeper
     def self.module_full_path(home_path, user_name, module_name)
       if @@config[:users] \
         && @@config[:users][user_name] \
-        && @@config[:users][user_name][:pods] \
-        && @@config[:users][user_name][:pods][module_name] \
-        && @@config[:users][user_name][:pods][module_name][:path]
-        @@config[:users][user_name][:pods][module_name][:path]
+        && @@config[:users][user_name][:mods] \
+        && @@config[:users][user_name][:mods][module_name] \
+        && @@config[:users][user_name][:mods][module_name][:path]
+        @@config[:users][user_name][:mods][module_name][:path]
       else
         File.expand_path("#{home_path}/../#{module_name}")
       end
@@ -146,10 +146,10 @@ module BigKeeper
     def self.module_path(user_name, module_name)
       if @@config[:users] \
         && @@config[:users][user_name] \
-        && @@config[:users][user_name][:pods] \
-        && @@config[:users][user_name][:pods][module_name] \
-        && @@config[:users][user_name][:pods][module_name][:path]
-        @@config[:users][user_name][:pods][module_name][:path]
+        && @@config[:users][user_name][:mods] \
+        && @@config[:users][user_name][:mods][module_name] \
+        && @@config[:users][user_name][:mods][module_name][:path]
+        @@config[:users][user_name][:mods][module_name][:path]
       else
         "../#{module_name}"
       end

data/lib/big_keeper/util/podfile_operator.rb

@@ -28,7 +28,7 @@ module BigKeeper
 
     def replace_all_module_release(path, module_names, version)
       module_names.each do |module_name|
-        DepService.dep_operator(path).find_and_replace(
+        DepService.dep_operator(path).update_module_config(
                                              module_name,
                                              ModuleType::GIT,
                                              GitInfo.new(BigkeeperParser.module_git(module_name), GitType::TAG, version))

data/lib/big_keeper/util/xcode_operator.rb

@@ -3,6 +3,11 @@ require 'big_keeper/util/logger'
 module BigKeeper
   class XcodeOperator
     def self.open_workspace(path)
+      # Close Xcode
+      `pkill Xcode`
+
+      sleep 0.5
+
       # Open home workspace
       `open #{path}/*.xcworkspace`
     end

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli