podsorz 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71846991c3031f5c87b7920fcfa1dd124c6045942f7806c1ce45c1c73439295d
-  data.tar.gz: c77371fcd0d59b1de427dc5a32acc7f0207e97f99d861668e970bf985431a963
+  metadata.gz: d38f8163c1f9e6587babc509157e0b5a2ab28579ac671f7d601b54530d459877
+  data.tar.gz: d613d70b391488a7e5e0dbb23af7adfbb7a244ae11207df3bbd20c926fdeb43a
 SHA512:
-  metadata.gz: e6b377d4f212e5aff0c92cfd9e840728c442ebd1ad674d636fe1f7f066844c747add1707b8fe66e4f1cf02b04860f3fc1861c8ad1cf127b1593fb133f9eb2b2b
-  data.tar.gz: ecd46d55200dfbf9318ec92b45b95ae5aca15270f6a90c9672a9a8aa40bce1ff8693b19369169d0e81a5d5ba8627d2fc7e2d38ad3091d599f4b31771750278a6
+  metadata.gz: 820b026eb6a37aca7638b876a39dc2ed6c8bd82fa47155ae72c10349b99846012828b123e5d0f5fda5c05b28f17b2e1bc205783385c636d19f9794a2aebdb0da
+  data.tar.gz: e6bf24c686367fee43132c8c13601d304af3ae2a073617cef38544eb6b529d75a6bdba5edffd652c8a31379cdaa3674d31f6efb02dd0dd295813a51e707eacd7

data/Gemfile.lock

@@ -10,8 +10,8 @@ PATH
 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)
@@ -23,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)
@@ -41,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)
@@ -64,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)
@@ -87,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/core/Binary/binary_repo.rb

@@ -136,9 +136,9 @@ module PodsOrz
 				repo_push_cmd = []
 				repo_push_cmd << "cd #{file_path}"
 				if is_swift
-					repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --allow-warnings --use-libraries --skip-import-validation --sources=#{@source_code_repo_url} --use-modular-headers --swift-version=5.0 --skip-tests"
+					repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --sources=#{@source_code_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 --allow-warnings --use-libraries --skip-import-validation --sources=#{@source_code_repo_url} --skip-tests"	
+					repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --sources=#{@source_code_repo_url} --allow-warnings --use-libraries --skip-import-validation --skip-tests --platforms=ios"	
 				end
 				
 

data/lib/podsorz/core/PodsOrz/pods_git_operator.rb

@@ -648,6 +648,7 @@ module PodsOrz
 			#rebase
 			rebase_branch = rebase_branch.strip.chomp
 			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

data/lib/podsorz/core/PodsOrz/pods_repo.rb

@@ -190,9 +190,9 @@ module PodsOrz
 				repo_push_cmd = []
 				repo_push_cmd << "cd #{file_path}"
 				if is_swift
-					repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --allow-warnings --use-libraries --skip-import-validation --sources=#{@repo_url} --use-modular-headers --swift-version=5.0 --skip-tests"
+					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 --allow-warnings --use-libraries --skip-import-validation --sources=#{@repo_url} --skip-tests"	
+					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
 				
 

data/lib/podsorz/core/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/util/git_operator.rb

@@ -326,7 +326,7 @@ module PodsOrz
       end
 
       if has_conflicts
-        Logger.error("【#{pod}】 on branch: \"#{parent_branch}\" Merge conflict, please manual fix conflicts.(fix conflicts and run \"git commit\")(use \"git merge --abort\" to abort the merge)")
+        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

data/lib/podsorz/version.rb

@@ -1,3 +1,3 @@
 module PodsOrz
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 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"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podsorz
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Xiangqi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -66,8 +66,9 @@ 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'
+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:
@@ -79,7 +80,6 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- Note
 - README.md
 - Rakefile
 - bin/podsorz

data/Note

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