cocoapods-trunk 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da8782fab1e5bcae243169d0622823796bde8b61
-  data.tar.gz: c1e8babee9edcbde68e8a6ef0c2bf6b0113f4a3e
+  metadata.gz: 061faffd0f2838d1bca42f9f05673bdc2eed7c72
+  data.tar.gz: 443217af6db153ddd1bf0fc2fb5fb44f8abfe480
 SHA512:
-  metadata.gz: 0636ab94fd3827229715520ad02c0b73fd8b02b1c876036a06b430701a42b4c24b83dede6ac453036d87a4e68fb441bb4812b050a1f318f95498871dff576544
-  data.tar.gz: 7bdf4ad6963ffe2f831724f0d76cf3e8f4c4e5cb0c5da040a5482e879e5cf6db1b02b0f0c01d74fa39e27536ad1e06acc113e925dd3eec40c3885c5166a9fd0e
+  metadata.gz: b2e516f5ad606ad693f12d9cbf5c906627dc004762d7be1ff9066f1bddeb1acdf08da3142b4a1fe1d4ad59278a5101d6283d1034e210dfdc2528d886f4702e0d
+  data.tar.gz: 8b4dd0f1a27df89be0132dc8037815592061aa226e276e2c9dcd12b4f08777261294d04263631b852dd0023ec908825770a9169e2e067cf5323b48622a6fede6

data/.travis.yml

@@ -1,13 +1,10 @@
-# Sets Travis to run the Ruby specs on OS X machines to be as close as possible
-# to the user environment.
-#
-osx_image: xcode7.3
-language: objective-c
+dist: trusty
+language: ruby
 cache: bundler
 rvm:
-  - system
-  - 2.0.0-p451
-
+   - 2.0.0-p647
+   - 2.3.4
+   - 2.4.1
 addons:
  code_climate:
    repo_token: 937468c2cbb0d7c0546b62d0fcbcba8a2a8b82714a64a52ffd0b951e71df626d
@@ -15,7 +12,11 @@ addons:
 before_install:
   - export GEM_HOME=$HOME/.gem
   - export PATH=$GEM_HOME/bin:$PATH
-  - sudo gem install bundler
+  # There is a bug in travis. When using system ruby, bundler is not
+  # installed and causes the default install action to fail.
+  - if [ "$TRAVIS_RUBY_VERSION" = "system" ]; then sudo gem install "bundler:~> 1.13"; else gem install "bundler:~> 1.13"; fi
+  # RubyGems 2.0.14 isn't a fun time on 2.0.0p451
+  - if [ "$TRAVIS_RUBY_VERSION" = "system" ]; then sudo gem update --system; fi
 
 install:
   - bundle install --without=documentation

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 1.3.0 (2017-10-02)
+
+##### Enhancements
+
+* Add skip test option to trunk push  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#93](https://github.com/CocoaPods/cocoapods-trunk/pull/93)
+  
+* Loosen netrc requirement
+  [jasl](https://github.com/jasl)
+  [#93](https://github.com/CocoaPods/cocoapods-trunk/pull/95)
+  
+* Update development dependencies to support MRI 2.3+
+  [jasl](https://github.com/jasl)
+  [#93](https://github.com/CocoaPods/cocoapods-trunk/pull/95)
+
+##### Bug Fixes
+
+* None.  
+
+
 ## 1.2.0 (2017-04-11)
 
 ##### Enhancements

data/Gemfile.lock

@@ -1,42 +1,42 @@
 GIT
   remote: https://github.com/CocoaPods/CLAide.git
-  revision: 8a8f26fb5d6e2b0d604bdb3c2cca14fab4f80adc
+  revision: 7f26d3d016efeea728ed0e608357e910d4c6e8f9
   branch: master
   specs:
-    claide (1.0.1)
+    claide (1.0.2)
 
 GIT
   remote: https://github.com/CocoaPods/CocoaPods.git
-  revision: cae98c5386f7d80d6fe065c3f081ce130628151a
+  revision: a75a2e85e262c3c38d1a2fa9e0f5de01cc6a3368
   branch: master
   specs:
-    cocoapods (1.2.0)
+    cocoapods (1.3.1)
       activesupport (>= 4.0.2, < 5)
-      claide (>= 1.0.1, < 2.0)
-      cocoapods-core (= 1.2.0)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.3.1)
       cocoapods-deintegrate (>= 1.0.1, < 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.2.0)
+      cocoapods-trunk (= 1.3.0)
       cocoapods-try (>= 1.1.0, < 2.0)
-      colored (~> 1.2)
+      colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.5)
+      molinillo (~> 0.6.1)
       nap (~> 1.0)
-      ruby-macho (~> 0.2.5)
-      xcodeproj (>= 1.4.1, < 2.0)
+      ruby-macho (~> 1.1)
+      xcodeproj (>= 1.5.1, < 2.0)
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: da067319634495b132b8f0403867e5cf5a2e2485
+  revision: 77f5b2081bf347db73e5978737633e1943dc5f29
   branch: master
   specs:
-    cocoapods-core (1.2.0)
-      activesupport (>= 4.0.2, < 5)
+    cocoapods-core (1.3.1)
+      activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
 
@@ -50,21 +50,21 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods-trunk (1.2.0)
+    cocoapods-trunk (1.3.0)
       nap (>= 0.8, < 2.0)
-      netrc (= 0.7.8)
+      netrc (~> 0.11)
 
 GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.5)
-    activesupport (4.2.7.1)
+    activesupport (4.2.9)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
     ast (2.2.0)
     bacon (1.2.0)
     cocoapods-deintegrate (1.0.1)
@@ -76,8 +76,8 @@ GEM
     cocoapods-try (1.1.0)
     codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
-    colored (1.2)
-    crack (0.4.2)
+    colored2 (3.1.2)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
     docile (1.1.5)
     escape (0.0.4)
@@ -85,7 +85,8 @@ GEM
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.0.3)
-    i18n (0.7.0)
+    hashdiff (0.3.4)
+    i18n (0.8.6)
     kicker (3.0.0)
       listen (~> 1.3.0)
       notify (~> 0.5.2)
@@ -94,22 +95,23 @@ GEM
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     metaclass (0.0.4)
-    minitest (5.10.1)
+    minitest (5.10.3)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.2)
       mocha (>= 0.13.0)
-    molinillo (0.5.5)
+    molinillo (0.6.3)
     multi_json (1.11.2)
     nanaimo (0.2.3)
     nap (1.1.0)
-    netrc (0.7.8)
+    netrc (0.11.0)
     notify (0.5.2)
     parser (2.3.0.7)
       ast (~> 2.2)
     powerpack (0.1.1)
     prettybacon (0.0.2)
       bacon (~> 1.2)
+    public_suffix (2.0.5)
     rainbow (2.1.0)
     rake (10.4.2)
     rb-fsevent (0.9.5)
@@ -123,7 +125,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-macho (1.1.0)
     ruby-progressbar (1.7.5)
     safe_yaml (1.0.4)
     simplecov (0.9.2)
@@ -131,18 +133,18 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.9.0)
     simplecov-html (0.9.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     unicode-display_width (1.0.3)
-    webmock (1.21.0)
+    webmock (3.0.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    xcodeproj (1.4.2)
+      hashdiff
+    xcodeproj (1.5.1)
       CFPropertyList (~> 2.3.3)
-      activesupport (>= 3)
-      claide (>= 1.0.1, < 2.0)
-      colored (~> 1.2)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
       nanaimo (~> 0.2.3)
 
 PLATFORMS
@@ -166,4 +168,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.13.5
+   1.15.4

data/cocoapods-trunk.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'nap', '>= 0.8', '< 2.0'
-  spec.add_dependency 'netrc', '0.7.8'
+  spec.add_dependency 'netrc', '~> 0.11'
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", '~> 10.0'
 

data/lib/cocoapods_trunk.rb

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

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

@@ -34,6 +34,7 @@ module Pod
             ['--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'],
+            ['--skip-tests', 'Lint skips building and running tests during validation'],
           ].concat(super)
         end
 
@@ -42,6 +43,7 @@ module Pod
           @use_frameworks = !argv.flag?('use-libraries')
           @swift_version = argv.option('swift-version', nil)
           @skip_import_validation = argv.flag?('skip-import-validation', false)
+          @skip_tests = argv.flag?('skip-tests', false)
           @path = argv.shift_argument || '.'
           find_podspec_file if File.directory?(@path)
           super
@@ -119,6 +121,7 @@ module Pod
           validator.use_frameworks = @use_frameworks
           validator.swift_version  = @swift_version if Validator.method_defined?(:swift_version=)
           validator.skip_import_validation = @skip_import_validation
+          validator.skip_tests = @skip_tests
           validator.validate
           unless validator.validated?
             raise Informative, "The spec did not pass validation, due to #{validator.failure_reason}."

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

@@ -8,9 +8,9 @@ module Pod
         self.description = <<-DESC
               Register a new account, or create a new session.
 
-              If this is your first registration, both an `EMAIL` address and your
-              `NAME` are required. If you’ve already registered with trunk, you may
-              omit the `NAME` (unless you would like to change it).
+              If this is your first registration, both an `EMAIL` address and
+              `YOUR_NAME` are required. If you’ve already registered with trunk, you may
+              omit the `YOUR_NAME` (unless you would like to change it).
 
               It is recommended that you provide a description of the session, so
               that it will be easier to identify later on. For instance, when you
@@ -27,7 +27,7 @@ module Pod
 
         self.arguments = [
           CLAide::Argument.new('EMAIL', true),
-          CLAide::Argument.new('NAME',  false),
+          CLAide::Argument.new('YOUR_NAME', false),
         ]
 
         def self.options

data/spec/command/trunk/addowner_spec.rb

@@ -39,7 +39,7 @@ module Pod
 
     it 'should successfully add an owner' do
       url = 'https://trunk.cocoapods.org/api/v1/pods/QueryKit/owners'
-      WebMock::API.stub_request(:patch, url).
+      stub_request(:patch, url).
         with(:body => '{"email":"kyle@cocoapods.org"}',
              :headers => { 'Authorization' => 'Token 527d11fe429f3426cb8dbeba183a0d80' }).
         to_return(:status => 200, :body => '[]', :headers => {})

data/spec/command/trunk/deprecate_spec.rb

@@ -38,11 +38,11 @@ module Pod
 
     it 'should send the proper network request' do
       redirect = 'http://redirected.com'
-      WebMock::API.stub_request(:patch, 'https://trunk.cocoapods.org/api/v1/pods/Stencil/deprecated').
-        with(:body => WebMock::API.hash_including('in_favor_of' => 'Stamp')).
+      stub_request(:patch, 'https://trunk.cocoapods.org/api/v1/pods/Stencil/deprecated').
+        with(:body => hash_including('in_favor_of' => 'Stamp')).
         to_return(:status => 201, :headers => { :location => redirect })
 
-      WebMock::API.stub_request(:get, redirect).
+      stub_request(:get, redirect).
         to_return(:status => 200, :body => @push_response.to_json)
 
       Command::Trunk::Deprecate.invoke(%w(Stencil --in-favor-of=Stamp))

data/spec/command/trunk/info_spec.rb

@@ -16,7 +16,7 @@ module Pod
 
     it 'should show information for a pod' do
       url = 'https://trunk.cocoapods.org/api/v1/pods/Stencil'
-      WebMock::API.stub_request(:get, url).to_return(:body => {
+      stub_request(:get, url).to_return(:body => {
         'owners' => [
           {
             'name' => 'Kyle Fuller',

data/spec/command/trunk/push_spec.rb

@@ -36,7 +36,7 @@ module Pod
 
     it 'should error when the trunk service returns an error' do
       url = 'https://trunk.cocoapods.org/api/v1/pods?allow_warnings=false'
-      WebMock::API.stub_request(:post, url).to_return(:status => 422, :body => {
+      stub_request(:post, url).to_return(:status => 422, :body => {
         'error' => 'The Pod Specification did not pass validation.',
         'data' => {
           'warnings' => [
@@ -126,22 +126,23 @@ module Pod
       end
 
       it 'passes a swift version back to command, to handle .swift-version files' do
+        Validator.any_instance.stubs(:dot_swift_version).returns('1.2.3')
         Validator.any_instance.stubs(:used_swift_version).returns('1.2.3')
 
-        cmd = Command.parse(%w(trunk push spec/fixtures/BananaLib.podspec))
+        cmd = Command.parse(%w(trunk push spec/fixtures/BananaLib.podspec --allow-warnings))
         cmd.send(:validate_podspec)
         cmd.instance_variable_get(:@swift_version).should == '1.2.3'
       end
 
       it 'validates specs as frameworks by default' do
         Validator.any_instance.expects(:podfile_from_spec).
-          with(:ios, '8.0', true).once.returns(Podfile.new)
+          with(:ios, '8.0', true, []).once.returns(Podfile.new)
         Validator.any_instance.expects(:podfile_from_spec).
-          with(:osx, nil, true).once.returns(Podfile.new)
+          with(:osx, nil, true, []).once.returns(Podfile.new)
         Validator.any_instance.expects(:podfile_from_spec).
-          with(:tvos, nil, true).once.returns(Podfile.new)
+          with(:tvos, nil, true, []).once.returns(Podfile.new)
         Validator.any_instance.expects(:podfile_from_spec).
-          with(:watchos, nil, true).once.returns(Podfile.new)
+          with(:watchos, nil, true, []).once.returns(Podfile.new)
 
         cmd = Command.parse(%w(trunk push spec/fixtures/BananaLib.podspec))
         cmd.send(:validate_podspec)
@@ -149,13 +150,13 @@ module Pod
 
       it 'validates specs as libraries if requested' do
         Validator.any_instance.expects(:podfile_from_spec).
-          with(:ios, nil, false).once.returns(Podfile.new)
+          with(:ios, nil, false, []).once.returns(Podfile.new)
         Validator.any_instance.expects(:podfile_from_spec).
-          with(:osx, nil, false).once.returns(Podfile.new)
+          with(:osx, nil, false, []).once.returns(Podfile.new)
         Validator.any_instance.expects(:podfile_from_spec).
-          with(:tvos, nil, false).once.returns(Podfile.new)
+          with(:tvos, nil, false, []).once.returns(Podfile.new)
         Validator.any_instance.expects(:podfile_from_spec).
-          with(:watchos, nil, false).once.returns(Podfile.new)
+          with(:watchos, nil, false, []).once.returns(Podfile.new)
 
         cmd = Command.parse(%w(trunk push spec/fixtures/BananaLib.podspec --use-libraries))
         cmd.send(:validate_podspec)
@@ -176,6 +177,12 @@ module Pod
         cmd = Command.parse(%w(trunk push spec/fixtures/BananaLib.podspec --skip-import-validation))
         cmd.send(:validate_podspec)
       end
+
+      it 'passes skip test' do
+        Validator.any_instance.expects(:skip_tests=).with(true)
+        cmd = Command.parse(%w(trunk push spec/fixtures/BananaLib.podspec --skip-tests))
+        cmd.send(:validate_podspec)
+      end
     end
 
     describe 'sending the swift version up to trunk' do

data/spec/command/trunk/register_spec.rb

@@ -17,8 +17,8 @@ module Pod
 
     it 'should register user' do
       url = 'https://trunk.cocoapods.org/api/v1/sessions'
-      WebMock::API.stub_request(:post, url).
-        with(:body => WebMock::API.hash_including('email' => 'kyle@cocoapods.org')).
+      stub_request(:post, url).
+        with(:body => hash_including('email' => 'kyle@cocoapods.org')).
         to_return(:status => 200, :body => '{"token": "acct"}')
       Netrc.any_instance.stubs(:[]).returns(nil)
       Netrc.any_instance.expects(:[]=).with('trunk.cocoapods.org', ['kyle@cocoapods.org', 'acct'])

data/spec/command/trunk/remove_owner_spec.rb

@@ -39,7 +39,7 @@ module Pod
 
     it 'should successfully remove an owner' do
       url = 'https://trunk.cocoapods.org/api/v1/pods/QueryKit/owners/kyle@cocoapods.org'
-      WebMock::API.stub_request(:delete, url).
+      stub_request(:delete, url).
         with(:headers => { 'Authorization' => 'Token 527d11fe429f3426cb8dbeba183a0d80' }).
         to_return(:status => 200, :body => '[]', :headers => {})
 

data/spec/spec_helper.rb

@@ -22,6 +22,9 @@ require 'bacon'
 require 'mocha-on-bacon'
 require 'pretty_bacon'
 require 'webmock'
+
+include WebMock::API
+WebMock.enable!
 WebMock.disable_net_connect!(:allow => 'codeclimate.com')
 
 require 'cocoapods'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-trunk
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Eloy Durán
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nap
@@ -34,16 +34,16 @@ dependencies:
   name: netrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.8
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.8
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement