big_keeper 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5275d4933523f33d0526dc52a9491079d9bc3b82
-  data.tar.gz: 2dbd46bcd8f579101166731574b21cfda7ae267a
+  metadata.gz: 40f56a4994a7408e30ccd119e1ed948d5587a25d
+  data.tar.gz: fd1d292ca83f57e781744567b52c5016cf9bdb5e
 SHA512:
-  metadata.gz: 9aa603c3784108574da97f8a0236a0609dae2fec59ad5bb1131633e1b52dd4c5f71451aaf06d8da269673ea16772ffde7e949b8f90682417f74d94fcfc2f17e1
-  data.tar.gz: 0591f8852f2ba2ebc071c75a3765eac92549b08cb48700fec90466e79e3d91dc3f847e7b370febb596ecb32b86b8ab4d810e4c4b06aec90f548af172ff5171c7
+  metadata.gz: 73b4235927749294cb9ff03db11b459e2c965644256607da69603c212c87c9e74b6786b63e9db9112a3d05560c8b91db2e680cf06598860d0c58dc271815bf8d
+  data.tar.gz: 479f99e2fc93c8bf211382bd7586462936d6e2fe43a1865b66b6ddbe76a715a017da8454f03d8ed0fbefd9dd05681920947173021ec0c48d7f1720b61e565a7c

data/lib/big_keeper.rb

@@ -13,10 +13,10 @@ require 'big_keeper/command/feature&hotfix/switch'
 require 'big_keeper/command/feature&hotfix/update'
 require 'big_keeper/command/feature&hotfix/pull'
 require 'big_keeper/command/feature&hotfix/push'
+require 'big_keeper/command/pod/podfile'
 require 'big_keeper/command/feature&hotfix/delete'
 require 'big_keeper/command/release/home'
 require 'big_keeper/command/release/module'
-require 'big_keeper/command/pod/podfile_lock'
 
 require 'big_keeper/service/git_service'
 
@@ -26,7 +26,7 @@ include GLI::App
 
 module BigKeeper
   # Your code goes here...
-  program_desc 'Efficiency improvement for iOS&Android modular development, iOSer&Android using this tool can make modular development easier.'
+  program_desc 'Efficiency improvement for iOS&Android module development, iOSer&Android using this tool can make module development easier.'
 
   flag %i[p path], default_value: './'
   flag %i[v ver], default_value: 'Version in Bigkeeper file'
@@ -276,6 +276,13 @@ module BigKeeper
         podfile_lock(path)
       end
     end
+
+    podfile.desc 'Update modules should be upgrade.'
+    podfile.command :update do |lock|
+      lock.action do |global_options, options, args|
+        podfile_modules_update(path)
+      end
+    end
   end
 
   desc 'Show version of bigkeeper'

data/lib/big_keeper/command/pod/{podfile_lock.rb → podfile.rb}

@@ -1,6 +1,6 @@
-
 require 'big_keeper/util/podfile_detector'
 require 'big_keeper/util/podfile_operator'
+require 'big_keeper/util/podfile_module'
 require 'big_keeper/util/gitflow_operator'
 require 'big_keeper/util/bigkeeper_parser'
 require 'big_keeper/model/podfile_type'
@@ -11,10 +11,10 @@ module BigKeeper
   def self.podfile_detect(path)
       # Parse Bigkeeper file
       BigkeeperParser.parse("#{path}/Bigkeeper")
-      # Get modulars' name
-      modular_list = BigkeeperParser.module_names
+      # Get modules' name
+      module_list = BigkeeperParser.module_names
       # initialize PodfileDetector
-      detector = PodfileDetector.new(path,modular_list)
+      detector = PodfileDetector.new(path,module_list)
       # Get unlocked third party pods list
       unlock_pod_list = detector.get_unlock_pod_list
       # Print out unlock pod list
@@ -28,10 +28,10 @@ module BigKeeper
   def self.podfile_lock(path)
       # Parse Bigkeeper file
       BigkeeperParser.parse("#{path}/Bigkeeper")
-      # Get modulars' name
-      modular_list = BigkeeperParser.module_names
+      # Get modules' name
+      module_list = BigkeeperParser.module_names
       # initialize PodfileDetector
-      detector = PodfileDetector.new(path,modular_list)
+      detector = PodfileDetector.new(path,module_list)
       # Get unlocked third party pods list
       unlock_pod_list = detector.get_unlock_pod_list
       # Get Version
@@ -48,4 +48,22 @@ module BigKeeper
 
   end
 
+  def self.podfile_modules_update(path)
+      # Parse Bigkeeper file
+      BigkeeperParser.parse("#{path}/Bigkeeper")
+      # Get modules' name
+      module_list = BigkeeperParser.module_names
+      # initialize PodfileDetector
+      detector = PodfileModuleDetector.new(path)
+      # Get module latest version
+      module_dictionary = detector.check_version_list
+      # Check if anything should be upgrade
+      if module_dictionary.empty?
+        Logger.warning("There is nothing to be upgrade.")
+      else
+        PodfileOperator.new.find_and_upgrade("#{path}/Podfile",module_dictionary)
+        Logger.highlight("The Podfile has been changed.")
+      end
+  end
+
 end

data/lib/big_keeper/service/git_service.rb

@@ -104,12 +104,13 @@ module BigKeeper
 
     def pull(path, branch_name)
       git = GitOperator.new
-      if git.current_branch(path) == branch_name
+      current_branch_name = git.current_branch(path)
+      if current_branch_name == branch_name
         git.pull(path)
       else
-        Dir.chdir(path) do
-          `git pull origin #{branch_name}:#{branch_name}`
-        end
+        git.checkout(path, branch_name)
+        git.pull(path)
+        git.checkout(path, current_branch_name)
       end
     end
 
@@ -149,6 +150,10 @@ module BigKeeper
     end
 
     def verify_rebase(path, branch_name, name)
+
+      # pull rebased branch
+      pull(path, branch_name)
+
       Dir.chdir(path) do
         IO.popen("git rebase #{branch_name} --ignore-whitespace") do |io|
           unless io.gets
@@ -169,8 +174,10 @@ module BigKeeper
                   5.Run 'finish' again.")
           end
         end
-        `git push -f origin #{branch_name}`
-        GitOperator.new.checkout(path, 'develop')
+        if GitOperator.new.current_branch(path) != 'develop' && GitOperator.new.current_branch(path) != 'master'
+          `git push -f`
+          GitOperator.new.checkout(path, branch_name)
+        end
       end
     end
   end

data/lib/big_keeper/util/pod_operator.rb

@@ -6,6 +6,7 @@ module BigKeeper
       Logger.highlight('Start pod install, waiting...')
 
       # pod install
+      `pod repo update`
       `pod install --project-directory=#{path}`
 
       Logger.highlight('Finish pod install.')

data/lib/big_keeper/util/podfile_detector.rb

@@ -6,12 +6,12 @@ module BigKeeper
 
 class PodfileDetector
 
-  attr_accessor :modular_list, :main_path
+  attr_accessor :module_list, :main_path
   $unlock_pod_list = []
   $modify_pod_list = {}
 
-  def initialize(main_path,modular_list)
-    @modular_list = modular_list
+  def initialize(main_path,module_list)
+    @module_list = module_list
     @main_path = main_path
   end
 
@@ -21,7 +21,7 @@ class PodfileDetector
       podfile_lines.collect do |sentence|
       deal_podfile_line(sentence) unless sentence =~(/(\d+.){1,2}\d+/)
       end
-      return $unlock_pod_list
+      $unlock_pod_list
       # p $unlock_pod_list
   end
 
@@ -29,9 +29,9 @@ class PodfileDetector
     if sentence.include?('pod ')
       pod_model = Podfile_Modle.new(sentence)
       if !pod_model.name.empty? && pod_model.configurations != '[\'Debug\']' && pod_model.path == nil && pod_model.tag == nil
-            $unlock_pod_list << pod_model.name unless @modular_list.include?(pod_model.name)
+            $unlock_pod_list << pod_model.name unless @module_list.include?(pod_model.name)
       end
-      return pod_model
+      pod_model
     end
   end
 
@@ -72,7 +72,7 @@ class PodfileDetector
   def get_pod_name(sentence)
     pod_model = deal_podfile_line(sentence)
     pod_name = pod_model.name if pod_model != nil && pod_model.configurations.nil
-    @unlock_pod_list << pod_name unless @modular_list.include pod_name
+    @unlock_pod_list << pod_name unless @module_list.include pod_name
   end
 
 

data/lib/big_keeper/util/podfile_module.rb

@@ -0,0 +1,64 @@
+require 'big_keeper/util/bigkeeper_parser'
+require 'big_keeper/util/podfile_detector'
+require 'big_keeper/model/podfile_model'
+require 'big_keeper/util/logger'
+
+module BigKeeper
+
+class PodfileModuleDetector
+  @module_list = []
+
+  def initialize(main_path)
+    @module_list = BigkeeperParser.module_names
+    @main_path = main_path
+    @update_modules = {}
+    # check_version_list
+  end
+
+  #检查需要更新业务库列表
+  def check_version_list
+    if @module_list.empty?
+      Logger.highlight('There is not any module should to be check.')
+      return
+    else
+      Logger.highlight('Checking..')
+      @module_list.each do |module_name|
+        get_pod_search_result(module_name)
+      end
+
+      #获得pod信息后
+      deal_module_info
+    end
+  end
+
+
+  def get_pod_search_result(pod_name)
+    #输入pod Search 结果
+    `pod search #{pod_name} --ios --simple >> #{@main_path}/bigKeeperPodInfo.tmp`
+  end
+
+  def deal_module_info
+    podfile_lines = File.readlines("#{@main_path}/bigKeeperPodInfo.tmp")
+    Logger.highlight("Analyzing modules info...") unless podfile_lines.size.zero?
+      podfile_lines.collect do |sentence|
+        if sentence =~(/pod/)
+          sentence = sentence.sub('pod','')
+          sentence = sentence.delete('\n\'')
+          match_result = sentence.split(',')
+          pod_name = match_result[0].strip
+          latest_version = match_result[1].strip
+          @update_modules[pod_name] = latest_version  unless @update_modules.include?(pod_name)
+        end
+      end
+    p @update_modules
+    File.delete("#{@main_path}/bigKeeperPodInfo.tmp")
+    @update_modules
+  end
+
+  def get_module_latest_version(pod_model)
+
+  end
+
+end
+
+end

data/lib/big_keeper/util/podfile_operator.rb

@@ -115,6 +115,27 @@ module BigKeeper
       end
     end
 
+    def find_and_upgrade(podfile,dictionary)
+      temp_file = Tempfile.new('.Podfile.tmp')
+      begin
+        File.open(podfile, 'r') do |file|
+          file.each_line do |line|
+            pod_model = PodfileDetector.get_pod_model(line)
+            if pod_model != nil && pod_model.name != nil && dictionary[pod_model.name] != nil
+                temp_file.puts generate_pod_config(pod_model.name,dictionary[pod_model.name],pod_model.comment)
+            else
+                temp_file.puts line
+            end
+          end
+        end
+        temp_file.close
+        FileUtils.mv(temp_file.path, podfile)
+      ensure
+        temp_file.close
+        temp_file.unlink
+      end
+    end
+
     def podspec_change(podspec_file, version, module_name)
       temp_file = Tempfile.new(".#{module_name}.podspec")
       begin

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: big_keeper
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -231,7 +231,7 @@ 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/podfile_lock.rb
+- lib/big_keeper/command/pod/podfile.rb
 - lib/big_keeper/command/release/home.rb
 - lib/big_keeper/command/release/module.rb
 - lib/big_keeper/model/gitflow_type.rb
@@ -248,6 +248,7 @@ files:
 - lib/big_keeper/util/logger.rb
 - lib/big_keeper/util/pod_operator.rb
 - lib/big_keeper/util/podfile_detector.rb
+- lib/big_keeper/util/podfile_module.rb
 - lib/big_keeper/util/podfile_operator.rb
 - lib/big_keeper/version.rb
 - resources/banner.png