bigkeeper 0.7.6 → 0.7.7

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

@@ -0,0 +1,140 @@
+require 'big_keeper/command/feature&hotfix/start'
+require 'big_keeper/command/feature&hotfix/finish'
+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/feature&hotfix/delete'
+
+module BigKeeper
+  def self.feature_and_hotfix_command(type)
+    desc "Gitflow #{GitflowType.name(type)} operations"
+    command GitflowType.command(type) do |c|
+      c.desc "Start a new #{GitflowType.name(type)} with name for given modules and main project"
+      c.command :start do |start|
+        start.action do |global_options, options, args|
+          path = File.expand_path(global_options[:path])
+          version = global_options[:ver]
+          user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+
+          help_now!('user name is required') if user and user.empty?
+          help_now!("#{GitflowType.name(type)} name is required") if args.length < 1
+          name = args[0]
+          modules = args[(1...args.length)] if args.length > 1
+          start(path, version, user, name, modules, type)
+        end
+      end
+
+      c.desc "Update modules for the #{GitflowType.name(type)} with name"
+      c.command :update do |update|
+        update.action do |global_options, options, args|
+          path = File.expand_path(global_options[:path])
+          user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+
+          help_now!('user name is required') if user and user.empty?
+          modules = args[(0...args.length)] if args.length > 0
+          update(path, user, modules, type)
+        end
+      end
+
+      c.desc "Switch to the #{GitflowType.name(type)} with name"
+      c.command :switch do |switch|
+        switch.action do |global_options, options, args|
+          path = File.expand_path(global_options[:path])
+          version = global_options[:ver]
+          user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+
+          help_now!('user name is required') if user and user.empty?
+          help_now!("#{GitflowType.name(type)} name is required") if args.length < 1
+          name = args[0]
+          switch_to(path, version, user, name, type)
+        end
+      end
+
+      c.desc "Pull remote changes for current #{GitflowType.name(type)}"
+      c.command :pull do |pull|
+        pull.action do |global_options, options, args|
+          path = File.expand_path(global_options[:path])
+          user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+
+          help_now!('user name is required') if user and user.empty?
+          pull(path, user, type)
+        end
+      end
+
+      c.desc "Push local changes to remote for current #{GitflowType.name(type)}"
+      c.command :push do |push|
+        push.action do |global_options, options, args|
+          path = File.expand_path(global_options[:path])
+          user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+
+          help_now!('user name is required') if user and user.empty?
+          help_now!('comment message is required') if args.length < 1
+          help_now!(%Q(comment message should be wrappered with '' or "")) if args.length > 1
+          comment = args[0]
+          push(path, user, comment, type)
+        end
+      end
+
+      c.desc "Rebase '#{GitflowType.base_branch(type)}' to current #{GitflowType.name(type)}"
+      c.command :rebase do |rebase|
+        rebase.action do |global_options, options, args|
+          path = File.expand_path(global_options[:path])
+          user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+
+          help_now!('user name is required') if user and user.empty?
+          rebase(path, user, type)
+        end
+      end
+
+      c.desc "Finish current #{GitflowType.name(type)}"
+      c.command :finish do |finish|
+        finish.action do |global_options, options, args|
+          path = File.expand_path(global_options[:path])
+          user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+
+          help_now!('user name is required') if user and user.empty?
+          finish(path, user, type)
+        end
+      end
+
+      c.desc "Publish current #{GitflowType.name(type)}"
+      c.command :publish do |publish|
+        publish.action do |global_options, options, args|
+          path = File.expand_path(global_options[:path])
+          user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+
+          help_now!('user name is required') if user and user.empty?
+          publish(path, user, type)
+        end
+      end
+
+      c.desc "Delete #{GitflowType.name(type)} with name"
+      c.command :delete do |delete|
+        delete.action do |global_options, options, args|
+          path = File.expand_path(global_options[:path])
+          user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+
+          help_now!('user name is required') if user and user.empty?
+          help_now!("#{GitflowType.name(type)} name is required") if args.length < 1
+          name = args[0]
+          delete(path, user, name, type)
+        end
+      end
+
+      c.desc "List all the #{GitflowType.name(type)}s"
+      c.command :list do |list|
+        list.action do |global_options, options, args|
+          path = File.expand_path(global_options[:path])
+
+          branchs = GitService.new.branchs_with_type(File.expand_path(path), type)
+          branchs.each do |branch|
+            p branch
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,6 +4,7 @@ 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/cache_operator'
 require 'big_keeper/util/bigkeeper_parser'
 
 require 'big_keeper/dependency/dep_service'
@@ -21,8 +22,10 @@ module BigKeeper
       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)
+      ModuleCacheOperator.new(path).cache_path_modules([])
+      ModuleCacheOperator.new(path).cache_git_modules(modules)
+
+      modules = ModuleCacheOperator.new(path).current_path_modules
 
       # Rebase modules and modify podfile as git
       modules.each do |module_name|
@@ -32,10 +35,10 @@ module BigKeeper
       Logger.highlight("Finish branch '#{branch_name}' for 'Home'")
 
       # pod install
-      DepService.dep_operator(path).install(false)
+      DepService.dep_operator(path, user).install(false)
 
       # Open home workspace
-      DepService.dep_operator(path).open
+      DepService.dep_operator(path, user).open
 
       # Push home changes to remote
       GitService.new.verify_push(path, "finish branch #{branch_name}", branch_name, 'Home')

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

@@ -4,6 +4,7 @@ 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/cache_operator'
 require 'big_keeper/util/bigkeeper_parser'
 
 require 'big_keeper/dependency/dep_service'
@@ -21,12 +22,12 @@ module 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)
+      path_modules = ModuleCacheOperator.new(path).current_path_modules
       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)
+      ModuleCacheOperator.new(path).cache_git_modules([])
+
+      modules = ModuleCacheOperator.new(path).current_git_modules
 
       # Rebase modules and modify podfile as git
       modules.each do |module_name|
@@ -36,10 +37,10 @@ module BigKeeper
       Logger.highlight("Publish branch '#{branch_name}' for 'Home'")
 
       # pod install
-      DepService.dep_operator(path).install(false, user)
+      DepService.dep_operator(path, user).install(false)
 
       # Recover podfile
-      DepService.dep_operator(path).recover
+      DepService.dep_operator(path, user).recover
 
       # Push home changes to remote
       GitService.new.verify_push(path, "publish branch #{branch_name}", branch_name, 'Home')

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

@@ -1,4 +1,5 @@
 require 'big_keeper/util/logger'
+require 'big_keeper/util/cache_operator'
 
 require 'big_keeper/dependency/dep_service'
 
@@ -11,8 +12,7 @@ module BigKeeper
 
       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)
+      modules = ModuleCacheOperator.new(path).current_path_modules
 
       modules.each do |module_name|
         ModuleService.new.pull(path, user, module_name, branch_name, type)

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

@@ -1,4 +1,5 @@
 require 'big_keeper/util/logger'
+require 'big_keeper/util/cache_operator'
 
 require 'big_keeper/dependency/dep_service'
 
@@ -12,8 +13,7 @@ module BigKeeper
 
       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)
+      modules = ModuleCacheOperator.new(path).current_path_modules
 
       modules.each do |module_name|
         ModuleService.new.push(path, user, module_name, branch_name, type, comment)

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

@@ -1,4 +1,5 @@
 require 'big_keeper/util/logger'
+require 'big_keeper/util/cache_operator'
 
 require 'big_keeper/dependency/dep_service'
 
@@ -11,8 +12,7 @@ module BigKeeper
 
       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)
+      modules = ModuleCacheOperator.new(path).current_path_modules
 
       modules.each do |module_name|
         ModuleService.new.rebase(path, user, module_name, branch_name, type)

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

@@ -6,6 +6,7 @@ require 'big_keeper/util/bigkeeper_parser'
 require 'big_keeper/util/logger'
 require 'big_keeper/util/pod_operator'
 require 'big_keeper/util/xcode_operator'
+require 'big_keeper/util/cache_operator'
 
 require 'big_keeper/dependency/dep_service'
 
@@ -27,10 +28,8 @@ module BigKeeper
 
       GitService.new.verify_home_branch(path, branch_name, OperateType::START)
 
-      stash_modules = DepService.dep_operator(path).modules_with_type(
-                                BigkeeperParser.module_names, ModuleType::PATH)
+      stash_modules = ModuleCacheOperator.new(path).current_path_modules
 
-      p stash_modules
       # Stash current branch
       StashService.new.stash_all(path, branch_name, user, stash_modules)
 
@@ -51,8 +50,10 @@ module BigKeeper
       # Start home feature
       GitService.new.start(path, full_name, type)
 
+      ModuleCacheOperator.new(path).cache_path_modules(modules)
+
       # Backup podfile
-      DepService.dep_operator(path).backup
+      DepService.dep_operator(path, user).backup
 
       # Modify podfile as path and Start modules feature
       modules.each do |module_name|
@@ -60,16 +61,25 @@ module BigKeeper
       end
 
       # pod install
-      DepService.dep_operator(path).install(true, user)
+      DepService.dep_operator(path, user).install(true)
 
       # Open home workspace
-      DepService.dep_operator(path).open
+      DepService.dep_operator(path, user).open
 
       # Push home changes to remote
       GitService.new.verify_push(path,
         "init #{GitflowType.name(type)} #{full_name}",
         branch_name,
         'Home')
+
+      modules.each do |module_name|
+        module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
+        # Push home changes to remote
+        GitService.new.verify_push(module_full_path,
+          "init #{GitflowType.name(type)} #{full_name}",
+          branch_name,
+          module_name)
+      end
     ensure
     end
   end

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

@@ -18,8 +18,7 @@ module BigKeeper
 
       GitService.new.verify_home_branch(path, branch_name, OperateType::SWITCH)
 
-      stash_modules = DepService.dep_operator(path).modules_with_type(
-                                BigkeeperParser.module_names, ModuleType::PATH)
+      stash_modules = ModuleCacheOperator.new(path).current_path_modules
 
       # Stash current branch
       StashService.new.stash_all(path, branch_name, user, stash_modules)
@@ -31,18 +30,17 @@ module BigKeeper
       # Apply home stash
       StashService.new.pop_stash(path, branch_name, 'Home')
 
-      modules = DepService.dep_operator(path).modules_with_type(
-                                BigkeeperParser.module_names, ModuleType::PATH)
+      modules = ModuleCacheOperator.new(path).current_path_modules
 
       modules.each do |module_name|
         ModuleService.new.switch_to(path, user, module_name, branch_name, type)
       end
 
       # pod install
-      DepService.dep_operator(path).install(false, user)
+      DepService.dep_operator(path, user).install(false)
 
       # Open home workspace
-      DepService.dep_operator(path).open
+      DepService.dep_operator(path, user).open
     ensure
     end
   end

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

@@ -6,6 +6,7 @@ require 'big_keeper/util/bigkeeper_parser'
 require 'big_keeper/util/logger'
 require 'big_keeper/util/pod_operator'
 require 'big_keeper/util/xcode_operator'
+require 'big_keeper/util/cache_operator'
 
 require 'big_keeper/dependency/dep_service'
 
@@ -26,8 +27,7 @@ module BigKeeper
 
       full_name = branch_name.gsub(/#{GitflowType.name(type)}\//, '')
 
-      current_modules = DepService.dep_operator(path).modules_with_type(
-                                BigkeeperParser.module_names, ModuleType::PATH)
+      current_modules = ModuleCacheOperator.new(path).current_path_modules
 
       # Verify input modules
       modules = [] unless modules
@@ -47,6 +47,8 @@ module BigKeeper
       add_modules = modules - current_modules
       del_modules = current_modules - modules
 
+      ModuleCacheOperator.new(path).cache_path_modules(modules)
+
       if add_modules.empty? and del_modules.empty?
         Logger.default("There is nothing changed with modules #{modules}.")
       else
@@ -60,10 +62,10 @@ module BigKeeper
         end
 
         # pod install
-        DepService.dep_operator(path).install(false, user)
+        DepService.dep_operator(path, user).install(false)
 
         # Open home workspace
-        DepService.dep_operator(path).open
+        DepService.dep_operator(path, user).open
       end
     ensure
     end

data/lib/big_keeper/command/pod.rb

@@ -0,0 +1,36 @@
+require 'big_keeper/command/pod/podfile'
+
+module BigKeeper
+
+  def self.pod_command
+    desc 'Podfile operation'
+    command :podfile do |podfile|
+      podfile.flag %i[pod podfile]
+      podfile.desc 'Podfile'
+
+      podfile.desc 'Detect podname should be locked.'
+      podfile.command :detect do |detect|
+        detect.action do |global_options,options,args|
+          path = File.expand_path(global_options[:path])
+          podfile_detect(path)
+        end
+      end
+
+      podfile.desc 'Lock podname should be locked.'
+      podfile.command :lock do |lock|
+        lock.action do |global_options, options, args|
+          path = File.expand_path(global_options[:path])
+          podfile_lock(path)
+        end
+      end
+
+      podfile.desc 'Update modules should be upgrade.'
+      podfile.command :update do |lock|
+        lock.action do |global_options, options, args|
+          path = File.expand_path(global_options[:path])
+          podfile_modules_update(path)
+        end
+      end
+    end
+  end
+end

data/lib/big_keeper/command/release.rb

@@ -0,0 +1,68 @@
+require 'big_keeper/command/release/home'
+require 'big_keeper/command/release/module'
+
+module BigKeeper
+  def self.release_command
+    desc 'Gitflow release operations'
+    command :release do |c|
+
+      c.desc 'Release home project operations'
+      c.command :home do |home|
+        home.desc 'Start release home project'
+        home.command :start do |start|
+          start.action do |global_options, options, args|
+            path = File.expand_path(global_options[:path])
+            version = global_options[:ver]
+            user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+
+            help_now!('user name is required') if user and user.empty?
+            raise Logger.error("release version is required") if version == nil
+            release_home_start(path, version, user)
+          end
+        end
+
+        home.desc 'Finish release home project'
+        home.command :finish do |finish|
+          finish.action do |global_options, options, args|
+            path = File.expand_path(global_options[:path])
+            version = global_options[:ver]
+
+            raise Logger.error("release version is required") if version == nil
+            release_home_finish(path, version)
+          end
+        end
+      end
+
+      c.desc 'release module'
+      c.command :module do |m|
+        m.desc 'Start release module project'
+        m.command :start do |start|
+          start.action do |global_options, options, args|
+            path = File.expand_path(global_options[:path])
+            version = global_options[:ver]
+            user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+
+            help_now!('module name is required') if args.length != 1
+            raise Logger.error("release version is required") if version == nil
+            module_name = args[0]
+            release_module_start(path, version, user, module_name)
+          end
+        end
+
+        m.desc 'finish release module project'
+        m.command :finish do |finish|
+          finish.action do |global_options, options, args|
+            path = File.expand_path(global_options[:path])
+            version = global_options[:ver]
+            user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+
+            help_now!('module name is required') if args.length != 1
+            raise Logger.error("release version is required") if version == nil
+            module_name = args[0]
+            release_module_finish(path, version, user, module_name)
+          end
+        end
+      end
+    end
+  end
+end