podsorz 0.0.2 → 0.0.7

data/lib/podsorz/core/{podfile_io.rb → PodFile/podfile_io.rb}

@@ -1,17 +1,76 @@
 require "podsorz/util/logger"
-require "podsorz/core/podfile_model"
+require "podsorz/core/PodFile/podfile_model"
 
 module PodsOrz
 
 	class PodfileIO
-		attr_accessor :main_path, :total_sentences, :usable_sentences, :total_pod_models 
+		attr_accessor :main_path, :total_sentences, :usable_sentences, :total_pod_models, :http_host
 
 		def initialize(main_path)
 			@main_path = main_path
+			@http_host = "http://192.168.6.23:8080"
 
 			self.parse_podfile_orz
 		end
 
+		def filter_binary_pod_models()
+			filter_result_models = []
+
+			filter_strings = ["sourceVendorPods", "subspecPods", "kxPods"]
+
+			result_lines = []
+
+			switch_flag = false
+			filter_strings.each do |f_str|
+				@total_sentences.each do |line|
+					if line.include? f_str
+						switch_flag = true
+					end
+
+					result_lines << line if switch_flag
+
+					if line.include? "正则匹配注释#{f_str}"
+						switch_flag = false
+						break
+					end
+				end
+			end
+
+			result_lines.each do |line|
+				podfile_model = PodsOrz::PodfileModel.validate_podfile_sentence_instance(line)
+				filter_result_models << podfile_model unless podfile_model.nil?
+			end
+
+			filter_result_models
+		end
+
+		def get_podfile_pod_version(pod)
+			pod_version = ""
+			@total_pod_models.each do |model|
+				if model.name == pod
+					pod_version = model.version
+					break
+				end
+			end
+
+			pod_version = "" if pod_version.nil?
+
+			pod_version
+		end
+
+		def get_podfile_pod_branch(pod)
+			branch = ""
+			@total_pod_models.each do |model|
+				if model.name == pod
+					branch = model.branch
+					break
+				end
+			end
+			
+			branch = "" if branch.nil?
+
+			branch
+		end
 
 		def parse_podfile_orz
 			orz_file_path = File.expand_path("Podfile_orz.rb", @main_path)
@@ -40,8 +99,7 @@ module PodsOrz
 			
 		end
 
-
-		def output_local_pod(pod_name_list)
+		def load_config_local_pod(pod_name_list)
 			pod_name_list.each do |podname|
 				@total_pod_models.map { |model|
 					if model.name.start_with? podname.to_s
@@ -89,6 +147,14 @@ module PodsOrz
 									if model.configurations
 										sentence = sentence + ", :configurations => " + model.configurations.to_s
 									end
+									
+									if model.modular_headers
+										sentence = sentence + ", :modular_headers => " + model.modular_headers.to_s
+									end
+
+									if model.subspecs
+										sentence = sentence + ", :subspecs => " + model.subspecs.to_s
+									end
 
 									puts(sentence.chomp + "\n")
 								end
@@ -123,6 +189,14 @@ module PodsOrz
 							if model.configurations
 								sentence = sentence + ", :configurations => " + model.configurations.to_s
 							end
+							
+							if model.modular_headers
+								sentence = sentence + ", :modular_headers => " + model.modular_headers.to_s
+							end
+
+							if model.subspecs
+								sentence = sentence + ", :subspecs => " + model.subspecs.to_s
+							end							
 
 							sentence = sentence + "\n"
 							puts(sentence)
@@ -170,6 +244,12 @@ module PodsOrz
 									if model.configurations
 										sentence = sentence + ", :configurations => " + model.configurations.to_s
 									end
+									if model.modular_headers
+										sentence = sentence + ", :modular_headers => " + model.modular_headers.to_s
+									end
+									if model.subspecs
+										sentence = sentence + ", :subspecs => " + model.subspecs.to_s
+									end
 
 									puts(sentence.chomp + "\n")
 								end
@@ -183,5 +263,64 @@ module PodsOrz
 			}
 		end
 
+#binary output
+
+		def output_local_binary_sentence(binary_pods_list)
+			return if binary_pods_list.empty?
+
+			load_config_binary_pod(binary_pods_list)
+			
+			cocoas_podfile_path = File.expand_path("Podfile", @main_path)
+
+			output_pod_list = @total_pod_models.reject { |model| 
+				podspec = model.podspec
+				podspec.to_s.empty?
+			}
+
+			File.open(cocoas_podfile_path, "w+") {|io|
+				Logger.highlight("Podfile binary podspec completed!")
+
+				@usable_sentences.map! do |sentence|
+					output_pod_list.each do |model|
+						filter_str = "\'#{model.name}\'"
+						if sentence.include? filter_str
+							splite_list = sentence.split(filter_str)
+							sentence = splite_list[0].to_s + filter_str + ", :podspec => " + "\'#{model.podspec.to_s}\'"
+							if model.configurations
+								sentence = sentence + ", :configurations => " + model.configurations.to_s
+							end
+							
+							if model.modular_headers
+								sentence = sentence + ", :modular_headers => " + model.modular_headers.to_s
+							end
+
+							if model.subspecs
+								sentence = sentence + ", :subspecs => " + model.subspecs.to_s
+							end
+
+							sentence = sentence + "\n"
+							puts(sentence)
+						end
+					end
+
+					io.write(sentence + "\n")
+
+					sentence
+				end
+			}
+		end
+
+		def load_config_binary_pod(pod_name_list)
+			pod_name_list.each do |podname|
+				@total_pod_models.map { |model|
+					if model.name.start_with? podname.to_s
+						model.podspec = "#{@http_host}/#{model.name}/#{model.version}/#{model.name}.podspec" unless model.version.nil?
+					end
+				}
+			end
+		end
+
+#class end
+
 	end
 end

data/lib/podsorz/core/{podfile_model.rb → PodFile/podfile_model.rb}

@@ -3,7 +3,22 @@ module PodsOrz
 
   class PodfileModel
 
-    attr_accessor :name, :git, :path, :configurations, :branch,:tag, :version
+    attr_accessor :name, :git, :path, :branch,:tag, :version, :podspec, :configurations, :modular_headers, :subspecs
+
+    def self.validate_podfile_sentence_instance(sentence)
+      result_model = nil
+      
+      sentence = sentence.strip.chomp
+      unless sentence.empty? || sentence.size.zero?
+        unless sentence.start_with?("#")
+          if sentence.start_with?("pod ")
+            result_model = PodsOrz::PodfileModel.new(sentence)
+          end
+        end 
+      end
+
+      result_model
+    end
 
     def initialize(sentence)
       sentence_slip_list = sentence.split(',')
@@ -16,12 +31,20 @@ module PodsOrz
             @path = $~.post_match.strip
           elsif /:configurations =>/ =~ piece
             @configurations = $~.post_match.strip
+          elsif /:modular_headers =>/ =~ piece
+            @modular_headers = $~.post_match.strip
           elsif /:branch =>/ =~ piece
             @branch = $~.post_match.strip
           elsif /:tag =>/ =~ piece
             @tag = $~.post_match.strip
           elsif /pod /=~ piece
             @name = $~.post_match.delete("'\n ")
+          elsif /:subspecs =>/ =~ piece
+            @subspecs = $~.post_match.strip
+          else
+            mt = /\'\d{1,}\..*\d{1,}\'/.match(piece)
+            @version = mt[0].gsub(/[\'\"]/, "") unless mt.nil?
+              
           end
       end 
 
@@ -29,6 +52,8 @@ module PodsOrz
        
     end
 
+
+#class end
   end
 
 end

data/lib/podsorz/core/{pods_detector.rb → PodsOrz/pods_detector.rb}

@@ -1,4 +1,4 @@
-require "podsorz/core/pod_orzconfig_parse"
+require "podsorz/core/Config/pod_orzconfig_parse"
 require "podsorz/util/logger"
 
 module PodsOrz

data/lib/podsorz/core/{pods_git_manager.rb → PodsOrz/pods_git_manager.rb}

@@ -1,8 +1,8 @@
-require "podsorz/core/pod_orzconfig_parse"
-require "podsorz/core/pods_git_operator"
-require "podsorz/core/podfile_io"
-require "podsorz/core/pods_version"
-require "podsorz/core/pods_repo"
+require "podsorz/core/Config/pod_orzconfig_parse"
+require "podsorz/core/PodsOrz/pods_git_operator"
+require "podsorz/core/PodFile/podfile_io"
+require "podsorz/core/PodsOrz/pods_version"
+require "podsorz/core/PodsOrz/pods_repo"
 require 'open3'
 
 module PodsOrz
@@ -16,7 +16,7 @@ module PodsOrz
 			@pods_git_operator = PodsOrz::PodsGitOperator.new(kx_pods_path, @orzconfig_parse.app_release_version, @orzconfig_parse.branch_author_suffix)
 
 			@podfile_io = PodsOrz::PodfileIO.new(main_path)
-			@podfile_io.output_local_pod(@orzconfig_parse.fix_pod_list)
+			@podfile_io.load_config_local_pod(@orzconfig_parse.fix_pod_list)
 
 			@pods_version = PodsOrz::PodsVersion.new(main_path)
 
@@ -189,7 +189,16 @@ module PodsOrz
 
 #Publish Command --
 
-		def start_repo_publish
+		def start_repo_publish(is_swift)
+			if is_swift
+				pods_list = @orzconfig_parse.fix_pod_list
+				if pods_list.length > 1
+					Logger.error("Swift pod count > 1, please publish swift pod one by one")
+					exit()
+				end
+			end
+			
+
 			#1.判断 release 是否存在新的commit内容
 			newContent_pod_list = filter_newContent_pods()
 
@@ -214,7 +223,7 @@ module PodsOrz
 			#5.Repo push
 			@pods_repo.check_repo_exist
 
-			pods_repo_push
+			pods_repo_push(is_swift)
 			
 			#6.Update Podfile_orz
 			update_publish_podfile_orz
@@ -344,7 +353,7 @@ module PodsOrz
 			}
 		end
 
-		def pods_repo_push
+		def pods_repo_push(is_swift)
 			is_push_success = true
 
 			pods_list = @orzconfig_parse.fix_pod_list
@@ -383,7 +392,7 @@ module PodsOrz
 					when 1
 						#update remote
 						file_path = @pods_git_operator.get_pod_file_path(pod)
-						is_update_success = @pods_repo.push_pod_remote(pod, file_path, p_version)
+						is_update_success = @pods_repo.push_pod_remote(pod, file_path, p_version, is_swift)
 						unless is_update_success
 							delete_tag_list = []
 							delete_tag_list << pod
@@ -429,10 +438,11 @@ module PodsOrz
 
 #Install Command --
 
-		def install_pod(main_path)
+		def install_pod(main_path, binary_pods_list)
 			command = Thread.new do 
 				@pods_repo.check_repo_exist
-				@podfile_io.output_local_total_sentence
+				@podfile_io.output_local_binary_sentence(binary_pods_list)
+				@podfile_io.output_local_total_sentence()
 			end
 
 			command.join

data/lib/podsorz/core/{pods_git_operator.rb → PodsOrz/pods_git_operator.rb}

@@ -528,29 +528,8 @@ module PodsOrz
 			is_merge_success = true
 			pod_file_path = File.expand_path(pod, @kx_pods_path)
 
-			merge_cmd_list = []
-			merge_cmd_list << "cd #{pod_file_path}"
-			merge_cmd_list << "git checkout #{into_branch}"
-			merge_cmd_list << "git fetch origin #{into_branch}"
-			merge_cmd_list << "git reset --hard origin/#{into_branch}"
-			merge_cmd_list << "git merge #{from_branch} --no-ff --no-squash --no-edit"
-
-			merge_cmd_lines = []
-			has_conflicts = false
-			IO.popen(merge_cmd_list.join(";")) do |io|
-				merge_cmd_lines = io.readlines
-				merge_cmd_lines.each do |line|
-					has_conflicts = true if line.include? "Merge conflict"
-				end
-
-				io.close
-			end
-
-			if has_conflicts
-				Logger.error("【#{pod}】 on branch: \"#{into_branch}\" Merge conflict, please manual fix conflicts.(fix conflicts and run \"git commit\")(use \"git merge --abort\" to abort the merge)")
-				is_merge_success = false
-				return is_merge_success
-			end
+			is_merge_success = @git_operator.merge(pod_file_path, into_branch, from_branch)
+			return is_merge_success unless is_merge_success
 
 			push_cmd_list = []
 			push_cmd_list << "cd #{pod_file_path}"
@@ -668,9 +647,8 @@ module PodsOrz
 			
 			#rebase
 			rebase_branch = rebase_branch.strip.chomp
-			if rebase_branch.empty?
-				return is_check_success
-			end
+			return is_sync_success if rebase_branch.nil?
+			return is_sync_success if rebase_branch.empty?
 
 			is_prepare_rebase = sync_prepare_rebase(pod, rebase_branch)
 			unless is_prepare_rebase
@@ -727,8 +705,15 @@ module PodsOrz
 				return is_rebase_success
 			end
 
-			#personal
-			is_rebase_success = sync_personal_rebase(pod, rebase_branch)
+			is_current_release_branch = current_branch.include? "release"
+
+			if is_current_release_branch
+				#release
+				is_rebase_success = sync_parent_rebase(pod, rebase_branch)
+			else
+				#personal
+				is_rebase_success = sync_personal_rebase(pod, rebase_branch)
+			end
 
 			is_rebase_success
 		end
@@ -740,32 +725,144 @@ module PodsOrz
 			current_branch = @git_operator.current_branch(pod_file_path)
 
 			#1.except develop
-			cmp_result = current_branch.casecmp("develop")
-			if cmp_result == 0
+			is_inlcude = current_branch.include? "develop"
+			if is_inlcude
 				Logger.error("CMD of sync which current_branch can't be 'develop','develop' not support --rebase")
 				is_check_success = false
 				return is_check_success
 			end
 
-			#2.except release rebase
+			#2.release_branch can only rebase develop
 			is_current_release_branch = current_branch.include? "release"
 			if is_current_release_branch
-				Logger.error("CMD of sync which current_branch is '#{current_branch}','release' not support --rebase, switch 'bugfix' branch, 'podsorz sync --rebase=develop' instead")
-				is_check_success = false
-				return is_check_success
+				is_inlcude = rebase_branch.include? "develop"
+				unless is_inlcude
+					Logger.error("current_branch:#{current_branch} can only rebase 'develop', rebase_branch:#{rebase_branch} not support!")
+					is_check_success = false
+					return is_check_success
+				end
 			end
 
 			#3.except rebase myself
-			cmp_result = current_branch.casecmp(rebase_branch)
-			if cmp_result == 0
+			is_inlcude = current_branch.include? rebase_branch
+			if is_inlcude
 				Logger.error("CMD of sync which current_branch :#{current_branch} can't --rebase itself ")
 				is_check_success = false
 				return is_check_success
 			end
 
+			#4.feature & bugfix
+			is_feature_branch = current_branch.include? "feature"
+			if is_feature_branch
+				is_rebase_branch_develop = rebase_branch.include? "develop"
+				unless is_rebase_branch_develop
+					Logger.error("CMD of sync which current_branch :#{current_branch} can only --rebase=develop")
+					is_check_success = false
+					return is_check_success
+				end
+			end
+
+			is_bugfix_branch = current_branch.include? "bugfix"
+			if is_bugfix_branch
+				is_rebase_branch_release = rebase_branch.include? "release"
+				unless is_rebase_branch_release
+					Logger.error("CMD of sync which current_branch :#{current_branch} can only --rebase='release_xxxx'")
+					is_check_success = false
+					return is_check_success
+				end
+			end
+
+
 			is_check_success
 		end
 
+		def sync_parent_rebase(pod, rebase_branch)
+			is_rebase_success = true
+
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			current_branch = @git_operator.current_branch(pod_file_path)
+
+			Logger.default("【#{pod}】 current_branch:#{current_branch} --rebase=#{rebase_branch} start...") 
+
+			#0.fetch origin develop
+			@git_operator.fetch(pod_file_path, rebase_branch)
+
+			diff_commit_lines = @git_operator.compare_branch(pod_file_path, current_branch, "origin/#{rebase_branch}")
+
+			unless diff_commit_lines.empty?
+				Logger.warning("【#{pod}】has diff commits between '#{current_branch}'-'#{rebase_branch}':\n")
+				diff_commit_lines.each do |line|
+					puts(line)
+				end
+			end
+
+			is_develop_has_commit = false
+			is_release_has_commit = false
+
+			diff_commit_lines.each do |line|
+				is_develop_has_commit = true if line.include? ">"
+				is_release_has_commit = true if line.include? "<"
+			end
+
+			#1.release only
+			if is_release_has_commit && !is_develop_has_commit
+				Logger.highlight("【#{pod}】:#{current_branch} already has totoal commits from 'develop'")
+				return(is_rebase_success)
+			end
+			
+			#2.develop only
+			if !is_release_has_commit && is_develop_has_commit
+				is_rebase_success = @git_operator.rebase(pod_file_path, rebase_branch)
+
+				if is_rebase_success
+					is_rebase_success = @git_operator.push_to_remote(pod_file_path, current_branch)
+				end
+
+				Logger.highlight("【#{pod}】:#{current_branch} sync commits from 'develop' completed!") if is_rebase_success
+
+				return(is_rebase_success)
+			end
+
+			#3.release,develop diff each other
+			#3.1 Merge 
+			is_rebase_success = @git_operator.merge(pod_file_path, rebase_branch, current_branch)
+			unless is_rebase_success
+				todo_desc = %{
+					CMD on 【#{pod}】 sync --rebase=develop failure!
+
+					1.fix develop merge #{current_branch} conflicts.
+					2.'push' develop merged code to remote 
+					3.checkout #{current_branch} ,rebase 'develop' 
+					4.#{current_branch} push to remote
+				}
+				Logger.error("#{todo_desc}")
+				return is_rebase_success 
+			end
+
+			#3.2 Push develop
+			is_rebase_success = @git_operator.push_to_remote(pod_file_path, rebase_branch)
+			return is_rebase_success unless is_rebase_success
+
+			Logger.highlight("【#{pod}】:'develop' merged commits from '#{current_branch}' completed!")
+
+			#3.3 Rebase develop
+			is_rebase_success = @git_operator.checkout(pod_file_path, current_branch)
+			return(is_rebase_success) unless is_rebase_success
+
+			is_rebase_success = @git_operator.rebase(pod_file_path, rebase_branch)
+			return(is_rebase_success) unless is_rebase_success
+
+			Logger.highlight("【#{pod}】:'#{current_branch}' sync commits from 'develop' completed!")
+
+			#3.4 Push current to remote
+			is_rebase_success = @git_operator.push_to_remote(pod_file_path, current_branch)
+			return(is_rebase_success) unless is_rebase_success
+
+			Logger.highlight("【#{pod}】:'#{current_branch}' && 'develop' stand at the same starting line！")
+
+			is_rebase_success			
+		end
+
 		def sync_personal_rebase(pod, rebase_branch)
 			is_rebase_success = true
 
@@ -786,7 +883,7 @@ module PodsOrz
 			if has_div
 				is_rebase_success = double_check_personal_rebase_fore_push(pod)
 			else
-				Logger.highlight("【#{pod}】 current_branch:#{current_branch} --rebase=#{rebase_branch} completed, use 'podsorz commit --push --notify' to push & notify updated code, or 'git reset commit' role back to old version")
+				Logger.highlight("【#{pod}】 current_branch:#{current_branch} --rebase=#{rebase_branch} completed, use 'podsorz commit --push --notify' to push & notify updated code, or 'git reset commit' roll back to old version")
 			end
 
 			is_rebase_success