podsorz 0.0.2 → 0.0.7

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

@@ -5,11 +5,13 @@ module PodsOrz
 	class PodsRepo
 		attr_accessor :repo_name, :repo_url
 
+		def initialize()
+			@repo_name = "kuxiu_specs"
+			@repo_url = "git@gitlab.91banban.com:ios_pods/Specs.git"
+		end
+
 		def check_repo_exist
 			command = Thread.new do 
-				@repo_name = "kuxiu_specs"
-				@repo_url = "git@gitlab.91banban.com:ios_pods/Specs.git"
-
 				has_repo = false
 				Open3.popen3("pod repo list") do |stdin , stdout , stderr, wait_thr|
 			        while line = stdout.gets
@@ -53,7 +55,7 @@ module PodsOrz
 				Logger.warning("#{pod}:#{pod_version} large than git_tag:#{git_tag}")
 			end
 
-			compare_result;
+			compare_result
 			
 		end
 
@@ -67,7 +69,7 @@ module PodsOrz
 			case compare_result
 			when 0
 				#same
-				Logger.default("#{pod}:#{pod_version} has nothing to update remote kuxiu_specs")
+				Logger.default("#{pod}:#{pod_version} has nothing to update remote #{@repo_name}")
 			when -1
 				#less than remote version
 				Logger.error("#{pod}:#{pod_version} is less than remote:#{remote_version} \n please checkout manual，make sure local_pod_version = (remote_version +1).It would be great if you could also remove the invalid tag:#{pod_version} this time. It doesn't matter if you don't delete it")
@@ -76,17 +78,41 @@ module PodsOrz
 				Logger.warning("#{pod}:#{pod_version} large than remote:#{remote_version}, will start update remote")
 			end
 
-			compare_result;
+			compare_result
+		end
+
+		def directory_pod_version(pod, pod_version)
+			directory_result = ""
+
+			dir_kuxiu_specs = "#{Dir.home}/.cocoapods/repos/#{@repo_name}"
+			dir_pod_path = File.expand_path("#{pod}", dir_kuxiu_specs)
+			is_dir_exist = File.directory?(dir_pod_path)
+
+			unless is_dir_exist
+				Logger.warning("#{pod} remote #{pod}\/ directory do not exist")
+				return directory_result
+			end
+
+			dir_version_path = File.expand_path("#{pod_version}", dir_pod_path)
+			is_dir_exist = File.directory?(dir_version_path)
+			unless is_dir_exist
+				Logger.warning("#{pod}:#{pod_version} remote #{pod}.podspec do not exist")
+				return directory_result
+			end
+
+			directory_result = dir_version_path
+
+			directory_result
 		end
 
 		def fetch_remote_pod_version(pod)
 			version = "0.0.0"
 
-			dir_kuxiu_specs = "#{Dir.home}/.cocoapods/repos/kuxiu_specs"
+			dir_kuxiu_specs = "#{Dir.home}/.cocoapods/repos/#{@repo_name}"
 			dir_pod_path = File.expand_path("#{pod}", dir_kuxiu_specs)
-			is_dir_exit = File.directory?(dir_pod_path)
+			is_dir_exist = File.directory?(dir_pod_path)
 
-			unless is_dir_exit
+			unless is_dir_exist
 				Logger.warning("#{pod} remote spec do not exist, default version: 0.0.0")
 				return version 
 			end
@@ -157,17 +183,24 @@ module PodsOrz
 			
 		end
 
-		def push_pod_remote(pod, file_path, pod_version)
+		def push_pod_remote(pod, file_path, pod_version, is_swift)
 			is_push_success = false
 
 			command = Thread.new do 
 				repo_push_cmd = []
 				repo_push_cmd << "cd #{file_path}"
-				repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --allow-warnings --use-libraries --skip-import-validation --sources=#{@repo_url}"
+				if is_swift
+					repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --sources=#{@repo_url} --allow-warnings --use-libraries --skip-import-validation --use-modular-headers --swift-version=5.0 --skip-tests --platforms=ios"
+				else
+					repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --sources=#{@repo_url} --allow-warnings --use-libraries --skip-import-validation --skip-tests --platforms=ios"	
+				end
+				
 
 				error_info = []
 
+				Logger.separator()
 				Logger.default("【#{pod}】:#{pod_version} start push repo remote...")
+				Logger.separator()
 
 				IO.popen(repo_push_cmd.join(";")) do |io|	
 					io.each do |line|

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

@@ -25,7 +25,10 @@ module PodsOrz
 			File.open(file_path, "r") do |file|
 				file.readlines.each do |line|
 					l = line.strip.chomp
-					next if l.start_with?("#")
+					if l.start_with?("#")
+						update_lines << line
+						next 
+					end
 
 					if /\.(version)(.*) =/ =~ line
 						version_num = $~.post_match.strip.chomp.to_s

data/lib/podsorz/core/Specs/podspec_model.rb

@@ -0,0 +1,45 @@
+module PodsOrz
+
+  class PodspecModel
+
+    attr_accessor :dependency_list, :pod_name, :have_resources
+
+    def initialize(podspec_file_path)
+      @dependency_list = []
+      @have_resources = false
+
+      totoal_sentences = []
+      File.open(podspec_file_path, "r") {|io|
+        totoal_sentences = io.readlines
+      }
+
+      totoal_sentences.each do |line|
+        if /\.(name)(.*) =/ =~ line
+          @pod_name = $~.post_match.strip
+          @pod_name = pod_name.gsub(/[\'\"]/, "")
+        end
+
+        if /\.(resource)(.*) =/ =~ line
+          @have_resources = true
+        end
+
+        if /\.dependency/ =~ line
+          dependency = $~.post_match.strip
+
+          unless @pod_name.nil?
+            unless dependency.include? @pod_name
+              @dependency_list << dependency  
+            end
+          end
+
+        end
+      end
+
+    end
+
+
+
+#class end
+  end
+
+end

data/lib/podsorz/util/git_operator.rb

@@ -53,6 +53,12 @@ module PodsOrz
               Logger.error("Checkout #{branch_name} failed.") 
               is_checkout_success = false
             end
+
+            if line.include? 'fatal'
+              Logger.error("Checkout #{branch_name} failed.") 
+              is_checkout_success = false
+            end
+
           end
 
           io.close
@@ -231,6 +237,17 @@ module PodsOrz
       end
     end
 
+    def fetch(path, branch)
+      cmd_line = []
+
+      cmd_line << "cd #{path}"
+      cmd_line << "git fetch origin #{branch}"
+
+      IO.popen(cmd_line.join(";")) do |io|
+        io.close
+      end
+    end
+
     def compare_branch(path, branch, compare_branch)
       diff_commit_list = []
 
@@ -287,6 +304,36 @@ module PodsOrz
 
     end
 
+    def merge(path, parent_branch, son_branch)
+      is_merge_success = true
+
+      merge_cmd_list = []
+      merge_cmd_list << "cd #{path}"
+      merge_cmd_list << "git checkout #{parent_branch}"
+      merge_cmd_list << "git fetch origin #{parent_branch}"
+      merge_cmd_list << "git reset --hard origin/#{parent_branch}"
+      merge_cmd_list << "git merge #{son_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("branch: \"#{parent_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
+    end
+
     def rebase(path, branch)
       is_rebase_success = true
 

data/lib/podsorz/version.rb

@@ -1,3 +1,3 @@
 module PodsOrz
-  VERSION = "0.0.2"
+  VERSION = "0.0.7"
 end

data/podsorz.gemspec

@@ -10,7 +10,16 @@ Gem::Specification.new do |spec|
   spec.email         = ["110293734@qq.com"]
 
   spec.summary       = %q{iOS application modulize into pods, improvement for develop modules.}
-  spec.description   = %q{iOS application modulize into pods, improvement for develop modules. CMD: git-flow, auto publish code, auto push repo, auto rewrite podfile}
+  spec.description   = %{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
+  }
+  
   spec.homepage      = "https://github.com/XiangqiTu"
   spec.license       = "MIT"
 
@@ -36,5 +45,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "gli", "~> 2.16"
   spec.add_runtime_dependency "cocoapods"
   spec.add_runtime_dependency "colorize"
+  spec.add_runtime_dependency "cocoapods-packager"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podsorz
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - Xiangqi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -52,8 +52,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 'iOS application modulize into pods, improvement for develop modules.
-  CMD: git-flow, auto publish code, auto push repo, auto rewrite podfile'
+- !ruby/object:Gem::Dependency
+  name: cocoapods-packager
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: "iOS application modulize into pods, improvement for develop modules.
+  \n    CMD:\n    1.git-flow\n    2.auto publish code\n    3.auto push repo\n    4.auto
+  rewrite podfile\n    5.sync other branch commit\n    6.binary static libary\n  "
 email:
 - 110293734@qq.com
 executables:
@@ -65,27 +80,32 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- Note
 - README.md
 - Rakefile
 - bin/podsorz
 - lib/podsorz.rb
+- lib/podsorz/command/binary.rb
 - lib/podsorz/command/commit.rb
 - lib/podsorz/command/install.rb
 - lib/podsorz/command/publish.rb
 - lib/podsorz/command/setup.rb
 - lib/podsorz/command/switch.rb
 - lib/podsorz/command/sync.rb
-- lib/podsorz/core/orz_config_templet.rb
-- lib/podsorz/core/orz_env_detector.rb
-- lib/podsorz/core/pod_orzconfig_parse.rb
-- lib/podsorz/core/podfile_io.rb
-- lib/podsorz/core/podfile_model.rb
-- lib/podsorz/core/pods_detector.rb
-- lib/podsorz/core/pods_git_manager.rb
-- lib/podsorz/core/pods_git_operator.rb
-- lib/podsorz/core/pods_repo.rb
-- lib/podsorz/core/pods_version.rb
+- lib/podsorz/core/Binary/binary_builder.rb
+- lib/podsorz/core/Binary/binary_manager.rb
+- lib/podsorz/core/Binary/binary_repo.rb
+- lib/podsorz/core/Binary/binary_server.rb
+- lib/podsorz/core/Config/orz_config_templet.rb
+- lib/podsorz/core/Config/orz_env_detector.rb
+- lib/podsorz/core/Config/pod_orzconfig_parse.rb
+- lib/podsorz/core/PodFile/podfile_io.rb
+- lib/podsorz/core/PodFile/podfile_model.rb
+- lib/podsorz/core/PodsOrz/pods_detector.rb
+- lib/podsorz/core/PodsOrz/pods_git_manager.rb
+- lib/podsorz/core/PodsOrz/pods_git_operator.rb
+- lib/podsorz/core/PodsOrz/pods_repo.rb
+- lib/podsorz/core/PodsOrz/pods_version.rb
+- lib/podsorz/core/Specs/podspec_model.rb
 - lib/podsorz/util/git_operator.rb
 - lib/podsorz/util/logger.rb
 - lib/podsorz/util/process_operator.rb

data/Note

@@ -1,3 +0,0 @@
-
-gem build
-gem push

data/lib/podsorz/core/orz_config_templet.rb

@@ -1,13 +0,0 @@
-module GitConfig
-	#App 当前版本
-	APP_RELEASE_VERSION = "2.0.8" 
-	
-	#作者姓名xiangqi简写
-	BRANCH_AUTHOR_SUFFIX = "xq" 
-end
-
-#想要开发修改的的Pod
-	$FIX_POD_LIST = [
-#        "KXModuleOrz",
-#        "KXModuleQuestionRepo",
-	]