cocoapods-trunk 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f0a2309c1281858012a7c4267a7e51238805a5ccd6c28682d51338d10e54c72
-  data.tar.gz: 4f28e72b7d0aa56b709ece149ab1b2f156311bd85627a8bcece288d1c197e759
+  metadata.gz: 43e91d5573ade7674c9ede81699454a44188687418caf843239ad9cd0b1a0e63
+  data.tar.gz: 9a978262bd54a83cbb69b3810df05950be3044a7deb04834ead9f2ef276d29fc
 SHA512:
-  metadata.gz: d04bc5f939b2bde1fefeae748077aa1871b4d500d36946ad4820830f9ead8102b5d195907f10da465c480e051077a34b961301b5ea3faf4719b575ed7ba2291c
-  data.tar.gz: 0756a6dd8f578984fe6813a501eeb327d904e6fb0f3fba2bcd99ca054f01c6b76b7fbe6232942f47615ba8563e65b5d995785298eab5567f1f8a6617ab288688
+  metadata.gz: 023642a2121bdb3e345d5aaa27012c42c262b464e5fbaaa0f0d6d693544aff401212f6845bc61a586689804af778bd57748033b47707eba509f1dedab8ce7f84
+  data.tar.gz: 25dd04be50dc69d3a5ca138b48a51b40e2577c446ab16e22e5b0390b4566919ff2360704201ffcac8b230c69d7033f6126e84be8250b7b9b5ac573c5a3343dab

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.5.0 (2020-05-01)
+
+##### Enhancements
+
+* Add --synchronous option to `pod trunk push`.  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#147](https://github.com/CocoaPods/cocoapods-trunk/pull/147)
+  [CocoaPods#9497](https://github.com/CocoaPods/CocoaPods/issues/9497)
+
+##### Bug Fixes
+
+* None.  
+
+
 ## 1.4.1 (2019-09-26)
 
 ##### Enhancements

data/Gemfile.lock

@@ -7,19 +7,19 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/CocoaPods.git
-  revision: af83e4713771bc98dd7f903cc81c4fbc8866812c
+  revision: ae4d9804450c9f83a3fea29eadc3c6e2affe24c7
   branch: master
   specs:
-    cocoapods (1.8.0.beta.1)
+    cocoapods (1.8.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.8.0.beta.1)
+      cocoapods-core (= 1.8.0)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (= 1.4.1)
+      cocoapods-trunk (= 1.5.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
@@ -32,10 +32,10 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: 0a6dea961da236995dfde3c7927e4daaf2045820
+  revision: dbc9b76820d546b4d655aa26141fad0412c3c849
   branch: master
   specs:
-    cocoapods-core (1.8.0.beta.1)
+    cocoapods-core (1.8.0)
       activesupport (>= 4.0.2, < 6)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.0)
@@ -52,14 +52,14 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods-trunk (1.4.1)
+    cocoapods-trunk (1.5.0)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.0)
+    CFPropertyList (3.0.1)
     activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -67,7 +67,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    algoliasearch (1.26.1)
+    algoliasearch (1.27.0)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     ast (2.2.0)
@@ -104,7 +104,7 @@ GEM
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     metaclass (0.0.4)
-    minitest (5.11.3)
+    minitest (5.12.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.2)

data/lib/cocoapods_trunk.rb

@@ -1,3 +1,3 @@
 module CocoaPodsTrunk
-  VERSION = '1.4.1'.freeze
+  VERSION = '1.5.0'.freeze
 end

data/lib/pod/command/trunk/push.rb

@@ -36,6 +36,7 @@ module Pod
              'This takes precedence over a .swift-version file.'],
             ['--skip-import-validation', 'Lint skips validating that the pod can be imported'],
             ['--skip-tests', 'Lint skips building and running tests during validation'],
+            ['--synchronous', 'If validation depends on other recently pushed pods, synchronize'],
           ].concat(super)
         end
 
@@ -47,6 +48,7 @@ module Pod
           @skip_import_validation = argv.flag?('skip-import-validation', false)
           @skip_tests = argv.flag?('skip-tests', false)
           @path = argv.shift_argument || '.'
+          @synchronous = argv.flag?('synchronous', false)
           find_podspec_file if File.directory?(@path)
           super
         end
@@ -80,6 +82,8 @@ module Pod
 
         private
 
+        MASTER_GIT_REPO_URL = 'https://github.com/CocoaPods/Specs.git'.freeze
+
         def push_to_trunk
           spec.attributes_hash[:pushed_with_swift_version] = @swift_version if @swift_version
           response = request_path(:post, "pods?allow_warnings=#{@allow_warnings}",
@@ -118,7 +122,7 @@ module Pod
         def validate_podspec
           UI.puts 'Validating podspec'.yellow
 
-          validator = Validator.new(spec, [master_repo_url])
+          validator = Validator.new(spec, [repo_url])
           validator.allow_warnings = @allow_warnings
           validator.use_frameworks = @use_frameworks
           if validator.respond_to?(:use_modular_headers=)
@@ -139,21 +143,17 @@ module Pod
           @swift_version = validator.respond_to?(:used_swift_version) && validator.used_swift_version
         end
 
+        def repo_url
+          @synchronous ? MASTER_GIT_REPO_URL : Pod::TrunkSource::TRUNK_REPO_URL
+        end
+
         def update_master_repo
           # more robust Trunk setup logic:
           # - if Trunk exists, updates it
           # - if Trunk doesn't exist, add it and update it
           #
-          trunk = sources_manager.find_or_create_source_with_url(Pod::TrunkSource::TRUNK_REPO_URL)
-          sources_manager.update(trunk.name)
-        end
-
-        def master_repo_name
-          sources_manager.master.first.name
-        end
-
-        def master_repo_url
-          sources_manager.master.first.url
+          repo = sources_manager.find_or_create_source_with_url(repo_url)
+          sources_manager.update(repo.name)
         end
 
         def sources_manager

data/spec/command/trunk/push_spec.rb

@@ -241,7 +241,6 @@ module Pod
       it 'updates the master repo when it exists' do
         Config.instance.sources_manager.stubs(:source_with_url).
           at_most(2).
-          returns(Pod::TrunkSource.new(Pod::TrunkSource::TRUNK_REPO_NAME)).
           returns(Pod::TrunkSource.new(Pod::TrunkSource::TRUNK_REPO_NAME))
 
         Config.instance.sources_manager.expects(:update).with(Pod::TrunkSource::TRUNK_REPO_NAME).twice
@@ -262,6 +261,40 @@ module Pod
       end
     end
 
+    describe 'synchronous updating the git repo' do
+      before do
+        @cmd = Command.parse(%w(trunk push spec/fixtures/BananaLib.podspec --synchronous))
+        @cmd.stubs(:validate_podspec)
+        @cmd.stubs(:push_to_trunk).returns([200, success_json])
+        Command::Trunk::Push.any_instance.unstub(:update_master_repo)
+        Command::Trunk::Push.any_instance.stubs(:master_repo_name).returns('master')
+      end
+
+      it 'updates the git repo when it exists' do
+        Config.instance.sources_manager.stubs(:source_with_url).
+          at_most(2).
+          returns(Pod::TrunkSource.new('master'))
+
+        Config.instance.sources_manager.expects(:update).with('master').twice
+        Command::Repo::AddCDN.any_instance.expects(:run).never
+
+        @cmd.run
+      end
+
+      it 'sets up the git repo when it does not exist' do
+        Config.instance.sources_manager.stubs(:source_with_url).
+          at_most(3).
+          returns(nil).
+          returns(Pod::TrunkSource.new('master'))
+        Config.instance.sources_manager.stubs(:cdn_url?).returns(false)
+        Config.instance.sources_manager.stubs(:create_source_with_url).once.
+          returns(Pod::TrunkSource.new('master'))
+        Config.instance.sources_manager.expects(:update).with('master').twice
+
+        @cmd.run
+      end
+    end
+
     describe 'Presenting Responses to the user' do
       before do
         Command::Trunk::Push.any_instance.stubs(:update_master_repo)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-trunk
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Eloy Durán
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nap