bigkeeper 0.9.17 → 0.9.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2241a06a8957bc229f966705191bca6e0088a1ee9ae8658a5b46aa1fbe67afa
-  data.tar.gz: 6331390f7fc6701c22bc25118fa1e93381dbb88b2ac71f1ea5b1d12c253b7122
+  metadata.gz: fd7362d98b471a417a54fa026978d8b090d99957c40bb69b98faf8e105bfdc41
+  data.tar.gz: a9740d5b04a663b085135c8d98fbc4174dce6f70c3b7511d80fae3fca9833f9d
 SHA512:
-  metadata.gz: 6fa57906062b4563110e53f62b6bcba614db052d2a808bff826a5775d92c665b41f74d419a4ff3c1487cca63d90e584b70647c89a97dea32d9fc931c47a3f5d2
-  data.tar.gz: 677aa18e051ae029e749ea2d9ef15a608b2f98136dc7de8aaa6fd5781563c0be83923083d4fd8ade33bc759ecd387d8be76611e96e53f206ca110ae850d79410
+  metadata.gz: c1dc2ee479cfc5cc9c62fb59ee1cf2316db5f0a2cb34a9c8e305ba01fdf2656ae1bef1c9faccad07e1c09e9e7f4ef3d1a9098965c499a05fdcb28c4f689aca5f
+  data.tar.gz: d24cde1b07508171c49447d6e722184b1dba0cc15f6fb854f5b04809417cd8461ce96f16dfe8db2ff5c8bab84777ab9848011b9e0c1799eab7fa3cf3c210e20a

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

@@ -11,7 +11,6 @@ module BigKeeper
   def self.prerelease_start(path, version, user, modules)
     BigkeeperParser.parse("#{path}/Bigkeeper")
     version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
-    modules = BigkeeperParser.module_names
     DepService.dep_operator(path, user).prerelease_start(path, version, user, modules)
   end
 

data/lib/big_keeper/command/spec.rb

@@ -42,13 +42,11 @@ module BigKeeper
       spec.command :sync do | sync|
         sync.action do |global_options, options, args|
           LeanCloudLogger.instance.set_command("spec/sync")
-
           path = File.expand_path(global_options[:path])
-          version = global_options[:ver]
           user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
-          module_name = args
-
-          spec_sync(path, version, user, module_name)
+          help_now!('module name is required') if args.length != 1
+          module_name = args[0]
+          spec_sync(path, user, module_name)
         end
       end
 

data/lib/big_keeper/command/spec/sync.rb

@@ -1,12 +1,39 @@
 require 'big_keeper/util/bigkeeper_parser'
 require 'big_keeper/dependency/dep_type'
 require 'big_keeper/util/logger'
+require 'big_keeper/util/podspec_operator'
+require 'big_keeper/util/lockfile_parser'
 
 module BigKeeper
-  def self.spec_sync(path, version, user, module_name)
+  def self.spec_sync(path, user, module_name)
     # Parse Bigkeeper file
     BigkeeperParser.parse("#{path}/Bigkeeper")
 
-    Logger.default('Coming soon.')
+    module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
+
+    detector = PodspecOperator.instance
+    detector.parse(module_full_path, module_name)
+
+    lock_parser = LockfileParser.instance
+    lock_parser.parse(path)
+
+    pod_versions = Hash.new
+    for pod in detector.pod_list
+      pod_ver = get_pod_version(lock_parser.pods, pod)
+      if pod_ver != nil
+        pod_versions = pod_versions.merge(pod_ver)
+      end
+    end
+
+    PodfileOperator.new.find_and_lock("#{module_full_path}/Example/Podfile", pod_versions)
+    Logger.highlight("The Podfile has been changed.")
   end
+
+  def self.get_pod_version(locks, pod_name)
+    pod_version = Hash.new
+    if locks[pod_name]
+      pod_version = {"#{pod_name}" => locks[pod_name]}
+    end
+  end
+
 end

data/lib/big_keeper/dependency/dep_gradle_operator.rb

@@ -77,7 +77,7 @@ module BigKeeper
       BigkeeperParser.parse("#{path}/Bigkeeper")
       version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
       modules = BigkeeperParser.module_names
-      
+
       if modules.nil? || modules.empty?
         Logger.default('no module need to release')
       end
@@ -201,8 +201,8 @@ module BigKeeper
       BigkeeperParser.parse("#{path}/Bigkeeper")
 
       version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
+      modules = BigkeeperParser.module_names if (modules.nil? || modules.empty?)
       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

data/lib/big_keeper/dependency/dep_pod_operator.rb

@@ -170,7 +170,7 @@ module BigKeeper
 
           DepService.dep_operator(path, user).update_module_config(
                                                module_name,
-                                               ModuleOperateType::RELEASE_START)
+                                               ModuleOperateType::FINISH)
         end
       end
 

data/lib/big_keeper/util/lockfile_parser.rb

@@ -36,10 +36,10 @@ module BigKeeper
           $mode = 'PODFILE CHECKSUM'
         else
           if $mode == 'PODS'
-             deal_pod(sentence.strip.delete('\n'))
+             deal_pod(sentence.strip.chomp)
           end
           if $mode == 'SPEC CHECKSUMS'
-             deal_spec(sentence.strip.delete('\n'))
+             deal_spec(sentence.strip.chomp)
           end
         end
        end
@@ -105,10 +105,10 @@ module BigKeeper
 
     #处理SPEC CHECKSUMS
     def deal_spec(s)
-        if /: +/ =~ s
+      if /: +/ =~ s
         dependency = $~.pre_match.strip
         self.dependencies << dependency unless self.dependencies.include?(dependency)
-        end
+      end
     end
 
     def get_lock_podname(sentence) #获得lock pod名称

data/lib/big_keeper/util/podfile_operator.rb

@@ -20,9 +20,9 @@ module BigKeeper
     def generate_pod_config(pod_name, version, comment)
       module_config = ''
       if comment != nil
-        module_config = "  pod '#{pod_name}' , '#{version}' # #{comment}"
+        module_config = "  pod '#{pod_name}', '#{version}' # #{comment}"
       else
-        module_config =  "  pod '#{pod_name}' , '#{version}'"
+        module_config =  "  pod '#{pod_name}', '#{version}'"
       end
     end
 
@@ -50,6 +50,7 @@ module BigKeeper
           end
         end
         if !dictionary.empty?
+          temp_file.puts ''
           temp_file.puts 'def sub_dependency'
           dictionary.keys.each do |sub_pod|
             temp_file.puts generate_pod_config(sub_pod, dictionary[sub_pod], 'bigkeeper')

data/lib/big_keeper/util/podspec_operator.rb

@@ -0,0 +1,55 @@
+require 'tempfile'
+require 'fileutils'
+require 'big_keeper/dependency/dep_type'
+require 'big_keeper/util/podfile_detector'
+
+module BigKeeper
+  # Operator for podspec file
+  class PodspecOperator
+    include Singleton
+    attr_accessor :module_list, :main_path, :pod_list
+    $unlock_pod_list = []
+    $modify_pod_list = {}
+
+    def initialize
+      @module_list = BigkeeperParser.module_names
+      @pod_list = []
+    end
+
+    def parse(path, module_name)
+      @main_path = path
+      podspec_lines = File.readlines("#{@main_path}/#{module_name}.podspec", :encoding => 'UTF-8')
+      Logger.highlight("Analyzing Podspec...") unless podspec_lines.size.zero?
+      podspec_lines.collect do |sentence|
+        if /dependency / =~ sentence
+          pod_name = get_pod_name(sentence)
+          @pod_list << pod_name
+        end
+      end
+    end
+
+    def get_pod_name(sentence)
+      pod_model = deal_podfile_line(sentence)
+      if pod_model != nil
+        return pod_model.chomp.gsub("'", "")
+      end
+    end
+
+    def deal_podfile_line(sentence)
+      pod_name = ''
+      if sentence.strip.include?('dependency ')
+        pod_dep = sentence.split('dependency ')
+        if pod_dep.size > 1
+          pod_names = pod_dep[1].split(',')
+          if pod_names.size > 1
+            pod_name = pod_names[0]
+          else
+            pod_name = pod_dep[1]
+          end
+        end
+        pod_name
+      end
+    end
+
+  end
+end

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.9.17"
+  VERSION = "0.9.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.9.17
+  version: 0.9.18
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-07 00:00:00.000000000 Z
+date: 2019-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -314,6 +314,7 @@ files:
 - lib/big_keeper/util/podfile_detector.rb
 - lib/big_keeper/util/podfile_module.rb
 - lib/big_keeper/util/podfile_operator.rb
+- lib/big_keeper/util/podspec_operator.rb
 - lib/big_keeper/util/verify_operator.rb
 - lib/big_keeper/util/version_config_operator.rb
 - lib/big_keeper/util/xcode_operator.rb
@@ -346,8 +347,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Efficiency improvement for iOS&Android modular development.