cocoapods-repo-update 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 779accb52ea1d9cb5caff2e957c08b06c49cbc32
-  data.tar.gz: e2cbc0bf417319b834422cad6542eaa0a932edd8
+  metadata.gz: 1f943bdfe08c5b73e39d69c2e45a95d409166148
+  data.tar.gz: c4a9c6f9981ba750cc2f626ea9de5a590c48918f
 SHA512:
-  metadata.gz: 5709266e33abf96ee2f14ece070ee095b1bdb6641bc757acdc70a1a46896e71a42ccc481a2d7df0855702b8a172c4229de82f8d3bf645f01c53adb8ced38c167
-  data.tar.gz: d4b1775cf7afd57d29ba84c4daa461c2db0e199372b071bc7762769a180b9f02f8aa30994dc798d6e36775d75831d7bb869a3f8349c6adfc065abc9c6e9e16bc
+  metadata.gz: 3b71d276fb4c4261256c36d02f1c89b9c73583821e60943434c1853e6afea09b363046579c7a61ea2386634c2a4459e61d187c00b35cf711a496f4bcd5297bb6
+  data.tar.gz: dbec013ac1bb9059491d25ee17b33147886aaf7a1223939fca427484892ca981e7efab1d5177cb2f73d675bed4d0a2a62fd9db1f9c4de07a17001a746524d834

data/lib/cocoapods_repo_update/gem_version.rb

@@ -1,4 +1,4 @@
 module CocoapodsRepoUpdate
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
   NAME = "cocoapods-repo-update"
 end

data/lib/cocoapods_repo_update/helper.rb

@@ -13,5 +13,17 @@ module CocoapodsRepoUpdate
       $stdout.reopen original_stdout
       $stderr.reopen original_stderr
     end
+
+    def self.specs_need_update?(exception)
+      no_spec_found?(exception) || version_conflict?(exception)
+    end
+
+    def self.no_spec_found?(exception)
+      exception.is_a?(Pod::NoSpecFoundError)
+    end
+
+    def self.version_conflict?(exception)
+      exception.cause.is_a?(Molinillo::VersionConflict)
+    end
   end
 end

data/lib/cocoapods_repo_update/hooks.rb

@@ -16,8 +16,15 @@ module CocoapodsRepoUpdate
           analyzer.analyze
         end
         Pod::UI.puts "Not updating local specs repo"
-      rescue Pod::NoSpecFoundError
-        Pod::UI.puts "At least one Pod is not in the local specs repo. Updating specs repo..."
+      rescue Exception => e
+        raise unless CocoapodsRepoUpdate::Helper.specs_need_update?(e)
+
+        message = "At least one Pod is not in the local specs repo"
+        if CocoapodsRepoUpdate::Helper.version_conflict?(e)
+          message = "There was a version conflict with some of your pods"
+        end
+
+        Pod::UI.puts "#{message}. Updating specs repo..."
         # Update the specs repos, silently
         CocoapodsRepoUpdate::Helper.suppress_output do
           analyzer.update_repositories

data/spec/unit/hooks_spec.rb

@@ -13,10 +13,16 @@ describe CocoapodsRepoUpdate::Hooks do
                                                                lockfile: double('lockfile')) }
   let(:analyzer) { double('analyzer') }
 
+  let(:no_spec_found) { Pod::NoSpecFoundError.new }
+  let(:version_conflict) { double('version conflict', cause: double('conflict')) }
+
   before do
     allow(Pod::Installer::Analyzer).to receive(:new).with(installer_context.sandbox,
                                                           installer_context.podfile,
                                                           installer_context.lockfile).and_return(analyzer)
+
+    allow(no_spec_found).to receive(:is_a?).with(Pod::NoSpecFoundError).and_return(true)
+    allow(version_conflict.cause).to receive(:is_a?).with(Molinillo::VersionConflict).and_return(true)
   end
 
   context 'pre install' do
@@ -27,11 +33,21 @@ describe CocoapodsRepoUpdate::Hooks do
       trigger_pre_install(installer_context, options)
     end
 
-    it 'runs the post install action and updates specs' do
+    it 'runs the post install action and updates specs if a spec is not found' do
       allow(analyzer).to receive(:analyze).and_raise(Pod::NoSpecFoundError)
       expect(analyzer).to receive(:update_repositories)
 
       trigger_pre_install(installer_context, options)
     end
+
+    it 'runs the post install action and updates specs if there is a version conflict' do
+      exception = StandardError.new
+      allow(exception).to receive(:cause).and_return(Molinillo::VersionConflict.new({}, nil))
+
+      allow(analyzer).to receive(:analyze).and_raise(exception)
+      expect(analyzer).to receive(:update_repositories)
+
+      trigger_pre_install(installer_context, options)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-repo-update
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - James Treanor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods