bigkeeper 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 212d55ed7b40a20cb064b7e44aec4d64f626f544cf58317a5e7282fdc6997c21
-  data.tar.gz: a70529b65ad54fab0c0095e72cfc4b99cfae34523ccf47dce639a704d5c12046
+SHA1:
+  metadata.gz: cf22bc9b9d70faf0f43bd27e47961d18dad8355a
+  data.tar.gz: 173dbc4a58a0a68bb6acd7347356e7c3ecac30a1
 SHA512:
-  metadata.gz: e3e6bd0cfe8f8addaa70d46481ee4e29ebae75f39e4fc7986d18ee566f2f7a1db5f1fd3d1599d6df9a3ed6512e9ba54cc8fb84ea5245fbf4ad5e5c7e68b8237b
-  data.tar.gz: 981001593e44d3bbf4e1e787c389c85f54816b9ae6e88ffaa433a84a37a73612a8234d64fcf0cf0ccad9d9a37b010827f666fb02f7ebc7bb0493463af25cfb67
+  metadata.gz: 1190f2647d435bd6e079d0b7b24ff9a97136f2f96dd93e690d513b6de7273c8602c2331a9370c9d11585a1ca8bd831414541ca52c78cc7962aea1fe5df732f94
+  data.tar.gz: 4ec0c705ac99fe65082ca443eda32beb12d7d704c1d272323e0af8b4a45a691f61d52ac6ad22e26778cb253fefd89f0fd433c6beb89d29b565d113b9d063dc43

data/bin/big

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
+# require "bundler/setup"
 require "big_keeper"
 
 # You can add fixtures and/or initialization code here to make experimenting

data/lib/big_keeper/command/release.rb

@@ -1,12 +1,37 @@
 require 'big_keeper/command/release/home'
 require 'big_keeper/command/release/module'
 require 'big_keeper/util/leancloud_logger'
+require 'big_keeper/command/release/start'
+require 'big_keeper/command/release/finish'
+require 'big_keeper/util/command_line_util'
 
 module BigKeeper
   def self.release_command
     desc 'Gitflow release operations'
     command :release do |c|
 
+      c.desc 'release project start'
+      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
+          modules = args[(0...args.length)] if args.length > 0
+          release_start(path, version, user, modules)
+        end
+      end
+
+      c.desc 'release project finish'
+      c.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
+          modules = args[(0...args.length)] if args.length > 0
+          release_finish(path, version, user, modules)
+        end
+      end
+
       c.desc 'Release home project operations'
       c.command :home do |home|
         home.desc 'Start release home project'

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

@@ -0,0 +1,36 @@
+module BigKeeper
+  def self.release_finish(path, version, user, modules)
+    BigkeeperParser.parse("#{path}/Bigkeeper")
+    version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
+    modules = release_check_changed_modules(path, user) if (modules.nil? || modules.empty?)
+
+    if modules.nil? || modules.empty?
+      Logger.error('no module need to release')
+    end
+    if !CommandLineUtil.double_check("module #{modules} will changed version to #{version}, are you sure?")
+      Logger.error('release finish interrupt')
+    end
+    #stash home
+    StashService.new.stash(path, GitOperator.new.current_branch(path), 'home')
+    # delete cache
+    CacheOperator.new(path).clean()
+    # checkout develop
+    GitService.new.verify_checkout_pull(path, 'develop')
+
+    modules.each do |module_name|
+      Logger.highlight("release start module #{module_name}")
+      ModuleService.new.release_finish(path, user, modules, module_name, version)
+    end
+
+    #release home
+    DepService.dep_operator(path, user).release_home_finish(modules, version)
+
+    # Push home changes to remote
+    Logger.highlight("Push branch 'develop' for 'Home'...")
+    GitService.new.verify_push(
+      path,
+      "release finish for #{version}",
+      'develop',
+      'Home')
+  end
+end

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

@@ -0,0 +1,4 @@
+module BigKeeper
+  def self.publish(path, version, user)
+  end
+end

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

@@ -0,0 +1,78 @@
+module BigKeeper
+  def self.release_start(path, version, user, modules)
+    BigkeeperParser.parse("#{path}/Bigkeeper")
+    version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
+    modules = release_check_changed_modules(path, user) if (modules.nil? || modules.empty?)
+
+    if modules.nil? || modules.empty?
+      Logger.error('no module need to release')
+    end
+
+    if !CommandLineUtil.double_check("module #{modules} will changed version to #{version}-SNAPSHOT, are you sure?")
+      Logger.error('release start interrupt')
+    end
+
+    #stash home
+    StashService.new.stash(path, GitOperator.new.current_branch(path), 'home')
+    # delete cache
+    CacheOperator.new(path).clean()
+    # checkout develop
+    GitService.new.verify_checkout_pull(path, 'develop')
+
+    modules.each do |module_name|
+      Logger.highlight("release start module #{module_name}")
+      ModuleService.new.release_start(path, user, modules, module_name, version)
+    end
+
+    #release home
+    DepService.dep_operator(path, user).release_home_start(modules, version)
+
+    # Push home changes to remote
+    Logger.highlight("Push branch 'develop' for 'Home'...")
+    GitService.new.verify_push(
+      path,
+      "release start for #{version}",
+      'develop',
+      'Home')
+  end
+
+  def self.release_finish(path, version, user, modules)
+    BigkeeperParser.parse("#{path}/Bigkeeper")
+    version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
+
+    #stash home
+    StashService.new.stash(path, GitOperator.new.current_branch(path), 'home')
+    # delete cache
+    CacheOperator.new(path).clean()
+    # checkout develop
+    GitService.new.verify_checkout_pull(path, 'develop')
+
+    modules.each do |module_name|
+      Logger.highlight("release start module #{module_name}")
+      ModuleService.new.release_finish(path, user, modules, module_name, version)
+    end
+
+    #release home
+    DepService.dep_operator(path, user).release_home_finish(modules, version)
+
+    # Push home changes to remote
+    Logger.highlight("Push branch 'develop' for 'Home'...")
+    GitService.new.verify_push(
+      path,
+      "release finish for #{version}",
+      'develop',
+      'Home')
+  end
+
+  def self.release_check_changed_modules(path, user)
+    changed_modules = []
+    BigkeeperParser.parse("#{path}/Bigkeeper")
+    allModules = BigkeeperParser.module_names
+    allModules.each do |module_name|
+      if ModuleService.new.release_check_changed(path, user, module_name)
+        changed_modules << module_name
+      end
+    end
+    changed_modules
+  end
+end

data/lib/big_keeper/dependency/dep_gradle_operator.rb

@@ -2,6 +2,7 @@ require 'big_keeper/dependency/dep_operator'
 require 'big_keeper/util/gradle_module_operator'
 require 'big_keeper/util/gradle_file_operator'
 require 'big_keeper/model/operate_type'
+require 'big_keeper/util/version_config_operator'
 
 module BigKeeper
   # Operator for podfile
@@ -43,6 +44,30 @@ module BigKeeper
       end
     end
 
+    def release_module_start(modules, module_name, version)
+        module_full_path = BigkeeperParser.module_full_path(@path, @user, module_name)
+        version_config_file = "#{module_full_path}/doc/config/version-config.gradle"
+        version = "#{version}-SNAPSHOT" unless version.include?'SNAPSHOT'
+        VersionConfigOperator.change_version(version_config_file, modules, version)
+    end
+
+    def release_module_finish(modules, module_name, version)
+        module_full_path = BigkeeperParser.module_full_path(@path, @user, module_name)
+        version_config_file = "#{module_full_path}/doc/config/version-config.gradle"
+        VersionConfigOperator.change_version(version_config_file, modules, version)
+    end
+
+    def release_home_start(modules, version)
+      version_config_file = "#{@path}/doc/config/version-config.gradle"
+      version = "#{version}-SNAPSHOT" unless version.include?'SNAPSHOT'
+      VersionConfigOperator.change_version(version_config_file, modules, version)
+    end
+
+    def release_home_finish(modules, version)
+      version_config_file = "#{@path}/doc/config/version-config.gradle"
+      VersionConfigOperator.change_version(version_config_file, modules, version)
+    end
+
     def open
     end
   end

data/lib/big_keeper/dependency/dep_operator.rb

@@ -21,6 +21,22 @@ module BigKeeper
       raise "You should override this method in subclass."
     end
 
+    def release_module_start(modules, module_name, version)
+      raise "You should override this method in subclass."
+    end
+
+    def release_module_finish(modules, module_name, version)
+      raise "You should override this method in subclass."
+    end
+
+    def release_home_start(modules, version)
+      raise "You should override this method in subclass."
+    end
+
+    def release_home_finish(modules, version)
+      raise "You should override this method in subclass."
+    end
+
     def install(modules, type, should_update)
       raise "You should override this method in subclass."
     end

data/lib/big_keeper/service/module_service.rb

@@ -154,6 +154,71 @@ module BigKeeper
       result_dic
     end
 
+    def release_check_changed(path, user, module_name)
+      module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
+
+      git = GitOperator.new
+      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.clone(File.expand_path("#{module_full_path}/../"), module_git)
+      end
+      GitService.new.verify_checkout_pull(module_full_path, 'develop')
+      git.check_remote_branch_diff(module_full_path, 'develop', 'master')
+    end
+
+    def release_start(path, user, modules, module_name, version)
+      module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
+
+      git = GitOperator.new
+      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.clone(File.expand_path("#{module_full_path}/../"), module_git)
+      end
+      #stash module
+      StashService.new.stash(module_full_path, GitOperator.new.current_branch(module_full_path), module_name)
+      # delete cache
+      CacheOperator.new(module_full_path).clean()
+      # checkout develop
+      GitService.new.verify_checkout_pull(module_full_path, 'develop')
+      DepService.dep_operator(path, user).release_module_start(modules, module_name, version)
+
+      # Push home changes to remote
+      Logger.highlight("Push branch 'develop' for #{module_name}...")
+      GitService.new.verify_push(
+        module_full_path,
+        "release start for #{version}",
+        'develop',
+        "#{module_name}")
+    end
+
+    def release_finish(path, user, modules, module_name, version)
+      module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
+
+      git = GitOperator.new
+      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.clone(File.expand_path("#{module_full_path}/../"), module_git)
+      end
+      #stash module
+      StashService.new.stash(module_full_path, GitOperator.new.current_branch(module_full_path), module_name)
+      # delete cache
+      CacheOperator.new(module_full_path).clean()
+      # checkout develop
+      GitService.new.verify_checkout_pull(module_full_path, 'develop')
+      DepService.dep_operator(path, user).release_module_finish(modules, module_name, version)
+
+      # Push home changes to remote
+      Logger.highlight("Push branch 'develop' for #{module_name}...")
+      GitService.new.verify_push(
+        module_full_path,
+        "release finish for #{version}",
+        'develop',
+        "#{module_name}")
+    end
+
     private :verify_module
   end
 end

data/lib/big_keeper/util/bigkeeper_parser.rb

@@ -231,6 +231,10 @@ module BigKeeper
       @@config[:modules][module_name][:maven_artifact]
     end
 
+    def self.module_version_alias(module_name)
+      @@config[:modules][module_name][:version_alias]
+    end
+
     def self.module_pulls(module_name)
       @@config[:modules][module_name][:pulls]
     end

data/lib/big_keeper/util/command_line_util.rb

@@ -0,0 +1,9 @@
+module BigKeeper
+  class CommandLineUtil
+    def self.double_check(tips)
+      Logger.highlight("#{tips} (y/n)")
+      input = STDIN.gets().chop
+      input.eql?('y')
+    end
+  end
+end

data/lib/big_keeper/util/git_operator.rb

@@ -181,6 +181,22 @@ module BigKeeper
       end
     end
 
+    def check_remote_branch_diff(path, branch, compare_branch)
+      fetch(path)
+      compare_branch_commits = Array.new
+      IO.popen("cd '#{path}';git log --left-right #{branch}...origin/#{compare_branch} --pretty=oneline") do |io|
+        io.each do |line|
+          compare_branch_commits.push(line) unless (line.include? '>') && (line.include? "Merge branch \'#{branch}\' into \'#{compare_branch}\'")
+        end
+      end
+      if compare_branch_commits.size > 0
+        return true
+      else
+        return false
+      end
+    end
+
+    # TODO: 需要改造，util方法不应该有业务逻辑
     def check_diff(path, branch, compare_branch)
       compare_branch_commits = Array.new
       IO.popen("cd '#{path}'; git log --left-right #{branch}...#{compare_branch} --pretty=oneline") do |io|

data/lib/big_keeper/util/gradle_file_operator.rb

@@ -286,6 +286,7 @@ module BigKeeper
         version_name = branch_name.sub(/([\s\S]*)\/(\d+.\d+.\d+)_([\s\S]*)/){ $2 }
       else
         version_name = branch_name.sub(/([\s\S]*)\/([\s\S]*)/){ $2 }
+        version_name = version_name.gsub('_', '-')
       end
       version_name
     end

data/lib/big_keeper/util/gradle_module_operator.rb

@@ -59,6 +59,7 @@ module BigKeeper
       version_name = ''
       if ModuleOperateType::ADD == module_operate_type
         version_name = branch_name.sub(/([\s\S]*)\/([\s\S]*)/){ $2 }
+        version_name = version_name.gsub('_', '-')
       elsif ModuleOperateType::FINISH == module_operate_type
         version_name = branch_name.sub(/([\s\S]*)\/(\d+.\d+.\d+)_([\s\S]*)/){ $2 }
       end

data/lib/big_keeper/util/version_config_operator.rb

@@ -0,0 +1,29 @@
+module BigKeeper
+  class VersionConfigOperator
+    def self.change_version(version_config_file, modules, version)
+      temp_file = Tempfile.new('.version-config.gradle.tmp')
+      begin
+        File.open(version_config_file, 'r') do |file|
+          file.each_line do |line|
+            temp_file.puts(replace_module_version(line, modules, version))
+          end
+        end
+        temp_file.close
+        FileUtils.mv(temp_file.path, version_config_file)
+      ensure
+        temp_file.close
+        temp_file.unlink
+      end
+    end
+
+    def self.replace_module_version(line, modules, version)
+      modules.each do |module_name|
+        version_alias = BigkeeperParser.module_version_alias(module_name)
+        if !version_alias.nil? && !version_alias.empty? && line.match(/\s*#{version_alias}\s*=\s*('|")([\s\S]*)('|")\s*/)
+          return line.sub(/(\s*#{version_alias}\s*=\s*)('|")([\s\S]*)('|")\s*/){"#{$1}\'#{version}\'"}
+        end
+      end
+      line
+    end
+  end
+end

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.9.9"
+  VERSION = "0.9.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-27 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -271,8 +271,11 @@ files:
 - lib/big_keeper/command/pod.rb
 - lib/big_keeper/command/pod/podfile.rb
 - lib/big_keeper/command/release.rb
+- lib/big_keeper/command/release/finish.rb
 - lib/big_keeper/command/release/home.rb
 - lib/big_keeper/command/release/module.rb
+- lib/big_keeper/command/release/publish.rb
+- lib/big_keeper/command/release/start.rb
 - lib/big_keeper/command/spec.rb
 - lib/big_keeper/command/spec/add.rb
 - lib/big_keeper/command/spec/analyze.rb
@@ -295,6 +298,7 @@ files:
 - lib/big_keeper/util/bigkeeper_parser.rb
 - lib/big_keeper/util/cache_operator.rb
 - lib/big_keeper/util/code_operator.rb
+- lib/big_keeper/util/command_line_util.rb
 - lib/big_keeper/util/file_operator.rb
 - lib/big_keeper/util/git_operator.rb
 - lib/big_keeper/util/gitflow_operator.rb
@@ -311,6 +315,7 @@ files:
 - lib/big_keeper/util/podfile_module.rb
 - lib/big_keeper/util/podfile_operator.rb
 - lib/big_keeper/util/verify_operator.rb
+- lib/big_keeper/util/version_config_operator.rb
 - lib/big_keeper/util/xcode_operator.rb
 - lib/big_keeper/version.rb
 - resources/banner.png
@@ -342,7 +347,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Efficiency improvement for iOS&Android modular development.