bigkeeper 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2455c224a1bb937f05c9a99a1a0deaad0650e08
-  data.tar.gz: 7432572e163736ebee2275bce07d97f0c5952bcf
+  metadata.gz: b0865993502adc9ea5a674ce5201cc9d28cad25b
+  data.tar.gz: 98224dd734ab65172620028b5a6138fa0a73d872
 SHA512:
-  metadata.gz: f5f8c0aa2f96982f35358911c2b5ade8eb2d1d2b4ab4b3f66ca63e0e3b85815d75af40efc2a963a8e8e7527f2e5f1996cf82c95c174cdde477340c4e85ece4f4
-  data.tar.gz: f011e953b604e0311c46d7f9eef03c263aadf5e0d6da515605b1c8f9c7b16b96e962e704412a5c5b10aa1ca2243e72ac73e8238eca49ed7f28d63c6bc0a9e2c4
+  metadata.gz: eb028888e708fd0156d0d1a4c03d6d107ac5f1c64b4138ecd8922e78a3048051d6f87dcf87a46b66ac0a5fb68f404463a9a13737ff9a6f4aed82a4109874d2ef
+  data.tar.gz: fcecfc0731700f362578423571b472fa1b277421df0653e88f79ac457b06462f7618315e4597f373754c690c7b1765ca7f2a07d4d159a082a1d233a1ecfb0e9e

data/Gemfile.lock

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

data/lib/big_keeper.rb

@@ -11,6 +11,7 @@ require 'big_keeper/model/gitflow_type'
 require 'big_keeper/command/feature&hotfix'
 require 'big_keeper/command/release'
 require 'big_keeper/command/pod'
+require 'big_keeper/command/module'
 
 require 'big_keeper/service/git_service'
 
@@ -44,6 +45,8 @@ module BigKeeper
 
   pod_command
 
+  module_command
+
   desc 'Show version of bigkeeper'
   command :version do |version|
     version.action do |global_options, options, args|

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

@@ -22,7 +22,7 @@ module BigKeeper
       file = File.new(json_path, 'w')
       begin
         #get all modules info
-        module_list_dic = get_module_info(path, user, type, version, branches)
+        module_list_dic = get_module_info(path, user, type, version, branches, is_print_log)
         file << module_list_dic.to_json
         file.close
       end
@@ -33,7 +33,7 @@ module BigKeeper
     end
   end
 
-  def self.get_module_info(path, user, type, version, home_branches)
+  def self.get_module_info(path, user, type, version, home_branches, is_print_log)
     #get module list
     modules = BigkeeperParser.module_names
     git_operator = GitOperator.new

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

@@ -7,13 +7,12 @@ require 'big_keeper/util/xcode_operator'
 require 'big_keeper/dependency/dep_service'
 
 module BigKeeper
-  def self.switch_to(path, version, user, name, type)
+  def self.switch_to(path, version, user, full_name, type)
     begin
       # Parse Bigkeeper file
       BigkeeperParser.parse("#{path}/Bigkeeper")
 
       version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
-      full_name = "#{version}_#{user}_#{name}"
       branch_name = "#{GitflowType.name(type)}/#{full_name}"
 
       GitService.new.verify_home_branch(path, branch_name, OperateType::SWITCH)

data/lib/big_keeper/command/module.rb

@@ -0,0 +1,23 @@
+require 'big_keeper/command/module/list'
+
+module BigKeeper
+
+  def self.module_command
+
+    desc 'Module operation'
+    command :module do | mod |
+
+      mod.desc 'module'
+      mod.desc 'Prase module relevant infomation.'
+      mod.command :list do | list |
+        list.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
+
+          module_list(path, user, options)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+require 'logger'
+require 'json'
+
+module BigKeeper
+  def self.module_list(path, user, options)
+      BigkeeperParser.parse("#{path}/Bigkeeper")
+      module_dic = BigkeeperParser.parse_modules
+      module_list = Array.new
+      module_dic.keys.each do | key |
+        dic = Hash["module_name" => key,
+                           "git" => module_dic[key][:git],
+                         "pulls" => module_dic[key][:pulls]]
+        module_list << dic
+      end
+      json = JSON.pretty_generate(module_list)
+      Logger.default(json)
+  end
+end

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

@@ -10,13 +10,15 @@ module BigKeeper
   def self.release_home_start(path, version, user)
     BigkeeperParser.parse("#{path}/Bigkeeper")
 
+    version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
     modules = BigkeeperParser.module_names
 
+    CacheOperator.new(path).save('Podfile')
+
     #stash
     StashService.new.stash_all(path, GitOperator.new.current_branch(path), user, modules)
 
     # check
-    GitOperator.new.check_merge(path, "feature/#{version}")
     GitOperator.new.check_diff(path, "develop", "master")
 
     #checkout release branch
@@ -45,22 +47,41 @@ module BigKeeper
   end
 
   def self.release_home_finish(path, version)
+    BigkeeperParser.parse("#{path}/Bigkeeper")
+    version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
+    Logger.highlight("Start finish release home for #{version}")
     if GitOperator.new.has_branch(path, "release/#{version}")
-      if GitOperator.new.current_branch(path) == "release/#{version}"
-        GitOperator.new.commit(path, "release: V #{version}")
-        GitOperator.new.push_to_remote(path, "release/#{version}")
-        GitflowOperator.new.finish_release(path, version)
-        if GitOperator.new.current_branch(path) == "master"
-          GitOperator.new.tag(path, version)
-        else
-          GitOperator.new.checkout(path, "master")
-          GitOperator.new.tag(path, version)
-        end
-      else
-        raise Logger.error("Not in release branch, please check your branches.")
+      if GitOperator.new.current_branch(path) != "release/#{version}"
+        GitOperator.new.checkout(path, "release/#{version}")
       end
+
+      GitOperator.new.commit(path, "release: V #{version}")
+      GitOperator.new.push_to_remote(path, "release/#{version}")
+
+      # master
+      GitOperator.new.checkout(path, "master")
+      GitOperator.new.merge(path, "release/#{version}")
+      GitOperator.new.push_to_remote(path, "master")
+      if GitOperator.new.current_branch(path) != "master"
+        GitOperator.new.checkout(path, "master")
+      end
+      GitOperator.new.tag(path, version)
+
+      # develop
+      GitOperator.new.checkout(path, "release/#{version}")
+      CacheOperator.new(path).load('Podfile')
+      CacheOperator.new(path).clean()
+      GitOperator.new.commit(path, "reset #{verbose} Podfile")
+      GitOperator.new.push_to_remote(path, "release/#{version}")
+
+      GitOperator.new.checkout(path, "develop")
+      GitOperator.new.merge(path, "release/#{version}")
+      GitOperator.new.push_to_remote(path, "develop")
+      GitOperator.new.check_diff(path, "develop", "master")
+
+      Logger.highlight("Finish release home for #{version}")
     else
-      raise Logger.error("Not has release branch, please use release start first.")
+      raise Logger.error("Dont have release/#{version} branch, please use release home start first.")
     end
   end
 

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

@@ -36,6 +36,12 @@ module BigKeeper
 
     # check commit
     Logger.error("current branch has unpush files") if GitOperator.new.has_changes(module_path)
+
+    #修改 podspec 文件
+    # TO DO: - advanced to use Regular Expression
+    has_change = PodfileOperator.new.podspec_change(%Q(#{module_path}/#{module_name}.podspec), version, module_name)
+    GitService.new.verify_push(module_path, "Change version number", "develop", "#{module_name}") if has_change == true
+
     # check out master
     Logger.highlight("'#{module_name}' checkout branch to master...")
     GitService.new.verify_checkout_pull(module_path, "master")
@@ -43,13 +49,9 @@ module BigKeeper
     Logger.highlight(%Q(Merge develop to master))
     # merge develop to master
     GitOperator.new.merge(module_path, "develop")
-    GitOperator.new.push_to_remote(module_path, "master")
+    # GitOperator.new.push_to_remote(module_path, "master")
 
-    #修改 podspec 文件
-    # TO DO: - advanced to use Regular Expression
-    has_change = PodfileOperator.new.podspec_change(%Q(#{module_path}/#{module_name}.podspec), version, module_name)
-    GitService.new.verify_push(module_path, "Change version number", "master", "#{module_name}") if has_change == true
-    GitOperator.new.tag(module_path, version)
+    # GitOperator.new.tag(module_path, version)
     # pod repo push
     if spec == true
       PodOperator.pod_repo_push(module_path, module_name, BigkeeperParser.source_spec_path(module_name), version)

data/lib/big_keeper/util/git_operator.rb

@@ -184,8 +184,9 @@ module BigKeeper
         compare_branch_commits.map { |item|
             Logger.default(item)
         }
-        Logger.error("#{compare_branch} branch has commit dont committed in #{branch}, please check")
-        return
+        Logger.error("#{compare_branch} branch has commit doesn't committed in #{branch}, please check")
+      else
+        Logger.highlight("#{compare_branch} branch doesn't has commit before #{branch}")
       end
     end
 

data/lib/big_keeper/util/list_generator.rb

@@ -39,7 +39,26 @@ module BigKeeper
               end
             end
           end
-          branch_dic["home_branche_name"] = home_branch_name
+
+          branch_dic["is_remote"] = false
+          if home_branch_name =~ /^remotes\//
+            home_branch_name = $~.post_match
+            branch_dic["is_remote"] = true
+          end
+
+          if home_branch_name =~ /^origin\//
+            home_branch_name = $~.post_match
+          end
+
+          if home_branch_name =~ /^feature\//
+            home_branch_name = $~.post_match
+          end
+
+          if home_branch_name =~ /^hotfix\//
+            home_branch_name = $~.post_match
+          end
+
+          branch_dic["home_branch_name"] = home_branch_name
           branch_dic["involve_modules"] = involve_modules
           json_array << branch_dic
       end

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -235,6 +235,8 @@ files:
 - lib/big_keeper/command/feature&hotfix/start.rb
 - lib/big_keeper/command/feature&hotfix/switch.rb
 - lib/big_keeper/command/feature&hotfix/update.rb
+- lib/big_keeper/command/module.rb
+- lib/big_keeper/command/module/list.rb
 - lib/big_keeper/command/pod.rb
 - lib/big_keeper/command/pod/podfile.rb
 - lib/big_keeper/command/release.rb