bigkeeper 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9eaa70208d94d55946d3377b17be578f9c3e0932
-  data.tar.gz: ff1ed0d365a01e369006174ca4c302cd96404957
+  metadata.gz: accc51fc75fc6d9d662aee5a2f6201682d3eaf1f
+  data.tar.gz: 1de9680bcb63b9bd8c0062945d96bd173e57adfe
 SHA512:
-  metadata.gz: 463292cbc33f46ab64da6bf555d05b5a43da58ea0447bfa675bc931740d831c5889d19caa2b5a2d7839a655f14c11638cacf0d57d3a6a26a8c85704fe4fc34c2
-  data.tar.gz: 69edb9b632b0a40005358fb405e0c9fd1a52d59d1bd33cc7c507fabcc6689d3d93ede8e712ffae3ebaf368dd01e277ae6fff5b71fa78d3ecc7ab7633768e6db1
+  metadata.gz: 00df2a04ec69be4a786849b4f7138ec4e282eba92f3364696ae393e35598a693f132ba0ad352beef2f9bab3ce178bc815d7e14d8c0a70ed32b7dffd3167f2518
+  data.tar.gz: bb9473f395ff7729223cd50ad0f855c3f3db0e031c8e9706913907665ddb9432e802f30784e0415f73e8f713462f09cd0e30caf3e157d3084c48206146d6b095

data/Gemfile.lock

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

data/lib/big_keeper.rb

@@ -62,6 +62,7 @@ module BigKeeper
   desc 'Show version of bigkeeper'
   command :version do |version|
     version.action do |global_options, options, args|
+      LeanCloudLogger.instance.set_command("version")
       p "bigkeeper (#{VERSION})"
     end
   end

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

@@ -37,6 +37,8 @@ module BigKeeper
       add_modules = modules - current_modules
       del_modules = current_modules - modules
 
+      # Clean module cache
+      ModuleCacheOperator.new(path).clean_modules
       ModuleCacheOperator.new(path).cache_path_modules(modules, add_modules, del_modules)
       remain_path_modules = ModuleCacheOperator.new(path).remain_path_modules
 

data/lib/big_keeper/dependency/dep_pod_operator.rb

@@ -109,7 +109,7 @@ module BigKeeper
       end
       for pwd in tags_repos_pwd do
         path = pwd.chomp
-        IO.popen("cd #{path}; ls") do |io|
+        IO.popen("cd '#{path}'; ls") do |io|
           io.each do |line|
             tags_spec_list.push(line)
           end

data/lib/big_keeper/util/bigkeeper_parser.rb

@@ -64,12 +64,12 @@ module BigKeeper
     end
 
     def self.parse_source(name)
-      @@config.delete("tmpSpec")
+      @@config.delete("tmp_spec")
       source_split = name.split(",") unless name.split(",").length != 2
       if source_split != nil
         sources = Hash["#{source_split[1].lstrip}" => "#{source_split[0]}"]
         @@config[:source] = sources
-        @@config[:tmpSpec] = source_split[1].lstrip
+        @@config[:tmp_spec] = source_split[1].lstrip
       end
     end
 
@@ -96,7 +96,7 @@ module BigKeeper
       elsif params[:git]
         parse_modules_mod(name, params)
       else
-        Logger.error(%(There should be ':path =>' or ':git =>' for mod #{name}))
+        Logger.error(%(There should be ':path =>' or ':git =>' ':alias =>' for mod #{name}))
       end
     end
 
@@ -112,7 +112,7 @@ module BigKeeper
 
     def self.parse_modules_mod(name, params)
       if @@config[:source] != nil
-          params[:spec] = "#{@@config[:tmpSpec]}"
+          params[:spec] = "#{@@config[:tmp_spec]}"
       end
       modules = @@config[:modules]
       modules[name] = params
@@ -145,6 +145,19 @@ module BigKeeper
       @@config[:home][:git]
     end
 
+    def self.home_modules_workspace()
+      if @@config[:home][:modules_workspace]
+        home_modules_workspace = @@config[:home][:modules_workspace]
+        if home_modules_workspace.rindex('/') != home_modules_workspace.length - 1
+          home_modules_workspace = home_modules_workspace + '/'
+        end
+
+        home_modules_workspace
+      else
+        '../'
+      end
+    end
+
     def self.home_pulls()
       @@config[:home][:pulls]
     end
@@ -175,9 +188,13 @@ module BigKeeper
         && @@config[:users][user_name][:mods] \
         && @@config[:users][user_name][:mods][module_name] \
         && @@config[:users][user_name][:mods][module_name][:path]
-        @@config[:users][user_name][:mods][module_name][:path]
+        File.expand_path(@@config[:users][user_name][:mods][module_name][:path])
       else
-        File.expand_path("#{home_path}/../#{module_name}")
+        if @@config[:modules][module_name][:alias]
+          File.expand_path("#{home_path}/#{home_modules_workspace}/#{@@config[:modules][module_name][:alias]}")
+        else
+          File.expand_path("#{home_path}/#{home_modules_workspace}/#{module_name}")
+        end
       end
     end
 
@@ -187,9 +204,14 @@ module BigKeeper
         && @@config[:users][user_name][:mods] \
         && @@config[:users][user_name][:mods][module_name] \
         && @@config[:users][user_name][:mods][module_name][:path]
-        @@config[:users][user_name][:mods][module_name][:path]
+        File.expand_path(@@config[:users][user_name][:mods][module_name][:path])
       else
-        "../#{module_name}"
+        p @@config[:modules][module_name]
+        if @@config[:modules][module_name][:alias]
+          "#{home_modules_workspace}#{@@config[:modules][module_name][:alias]}"
+        else
+          "#{home_modules_workspace}#{module_name}"
+        end
       end
     end
 

data/lib/big_keeper/util/git_operator.rb

@@ -11,7 +11,7 @@ module BigKeeper
 
     def has_remote_branch(path, branch_name)
       has_branch = false
-      IO.popen("cd #{path}; git branch -r") do |io|
+      IO.popen("cd '#{path}'; git branch -r") do |io|
         io.each do |line|
           has_branch = true if line.include? branch_name
         end
@@ -21,7 +21,7 @@ module BigKeeper
 
     def has_local_branch(path, branch_name)
       has_branch = false
-      IO.popen("cd #{path}; git branch") do |io|
+      IO.popen("cd '#{path}'; git branch") do |io|
         io.each do |line|
           has_branch = true if line.include? branch_name
         end
@@ -31,7 +31,7 @@ module BigKeeper
 
     def has_branch(path, branch_name)
       has_branch = false
-      IO.popen("cd #{path}; git branch -a") do |io|
+      IO.popen("cd '#{path}'; git branch -a") do |io|
         io.each do |line|
           has_branch = true if line.include? branch_name
         end
@@ -89,7 +89,7 @@ module BigKeeper
 
     def has_commits(path, branch_name)
       has_commits = false
-      IO.popen("cd #{path}; git log --branches --not --remotes") do |io|
+      IO.popen("cd '#{path}'; git log --branches --not --remotes") do |io|
         io.each do |line|
           has_commits = true if line.include? "(#{branch_name})"
         end
@@ -100,7 +100,7 @@ module BigKeeper
     def has_changes(path)
       has_changes = true
       clear_flag = 'nothing to commit, working tree clean'
-      IO.popen("cd #{path}; git status") do |io|
+      IO.popen("cd '#{path}'; git status") do |io|
         io.each do |line|
           has_changes = false if line.include? clear_flag
         end
@@ -132,7 +132,7 @@ module BigKeeper
 
     def tag(path, version)
       tags = Array.new
-      IO.popen("cd #{path}; git tag") do |io|
+      IO.popen("cd '#{path}'; git tag") do |io|
         io.each do |line|
           tags << line
         end
@@ -149,7 +149,7 @@ module BigKeeper
 
     def tag_list(path)
       tag_list = Array.new
-      IO.popen("cd #{path}; git tag -l") do |io|
+      IO.popen("cd '#{path}'; git tag -l") do |io|
         io.each do |line|
           unless line=~(/[a-zA-Z]/)
             tag_list << line
@@ -161,7 +161,7 @@ module BigKeeper
 
     def check_merge(path, condition)
       unmerged_branch = Array.new
-      IO.popen("cd #{path}; git branch --no-merged") do |io|
+      IO.popen("cd '#{path}'; git branch --no-merged") do |io|
         io.each do |line|
           unmerged_branch.push(line) if line.include? "#{condition}"
         end
@@ -176,7 +176,7 @@ module BigKeeper
 
     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|
+      IO.popen("cd '#{path}'; git log --left-right #{branch}...#{compare_branch} --pretty=oneline") do |io|
         io.each do |line|
           compare_branch_commits.push(line) if (line.include? '>') && (line.include? "Merge branch #{branch} into #{compare_branch}")
         end
@@ -192,14 +192,14 @@ module BigKeeper
     end
 
     def merge(path, branch_name)
-      IO.popen("cd #{path}; git merge #{branch_name}") do |line|
+      IO.popen("cd '#{path}'; git merge #{branch_name}") do |line|
         Logger.error("Merge conflict in #{branch_name}") if line.include? 'Merge conflict'
       end
     end
 
     def check_push_success(path, branch, compare_branch)
       compare_branch_commits = Array.new
-      IO.popen("cd #{path}; git log --left-right #{branch}...#{compare_branch} --pretty=oneline") do |io|
+      IO.popen("cd '#{path}'; git log --left-right #{branch}...#{compare_branch} --pretty=oneline") do |io|
         io.each do |line|
           compare_branch_commits.push(line) if (line.include? '>') || (line.include? 'fatal')
         end

data/lib/big_keeper/util/pod_operator.rb

@@ -9,7 +9,7 @@ module BigKeeper
         PodOperator.pod_update_private_repos(true)
       end
       Logger.highlight('Start pod install, waiting...')
-      cmd = "pod install --project-directory=#{path}"
+      cmd = "pod install --project-directory='#{path}'"
       Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
         while line = stdout.gets
           p line

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.8.8"
+  VERSION = "0.8.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-29 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -337,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Efficiency improvement for iOS&Android modular development.