podsorz 0.0.7 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a44111361a02ff1c1a71d7085d25bc8ac4ae3835085913ac796c09a86cda8f9
-  data.tar.gz: e130cd226bdb7072e8db2ee84ca2fad1a09d0d5cbb6b56a7b23e5ed2c206e190
+  metadata.gz: bd62dd4556e53831b2b078c24ea852a7c756288385a316ac86e38b3f4ae3a2be
+  data.tar.gz: 4d12c63701b3ea89a5096a7f440061940424b8e2ddc33fe1b7ef65200078b8cb
 SHA512:
-  metadata.gz: 021efcba84b814774fb105bb019d81053ffbaa727f469ca1c679a55f2ee65a1749ebc4aa15a9c684292899a2ab6930543812b0c825a9ee440b0cc5a2cf2381e3
-  data.tar.gz: b936d7f1b824146c954767ffd987127ebf09d474e127dae7b9f16e16cf494b959bd1003855c73997d5c5252b11665e25e7bfc2be32175a6b4d62505cc27a589d
+  metadata.gz: 216b722dbe1466edbc93c9051ea2e0f4a57324774d201c90f11b44c9adaed803fc49e9f381fb336dc60c817824290075ff673369098ad04e4e42a1a94a3ee386
+  data.tar.gz: da69be9b603987f84ff1a951f1582afefc8a0e647472d3dc89ae6924886823ac15088b3f0fe736e643b8a9ddbe6e65f8d217ebbda9a1facec677478ab09dc451

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Listen for rdebug-ide",
+            "type": "Ruby",
+            "request": "attach",
+            "cwd": "${workspaceRoot}",
+            "remoteHost": "127.0.0.1",
+            "remotePort": "1234",
+            "remoteWorkspaceRoot": "${workspaceRoot}"
+        }
+    ]
+}

data/Gemfile

@@ -4,3 +4,13 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in podsorz.gemspec
 gemspec
+gem "rspec"
+
+group :development do
+  gem 'bacon'
+  gem 'mocha-on-bacon'
+  gem 'mocha'
+  gem 'prettybacon'
+  gem 'coveralls', :require => false
+  gem 'rubocop'
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    podsorz (0.0.5)
+    podsorz (0.0.8)
       cocoapods
       cocoapods-packager
       colorize
@@ -21,7 +21,9 @@ GEM
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
+    ast (2.4.2)
     atomos (0.1.3)
+    bacon (1.2.0)
     claide (1.0.3)
     cocoapods (1.10.1)
       addressable (~> 2.6)
@@ -65,6 +67,14 @@ GEM
     colored2 (3.1.2)
     colorize (0.8.1)
     concurrent-ruby (1.1.8)
+    coveralls (0.8.23)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
     escape (0.0.4)
     ethon (0.12.0)
       ffi (>= 1.3.0)
@@ -78,17 +88,65 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.5.1)
     minitest (5.14.4)
+    mocha (1.12.0)
+    mocha-on-bacon (0.2.3)
+      mocha (>= 0.13.0)
     molinillo (0.6.6)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    prettybacon (0.0.2)
+      bacon (~> 1.2)
     public_suffix (4.0.6)
+    rainbow (3.0.0)
+    regexp_parser (2.1.1)
+    rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.11.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
     ruby-macho (1.4.0)
+    ruby-progressbar (1.11.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
+    thor (1.1.0)
     thread_safe (0.3.6)
+    tins (1.28.0)
+      sync
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
+    unicode-display_width (2.0.0)
     xcodeproj (1.19.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
@@ -100,7 +158,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bacon
+  coveralls
+  mocha
+  mocha-on-bacon
   podsorz!
+  prettybacon
+  rspec
+  rubocop
 
 BUNDLED WITH
    1.17.2

data/lib/podsorz.rb

@@ -8,6 +8,8 @@ require "podsorz/command/publish"
 require "podsorz/command/sync"
 require "podsorz/command/binary"
 require "podsorz/command/install"
+require "podsorz/command/check"
+require "podsorz/command/sort"
 
 require 'gli'
 
@@ -40,6 +42,8 @@ module PodsOrz
   install_command()
   sync_command()
   binary_command()
+  check_command()
+  sort_command()
 
   desc "Show podsorz version"
   command :version do |version|

data/lib/podsorz/command/binary.rb

@@ -14,7 +14,7 @@ module PodsOrz
 					prepare_work(dir_path)
 
 					git_manager = PodsOrz::PodsGitManager.new(dir_path)
-					result_hash = filter_binary_pods_list(git_manager, :package)
+					result_hash = filter_binary_pods_list(dir_path,git_manager, :package)
 					package_list = result_hash[:package]
 
 					binary_manager = PodsOrz::BinaryManager.new(dir_path)
@@ -32,7 +32,7 @@ module PodsOrz
 					prepare_work(dir_path)
 
 					git_manager = PodsOrz::PodsGitManager.new(dir_path)
-					filter_binary_pods_list(git_manager, :show)
+					filter_binary_pods_list(dir_path,git_manager, :show)
 				end
 					
 			end
@@ -45,7 +45,7 @@ module PodsOrz
 					prepare_work(dir_path)
 
 					git_manager = PodsOrz::PodsGitManager.new(dir_path)
-					result_hash = filter_binary_pods_list(git_manager, :package)
+					result_hash = filter_binary_pods_list(dir_path,git_manager, :package)
 					package_list = result_hash[:package]
 
 					binary_manager = PodsOrz::BinaryManager.new(dir_path)
@@ -59,12 +59,12 @@ module PodsOrz
 	end
 
 	def self.prepare_work(dir_path)
-		pods_repo = PodsOrz::PodsRepo.new()
+		pods_repo = PodsOrz::PodsRepo.new(dir_path)
 		pods_repo.check_repo_exist()
 	end
 
 
-	def self.filter_binary_pods_list(git_manager, cmd_type)
+	def self.filter_binary_pods_list(dir_path,git_manager, cmd_type)
 		result_hash = {
 			:binary => [],
 			:package => []
@@ -104,7 +104,7 @@ module PodsOrz
 		can_package_list = []
 
 		#2.查询Podfile_orz是否为已发版本状态
-		binary_repo = PodsOrz::BinaryRepo.new()
+		binary_repo = PodsOrz::BinaryRepo.new(dir_path)
 		binary_repo.check_binary_repo_exist()
 
 		origin_binary_list.each do |pod|
@@ -134,10 +134,17 @@ module PodsOrz
 			end
 		end
 
-		Logger.highlight("[cmd:#{cmd_type}] Exist static library pods : \n #{exist_binary_list.inspect}")
+		Logger.highlight("[cmd:#{cmd_type}] Exist static library pods :")
+		exist_binary_list.each do |item|
+			puts item.colorize(:green)
+		end
+
 		Logger.separator
-		Logger.warning("[cmd:#{cmd_type}] Not exist static library pods: \n #{empty_binary_list.inspect}")
 
+		Logger.warning("[cmd:#{cmd_type}] Not exist static library pods:")
+		empty_binary_list.each do |item|
+			puts item.colorize(:yellow)
+		end
 
 		result_hash[:binary] = has_binary_list
 		result_hash[:package] = can_package_list

data/lib/podsorz/command/check.rb

@@ -0,0 +1,31 @@
+# require "podsorz/core/PodsOrz/pods_check_merge"
+# require "../../PodsOrz/lib/podsorz/core/PodsOrz/pods_check_merge.rb"
+require "podsorz/core/PodsOrz/pods_check_merge"
+require "podsorz/core/Config/pod_orzconfig_parse"
+
+
+module PodsOrz
+	def self.check_command
+		desc "Check Pods not merge"
+		command :check do |check|
+			check.action do |global_options, options, args|
+				dir_path = global_options[:path]
+
+				is_directory = File.directory?(dir_path)
+
+				unless is_directory
+					Logger.error("Check failure, it is not a directory path: #{dir_path}")
+					exit()
+				end
+
+				@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(dir_path)
+                kx_pods_path = File.expand_path("../#{@orzconfig_parse.file_devpods_name}", dir_path)
+                # puts "kx_pods_path #{kx_pods_path}"
+				checkManger = PodsOrz::PodsCheckMerge.new()
+                checkManger.branchList(kx_pods_path)
+			
+			end
+		end
+	end
+
+end

data/lib/podsorz/command/install.rb

@@ -18,7 +18,7 @@ module PodsOrz
 				exit() unless is_same
 
 				#获取binary 列表
-				list_hash = PodsOrz.filter_binary_pods_list(git_manager, :binary)
+				list_hash = PodsOrz.filter_binary_pods_list(dir_path,git_manager, :binary)
 
 				git_manager.install_pod(dir_path, list_hash[:binary])
 			end

data/lib/podsorz/command/sort.rb

@@ -0,0 +1,34 @@
+require "podsorz/core/PodsOrz/pods_sort"
+require "podsorz/core/Config/pod_orzconfig_parse"
+
+module PodsOrz
+	def self.sort_command
+		desc "Prioritize the pods to be released and check for loops. Output the number of dependency"
+		command :sort do |sort|
+			sort.action do |global_options, options, args|
+				dir_path = global_options[:path]
+
+				is_directory = File.directory?(dir_path)
+
+				unless is_directory
+					Logger.error("Check failure, it is not a directory path: #{dir_path}")
+					exit()
+				end
+
+                
+                @orzconfig_parse = PodsOrz::PodOrzconfigParse.new(dir_path)
+				kx_pods_path = File.expand_path("../#{@orzconfig_parse.file_devpods_name}", dir_path)
+                pods_list = @orzconfig_parse.fix_pod_list
+                if pods_list.empty?
+                    Logger.warning("fix_pods is empty nothing to do")
+                else
+                    pods_sort = PodsOrz::PodsSort.new()
+				    pods_list =  pods_sort.sort(pods_list,kx_pods_path)
+                    
+                end
+			
+			end
+		end
+	end
+
+end

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

@@ -6,16 +6,17 @@ require "open3"
 
 module PodsOrz
 	class BinaryBuilder
-		attr_accessor :main_path, :kx_binary_path, :podfile_io, :pod_repo, :http_host
+		attr_accessor :main_path, :kx_binary_path, :podfile_io, :pod_repo, :http_host, :remote_binary_directory
 
 		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()
+			@pod_repo = PodsOrz::PodsRepo.new(main_path)
 
-			@http_host = "http://192.168.6.23:8080"
+			@http_host = "http://192.168.6.127:8899"
+			@remote_binary_directory = "binary_pod"
 		end
 
 		def start_package_pod(pod)
@@ -82,7 +83,7 @@ module PodsOrz
 				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)
+					FileUtils.mkdir_p(@kx_binary_path, :mode => 0777)
 				end
 			end
 		end
@@ -99,7 +100,7 @@ module PodsOrz
 			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)
+				FileUtils.mkdir_p(pod_path, :mode => 0777)
 			end
 		end
 
@@ -107,8 +108,8 @@ module PodsOrz
 			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)
+				Logger.warning("#{pod_version_path} directory not exist, generate default '#{pod_version_path}' directory")
+				FileUtils.mkdir_p(pod_version_path, :mode => 0777)
 			end
 
 			pod_version_path
@@ -241,7 +242,7 @@ module PodsOrz
 							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\'}"
+									sentence = mt[0] + "{:http => \'#{@http_host}/#{remote_binary_directory}/#{pod}/#{pod_version}/#{pod}.framework.zip\'}"
 								end
 
 								mt = /.*s.ios.vendored_framework   = /.match(sentence)

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

@@ -11,7 +11,7 @@ module PodsOrz
 			@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
 			@podfile_io = PodsOrz::PodfileIO.new(main_path)
 
-			@binary_repo = PodsOrz::BinaryRepo.new()
+			@binary_repo = PodsOrz::BinaryRepo.new(main_path)
 			@binary_repo.check_binary_repo_exist()
 
 			@binary_builder = PodsOrz::BinaryBuilder.new(main_path, @podfile_io)
@@ -150,7 +150,11 @@ module PodsOrz
 					dest_dir = @binary_builder.detect_version_directory(pod, pod_version)
 
 					each_result = @binary_repo.push_binary_remote(pod, dest_dir, pod_version, false)
-					is_publish_success = false unless each_result
+					unless each_result
+						is_publish_success = false 
+						Logger.error("#{pod}(#{pod_version}) publish failure!")
+					end
+					
 				end
 
 				command.join

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

@@ -1,14 +1,21 @@
 require "podsorz/util/logger"
 require 'open3'
+require "podsorz/core/Binary/binary_server"
+require "podsorz/core/Config/pod_orzconfig_parse"
+
 
 module PodsOrz
 	class BinaryRepo
-		attr_accessor :repo_name, :repo_url
+		attr_accessor :repo_name, :repo_url, :binary_server
 
-		def initialize()
+		def initialize(main_path)
 			@repo_name = "kuxiu_binary_specs"
 			@repo_url = "git@gitlab.91banban.com:ios_pods/binary-specs.git"
-			@source_code_repo_url = "git@gitlab.91banban.com:ios_pods/Specs.git"
+			@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
+			# 替换成config配置参数
+			# @source_code_repo_url = "git@gitlab.91banban.com:ios_pods/Specs.git"
+			@source_code_repo_url = @orzconfig_parse.remote_url_codespec
+			@binary_server = PodsOrz::BinaryServer.new()
 		end
 
 		def check_binary_repo_exist()
@@ -132,6 +139,19 @@ module PodsOrz
 		def push_binary_remote(pod, file_path, pod_version, is_swift)
 			is_push_success = false
 
+			#1.上传文件到服务器
+			is_push_success = @binary_server.upload_pod_file(pod, file_path, pod_version)
+			return is_push_success unless is_push_success
+
+			#2.发布到binary_repo
+			is_push_success = start_publish_binary(pod, file_path, pod_version, is_swift)
+			
+          	is_push_success
+		end
+
+		def start_publish_binary(pod, file_path, pod_version, is_swift)
+			is_push_success = false
+
 			command = Thread.new do 
 				repo_push_cmd = []
 				repo_push_cmd << "cd #{file_path}"
@@ -168,9 +188,6 @@ module PodsOrz
           	is_push_success
 		end
 
-
-
-
 #Class End
 
 	end