cocoapods-sync-podspecs 0.1.9 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b1b2b81372c2ca12b4259f1a260873f3de93e8649945c39ae3cb891787d65ea
-  data.tar.gz: 6b1372504d4f1e31b1f124da1a32a4c7fa117b53b89cfffc707c4f1c00bfeab8
+  metadata.gz: 9de345a627797c763a42d8b00ae11c8ed0ac6d790d929396542e476ec0050839
+  data.tar.gz: e326567beb4b6c3beee0afe8848cef3cda75656b2837258e50d710d5b4792423
 SHA512:
-  metadata.gz: '0413886e0cccff9a7bb3d669a90df6c1f34e28d432b19c117f8b4cd1c9fd5d2089468bfd908538271c37089f1f504c39afaf1002e372b5d1cd4531bf24c131c9'
-  data.tar.gz: d5b2d4d06718c4f40614b87932270f3ee7b9cc2b48f9c596b37c5a53e1994cad8b8b85ee607e21749defcb9c14b42a13fba96ce17f5755d6c6abcf6ff566bb08
+  metadata.gz: 5982e216e64e04ac6531519eeb63f46425d0118312d34a5f98e6206c374ca06d58f29413c0427640df74506f00d147899b7225cb4140503b163acdaf1969627b
+  data.tar.gz: 1412ef4aca07b10262b9a859bc4fd0934a3e7c7429f0e5d41382bb991997a2f0b1f269041c4ac64528951875a705150990b6745f32c445354f8c2a0d54a6a32a

data/lib/pod/command/bump-version.rb

@@ -48,10 +48,11 @@ module Pod
                 end
 
                 def modify_podspec(path, version)
-                    unless version =~ /^\d{1,}.\d.\d$|^\d{1,}.\d$|^\d{1,}$/
-                        UI.puts "s.version: not found"
+                    unless version =~ /^(\d+\.)?(\d+\.)?(\*|\d+)$/
+                        UI.puts "Invalid version #{version}"
                         return 
                     end
+                    
                     unless File.exist?path
                         UI.puts "Podspec file not found"
                         return
@@ -60,13 +61,13 @@ module Pod
                     File.open(path, "r+") do |f|
                         s = ""
                         f.each_line do |line|
-                            if line.to_s =~ /s\.version\s*=\s*"(\d{1,}.\d.\d|\d{1,}.\d|\d{1,})"/
-                                line = line.sub(/\d{1,}.\d.\d|\d{1,}.\d|\d{1,}/) do |match| 
+                            if line.to_s =~ /s\.version\s*=\s*'(\d+\.)?(\d+\.)?(\*|\d+)'/
+                                line = line.sub(/(\d+\.)?(\d+\.)?(\*|\d+)/) do |match| 
                                     version.to_s
                                 end
                             end
-                            if line.to_s =~ /s\.version\s*=\s*'(\d{1,}.\d.\d|\d{1,}.\d|\d{1,})'/
-                                line = line.sub(/\d{1,}.\d.\d|\d{1,}.\d|\d{1,}/) do |match| 
+                            if line.to_s =~ /s\.version\s*=\s*"(\d+\.)?(\d+\.)?(\*|\d+)"/
+                                line = line.sub(/(\d+\.)?(\d+\.)?(\*|\d+)/) do |match| 
                                     version.to_s
                                 end
                             end
@@ -74,7 +75,6 @@ module Pod
                         end
                         File.open(path, "w+") do |f| f.write(s) end
                     end	
-                    
                 end
 
                 # @return [Array<Pathname>] The path of the specifications to push.

data/lib/pod/command/push-tag.rb

@@ -15,16 +15,18 @@ module Pod
 
                 def self.options
                     [
-                        ['--local-only', 'Does not perform the step of pushing REPO to its remote'],
-                        ['--ignore-exists', 'Ignore exists tag'],
-                        ['--force', 'Force create new tag'],
+                        ['--commit-local', 'Make commit for bump version'],
+                        ['--push-remote', 'Perform the step of pushing REPO to its remote'],
+                        ['--continue-if-exists', 'Continues running when tag is existed'],
+                        ['--tag-on-change', 'Just push tag when podspec is changed'],
                     ].concat(super)
                 end
 
                 def initialize(argv)
-                    @force_create_tag = argv.flag?('force')
-                    @ignore_exists = argv.flag?('ignore-exists')
-                    @local_only = argv.flag?('local-only')
+                    @commit_local = argv.flag?('commit-local', false)
+                    @tag_on_change = argv.flag?('tag-on-change', false)
+                    @continue_if_exists = argv.flag?('continue-if-exists', false)
+                    @push_remote = argv.flag?('push-remote', false)
                     @tag_version = argv.shift_argument
                     @current_repo_dir = ''
                     super
@@ -41,17 +43,23 @@ module Pod
                 end
 
                 def run
+                    processedPaths = Array.new
+
                     podspec_files.each do |spec_file|
                         spec = Pod::Specification.from_file(spec_file)
                         
                         @tag_version = spec.version.to_s unless !@tag_version.nil?
                         @current_repo_dir = Pathname(spec_file).dirname
 
+                        next if processedPaths.include?(@current_repo_dir)
+
+                        processedPaths.push(@current_repo_dir)
+
                         # check_repo_status(spec.name, Pathname(spec_file).dirname)
                         # update_repo(spec.name, Pathname(spec_file).dirname)                        
 
                         exists_tag = pod_repo_git('tag').include?(@tag_version)
-                        if exists_tag && !@ignore_exists
+                        if exists_tag && !@continue_if_exists
                             raise Informative, "#{spec.name}: tag #{@tag_version} already exists" 
                         end
 
@@ -67,13 +75,13 @@ module Pod
 
                     # only commit if modified
                     if pod_repo_git('status', '--porcelain').include?(podspec_name)
-                        pod_repo_git('add', '*.podspec')
-                        pod_repo_git('commit', '--no-verify', '-m', message)
-                        push_pod_repo(name) unless @local_only
+                        pod_repo_git('add', '*.podspec') unless !@commit_local
+                        pod_repo_git('commit', '--no-verify', '-m', message) unless !@commit_local
+                        push_pod_repo(name) unless !@push_remote
 
                         pod_repo_git('tag', '-a', @tag_version, '-m', message)
                         push_tag_repo
-                    elsif @force_create_tag
+                    elsif !@tag_on_change
                         check_repo_status(name, @current_repo_dir)
                         update_repo(name, @current_repo_dir)                        
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-sync-podspecs
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.4
 platform: ruby
 authors:
 - quangmv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods