bigkeeper 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab449225c8909098f55adbcb26c5dfe31039774b
-  data.tar.gz: ec0775403a510e08b7265307434ebe58e7429365
+  metadata.gz: 6a7d8a654b60f6cc0974fec215e0ec7078dd6b5c
+  data.tar.gz: ad79e973c587663d557bd152854aa477b228b972
 SHA512:
-  metadata.gz: 6f2d7e97637f10bafb27feea9ebf9e53828fe7e178f544c37b14246545748d3c5d7e14f78f4c7c2db595c45fe7eac8df80bce49ec3d916e6b1c13a13b810441b
-  data.tar.gz: 79e766a7ade9aea1525f705a8d48989b9b638207c2610c8aa2ac62201931b926e92d08e497e330910c2e997b18b83b30dc41fb2d303ea7d8378c0bb18a284057
+  metadata.gz: 69604e25d6176e2f8ae5a006341f3b861cb9b5c640654693cc650fa99e3aabc9067a6dc6eb4e8c0c6121dcf86d0b0545959b64ffc8848b68b6557de72890dee4
+  data.tar.gz: 41fa488126c061453f6a3bb820f85742e4068c09deee4d8142203f906829a7f79224b70c8851dfb0d19db202c220019a05f58798f75d7bee9a4ae02ab0b1bc17

data/Gemfile.lock

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

data/lib/big_keeper.rb

@@ -13,6 +13,8 @@ require 'big_keeper/command/feature&hotfix/switch'
 require 'big_keeper/command/feature&hotfix/update'
 require 'big_keeper/command/feature&hotfix/pull'
 require 'big_keeper/command/feature&hotfix/push'
+require 'big_keeper/command/feature&hotfix/rebase'
+require 'big_keeper/command/feature&hotfix/publish'
 require 'big_keeper/command/pod/podfile'
 require 'big_keeper/command/feature&hotfix/delete'
 require 'big_keeper/command/release/home'
@@ -99,6 +101,14 @@ module BigKeeper
       end
     end
 
+    c.desc "Rebase 'develop' to current feature"
+    c.command :rebase do |rebase|
+      rebase.action do |global_options, options, args|
+        help_now!('user name is required') if user and user.empty?
+        rebase(path, user, GitflowType::FEATURE)
+      end
+    end
+
     c.desc 'Finish current feature'
     c.command :finish do |finish|
       finish.action do |global_options, options, args|
@@ -107,6 +117,14 @@ module BigKeeper
       end
     end
 
+    c.desc 'Publish current feature'
+    c.command :publish do |publish|
+      publish.action do |global_options, options, args|
+        help_now!('user name is required') if user and user.empty?
+        publish(path, user, GitflowType::FEATURE)
+      end
+    end
+
     c.desc 'Delete feature with name'
     c.command :delete do |delete|
       delete.action do |global_options, options, args|
@@ -180,6 +198,14 @@ module BigKeeper
       end
     end
 
+    c.desc "Rebase 'master' to current feature"
+    c.command :rebase do |rebase|
+      rebase.action do |global_options, options, args|
+        help_now!('user name is required') if user and user.empty?
+        rebase(path, user, GitflowType::HOTFIX)
+      end
+    end
+
     c.desc 'Finish current hotfix'
     c.command :finish do |finish|
       finish.action do |global_options, options, args|
@@ -188,6 +214,14 @@ module BigKeeper
       end
     end
 
+    c.desc 'Publish current feature'
+    c.command :publish do |publish|
+      publish.action do |global_options, options, args|
+        help_now!('user name is required') if user and user.empty?
+        publish(path, user, GitflowType::HOTFIX)
+      end
+    end
+
     c.desc 'Delete hotfix with name'
     c.command :delete do |delete|
       delete.action do |global_options, options, args|

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

@@ -6,7 +6,9 @@ require 'big_keeper/util/bigkeeper_parser'
 require 'big_keeper/util/logger'
 require 'big_keeper/util/pod_operator'
 
-require 'big_keeper/model/podfile_type'
+require 'big_keeper/dependency/dep_service'
+
+require 'big_keeper/dependency/dep_type'
 
 require 'big_keeper/service/stash_service'
 require 'big_keeper/service/module_service'

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

@@ -6,7 +6,9 @@ require 'big_keeper/util/pod_operator'
 require 'big_keeper/util/xcode_operator'
 require 'big_keeper/util/bigkeeper_parser'
 
-require 'big_keeper/model/podfile_type'
+require 'big_keeper/dependency/dep_service'
+
+require 'big_keeper/dependency/dep_type'
 
 
 module BigKeeper
@@ -16,12 +18,12 @@ module BigKeeper
       # Parse Bigkeeper file
       BigkeeperParser.parse("#{path}/Bigkeeper")
 
-      modules = PodfileOperator.new.modules_with_type("#{path}/Podfile",
-                                BigkeeperParser.module_names, ModuleType::PATH)
       branch_name = GitOperator.new.current_branch(path)
-
       Logger.error("Not a #{GitflowType.name(type)} branch, exit.") unless branch_name.include? GitflowType.name(type)
 
+      modules = DepService.dep_operator(path).modules_with_type(BigkeeperParser.module_names,
+        ModuleType::PATH)
+
       # Rebase modules and modify podfile as git
       modules.each do |module_name|
         ModuleService.new.finish(path, user, module_name, branch_name, type)
@@ -30,26 +32,13 @@ module BigKeeper
       Logger.highlight("Finish branch '#{branch_name}' for 'Home'")
 
       # pod install
-      PodOperator.pod_install(path, false)
-
-      modules.each do |module_name|
-        module_git = BigkeeperParser.module_git(module_name)
-        PodfileOperator.new.find_and_replace("#{path}/Podfile",
-                                             module_name,
-                                             ModuleType::GIT,
-                                             GitInfo.new(module_git, GitType::BRANCH, GitflowType.base_branch(type)))
-      end
+      DepService.dep_operator(path).install(false)
 
       # Open home workspace
-      XcodeOperator.open_workspace(path)
+      DepService.dep_operator(path).open
 
       # Push home changes to remote
       GitService.new.verify_push(path, "finish branch #{branch_name}", branch_name, 'Home')
-
-      # Rebase Home
-      GitService.new.verify_rebase(path, GitflowType.base_branch(type), 'Home')
-
-      `open #{BigkeeperParser.home_pulls()}`
     ensure
     end
   end

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

@@ -0,0 +1,54 @@
+#!/usr/bin/ruby
+
+require 'big_keeper/util/podfile_operator'
+require 'big_keeper/util/logger'
+require 'big_keeper/util/pod_operator'
+require 'big_keeper/util/xcode_operator'
+require 'big_keeper/util/bigkeeper_parser'
+
+require 'big_keeper/dependency/dep_service'
+
+require 'big_keeper/dependency/dep_type'
+
+
+module BigKeeper
+
+  def self.publish(path, user, type)
+    begin
+      # Parse Bigkeeper file
+      BigkeeperParser.parse("#{path}/Bigkeeper")
+
+      branch_name = GitOperator.new.current_branch(path)
+      Logger.error("Not a #{GitflowType.name(type)} branch, exit.") unless branch_name.include? GitflowType.name(type)
+
+      path_modules = DepService.dep_operator(path).modules_with_type(BigkeeperParser.module_names,
+        ModuleType::PATH)
+      Logger.error("You have unfinished modules #{path_modules}, Use 'finish' first please.") unless path_modules.empty?
+
+      modules = DepService.dep_operator(path).modules_with_branch(BigkeeperParser.module_names,
+        branch_name)
+
+      # Rebase modules and modify podfile as git
+      modules.each do |module_name|
+        ModuleService.new.publish(path, user, module_name, branch_name, type)
+      end
+
+      Logger.highlight("Publish branch '#{branch_name}' for 'Home'")
+
+      # pod install
+      DepService.dep_operator(path).install(false)
+
+      # Recover podfile
+      DepService.dep_operator(path).recover
+
+      # Push home changes to remote
+      GitService.new.verify_push(path, "publish branch #{branch_name}", branch_name, 'Home')
+
+      # Rebase Home
+      GitService.new.verify_rebase(path, GitflowType.base_branch(type), 'Home')
+
+      `open #{BigkeeperParser.home_pulls()}`
+    ensure
+    end
+  end
+end

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

@@ -1,5 +1,7 @@
 require 'big_keeper/util/logger'
 
+require 'big_keeper/dependency/dep_service'
+
 module BigKeeper
   def self.pull(path, user, type)
     begin
@@ -9,7 +11,7 @@ module BigKeeper
 
       Logger.error("Not a #{GitflowType.name(type)} branch, exit.") unless branch_name.include? GitflowType.name(type)
 
-      modules = PodfileOperator.new.modules_with_type("#{path}/Podfile",
+      modules = DepService.dep_operator(path).modules_with_type(
                                                       BigkeeperParser.module_names, ModuleType::PATH)
 
       modules.each do |module_name|

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

@@ -1,5 +1,7 @@
 require 'big_keeper/util/logger'
 
+require 'big_keeper/dependency/dep_service'
+
 module BigKeeper
 
   def self.push(path, user, comment, type)
@@ -10,7 +12,7 @@ module BigKeeper
 
       Logger.error("Not a #{GitflowType.name(type)} branch, exit.") unless branch_name.include? GitflowType.name(type)
 
-      modules = PodfileOperator.new.modules_with_type("#{path}/Podfile",
+      modules = DepService.dep_operator(path).modules_with_type(
                                 BigkeeperParser.module_names, ModuleType::PATH)
 
       modules.each do |module_name|

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

@@ -1,5 +1,7 @@
 require 'big_keeper/util/logger'
 
+require 'big_keeper/dependency/dep_service'
+
 module BigKeeper
   def self.reabse(path, user, type)
     begin
@@ -9,7 +11,7 @@ module BigKeeper
 
       Logger.error("Not a #{GitflowType.name(type)} branch, exit.") unless branch_name.include? GitflowType.name(type)
 
-      modules = PodfileOperator.new.modules_with_type("#{path}/Podfile",
+      modules = DepService.dep_operator(path).modules_with_type(
                                                       BigkeeperParser.module_names, ModuleType::PATH)
 
       modules.each do |module_name|

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

@@ -7,7 +7,9 @@ require 'big_keeper/util/logger'
 require 'big_keeper/util/pod_operator'
 require 'big_keeper/util/xcode_operator'
 
-require 'big_keeper/model/podfile_type'
+require 'big_keeper/dependency/dep_service'
+
+require 'big_keeper/dependency/dep_type'
 
 require 'big_keeper/service/stash_service'
 require 'big_keeper/service/module_service'
@@ -25,9 +27,10 @@ module BigKeeper
 
       GitService.new.verify_home_branch(path, branch_name, OperateType::START)
 
-      stash_modules = PodfileOperator.new.modules_with_type("#{path}/Podfile",
+      stash_modules = DepService.dep_operator(path).modules_with_type(
                                 BigkeeperParser.module_names, ModuleType::PATH)
 
+      p stash_modules
       # Stash current branch
       StashService.new.stash_all(path, branch_name, user, stash_modules)
 
@@ -48,16 +51,19 @@ module BigKeeper
       # Start home feature
       GitService.new.start(path, full_name, type)
 
+      # Backup podfile
+      DepService.dep_operator(path).backup
+
       # Modify podfile as path and Start modules feature
       modules.each do |module_name|
         ModuleService.new.add(path, user, module_name, full_name, type)
       end
 
       # pod install
-      PodOperator.pod_install(path, true) unless modules.empty?
+      DepService.dep_operator(path).install(true) unless modules.empty?
 
       # Open home workspace
-      XcodeOperator.open_workspace(path)
+      DepService.dep_operator(path).open
 
       # Push home changes to remote
       GitService.new.verify_push(path, "init #{GitflowType.name(type)} #{full_name}", branch_name, 'Home')

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

@@ -4,6 +4,8 @@ require 'big_keeper/util/logger'
 require 'big_keeper/util/pod_operator'
 require 'big_keeper/util/xcode_operator'
 
+require 'big_keeper/dependency/dep_service'
+
 module BigKeeper
   def self.switch_to(path, version, user, name, type)
     begin
@@ -16,7 +18,7 @@ module BigKeeper
 
       GitService.new.verify_home_branch(path, branch_name, OperateType::SWITCH)
 
-      stash_modules = PodfileOperator.new.modules_with_type("#{path}/Podfile",
+      stash_modules = DepService.dep_operator(path).modules_with_type(
                                 BigkeeperParser.module_names, ModuleType::PATH)
 
       # Stash current branch
@@ -29,7 +31,7 @@ module BigKeeper
       # Apply home stash
       StashService.new.pop_stash(path, branch_name, 'Home')
 
-      modules = PodfileOperator.new.modules_with_type("#{path}/Podfile",
+      modules = DepService.dep_operator(path).modules_with_type(
                                 BigkeeperParser.module_names, ModuleType::PATH)
 
       modules.each do |module_name|
@@ -37,10 +39,10 @@ module BigKeeper
       end
 
       # pod install
-      PodOperator.pod_install(path, false)
+      DepService.dep_operator(path).install(false)
 
       # Open home workspace
-      XcodeOperator.open_workspace(path)
+      DepService.dep_operator(path).open
     ensure
     end
   end

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

@@ -7,7 +7,9 @@ require 'big_keeper/util/logger'
 require 'big_keeper/util/pod_operator'
 require 'big_keeper/util/xcode_operator'
 
-require 'big_keeper/model/podfile_type'
+require 'big_keeper/dependency/dep_service'
+
+require 'big_keeper/dependency/dep_type'
 
 require 'big_keeper/service/stash_service'
 require 'big_keeper/service/module_service'
@@ -24,7 +26,7 @@ module BigKeeper
 
       full_name = branch_name.gsub(/#{GitflowType.name(type)}\//, '')
 
-      current_modules = PodfileOperator.new.modules_with_type("#{path}/Podfile",
+      current_modules = DepService.dep_operator(path).modules_with_type(
                                 BigkeeperParser.module_names, ModuleType::PATH)
 
       # Verify input modules
@@ -58,10 +60,10 @@ module BigKeeper
         end
 
         # pod install
-        PodOperator.pod_install(path, false)
+        DepService.dep_operator(path).install(false)
 
         # Open home workspace
-        XcodeOperator.open_workspace(path)
+        DepService.dep_operator(path).open
       end
     ensure
     end

data/lib/big_keeper/command/pod/podfile.rb

@@ -3,7 +3,7 @@ require 'big_keeper/util/podfile_operator'
 require 'big_keeper/util/podfile_module'
 require 'big_keeper/util/gitflow_operator'
 require 'big_keeper/util/bigkeeper_parser'
-require 'big_keeper/model/podfile_type'
+require 'big_keeper/dependency/dep_type'
 require 'big_keeper/util/logger'
 
 module BigKeeper

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

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 require 'big_keeper/util/podfile_operator'
 require 'big_keeper/util/gitflow_operator'
-require 'big_keeper/model/podfile_type'
+require 'big_keeper/dependency/dep_type'
 require 'big_keeper/util/info_plist_operator'
 require 'big_keeper/util/logger'
 
@@ -52,14 +52,14 @@ module BigKeeper
 
       Logger.highlight(%Q(Start to release/#{version}))
       # step 2 replace_modules
-      PodfileOperator.new.replace_all_module_release(%Q(#{project_path}/Podfile),
-                                                      modules,
-                                                      version)
+      PodfileOperator.new.replace_all_module_release(project_path,
+                                                     modules,
+                                                     version)
 
       # step 3 change Info.plist value
       InfoPlistOperator.new.change_version_build(project_path, version)
 
-      PodOperator.pod_install(project_path, true)
+      DepService.dep_operator(project_path).install(true)
       `open #{project_path}/*.xcworkspace`
     end
   end

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

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 require 'big_keeper/util/podfile_operator'
 require 'big_keeper/util/gitflow_operator'
-require 'big_keeper/model/podfile_type'
+require 'big_keeper/dependency/dep_type'
 require 'big_keeper/util/info_plist_operator'
 require 'big_keeper/util/git_operator'
 require 'big_keeper/util/logger'

data/lib/big_keeper/dependency/dep_gradle_operator.rb

@@ -0,0 +1,163 @@
+require 'big_keeper/dependency/dep_operator'
+
+module BigKeeper
+  # Operator for podfile
+  class DepGradleOperator < DepOperator
+
+    def backup
+      cache_operator = CacheOperator.new(@path)
+      cache_operator.save('setting.gradle')
+      Dir.glob("#{@path}/*/build.gradle").each do |build_gradle_file_path|
+        build_gradle_file = build_gradle_file_path.gsub!(/#{@path}/, '')
+        cache_operator.save(build_gradle_file)
+      end
+    end
+
+    def recover
+      cache_operator = CacheOperator.new(@path)
+
+      cache_operator.load('setting.gradle')
+      Dir.glob("#{@path}/*/build.gradle").each do |build_gradle_file_path|
+        build_gradle_file = build_gradle_file_path.gsub!(/#{@path}/, '')
+        cache_operator.load(build_gradle_file)
+      end
+
+      cache_operator.clean
+    end
+
+    def modules_with_branch(modules, branch_name)
+      snapshot_name = "#{branch_name}_SNAPSHOT"
+      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*/
+              matched_modules << module_name
+              break
+            end
+          end
+        end
+      end
+      matched_modules
+    end
+
+    def modules_with_type(modules, 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)
+              matched_modules << module_name
+              break
+            end
+          end
+        end
+      end
+      matched_modules
+    end
+
+    def regex(type, module_name)
+      if ModuleType::PATH == type
+        /compile\s*project\('\S*#{module_name.downcase}'\)\S*/
+      elsif ModuleType::GIT == type
+        /compile\s*'\S*#{module_name.downcase}\S*'\S*/
+      elsif ModuleType::SPEC == type
+        /compile\s*'\S*#{module_name.downcase}\S*'\S*/
+      else
+        //
+      end
+    end
+
+    def find_and_replace(module_name, module_type, source)
+      Dir.glob("#{@path}/*/build.gradle").each do |file|
+        temp_file = Tempfile.new('.build.gradle.tmp')
+        begin
+          File.open(file, 'r') do |file|
+            file.each_line do |line|
+              temp_file.puts generate_build_config(line, module_name, module_type, source)
+            end
+          end
+          temp_file.close
+          FileUtils.mv(temp_file.path, file)
+        ensure
+          temp_file.close
+          temp_file.unlink
+        end
+      end
+    end
+
+    def install(addition)
+      modules = modules_with_type(BigkeeperParser.module_names, ModuleType::PATH)
+
+      CacheOperator.new(@path).load('setting.gradle')
+
+      begin
+        File.open("#{@path}/setting.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"
+          end
+        end
+      ensure
+      end
+    end
+
+    def prefix_of_module(module_name)
+      file = "#{@path}/app/build.gradle"
+      prefix = ''
+
+      File.open(file, 'r') do |file|
+        file.each_line do |line|
+          if line =~ /(\s*)([\s\S]*)'(\S*)#{module_name.downcase}(\S*)'(\S*)/
+            prefix = line.sub(/(\s*)([\s\S]*)'(\S*)#{module_name.downcase}(\S*)'(\S*)/){
+              $3
+            }
+          end
+        end
+      end
+
+      prefix.chop
+    end
+
+    def open
+    end
+
+    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}')"
+        }
+      elsif ModuleType::GIT == module_type
+        branch_name = GitOperator.new.current_branch(@path)
+        snapshot_name = "SNAPSHOT"
+
+        # 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"
+          }
+        else
+          snapshot_name = branch_name.sub(/([\s\S]*)\/([\s\S]*)/){
+            "#{$2}_SNAPSHOT"
+          }
+        end
+        line.sub(/(\s*)([\s\S]*)'(\S*)#{module_name.downcase}(\S*)'(\S*)/){
+          "#{$1}compile '#{$3}#{module_name.downcase}:#{snapshot_name}'"
+        }
+      elsif ModuleType::SPEC == module_type
+        line.sub(/(\s*)([\s\S]*)'(\S*)#{module_name.downcase}(\S*)'(\S*)/){
+          "#{$1}compile '#{$3}#{module_name.downcase}:#{source}'"
+        }
+      else
+        line
+      end
+    end
+
+    private :generate_build_config, :regex
+  end
+end

data/lib/big_keeper/dependency/dep_operator.rb

@@ -0,0 +1,38 @@
+module BigKeeper
+  # Operator for podfile
+  class DepOperator
+    @path
+
+    def initialize(path)
+      @path = path
+    end
+
+    def backup
+      raise "You should override this method in subclass."
+    end
+
+    def recover
+      raise "You should override this method in subclass."
+    end
+
+    def modules_with_branch(modules, branch_name)
+      raise "You should override this method in subclass."
+    end
+
+    def modules_with_type(modules, type)
+      raise "You should override this method in subclass."
+    end
+
+    def find_and_replace(module_name, module_type, source)
+      raise "You should override this method in subclass."
+    end
+
+    def install(addition)
+      raise "You should override this method in subclass."
+    end
+
+    def open
+      raise "You should override this method in subclass."
+    end
+  end
+end

data/lib/big_keeper/dependency/dep_pod_operator.rb

@@ -0,0 +1,116 @@
+require 'big_keeper/dependency/dep_operator'
+
+require 'big_keeper/util/pod_operator'
+require 'big_keeper/util/xcode_operator'
+require 'big_keeper/util/cache_operator'
+
+module BigKeeper
+  # Operator for podfile
+  class DepPodOperator < DepOperator
+    def backup
+      CacheOperator.new(@path).save('Podfile')
+    end
+
+    def recover
+      cache_operator = CacheOperator.new(@path)
+      cache_operator.load('Podfile')
+      cache_operator.clean
+    end
+
+    def modules_with_branch(modules, branch_name)
+      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*,\s*:git\s*=>\s*\S*\s*,\s*:branch\s*=>\s*'#{branch_name}'\s*/
+              matched_modules << module_name
+              break
+            end
+          end
+        end
+      end
+      matched_modules
+    end
+
+    def modules_with_type(modules, 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)}/
+              matched_modules << module_name
+              break
+            end
+          end
+        end
+      end
+      matched_modules
+    end
+
+    def regex(type)
+      if ModuleType::PATH == type
+        "\s*:path\s*=>\s*"
+      elsif ModuleType::GIT == type
+        "\s*:git\s*=>\s*"
+      elsif ModuleType::SPEC == type
+        "\s*'"
+      else
+        ""
+      end
+    end
+
+    def find_and_replace(module_name, module_type, source)
+      file = "#{@path}/Podfile"
+      temp_file = Tempfile.new('.Podfile.tmp')
+
+      begin
+        File.open(file, 'r') do |file|
+          file.each_line do |line|
+            temp_file.puts generate_module_config(line, module_name, module_type, source)
+          end
+        end
+        temp_file.close
+        FileUtils.mv(temp_file.path, file)
+      ensure
+        temp_file.close
+        temp_file.unlink
+      end
+    end
+
+    def install(addition)
+      PodOperator.pod_install(@path, addition)
+    end
+
+    def open
+      XcodeOperator.open_workspace(@path)
+    end
+
+    def generate_module_config(line, module_name, module_type, source)
+      line.sub(/(\s*)pod(\s*)'(\S*)#{module_name}(\S*)'([\s\S]*)#([\s\S]*)/){
+        if ModuleType::PATH == module_type
+          "#{$1}pod '#{module_name}', :path => '#{source}' ##{$6}"
+        elsif ModuleType::GIT == module_type
+          # puts source.base
+          # puts source.addition
+          if GitType::BRANCH == source.type
+            "#{$1}pod '#{module_name}', :git => '#{source.base}', :branch => '#{source.addition}' ##{$6}"
+          elsif GitType::TAG == source.type
+            "#{$1}pod '#{module_name}', :git => '#{source.base}', :tag => '#{source.addition}' ##{$6}"
+          elsif GitType::COMMIT == source.type
+            "#{$1}pod '#{module_name}', :git => '#{source.base}', :commit => '#{source.addition}' ##{$6}"
+          else
+            "#{$1}pod '#{module_name}', :git => '#{source.base}' ##{$6}"
+          end
+        elsif ModuleType::SPEC == module_type
+          "#{$1}pod '#{module_name}', '#{source}' ##{$6}"
+        else
+          line
+        end
+      }
+    end
+
+    private :generate_module_config, :regex
+  end
+end

data/lib/big_keeper/dependency/dep_service.rb

@@ -0,0 +1,14 @@
+require 'big_keeper/util/git_operator'
+require 'big_keeper/model/gitflow_type'
+require 'big_keeper/model/operate_type'
+require 'big_keeper/util/logger'
+require 'big_keeper/dependency/dep_type'
+
+module BigKeeper
+  # Operator for podfile
+  class DepService
+    def self.dep_operator(path)
+      DepType.operator(path)
+    end
+  end
+end

data/lib/big_keeper/dependency/dep_type.rb

@@ -0,0 +1,64 @@
+require 'big_keeper/dependency/dep_operator'
+require 'big_keeper/dependency/dep_pod_operator'
+require 'big_keeper/dependency/dep_gradle_operator'
+require 'big_keeper/util/file_operator'
+
+module BigKeeper
+  module DepType
+    NONE = 0
+    COCOAPODS = 1
+    GRADLE = 2
+
+    def self.type(path)
+      if FileOperator.definitely_exists?("#{path}/Podfile")
+        COCOAPODS
+      elsif FileOperator.definitely_exists?("#{path}/build.gradle")
+        GRADLE
+      else
+        NONE
+      end
+    end
+
+    def self.operator(path)
+      operator_type = type(path)
+      if COCOAPODS == operator_type
+        DepPodOperator.new(path)
+      elsif GRADLE == operator_type
+        DepGradleOperator.new(path)
+      else
+        DepOperator.new(path)
+      end
+    end
+  end
+
+  module ModuleType
+    PATH = 1
+    GIT = 2
+    SPEC = 3
+  end
+
+  module GitType
+    MASTER = 1
+    BRANCH = 2
+    TAG = 3
+    COMMIT = 4
+  end
+
+  class GitInfo
+    def initialize(base, type, addition)
+      @base, @type, @addition = base, type, addition
+    end
+
+    def type
+      @type
+    end
+
+    def base
+      @base
+    end
+
+    def addition
+      @addition
+    end
+  end
+end

data/lib/big_keeper/service/git_service.rb

@@ -1,4 +1,5 @@
 require 'big_keeper/util/git_operator'
+require 'big_keeper/util/gitflow_operator'
 require 'big_keeper/model/gitflow_type'
 require 'big_keeper/model/operate_type'
 require 'big_keeper/util/logger'
@@ -12,6 +13,8 @@ module BigKeeper
       branch_name = "#{GitflowType.name(type)}/#{name}"
       if !git.has_remote_branch(path, branch_name) && !git.has_local_branch(path, branch_name)
 
+        GitflowOperator.new.verify_git_flow(path)
+
         verify_special_branch(path, 'master')
         verify_special_branch(path, 'develop')
 
@@ -121,7 +124,7 @@ module BigKeeper
         Logger.highlight("Delete local branch '#{branch_name}' for '#{name}'...")
 
         if git.current_branch(path) == branch_name
-          git.dicard(path)
+          git.discard(path)
           git.checkout(path, GitflowType.base_branch(type))
         end
         git.del_local(path, branch_name)
@@ -179,6 +182,8 @@ module BigKeeper
         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
       end
     end

data/lib/big_keeper/service/module_service.rb

@@ -13,7 +13,7 @@ module BigKeeper
       if !File.exist? module_full_path
         Logger.default("No local repository for module '#{module_name}', clone it...")
         module_git = BigkeeperParser.module_git(module_name)
-        git.new.clone(File.expand_path("#{module_full_path}/../"), module_git)
+        git.clone(File.expand_path("#{module_full_path}/../"), module_git)
       end
 
       current_branch_name = git.current_branch(module_full_path)
@@ -67,24 +67,32 @@ module BigKeeper
       verify_module(path, user, module_name, home_branch_name, type)
     end
 
+    def publish(path, user, module_name, home_branch_name, type)
+      Logger.highlight("Publish branch '#{home_branch_name}' for module '#{module_name}'...")
+
+      verify_module(path, user, module_name, home_branch_name, type)
+
+      GitService.new.verify_push(module_full_path, "publish branch #{home_branch_name}", home_branch_name, module_name)
+
+      module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
+      GitService.new.verify_rebase(module_full_path, GitflowType.base_branch(type), module_name)
+
+      `open #{BigkeeperParser.module_pulls(module_name)}`
+    end
+
     def finish(path, user, module_name, home_branch_name, type)
       Logger.highlight("Finish 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)
+      GitService.new.verify_push(module_full_path, "finish branch #{home_branch_name}", home_branch_name, module_name)
+
       module_git = BigkeeperParser.module_git(module_name)
-      PodfileOperator.new.find_and_replace("#{path}/Podfile",
+      DepService.dep_operator(path).find_and_replace(
                                            module_name,
                                            ModuleType::GIT,
                                            GitInfo.new(module_git, GitType::BRANCH, home_branch_name))
-
-      module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
-
-      GitService.new.verify_push(module_full_path, "finish branch #{home_branch_name}", home_branch_name, module_name)
-
-      GitService.new.verify_rebase(module_full_path, GitflowType.base_branch(type), module_name)
-
-      `open #{BigkeeperParser.module_pulls(module_name)}`
     end
 
     def add(path, user, module_name, name, type)
@@ -95,7 +103,7 @@ module BigKeeper
       verify_module(path, user, module_name, home_branch_name, type)
 
       module_path = BigkeeperParser.module_path(user, module_name)
-      PodfileOperator.new.find_and_replace("#{path}/Podfile",
+      DepService.dep_operator(path).find_and_replace(
                                            module_name,
                                            ModuleType::PATH,
                                            module_path)
@@ -115,7 +123,7 @@ module BigKeeper
 
       module_git = BigkeeperParser.module_git(module_name)
 
-      PodfileOperator.new.find_and_replace("#{path}/Podfile",
+      DepService.dep_operator(path).find_and_replace(
                                            module_name,
                                            ModuleType::GIT,
                                            GitInfo.new(module_git, GitType::BRANCH, GitflowType.base_branch(type)))

data/lib/big_keeper/util/bigkeeper_parser.rb

@@ -1,4 +1,5 @@
 require 'big_keeper/util/logger'
+require 'big_keeper/util/file_operator'
 
 # Bigkeeper module
 module BigKeeper
@@ -36,7 +37,7 @@ module BigKeeper
     def self.parse(bigkeeper)
       if @@config.empty?
 
-        Logger.error("Can't find a Bigkeeper file in current directory.") if !BigkeeperParser.definitely_exists?(bigkeeper)
+        Logger.error("Can't find a Bigkeeper file in current directory.") if !FileOperator.definitely_exists?(bigkeeper)
 
         content = File.read bigkeeper
         content.gsub!(/version\s/, 'BigKeeper::version ')
@@ -50,13 +51,6 @@ module BigKeeper
       end
     end
 
-    def self.definitely_exists? path
-      folder = File.dirname path
-      filename = File.basename path
-      # Unlike Ruby IO, ls, and find -f, this technique will fail to locate the file if the case is wrong:
-      not %x( find "#{folder}" -name "#{filename}" ).empty?
-    end
-
     def self.parse_version(name)
       @@config[:version] = name
     end

data/lib/big_keeper/util/cache_operator.rb

@@ -0,0 +1,25 @@
+require 'fileutils'
+require 'json'
+
+module BigKeeper
+  class CacheOperator
+    def initialize(path)
+      @path = File.expand_path(path)
+      @cache_path = File.expand_path("#{path}/.bigkeeper")
+    end
+
+    def save(file)
+      dest_path = File.dirname("#{@cache_path}/#{file}")
+      FileUtils.mkdir_p(dest_path) unless File.exist?(dest_path)
+      FileUtils.cp("#{@path}/#{file}", "#{@cache_path}/#{file}");
+    end
+
+    def load(file)
+      FileUtils.cp("#{@cache_path}/#{file}", "#{@path}/#{file}");
+    end
+
+    def clean
+      FileUtils.rm_r(@cache_path)
+    end
+  end
+end

data/lib/big_keeper/util/file_operator.rb

@@ -0,0 +1,15 @@
+module BigKeeper
+  # Operator for got
+  class FileOperator
+    def self.definitely_exists? path
+      folder = File.dirname path
+      filename = File.basename path
+      # Unlike Ruby IO, ls, and find -f, this technique will fail to locate the file if the case is wrong:
+      not %x( find "#{folder}" -name "#{filename}" ).empty?
+    end
+
+    def find_all(path, name)
+      Dir.glob("#{path}/*/#{name}")
+    end
+  end
+end

data/lib/big_keeper/util/git_operator.rb

@@ -107,7 +107,7 @@ module BigKeeper
       has_changes
     end
 
-    def dicard(path)
+    def discard(path)
       Dir.chdir(path) do
         `git checkout . && git clean -xdf`
       end

data/lib/big_keeper/util/podfile_operator.rb

@@ -1,6 +1,6 @@
 require 'tempfile'
 require 'fileutils'
-require 'big_keeper/model/podfile_type'
+require 'big_keeper/dependency/dep_type'
 require 'big_keeper/util/podfile_detector'
 
 module BigKeeper
@@ -17,64 +17,6 @@ module BigKeeper
       false
     end
 
-    def modules_with_type(podfile, modules, type)
-      matched_modules = []
-      File.open(podfile, 'r') do |file|
-        file.each_line do |line|
-          modules.each do |module_name|
-            if line =~ /pod\s*'#{module_name}',#{ModuleType.regex(type)}/
-              matched_modules << module_name
-              break
-            end
-          end
-        end
-      end
-      matched_modules
-    end
-
-    def find_and_replace(podfile, module_name, module_type, source)
-      temp_file = Tempfile.new('.Podfile.tmp')
-
-      begin
-        File.open(podfile, 'r') do |file|
-          file.each_line do |line|
-            if line.include?module_name
-              temp_file.puts generate_module_config(module_name, module_type, source)
-            else
-              temp_file.puts line
-            end
-          end
-        end
-        temp_file.close
-        FileUtils.mv(temp_file.path, podfile)
-      ensure
-        temp_file.close
-        temp_file.unlink
-      end
-    end
-
-    def generate_module_config(module_name, module_type, source)
-      module_config = ''
-      if ModuleType::PATH == module_type
-        module_config = %Q(    pod '#{module_name}', :path => '#{source}')
-      elsif ModuleType::GIT == module_type
-        # puts source.base
-        # puts source.addition
-        if GitType::BRANCH == source.type
-          module_config = %Q(    pod '#{module_name}', :git => '#{source.base}', :branch => '#{source.addition}')
-        elsif GitType::TAG == source.type
-          module_config = %Q(    pod '#{module_name}', :git => '#{source.base}', :tag => '#{source.addition}')
-        elsif GitType::COMMIT == source.type
-          module_config = %Q(    pod '#{module_name}', :git => '#{source.base}', :commit => '#{source.addition}')
-        else
-          module_config = %Q(    pod '#{module_name}', :git => '#{source.base}')
-        end
-      else
-        module_config = %Q(    pod '#{module_name}', '#{source}')
-      end
-      module_config
-    end
-
     def generate_pod_config(pod_name, version,comment)
       module_config = ''
       if comment != nil
@@ -84,9 +26,9 @@ module BigKeeper
       end
     end
 
-    def replace_all_module_release(podfile, module_names, version)
+    def replace_all_module_release(path, module_names, version)
       module_names.each do |module_name|
-        PodfileOperator.new.find_and_replace(podfile,
+        DepService.dep_operator(path).find_and_replace(
                                              module_name,
                                              ModuleType::GIT,
                                              GitInfo.new(BigkeeperParser.module_git(module_name), GitType::TAG, version))
@@ -161,6 +103,6 @@ module BigKeeper
       end
     end
 
-    private :generate_module_config,:generate_pod_config
+    private :generate_pod_config
   end
 end

data/lib/big_keeper/util/xcode_operator.rb

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

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -226,6 +226,7 @@ files:
 - lib/big_keeper.rb
 - lib/big_keeper/command/feature&hotfix/delete.rb
 - lib/big_keeper/command/feature&hotfix/finish.rb
+- lib/big_keeper/command/feature&hotfix/publish.rb
 - lib/big_keeper/command/feature&hotfix/pull.rb
 - lib/big_keeper/command/feature&hotfix/push.rb
 - lib/big_keeper/command/feature&hotfix/rebase.rb
@@ -235,14 +236,20 @@ files:
 - lib/big_keeper/command/pod/podfile.rb
 - lib/big_keeper/command/release/home.rb
 - lib/big_keeper/command/release/module.rb
+- lib/big_keeper/dependency/dep_gradle_operator.rb
+- lib/big_keeper/dependency/dep_operator.rb
+- lib/big_keeper/dependency/dep_pod_operator.rb
+- lib/big_keeper/dependency/dep_service.rb
+- lib/big_keeper/dependency/dep_type.rb
 - lib/big_keeper/model/gitflow_type.rb
 - lib/big_keeper/model/operate_type.rb
 - lib/big_keeper/model/podfile_model.rb
-- lib/big_keeper/model/podfile_type.rb
 - lib/big_keeper/service/git_service.rb
 - lib/big_keeper/service/module_service.rb
 - lib/big_keeper/service/stash_service.rb
 - lib/big_keeper/util/bigkeeper_parser.rb
+- lib/big_keeper/util/cache_operator.rb
+- lib/big_keeper/util/file_operator.rb
 - lib/big_keeper/util/git_operator.rb
 - lib/big_keeper/util/gitflow_operator.rb
 - lib/big_keeper/util/info_plist_operator.rb

data/lib/big_keeper/model/podfile_type.rb

@@ -1,44 +0,0 @@
-module BigKeeper
-  module ModuleType
-    PATH = 1
-    GIT = 2
-    SPEC = 3
-
-    def self.regex(type)
-      if PATH == type
-        "\s*:path\s*=>\s*"
-      elsif GIT == type
-        "\s*:git\s*=>\s*"
-      elsif SPEC == type
-        "\s*'"
-      else
-        name
-      end
-    end
-  end
-
-  module GitType
-    MASTER = 1
-    BRANCH = 2
-    TAG = 3
-    COMMIT = 4
-  end
-
-  class GitInfo
-    def initialize(base, type, addition)
-      @base, @type, @addition = base, type, addition
-    end
-
-    def type
-      @type
-    end
-
-    def base
-      @base
-    end
-
-    def addition
-      @addition
-    end
-  end
-end