bigkeeper 0.7.6 → 0.7.7

data/lib/big_keeper/util/cache_operator.rb

@@ -22,4 +22,73 @@ module BigKeeper
       FileUtils.rm_r(@cache_path)
     end
   end
+
+  class ModuleCacheOperator
+    def initialize(path)
+      @cache_path = File.expand_path("#{path}/.bigkeeper")
+      @modules = {"git" => {"all" => [], "current" => []}, "path" => {"all" => [], "current" => []}}
+
+      FileUtils.mkdir_p(@cache_path) unless File.exist?(@cache_path)
+
+      if File.exist?("#{@cache_path}/module.cache")
+        file = File.open("#{@cache_path}/module.cache", 'r')
+        @modules = JSON.load(file.read())
+        file.close
+      end
+    end
+
+    def all_path_modules
+      @modules["path"]["all"]
+    end
+
+    def current_path_modules
+      @modules["path"]["current"]
+    end
+
+    def all_git_modules
+      @modules["git"]["all"]
+    end
+
+    def current_git_modules
+      @modules["git"]["current"]
+    end
+
+    def cache_path_modules(modules)
+      @modules["path"]["all"] = modules
+      cache_modules
+    end
+
+    def cache_git_modules(modules)
+      @modules["git"]["all"] = modules
+      cache_modules
+    end
+
+    def add_branch_module(module_name)
+      @modules["path"]["current"].delete(module_name)
+      @modules["git"]["current"] << module_name
+      cache_modules
+    end
+
+    def del_branch_module(module_name)
+      @modules["git"]["current"].delete(module_name)
+      cache_modules
+    end
+
+    def add_path_module(module_name)
+      @modules["git"]["current"].delete(module_name)
+      @modules["path"]["current"] << module_name
+      cache_modules
+    end
+
+    def del_path_module(module_name)
+      @modules["path"]["current"].delete(module_name)
+      cache_modules
+    end
+
+    def cache_modules
+      file = File.new("#{@cache_path}/module.cache", 'w')
+      file << @modules.to_json
+      file.close
+    end
+  end
 end

data/lib/big_keeper/util/gradle_operator.rb

@@ -0,0 +1,151 @@
+require 'big_keeper/util/cache_operator'
+
+module BigKeeper
+  # Operator for podfile
+  class GradleOperator
+    def initialize(path)
+      @path = File.expand_path(path)
+    end
+
+    def backup
+      cache_operator = CacheOperator.new(@path)
+      cache_operator.save('settings.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('settings.gradle')
+      cache_operator.clean
+    end
+
+    def update_setting_config(current_module_name, user, modules)
+      CacheOperator.new(@path).load('settings.gradle')
+      begin
+        File.open("#{@path}/settings.gradle", 'a') do |file|
+          modules.each do |module_name|
+            next if current_module_name == module_name
+            file.puts "\r\ninclude ':module:#{module_name.downcase}'\r\n"
+            file.puts "project(':module:#{module_name.downcase}')." \
+              "projectDir = new File(rootProject.projectDir," \
+              "'#{BigkeeperParser.module_path(user, module_name)}/#{module_name.downcase}-lib')\r\n"
+          end
+        end
+      ensure
+      end
+    end
+
+    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
+          version_flag = false
+          version_index = 0
+
+          File.open(file, 'r') do |file|
+            file.each_line do |line|
+              version_flag = true if line.include? 'modifyPom'
+              if version_flag
+                version_index += 1 if line.include? '{'
+                version_index -= 1 if line.include? '}'
+
+                version_flag = false if 0 == version_flag
+
+                temp_file.puts generate_version_config(line, module_name, module_type, source)
+              else
+                temp_file.puts generate_compile_config(line, module_name, module_type, source)
+              end
+            end
+          end
+          temp_file.close
+          FileUtils.mv(temp_file.path, file)
+        ensure
+          temp_file.close
+          temp_file.unlink
+        end
+      end
+    end
+
+    def generate_version_config(line, module_name, module_type, source)
+      if ModuleType::GIT == module_type
+        branch_name = GitOperator.new.current_branch(@path)
+        full_name = ''
+
+        # Get version part of source.addition
+        if 'develop' == source.addition || 'master' == source.addition
+          full_name = branch_name.sub(/([\s\S]*)\/(\d+.\d+.\d+)_([\s\S]*)/){ $2 }
+        else
+          full_name = branch_name.sub(/([\s\S]*)\/([\s\S]*)/){ $2 }
+        end
+        line.sub(/(\s*)version ('|")(\S*)('|")([\s\S]*)/){
+          "#{$1}version '#{full_name}'#{$5}"
+        }
+      elsif ModuleType::SPEC == module_type
+        line.sub(/(\s*)version ('|")(\S*)('|")([\s\S]*)/){
+          "#{$1}version '#{source}'#{$5}"
+        }
+      else
+        line
+      end
+    end
+
+    def prefix_of_module(module_name)
+      prefix = ''
+      Dir.glob("#{@path}/.bigkeeper/*/build.gradle").each do |file|
+        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*)/){
+                $4
+              }
+              break
+            end
+          end
+        end
+        break unless prefix.empty?
+      end
+
+      prefix.chop
+    end
+
+    def generate_compile_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(':module:#{module_name.downcase}')"
+        }
+      elsif ModuleType::GIT == module_type
+        branch_name = GitOperator.new.current_branch(@path)
+        full_name = ''
+
+        # Get version part of source.addition
+        if 'develop' == source.addition || 'master' == source.addition
+          full_name = branch_name.sub(/([\s\S]*)\/(\d+.\d+.\d+)_([\s\S]*)/){ $2 }
+        else
+          full_name = branch_name.sub(/([\s\S]*)\/([\s\S]*)/){ $2 }
+        end
+        line.sub(/(\s*)([\s\S]*)('|")(\S*)#{module_name.downcase}(\S*)('|")(\S*)/){
+          if $2.include? 'moduleCompile'
+            "#{$1}moduleCompile '#{prefix_of_module(module_name)}#{module_name.downcase}:#{full_name}-SNAPSHOT'"
+          else
+            "#{$1}compile '#{prefix_of_module(module_name)}#{module_name.downcase}:#{full_name}-SNAPSHOT'"
+          end
+        }
+      elsif ModuleType::SPEC == module_type
+        line.sub(/(\s*)([\s\S]*)('|")(\S*)#{module_name.downcase}(\S*)('|")(\S*)/){
+          if $2.include? 'moduleCompile'
+            "#{$1}moduleCompile '#{prefix_of_module(module_name)}#{module_name.downcase}:#{source}'"
+          else
+            "#{$1}compile '#{prefix_of_module(module_name)}#{module_name.downcase}:#{source}'"
+          end
+        }
+      else
+        line
+      end
+    end
+
+    private :generate_compile_config, :generate_version_config, :prefix_of_module
+  end
+end

data/lib/big_keeper/util/podfile_operator.rb

@@ -26,16 +26,16 @@ module BigKeeper
       end
     end
 
-    def replace_all_module_release(path, module_names, version)
+    def replace_all_module_release(path, user, module_names, version)
       module_names.each do |module_name|
-        DepService.dep_operator(path).update_module_config(
+        DepService.dep_operator(path, user).update_module_config(
                                              module_name,
                                              ModuleType::GIT,
                                              GitInfo.new(BigkeeperParser.module_git(module_name), GitType::TAG, version))
       end
     end
 
-    def find_and_lock(podfile,dictionary)
+    def find_and_lock(podfile, dictionary)
       temp_file = Tempfile.new('.Podfile.tmp')
       begin
         File.open(podfile, 'r') do |file|
@@ -57,7 +57,7 @@ module BigKeeper
       end
     end
 
-    def find_and_upgrade(podfile,dictionary)
+    def find_and_upgrade(podfile, dictionary)
       temp_file = Tempfile.new('.Podfile.tmp')
       begin
         File.open(podfile, 'r') do |file|

data/lib/big_keeper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -192,8 +192,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.50.0
-description: Efficiency improvement for iOS modular development, iOSer using this
-  tool can make modular development easier.
+description: Efficiency improvement for iOS&Android modular development, iOSer&Androider
+  using this tool can make modular development easier.
 email:
 - mmoaay@sina.com
 executables:
@@ -224,6 +224,7 @@ files:
 - docs/zh-CN/RECOMMEND.md
 - docs/zh-CN/RELEASE.md
 - lib/big_keeper.rb
+- lib/big_keeper/command/feature&hotfix.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
@@ -233,7 +234,9 @@ 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/pod.rb
 - lib/big_keeper/command/pod/podfile.rb
+- lib/big_keeper/command/release.rb
 - lib/big_keeper/command/release/home.rb
 - lib/big_keeper/command/release/module.rb
 - lib/big_keeper/dependency/dep_gradle_operator.rb
@@ -252,6 +255,7 @@ files:
 - 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/gradle_operator.rb
 - lib/big_keeper/util/info_plist_operator.rb
 - lib/big_keeper/util/logger.rb
 - lib/big_keeper/util/pod_operator.rb
@@ -290,7 +294,7 @@ files:
 - resources/readme/big-keeper-readme.010.png
 - resources/readme/big-keeper-readme.011.png
 - resources/readme/big-keeper-readme.012.png
-homepage: https://github.com/BigKeeper/big-keeper
+homepage: https://github.com/BigKeeper/bigkeeper
 licenses:
 - MIT
 metadata:
@@ -314,5 +318,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Efficiency improvement for iOS modular development.
+summary: Efficiency improvement for iOS&Android modular development.
 test_files: []