cocoapods-trunk 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb68458b464a8a1727437bbb8426864565dc5a4b
-  data.tar.gz: 436c852ebf45f8381fcf0b3bda471ef5f250551d
+  metadata.gz: da8782fab1e5bcae243169d0622823796bde8b61
+  data.tar.gz: c1e8babee9edcbde68e8a6ef0c2bf6b0113f4a3e
 SHA512:
-  metadata.gz: fd5ab177c3887c80099d8fa19f84dbbd8876f4549268a83afa83268d855af3f706ddadd2e92f63280678d2fed5d2bb6eecc41544f20cb31009260058a1e01ddc
-  data.tar.gz: eab79015100cf6499b4306f1ad6f856e5d88efb6a5d3765ab1a0f89d9f42f0d2973f536f06883554bc70e4e358f9601bfd2fe5f066b28031ccc0da7d0aa2c2b9
+  metadata.gz: 0636ab94fd3827229715520ad02c0b73fd8b02b1c876036a06b430701a42b4c24b83dede6ac453036d87a4e68fb441bb4812b050a1f318f95498871dff576544
+  data.tar.gz: 7bdf4ad6963ffe2f831724f0d76cf3e8f4c4e5cb0c5da040a5482e879e5cf6db1b02b0f0c01d74fa39e27536ad1e06acc113e925dd3eec40c3885c5166a9fd0e

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 1.2.0 (2017-04-11)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Properly display `pod trunk deprecate` command line options  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6486](https://github.com/CocoaPods/CocoaPods/issues/6486)
+
+* Add `--skip-import-validation` to skip linking a pod during lint.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#86](https://github.com/CocoaPods/cocoapods-trunk/pull/86)
+
+
 ## 1.1.2 (2016-12-17)
 
 ##### Enhancements

data/Gemfile.lock

@@ -7,34 +7,35 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/CocoaPods.git
-  revision: 670952b563febda786895f9df80286a2e683d086
+  revision: cae98c5386f7d80d6fe065c3f081ce130628151a
   branch: master
   specs:
-    cocoapods (1.1.0)
+    cocoapods (1.2.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.1, < 2.0)
-      cocoapods-core (= 1.1.0)
+      cocoapods-core (= 1.2.0)
       cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.2, < 2.0)
+      cocoapods-downloader (>= 1.1.3, < 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.1.2)
+      cocoapods-trunk (= 1.2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.1)
+      molinillo (~> 0.5.5)
       nap (~> 1.0)
-      xcodeproj (>= 1.3.2, < 2.0)
+      ruby-macho (~> 0.2.5)
+      xcodeproj (>= 1.4.1, < 2.0)
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: 92b15bb175facbf57839fa08c44194ab9b8b80b2
+  revision: da067319634495b132b8f0403867e5cf5a2e2485
   branch: master
   specs:
-    cocoapods-core (1.1.0)
+    cocoapods-core (1.2.0)
       activesupport (>= 4.0.2, < 5)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -49,13 +50,14 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods-trunk (1.1.2)
+    cocoapods-trunk (1.2.0)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    CFPropertyList (2.3.5)
     activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
@@ -66,7 +68,7 @@ GEM
     ast (2.2.0)
     bacon (1.2.0)
     cocoapods-deintegrate (1.0.1)
-    cocoapods-downloader (1.1.2)
+    cocoapods-downloader (1.1.3)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
@@ -82,7 +84,7 @@ GEM
     ffi (1.9.10)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.0.2)
+    gh_inspector (1.0.3)
     i18n (0.7.0)
     kicker (3.0.0)
       listen (~> 1.3.0)
@@ -92,13 +94,14 @@ GEM
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     metaclass (0.0.4)
-    minitest (5.9.1)
+    minitest (5.10.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.2)
       mocha (>= 0.13.0)
-    molinillo (0.5.1)
+    molinillo (0.5.5)
     multi_json (1.11.2)
+    nanaimo (0.2.3)
     nap (1.1.0)
     netrc (0.7.8)
     notify (0.5.2)
@@ -120,6 +123,7 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-macho (0.2.6)
     ruby-progressbar (1.7.5)
     safe_yaml (1.0.4)
     simplecov (0.9.2)
@@ -134,10 +138,12 @@ GEM
     webmock (1.21.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    xcodeproj (1.3.2)
+    xcodeproj (1.4.2)
+      CFPropertyList (~> 2.3.3)
       activesupport (>= 3)
       claide (>= 1.0.1, < 2.0)
       colored (~> 1.2)
+      nanaimo (~> 0.2.3)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,4 +1,4 @@
-# Cocoapods::Trunk
+# CocoaPods::Trunk
 
 [![Build Status](https://img.shields.io/travis/CocoaPods/cocoapods-trunk/master.svg?style=flat)](https://travis-ci.org/CocoaPods/cocoapods-trunk)
 [![Coverage](https://img.shields.io/codeclimate/coverage/github/CocoaPods/cocoapods-trunk.svg?style=flat)](https://codeclimate.com/github/CocoaPods/cocoapods-trunk)

data/lib/cocoapods_trunk.rb

@@ -1,3 +1,3 @@
 module CocoaPodsTrunk
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.2.0'.freeze
 end

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

@@ -9,7 +9,7 @@ module Pod
           CLAide::Argument.new('NAME', true),
         ]
 
-        def options
+        def self.options
           [
             ['--in-favor-of=OTHER_NAME', 'The pod to deprecate this pod in favor of.'],
           ].concat(super)

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

@@ -33,6 +33,7 @@ module Pod
             ['--use-libraries', 'Linter uses static libraries to install the spec'],
             ['--swift-version=VERSION', 'The SWIFT_VERSION that should be used to lint the spec. ' \
              'This takes precedence over a .swift-version file.'],
+            ['--skip-import-validation', 'Lint skips validating that the pod can be imported'],
           ].concat(super)
         end
 
@@ -40,6 +41,7 @@ module Pod
           @allow_warnings = argv.flag?('allow-warnings', false)
           @use_frameworks = !argv.flag?('use-libraries')
           @swift_version = argv.option('swift-version', nil)
+          @skip_import_validation = argv.flag?('skip-import-validation', false)
           @path = argv.shift_argument || '.'
           find_podspec_file if File.directory?(@path)
           super
@@ -116,6 +118,7 @@ module Pod
           validator.allow_warnings = @allow_warnings
           validator.use_frameworks = @use_frameworks
           validator.swift_version  = @swift_version if Validator.method_defined?(:swift_version=)
+          validator.skip_import_validation = @skip_import_validation
           validator.validate
           unless validator.validated?
             raise Informative, "The spec did not pass validation, due to #{validator.failure_reason}."

data/spec/command/trunk/push_spec.rb

@@ -170,6 +170,12 @@ module Pod
         e = should.raise(Informative) { cmd.send(:validate_podspec) }
         e.message.should.include 'The spec did not pass validation, due to failure_reason.'
       end
+
+      it 'passes skip import validation' do
+        Validator.any_instance.expects(:skip_import_validation=).with(true)
+        cmd = Command.parse(%w(trunk push spec/fixtures/BananaLib.podspec --skip-import-validation))
+        cmd.send(:validate_podspec)
+      end
     end
 
     describe 'sending the swift version up to trunk' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-trunk
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Eloy Durán
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-17 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nap