podsorz 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c960d70973147909a6a1898da3101b1655a2a08426a90ae9c39cfbb7a838ffcd
-  data.tar.gz: fa464fe262693347b34eef283f83200571376124b60039c69ded9f688daf6575
+  metadata.gz: 5a44111361a02ff1c1a71d7085d25bc8ac4ae3835085913ac796c09a86cda8f9
+  data.tar.gz: e130cd226bdb7072e8db2ee84ca2fad1a09d0d5cbb6b56a7b23e5ed2c206e190
 SHA512:
-  metadata.gz: 979c4ee2d0dbf7d788aa5a9cab14633850c0c7d36ce7297356f2919aa5fc620ce578b995d25cce96d28453b828f381271fadc0f6b1d993624a088d7520316ef9
-  data.tar.gz: 649d4d2148002e5cdcb7140ee9553946f50f9747adf7d8e5da9ac79845ed8ea973785c679b2afe5a9b93b6e97b78fecc7320c26d4d5b208d6a8ff28d17a597a8
+  metadata.gz: 021efcba84b814774fb105bb019d81053ffbaa727f469ca1c679a55f2ee65a1749ebc4aa15a9c684292899a2ab6930543812b0c825a9ee440b0cc5a2cf2381e3
+  data.tar.gz: b936d7f1b824146c954767ffd987127ebf09d474e127dae7b9f16e16cf494b959bd1003855c73997d5c5252b11665e25e7bfc2be32175a6b4d62505cc27a589d

data/Gemfile.lock

@@ -1,16 +1,17 @@
 PATH
   remote: .
   specs:
-    podsorz (0.0.2)
+    podsorz (0.0.5)
       cocoapods
+      cocoapods-packager
       colorize
       gli (~> 2.16)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.2)
-    activesupport (5.2.4.4)
+    CFPropertyList (3.0.3)
+    activesupport (5.2.4.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -22,10 +23,10 @@ GEM
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.10.0)
+    cocoapods (1.10.1)
       addressable (~> 2.6)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.10.0)
+      cocoapods-core (= 1.10.1)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.4.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -40,7 +41,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.4)
       xcodeproj (>= 1.19.0, < 2.0)
-    cocoapods-core (1.10.0)
+    cocoapods-core (1.10.1)
       activesupport (> 5.0, < 6)
       addressable (~> 2.6)
       algoliasearch (~> 1.0)
@@ -52,6 +53,8 @@ GEM
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.4)
     cocoapods-downloader (1.4.0)
+    cocoapods-packager (1.5.0)
+      cocoapods (>= 1.7.3, < 2.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
@@ -61,20 +64,20 @@ GEM
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
     colorize (0.8.1)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     escape (0.0.4)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    ffi (1.13.1)
+    ffi (1.14.2)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    gli (2.19.2)
+    gli (2.20.0)
     httpclient (2.8.3)
-    i18n (1.8.5)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    json (2.3.1)
-    minitest (5.14.2)
+    json (2.5.1)
+    minitest (5.14.4)
     molinillo (0.6.6)
     nanaimo (0.3.0)
     nap (1.1.0)
@@ -84,7 +87,7 @@ GEM
     thread_safe (0.3.6)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.8)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     xcodeproj (1.19.0)
       CFPropertyList (>= 2.3.3, < 4.0)

data/lib/podsorz.rb

@@ -5,15 +5,24 @@ require "podsorz/command/setup"
 require "podsorz/command/switch"
 require "podsorz/command/commit"
 require "podsorz/command/publish"
-require "podsorz/command/install"
 require "podsorz/command/sync"
+require "podsorz/command/binary"
+require "podsorz/command/install"
 
 require 'gli'
 
 include GLI::App
 
 module PodsOrz
-  program_desc %{iOS application modulize into pods, improvement for develop modules. CMD: git-flow, auto publish code, auto push repo, auto rewrite podfile}
+  program_desc %{iOS application modulize into pods, improvement for develop modules. 
+    CMD:
+    1.git-flow
+    2.auto publish code
+    3.auto push repo
+    4.auto rewrite podfile
+    5.sync other branch commit
+    6.binary static libary
+  }
 
   current_exec_path = Dir.pwd()
 
@@ -30,6 +39,7 @@ module PodsOrz
   publish_command()
   install_command()
   sync_command()
+  binary_command()
 
   desc "Show podsorz version"
   command :version do |version|

data/lib/podsorz/command/binary.rb

@@ -0,0 +1,150 @@
+require "podsorz/core/PodsOrz/pods_repo"
+require "podsorz/core/Binary/binary_manager"
+require "podsorz/core/PodsOrz/pods_git_manager"
+
+
+module PodsOrz
+	def self.binary_command
+		desc "Binary command, static library related command"
+		command :binary do |binary|
+			binary.desc "package pods(which in PodsOrzConfig) into static libraries"
+			binary.command :package do |package|
+				package.action do |global_options,options,args|
+					dir_path = global_options[:path]
+					prepare_work(dir_path)
+
+					git_manager = PodsOrz::PodsGitManager.new(dir_path)
+					result_hash = filter_binary_pods_list(git_manager, :package)
+					package_list = result_hash[:package]
+
+					binary_manager = PodsOrz::BinaryManager.new(dir_path)
+					binary_manager.package(package_list)
+				end
+					
+			end
+
+
+
+			binary.desc "show whether remote exist static libraries on current version"
+			binary.command :show do |show|
+				show.action do |global_options,options,args|
+					dir_path = global_options[:path]
+					prepare_work(dir_path)
+
+					git_manager = PodsOrz::PodsGitManager.new(dir_path)
+					filter_binary_pods_list(git_manager, :show)
+				end
+					
+			end
+
+
+			binary.desc "publish binary repo"
+			binary.command :publish do |publish|
+				publish.action do |global_options,options,args|
+					dir_path = global_options[:path]
+					prepare_work(dir_path)
+
+					git_manager = PodsOrz::PodsGitManager.new(dir_path)
+					result_hash = filter_binary_pods_list(git_manager, :package)
+					package_list = result_hash[:package]
+
+					binary_manager = PodsOrz::BinaryManager.new(dir_path)
+					binary_manager.publish(package_list)
+				end
+			end
+
+
+			binary.default_command :show
+		end
+	end
+
+	def self.prepare_work(dir_path)
+		pods_repo = PodsOrz::PodsRepo.new()
+		pods_repo.check_repo_exist()
+	end
+
+
+	def self.filter_binary_pods_list(git_manager, cmd_type)
+		result_hash = {
+			:binary => [],
+			:package => []
+		}
+
+		#1.获取静态库加载配置表
+		is_all_binary = git_manager.orzconfig_parse.is_all_binary
+
+		origin_binary_list = []
+
+		unless cmd_type == :show
+			if is_all_binary
+				totoal_model_list = git_manager.podfile_io.filter_binary_pod_models()
+				totoal_model_list.each do |model|
+					origin_binary_list << model.name.to_s
+				end
+			else
+				origin_binary_list = git_manager.orzconfig_parse.static_lib_list if cmd_type == :binary
+				origin_binary_list = git_manager.orzconfig_parse.will_package_list if cmd_type == :package
+			end
+
+		else 
+			totoal_model_list = git_manager.podfile_io.total_pod_models
+			totoal_model_list.each do |model|
+				origin_binary_list << model.name.to_s
+			end
+		end
+		
+
+		return result_hash if origin_binary_list.empty?
+
+
+		empty_binary_list = []
+		exist_binary_list = []
+
+		has_binary_list = []
+		can_package_list = []
+
+		#2.查询Podfile_orz是否为已发版本状态
+		binary_repo = PodsOrz::BinaryRepo.new()
+		binary_repo.check_binary_repo_exist()
+
+		origin_binary_list.each do |pod|
+			pod_version = git_manager.podfile_io.get_podfile_pod_version(pod)
+
+			if pod_version.empty?
+				branch = git_manager.podfile_io.get_podfile_pod_branch(pod)
+				unless branch.empty?
+					empty_binary_list << "#{pod} no source-code version, :branch => #{branch}"
+				else
+					empty_binary_list << "#{pod} no source-code version, :branch => 'master'" 
+				end
+
+				next
+			end
+
+			has_remote = binary_repo.check_binary_pod_exist(pod, pod_version)
+			unless has_remote
+				empty_binary_list << "#{pod} no binary version:(#{pod_version})"
+			else
+				exist_binary_list << "#{pod}:(#{pod_version})"
+				has_binary_list << pod
+			end
+
+			if !pod_version.empty? && !has_remote
+				can_package_list << pod
+			end
+		end
+
+		Logger.highlight("[cmd:#{cmd_type}] Exist static library pods : \n #{exist_binary_list.inspect}")
+		Logger.separator
+		Logger.warning("[cmd:#{cmd_type}] Not exist static library pods: \n #{empty_binary_list.inspect}")
+
+
+		result_hash[:binary] = has_binary_list
+		result_hash[:package] = can_package_list
+		
+
+		result_hash
+
+	end
+
+end

data/lib/podsorz/command/commit.rb

@@ -1,5 +1,5 @@
-require "podsorz/core/pods_detector"
-require "podsorz/core/pods_git_manager"
+require "podsorz/core/PodsOrz/pods_detector"
+require "podsorz/core/PodsOrz/pods_git_manager"
 
 module PodsOrz
 	def self.commit_command

data/lib/podsorz/command/install.rb

@@ -1,5 +1,6 @@
-require "podsorz/core/pods_detector"
-require "podsorz/core/pods_git_manager"
+require "podsorz/core/PodsOrz/pods_detector"
+require "podsorz/core/PodsOrz/pods_git_manager"
+require "podsorz/command/binary"
 
 module PodsOrz
 	def self.install_command
@@ -16,8 +17,13 @@ module PodsOrz
 				is_same = git_manager.ensure_pods_branch()
 				exit() unless is_same
 
-				git_manager.install_pod(dir_path)
+				#获取binary 列表
+				list_hash = PodsOrz.filter_binary_pods_list(git_manager, :binary)
+
+				git_manager.install_pod(dir_path, list_hash[:binary])
 			end
 		end
 	end
+
+
 end

data/lib/podsorz/command/publish.rb

@@ -1,5 +1,5 @@
-require "podsorz/core/pods_detector"
-require "podsorz/core/pods_git_manager"
+require "podsorz/core/PodsOrz/pods_detector"
+require "podsorz/core/PodsOrz/pods_git_manager"
 require "podsorz/util/logger"
 
 module PodsOrz
@@ -17,6 +17,9 @@ module PodsOrz
 			8.更改远端 Podfile_orz.rb, 同步对应 pod 到最新的 version\n
 		}
 		command :publish do |publish|
+			publish.switch :swift, :negatable => false, :desc => "Publish Swift Pod"
+			publish.example "podsorz publish --swift", desc:"Single Publish Action，Publish Only One ’Swift‘ Pod" 
+
 			publish.action do |global_options, options, args|
 				dir_path = global_options[:path]
 				detector = PodsOrz::PodsDetector.new(dir_path)
@@ -33,7 +36,8 @@ module PodsOrz
 					exit()
 				end
 
-				git_manager.start_repo_publish
+				is_swift = options[:swift]
+				git_manager.start_repo_publish(is_swift)
 			end
 		end
 	end

data/lib/podsorz/command/setup.rb

@@ -1,4 +1,4 @@
-require "podsorz/core/orz_env_detector"
+require "podsorz/core/Config/orz_env_detector"
 
 
 module PodsOrz

data/lib/podsorz/command/switch.rb

@@ -1,5 +1,5 @@
-require "podsorz/core/pods_detector"
-require "podsorz/core/pods_git_manager"
+require "podsorz/core/PodsOrz/pods_detector"
+require "podsorz/core/PodsOrz/pods_git_manager"
 
 module PodsOrz
 	def self.switch_command

data/lib/podsorz/command/sync.rb

@@ -1,5 +1,5 @@
-require "podsorz/core/pods_detector"
-require "podsorz/core/pods_git_manager"
+require "podsorz/core/PodsOrz/pods_detector"
+require "podsorz/core/PodsOrz/pods_git_manager"
 
 module PodsOrz
 	def self.sync_command

data/lib/podsorz/core/Binary/binary_builder.rb

@@ -0,0 +1,312 @@
+require "podsorz/util/logger"
+require "podsorz/core/PodFile/podfile_io"
+require "podsorz/core/Specs/podspec_model"
+require "podsorz/util/logger"
+require "open3"
+
+module PodsOrz
+	class BinaryBuilder
+		attr_accessor :main_path, :kx_binary_path, :podfile_io, :pod_repo, :http_host
+
+		def initialize(main_path, podfile_io)
+			@main_path = main_path
+			@kx_binary_path = File.expand_path("../kx_binary", main_path)
+
+			@podfile_io = podfile_io
+			@pod_repo = PodsOrz::PodsRepo.new()
+
+			@http_host = "http://192.168.6.23:8080"
+		end
+
+		def start_package_pod(pod)
+			is_package_success = true
+
+			#1.创建kx_binary
+			detect_kx_binary()
+
+			#2.创建Pod文件夹
+			detect_pod_directory(pod)
+
+			#3.创建version文件夹
+			pod_version = @podfile_io.get_podfile_pod_version(pod)
+			detect_version_directory(pod, pod_version)
+
+			#4.copy kuxiu_specs中对应的podspec
+			copy_podspec(pod)
+
+			#5.build static library
+			is_build_success = build_static_library(pod)
+			unless is_build_success
+				Logger.error("【#{pod}】build version:#{pod_version} static library failure!")
+				is_package_success = false
+				return is_package_success
+			end
+
+			#6.zip framework
+			is_zip_success = zip_framework(pod)
+			unless is_zip_success
+				Logger.error("【#{pod}】zip framework failure!")
+				is_package_success = false
+				return is_package_success
+			end
+
+			#7.mv framework
+			is_mv_success = mv_embedded_framework(pod)
+			unless is_mv_success
+				Logger.error("【#{pod} mv #{pod}.framework.zip failure!")
+				is_package_success = false
+				return is_package_success
+			end
+
+			#8.override .podspec
+			is_override_success = override_podspec(pod)
+			unless is_override_success
+				Logger.error("【#{pod} mv #{pod}.podspec failure!")
+				is_package_success = false
+				return is_package_success
+			end
+
+			#9.delete build files
+			delete_build_files(pod)
+
+
+			is_package_success
+		end
+
+#detect
+		def detect_kx_binary()
+
+			result = check_directory()
+
+			if result
+				binary_result = File.directory?(@kx_binary_path)
+				unless binary_result
+					Logger.warning("kx_binary directory not exist, generate default 'kx_binary' directory")	
+					Dir.mkdir(@kx_pods_path)
+				end
+			end
+		end
+
+		def check_directory()
+			is_directory = File.directory?(@main_path)
+			Logger.error("Detect failure, it is not a directory path: #{@main_path}") unless is_directory
+
+			is_directory
+		end
+
+		def detect_pod_directory(pod)
+			pod_path = File.expand_path("#{pod}", @kx_binary_path)
+			pod_result = File.directory?(pod_path)
+			unless pod_result
+				Logger.warning("#{pod_path} directory not exist, generate default '#{pod_path}' directory")	
+				Dir.mkdir(pod_path)
+			end
+		end
+
+		def detect_version_directory(pod, pod_version)
+			pod_version_path = File.expand_path("#{pod}/#{pod_version}", @kx_binary_path)
+			pod_version_result = File.directory?(pod_version_path)
+			unless pod_version_result
+				Logger.warning("#{pod_version_path} directory not exist, generate default '#{pod_version_path}' directory")	
+				Dir.mkdir(pod_version_path)
+			end
+
+			pod_version_path
+		end
+
+#copy
+		def copy_podspec(pod)
+			command = Thread.new do 
+				pod_version = @podfile_io.get_podfile_pod_version(pod)
+				source_podspec_dir = @pod_repo.directory_pod_version(pod, pod_version)
+				source_file_path = File.expand_path("#{pod}.podspec", source_podspec_dir)
+
+				dest_dir = detect_version_directory(pod, pod_version)
+				dest_file_path = File.expand_path("#{pod}.podspec", dest_dir)
+
+				`cp -f #{source_file_path} #{dest_file_path}`
+
+				Logger.highlight("Copy file Success.\n Source file path:#{source_file_path} \n dest_file_path:#{dest_file_path}")
+			end
+			command.join
+		end
+
+		def build_static_library(pod)
+			is_build_success = true
+			command = Thread.new do 
+				pod_version = @podfile_io.get_podfile_pod_version(pod)
+
+				dest_dir = detect_version_directory(pod, pod_version)
+				dest_file_path = File.expand_path("#{pod}.podspec", dest_dir)
+
+				cmd_list = []
+				cmd_list << "cd #{dest_dir}"
+				cmd_list << "pod package #{pod}.podspec --exclude-deps --no-mangle --force --embedded --spec-sources=git@gitlab.91banban.com:ios_pods/Specs.git"
+
+				Open3.popen3(cmd_list.join(";")) do |stdin , stdout , stderr, wait_thr|
+					while line = stdout.gets
+						puts line
+				    end
+			    end
+			end
+			command.join
+			
+			is_build_success
+		end
+
+		def zip_framework(pod)
+			is_zip_success = true
+
+			command = Thread.new do 
+				pod_version = @podfile_io.get_podfile_pod_version(pod)
+
+				origin_spec_dir = detect_version_directory(pod, pod_version)
+				package_dir = File.expand_path("#{pod}-#{pod_version}", origin_spec_dir)
+				embedded_framework_dir = File.expand_path("ios/#{pod}.embeddedframework", package_dir)
+
+				cmd_list = []
+				cmd_list << "cd #{embedded_framework_dir}"
+				cmd_list << "zip -q -r -y -o #{pod}.framework.zip #{pod}.framework"
+
+				IO.popen(cmd_list.join(";")) do |io|
+					io_lines = io.readlines
+					io_lines.each do |line|
+						puts line
+						is_zip_success = false if line.include? "zip error"
+					end
+					io.close
+				end
+			end
+
+			command.join
+
+			is_zip_success
+		end
+
+		def mv_embedded_framework(pod)
+			is_mv_success = true
+
+			command = Thread.new do 
+				pod_version = @podfile_io.get_podfile_pod_version(pod)
+
+				origin_spec_dir = detect_version_directory(pod, pod_version)
+				package_dir = File.expand_path("#{pod}-#{pod_version}", origin_spec_dir)
+				embedded_framework_dir = File.expand_path("ios/#{pod}.embeddedframework", package_dir)
+
+				cmd_list = []
+				cmd_list << "cd #{embedded_framework_dir}"
+				cmd_list << "mv -f #{pod}.framework.zip #{origin_spec_dir}"
+
+				IO.popen(cmd_list.join(";")) do |io|
+					io_lines = io.readlines
+					io_lines.each do |line|
+						puts line
+						is_mv_success = false if line.include? "mv:"
+					end
+					io.close
+				end
+			end
+				command.join
+
+			is_mv_success
+		end
+
+		def override_podspec(pod)
+			is_override_success = true
+
+			command = Thread.new do 
+				pod_version = @podfile_io.get_podfile_pod_version(pod)
+
+				origin_spec_dir = detect_version_directory(pod, pod_version)
+				origin_spec_file_path = File.expand_path("#{pod}.podspec", origin_spec_dir)
+				origin_podspec_model = PodsOrz::PodspecModel.new(origin_spec_file_path)
+
+
+				package_dir = File.expand_path("#{pod}-#{pod_version}", origin_spec_dir)
+				static_pod_spec_path = File.expand_path("#{pod}.podspec", package_dir)
+
+				static_podspec_totoal_sentences = []
+				File.open(static_pod_spec_path, "r") {|io|
+					static_podspec_totoal_sentences = io.readlines
+				}
+
+				File.open(static_pod_spec_path, "w+") {|io|
+					static_podspec_totoal_sentences.each do |sentence|
+						sentence_content = sentence.strip.chomp.to_s
+					
+						is_sentence_content_empty = sentence_content.empty?
+						is_sentence_content_size_zero = sentence_content.size.zero?
+
+						unless is_sentence_content_empty || is_sentence_content_size_zero
+							unless sentence_content.start_with?("#")
+								mt = /.*s.source = /.match(sentence)
+								unless mt.nil?
+									sentence = mt[0] + "{:http => \'#{http_host}/#{pod}/#{pod_version}/#{pod}.framework.zip\'}"
+								end
+
+								mt = /.*s.ios.vendored_framework   = /.match(sentence)
+								#behind vendored_framework add extra lines
+								unless mt.nil?
+									sentence = mt[0] + "\'#{pod}.framework\'" + "\n"
+
+									#add Resource
+									if origin_podspec_model.have_resources
+										sentence += "  " + "s.resources = \'#{pod}.framework/Versions/A/Resources/*.{png,bundle,xib}\'" + "\n\n"
+									end
+
+									#add dependency
+									origin_podspec_model.dependency_list.each do |d|
+										sentence += "  " + "s.dependency " + "#{d}" + "\n"
+									end
+
+									sentence += "\n"
+
+								end
+
+							end
+						end
+
+						io.write(sentence.chomp + "\n")
+					end
+				}
+
+				cmd_list = []
+				cmd_list << "cd #{package_dir}"
+				cmd_list << "mv -f #{pod}.podspec #{origin_spec_dir}"
+
+				IO.popen(cmd_list.join(";")) do |io|
+					io_lines = io.readlines
+					io_lines.each do |line|
+						puts line
+						is_override_success = false if line.include? "mv:"
+					end
+					io.close
+				end
+			end
+			command.join
+
+			is_override_success
+		end
+
+		def delete_build_files(pod)
+			command = Thread.new do 
+				pod_version = @podfile_io.get_podfile_pod_version(pod)
+
+				origin_spec_dir = detect_version_directory(pod, pod_version)
+				package_dir_name = "#{pod}-#{pod_version}"
+
+				cmd_list = []
+				cmd_list << "cd #{origin_spec_dir}"
+				cmd_list << "rm -f -r #{package_dir_name}"
+
+				IO.popen(cmd_list.join(";")) do |io|
+					io.close
+				end
+			end
+
+			command.join
+		end
+
+#class end
+	end
+end