bigkeeper 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 984646f715b01935f0df1fc84d7bbab58ed75b4a
-  data.tar.gz: 202103da5bdd8813bafae83bb02a8f06102d8a05
+  metadata.gz: 47bab02441e1139a0e26323e7dece4f0c9d1dd48
+  data.tar.gz: 509045ecb854e6a6e384fd7b5efb8f990daab35b
 SHA512:
-  metadata.gz: 0351cf5e60e4cd89e9e6ca803871593de5d74170525eec45226798030c6f30138693cf47449f77ab2f5ff69201ccc1a66f401055563afaf3a470492c9dce3cdd
-  data.tar.gz: f155c7d12a092fc9016ee9bca4466a3b7a31c33285e309f5adc9ee90bc85161cc41bb286c9d7bc720c62a17b587f8194e40738f5c830251fe175939fa2c472ea
+  metadata.gz: a2104b4839d5f0b4ca6147609f5b74ecc772b1ad67281e99346ea5d0422f8cb6f60984c6ad168e9055adbbd7968c3b73ebcadc98e8884a1855fe8ddf5ab6d2f2
+  data.tar.gz: be8bb68375888689e666f0d291efaad4e3b7064a547fcc468a9a79194d38072b3fed9376c838a5c109dbe12f0dc911c975bc2066277beca04822a00e595fa18f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bigkeeper (0.9.2)
+    bigkeeper (0.9.3)
       big_resources
       big_stash (~> 0.1)
       cocoapods

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.rb

@@ -13,7 +13,7 @@ require 'big_keeper/command/release'
 require 'big_keeper/command/pod'
 require 'big_keeper/command/spec'
 require 'big_keeper/command/image'
-
+require 'big_keeper/command/init'
 require 'big_keeper/service/git_service'
 require 'big_keeper/util/leancloud_logger'
 
@@ -59,6 +59,8 @@ module BigKeeper
 
   image_command
 
+  init_command
+
   desc 'Show version of bigkeeper'
   command :version do |version|
     version.action do |global_options, options, args|

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

@@ -6,7 +6,7 @@ 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/model/operate_type'
 require 'big_keeper/dependency/dep_service'
 
 require 'big_keeper/dependency/dep_type'
@@ -41,7 +41,7 @@ module BigKeeper
       ModuleCacheOperator.new(path).cache_path_modules([], [], [])
 
       # Install
-      DepService.dep_operator(path, user).install(false)
+      DepService.dep_operator(path, user).install(modules, OperateType::FINISH, false)
 
       # Open home workspace
       DepService.dep_operator(path, user).open

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

@@ -6,7 +6,7 @@ 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/model/operate_type'
 require 'big_keeper/dependency/dep_service'
 
 require 'big_keeper/dependency/dep_type'
@@ -32,7 +32,7 @@ module BigKeeper
       end
 
       # Install
-      DepService.dep_operator(path, user).install(false)
+      DepService.dep_operator(path, user).install(modules, OperateType::PUBLISH, false)
 
       # Modify module as git
       modules.each do |module_name|

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

@@ -7,7 +7,7 @@ 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/model/operate_type'
 require 'big_keeper/dependency/dep_service'
 
 require 'big_keeper/dependency/dep_type'
@@ -56,7 +56,7 @@ module BigKeeper
       end
 
       # install
-      DepService.dep_operator(path, user).install(true)
+      DepService.dep_operator(path, user).install(modules, OperateType::START, true)
 
       # Open home workspace
       DepService.dep_operator(path, user).open

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

@@ -3,7 +3,7 @@ require 'big_stash/stash_operator'
 require 'big_keeper/util/logger'
 require 'big_keeper/util/pod_operator'
 require 'big_keeper/util/xcode_operator'
-
+require 'big_keeper/model/operate_type'
 require 'big_keeper/dependency/dep_service'
 
 module BigKeeper
@@ -36,7 +36,7 @@ module BigKeeper
       end
 
       # Install
-      DepService.dep_operator(path, user).install(false)
+      DepService.dep_operator(path, user).install(modules, OperateType::SWITCH, false)
 
       # Open home workspace
       DepService.dep_operator(path, user).open

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

@@ -7,7 +7,7 @@ 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/model/operate_type'
 require 'big_keeper/dependency/dep_service'
 
 require 'big_keeper/dependency/dep_type'
@@ -56,7 +56,7 @@ module BigKeeper
       end
 
       # Install
-      DepService.dep_operator(path, user).install(false)
+      DepService.dep_operator(path, user).install(modules, OperateType::UPDATE, false)
 
       # Open home workspace
       DepService.dep_operator(path, user).open

data/lib/big_keeper/command/init.rb

@@ -0,0 +1,36 @@
+require 'big_keeper/util/leancloud_logger'
+require 'big_keeper/util/file_operator'
+require 'fileutils'
+require 'big_keeper/util/logger'
+
+module BigKeeper
+  def self.init_command
+    desc 'BigKeeper file initialize'
+    command :init do | c |
+      c.desc "BigKeeper template file initialize."
+      c.action do | global_options, options, args |
+        LeanCloudLogger.instance.set_command("big/init")
+
+        bin_path = File.dirname(__FILE__)
+        bin_path = File.dirname(bin_path)
+        bin_path = File.dirname(bin_path)
+        bin_path = File.dirname(bin_path)
+        path = global_options['path']
+        Logger.highlight("Initialize BigKeeper File...")
+        #template path
+        source_file = File.join(bin_path, 'resources/template/BigKeeper')
+        #BigKeeper file need exist path
+        target_path = File.join(path, 'BigKeeper')
+
+        if !File.exists?(target_path)
+          FileUtils.cp(source_file, target_path)
+          Logger.highlight("Initialize BigKeeper Complete!")
+        else
+          Logger.highlight("BigKeeper File Has Exist!")
+        end
+
+        LeanCloudLogger.instance.set_command("file/init")
+      end
+    end
+  end
+end

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

@@ -5,6 +5,7 @@ require 'big_keeper/dependency/dep_type'
 require 'big_keeper/util/info_plist_operator'
 require 'big_keeper/util/logger'
 require 'big_keeper/util/xcode_operator'
+require 'big_keeper/model/operate_type'
 
 module BigKeeper
   def self.release_home_start(path, version, user)
@@ -46,7 +47,7 @@ module BigKeeper
     InfoPlistOperator.new.change_version_build(path, version)
 
     GitService.new.verify_push(path, "Change version to #{version}", "release/#{version}", 'Home')
-    DepService.dep_operator(path, user).install(true)
+    DepService.dep_operator(path, user).install(modules, OperateType::RELEASE, true)
     XcodeOperator.open_workspace(path)
   end
 

data/lib/big_keeper/dependency/dep_gradle_operator.rb

@@ -1,11 +1,14 @@
 require 'big_keeper/dependency/dep_operator'
 require 'big_keeper/util/gradle_operator'
+require 'big_keeper/model/operate_type'
 
 module BigKeeper
   # Operator for podfile
   class DepGradleOperator < DepOperator
 
     PATH_VERSION_CONFIG = "doc/config/version-config.gradle"
+    LOCAL_MODULE_BUILD = "module/module.gradle"
+    GLOBAL_MODULE_BUILD =  "module/global.gradle"
 
     def backup
       GradleOperator.new(@path).backup
@@ -15,7 +18,12 @@ module BigKeeper
       GradleOperator.new(@path).recover
     end
 
+    def update_project_config(modules, type)
+      raise "You should override this method in subclass."
+    end
+
     def update_module_config(module_name, module_operate_type)
+      update_local_depend(module_name, module_operate_type)
       update_project_version_config(module_name, module_operate_type)
       module_full_path = BigkeeperParser.module_full_path(@path, @user, module_name)
       GradleOperator.new(module_full_path).update_version_config(module_name, module_operate_type)
@@ -41,6 +49,29 @@ module BigKeeper
       end
     end
 
+    def update_local_depend(module_name, module_operate_type)
+      if !File.exist?("#{@path}/#{LOCAL_MODULE_BUILD}")
+        FileUtils.cp("#{@path}/#{GLOBAL_MODULE_BUILD}", "#{@path}/#{LOCAL_MODULE_BUILD}")
+      end
+      temp_file = Tempfile.new('.module.gradle.tmp')
+      begin
+        File.open("#{@path}/#{LOCAL_MODULE_BUILD}", 'r') do |file|
+          file.each_line do |line|
+            new_line = generate_local_depend_of_line(
+              line,
+              module_name,
+              module_operate_type)
+            temp_file.puts(new_line)
+          end
+        end
+        temp_file.close
+        FileUtils.mv(temp_file.path, "#{@path}/#{LOCAL_MODULE_BUILD}")
+      ensure
+        temp_file.close
+        temp_file.unlink
+      end
+    end
+
     def generate_version_config_of_line(line, module_name, module_operate_type)
       if line.downcase.match(/([\s\S]*)#{module_name.downcase.gsub('-','')}version(\s*)=(\s*)('|")(\S*)('|")([\s\S]*)/)
         branch_name = GitOperator.new.current_branch(@path)
@@ -62,6 +93,18 @@ module BigKeeper
       line
     end
 
+    def generate_local_depend_of_line(line, module_name, module_operate_type)
+      if line.downcase.match(/([\s\S]*):module:#{module_name.downcase.gsub('-','')}([\s\S]*)/)
+        if ModuleOperateType::ADD == module_operate_type
+          line = line.gsub('//','')
+        else
+          line = line.gsub('//','')
+          line = '//' + line
+        end
+      end
+      line
+    end
+
     def origin_config_of_module(module_name)
       origin_config = ''
       File.open("#{@path}/.bigkeeper/#{PATH_VERSION_CONFIG}", 'r') do |file|
@@ -75,7 +118,20 @@ module BigKeeper
       origin_config.chop
     end
 
-    def install(should_update)
+    def install(modules, type, should_update)
+      if OperateType::SWITCH == type
+        all_modules = BigkeeperParser.module_names
+
+        #close all
+        all_modules.each do |module_name|
+          update_local_depend(module_name, ModuleOperateType::DELETE)
+        end
+
+        #open modules
+        modules.each do |module_name|
+          update_local_depend(module_name, ModuleOperateType::ADD)
+        end
+      end
     end
 
     def open

data/lib/big_keeper/dependency/dep_operator.rb

@@ -21,7 +21,7 @@ module BigKeeper
       raise "You should override this method in subclass."
     end
 
-    def install(should_update)
+    def install(modules, type, should_update)
       raise "You should override this method in subclass."
     end
 

data/lib/big_keeper/model/operate_type.rb

@@ -3,6 +3,9 @@ module BigKeeper
     START = 1
     UPDATE = 2
     SWITCH = 3
+    FINISH = 4
+    PUBLISH = 5
+    RELEASE = 6
 
     def self.name(type)
       if START == type

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/resources/template/Bigkeeper

@@ -0,0 +1,23 @@
+# TEMPLATE FOR BIGKEEPER
+# PLEASE CHANGE THE CONTENT FOR YOUR PROJECT
+# REMEMBER DELETE THESE TIPS
+
+# version '0.0.1'
+
+# home 'BigkeeperMain', :git => 'git@github.com:BigKeeper/BigKeeperMain.git', :pulls => 'https://github.com/BigKeeper/BigKeeperMain/pulls'
+
+# source 'git@github.com:CocoaPods/Specs.git, CocoaPods' do
+#   modules do
+#     mod 'BigKeeperUserCenterModule', :git => 'git@github.com:BigKeeper/BigKeeperUserCenterModule.git', :pulls => 'https://github.com/BigKeeper/BigKeeperUserCenterModule/pulls'
+#     mod 'BigKeeperOrderModule', :git => 'git@github.com:BigKeeper/BigKeeperOrderModule.git', :pulls => 'https://github.com/BigKeeper/BigKeeperOrderModule/pulls'
+#   end
+# end
+
+
+# user 'perry' do
+#  mod 'BigKeeperModular', :path => '../BigKeeperModular'
+# end
+
+# user 'tom' do
+#  mod 'BigKeeperModular', :path => '../BigKeeperModular'
+# end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -267,6 +267,7 @@ files:
 - lib/big_keeper/command/feature&hotfix/update.rb
 - lib/big_keeper/command/image.rb
 - lib/big_keeper/command/image/image.rb
+- lib/big_keeper/command/init.rb
 - lib/big_keeper/command/pod.rb
 - lib/big_keeper/command/pod/podfile.rb
 - lib/big_keeper/command/release.rb
@@ -317,6 +318,7 @@ files:
 - resources/keynote/big-keeper-readme-feature.key
 - resources/keynote/big-keeper-readme-release.key
 - resources/readme/big-keeper-readme.001.png
+- resources/template/Bigkeeper
 homepage: https://github.com/BigKeeper/bigkeeper
 licenses:
 - MIT