cocoapods-trunk 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 744d02fa3ed37e9d6c313dd262aa67fcca2137965e30a381cd4af0004f742c93
-  data.tar.gz: 836f46995a910739e85f6a226cc877f55ff6e8ad69049dbdaeff15dd0348a3aa
+  metadata.gz: 7f0a2309c1281858012a7c4267a7e51238805a5ccd6c28682d51338d10e54c72
+  data.tar.gz: 4f28e72b7d0aa56b709ece149ab1b2f156311bd85627a8bcece288d1c197e759
 SHA512:
-  metadata.gz: 8edb2b0d1896106606bb16c2609a983be66a4ca09440aabd6994382b9f693bb39b3bb5b55ad41005307221de71cceb89c7a3e7eee68666958aec047321264ab3
-  data.tar.gz: 2d0db6f6be1b910a1ab9ce85978dca81821dd784eab7e79bcf27c7cbae9431dbe9b72ff97459397b0ac45deca55ef5acf75797474e66428e0057745d491a5329
+  metadata.gz: d04bc5f939b2bde1fefeae748077aa1871b4d500d36946ad4820830f9ead8102b5d195907f10da465c480e051077a34b961301b5ea3faf4719b575ed7ba2291c
+  data.tar.gz: 0756a6dd8f578984fe6813a501eeb327d904e6fb0f3fba2bcd99ca054f01c6b76b7fbe6232942f47615ba8563e65b5d995785298eab5567f1f8a6617ab288688

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.4.1 (2019-09-26)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Use a more robust `Trunk` init when pushing.  
+  [Igor Makarov](https://github.com/igor-makarov)
+  [#135](https://github.com/CocoaPods/cocoapods-trunk/pull/135)
+
+
 ## 1.4.0 (2019-08-21)
 
 ##### Enhancements

data/Gemfile.lock

@@ -19,7 +19,7 @@ GIT
       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.0)
+      cocoapods-trunk (= 1.4.1)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
@@ -52,7 +52,7 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods-trunk (1.4.0)
+    cocoapods-trunk (1.4.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
 

data/lib/cocoapods_trunk.rb

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

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

@@ -140,11 +140,12 @@ module Pod
         end
 
         def update_master_repo
-          if sources_manager.master_repo_functional?
-            sources_manager.update(master_repo_name)
-          else
-            Setup.invoke
-          end
+          # 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

data/spec/command/trunk/push_spec.rb

@@ -239,16 +239,24 @@ module Pod
       end
 
       it 'updates the master repo when it exists' do
-        Config.instance.sources_manager.stubs(:master_repo_functional?).returns(true)
+        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
+        Command::Repo::AddCDN.any_instance.expects(:run).never
 
         @cmd.run
       end
 
       it 'sets up the master repo when it does not exist' do
-        Config.instance.sources_manager.stubs(:master_repo_functional?).returns(false)
-        Config.instance.sources_manager.expects(:update).never
-        Command::Setup.any_instance.expects(:run).twice
+        Config.instance.sources_manager.stubs(:source_with_url).
+          at_most(3).
+          returns(nil).
+          returns(Pod::TrunkSource.new(Pod::TrunkSource::TRUNK_REPO_NAME))
+        Config.instance.sources_manager.expects(:update).with(Pod::TrunkSource::TRUNK_REPO_NAME).twice
+        Command::Repo::AddCDN.any_instance.expects(:run)
 
         @cmd.run
       end

metadata

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