cocoapods-trunk 1.0.0 → 1.1.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77b9b9ce99fc894c15a7cc3fdbf88a77e3aac595
-  data.tar.gz: 836c078e958c67491109e29c42e940848f447330
+  metadata.gz: 2420bad5c8404637a01a359be2f5e6a5102985dd
+  data.tar.gz: 7278abfb6ecdb18b3b7b632e21e58f140aee9bde
 SHA512:
-  metadata.gz: a008addf7458e13155794f0f66bfc4b730a4f4fd08be908f7fa5c4dc955f4db984690b1ae235438bc63a32a2ab6dcab5f53320c553f00726be84091aed400702
-  data.tar.gz: adef568851a2f0bac3a7a6ca4842429d57f34b56f754d82e77e5f82862eda69a30c978866dd48fa7ac9d4e05d91f3e983c27750c0a23c367b22483f9a90cdfe4
+  metadata.gz: 1ee5c3d4c895415ac0c42c96f85508878785d5ea9c117aa506ebc144cb2795c4d75191260faa09bef2c1cad7b5a2822d833fcbbe1a148a1c5533adc55e24c8e7
+  data.tar.gz: a524a78baee39eaa47247134e22a9869e06e2d6058977db31560a6c460e6e68d9cc038388e7f407c7e04a161135d6e2e1137e3c628e62318b400dc6aa95aff41

data/.travis.yml

@@ -16,9 +16,10 @@ before_install:
   - source ~/.rvm/scripts/rvm
   - if [[ $RVM_RUBY_VERSION != 'system' ]]; then rvm install $RVM_RUBY_VERSION; fi
   - rvm use $RVM_RUBY_VERSION
+  - if [[ $RVM_RUBY_VERSION == 'system' ]]; then sudo gem update --system; fi
   - if [[ $RVM_RUBY_VERSION == 'system' ]]; then sudo gem install bundler --no-ri --no-rdoc; else gem install bundler --no-ri --no-rdoc; fi
 
 install:
-  - sudo bundle install --without=documentation
+  - bundle install --without=documentation
 
 script: bundle exec rake spec

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.1.0.beta.1 (2016-10-10)
+
+##### Enhancements
+
+* Pass --swift-version to the Validator during `pod lib lint`
+  [Danielle Tomlinson](https://github.com/dantoml)
+  [#92](https://github.com/CocoaPods/cocoapods-trunk/pull/72)
+
+##### Bug Fixes
+
+* None.  
+
+
 ## 1.0.0 (2016-05-10)
 
 ##### Enhancements

data/Gemfile

@@ -3,7 +3,9 @@ source 'https://rubygems.org'
 gemspec
 
 # This is the version that ships with OS X 10.10, so be sure we test against it.
-gem 'json', '1.7.7'
+# At the same time, the 1.7.7 version won't install cleanly on Ruby > 2.2,
+# so we use a fork that makes a trivial change to a macro invocation.
+gem 'json', :git => 'https://github.com/segiddins/json.git', :branch => 'seg-1.7.7-ruby-2.2'
 
 group :development do
   gem 'cocoapods',      :git => "https://github.com/CocoaPods/CocoaPods.git", :branch => 'master'

data/Gemfile.lock

@@ -1,54 +1,62 @@
 GIT
   remote: https://github.com/CocoaPods/CLAide.git
-  revision: 62896152c8f884ddb062afb2cb0ff7a4fd0a9a65
+  revision: 8106d0d779ae1c9f571404a9f38950905ad5c803
   branch: master
   specs:
-    claide (1.0.0.beta.3)
+    claide (1.0.0)
 
 GIT
   remote: https://github.com/CocoaPods/CocoaPods.git
-  revision: 96c6d8babc3a4d36927eadb51401d77fce18df86
+  revision: b6143c3e2095d689531112764492545f842c0cce
   branch: master
   specs:
-    cocoapods (1.0.0.beta.7)
-      activesupport (>= 4.0.2)
-      claide (>= 1.0.0.beta.3, < 2.0)
-      cocoapods-core (= 1.0.0.beta.7)
-      cocoapods-deintegrate (>= 1.0.0.beta.1, < 2.0)
-      cocoapods-downloader (= 1.0.0.beta.3)
-      cocoapods-plugins (>= 1.0.0.beta.1, < 2.0)
-      cocoapods-search (= 1.0.0.beta.2)
-      cocoapods-stats (= 1.0.0.beta.4)
-      cocoapods-trunk (= 1.0.0)
-      cocoapods-try (>= 1.0.0.beta.3, < 2.0)
+    cocoapods (1.1.0.rc.2)
+      activesupport (>= 4.0.2, < 5)
+      claide (>= 1.0.0, < 2.0)
+      cocoapods-core (= 1.1.0.rc.2)
+      cocoapods-deintegrate (>= 1.0.1, < 2.0)
+      cocoapods-downloader (>= 1.1.1, < 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.0.beta.1)
+      cocoapods-try (>= 1.1.0, < 2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      fourflusher (~> 0.3.0)
-      molinillo (~> 0.4.4)
+      fourflusher (~> 1.0.1)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.5.1)
       nap (~> 1.0)
-      xcodeproj (= 1.0.0.beta.4)
+      xcodeproj (>= 1.3.1, < 2.0)
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: a31c88165961dd2d79f12e4d09534c2fbfa314b2
+  revision: fef34047643147b09955f8aeb1277a47d01ff1c1
   branch: master
   specs:
-    cocoapods-core (1.0.0.beta.7)
-      activesupport (>= 4.0.2)
+    cocoapods-core (1.1.0.rc.2)
+      activesupport (>= 4.0.2, < 5)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
 
+GIT
+  remote: https://github.com/segiddins/json.git
+  revision: a9588bc4334c2f5bf985f255b61c05eafdcd8907
+  branch: seg-1.7.7-ruby-2.2
+  specs:
+    json (1.7.7)
+
 PATH
   remote: .
   specs:
-    cocoapods-trunk (1.0.0)
+    cocoapods-trunk (1.1.0.beta.1)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.6)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -57,13 +65,13 @@ GEM
     addressable (2.3.8)
     ast (2.2.0)
     bacon (1.2.0)
-    cocoapods-deintegrate (1.0.0.beta.1)
-    cocoapods-downloader (1.0.0.beta.3)
-    cocoapods-plugins (1.0.0.beta.1)
+    cocoapods-deintegrate (1.0.1)
+    cocoapods-downloader (1.1.1)
+    cocoapods-plugins (1.0.0)
       nap
-    cocoapods-search (1.0.0.beta.2)
-    cocoapods-stats (1.0.0.beta.4)
-    cocoapods-try (1.0.0.beta.3)
+    cocoapods-search (1.0.0)
+    cocoapods-stats (1.0.0)
+    cocoapods-try (1.1.0)
     codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
     colored (1.2)
@@ -72,10 +80,10 @@ GEM
     docile (1.1.5)
     escape (0.0.4)
     ffi (1.9.10)
-    fourflusher (0.3.0)
+    fourflusher (1.0.1)
     fuzzy_match (2.0.4)
+    gh_inspector (1.0.2)
     i18n (0.7.0)
-    json (1.7.7)
     kicker (3.0.0)
       listen (~> 1.3.0)
       notify (~> 0.5.2)
@@ -84,12 +92,12 @@ GEM
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     metaclass (0.0.4)
-    minitest (5.8.4)
+    minitest (5.9.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.2)
       mocha (>= 0.13.0)
-    molinillo (0.4.4)
+    molinillo (0.5.1)
     multi_json (1.11.2)
     nap (1.1.0)
     netrc (0.7.8)
@@ -126,9 +134,9 @@ GEM
     webmock (1.21.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    xcodeproj (1.0.0.beta.4)
+    xcodeproj (1.3.1)
       activesupport (>= 3)
-      claide (>= 1.0.0.beta.1, < 2.0)
+      claide (>= 1.0.0, < 2.0)
       colored (~> 1.2)
 
 PLATFORMS
@@ -142,7 +150,7 @@ DEPENDENCIES
   cocoapods-core!
   cocoapods-trunk!
   codeclimate-test-reporter
-  json (= 1.7.7)
+  json!
   kicker
   mocha
   mocha-on-bacon
@@ -152,4 +160,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/lib/cocoapods_trunk.rb

@@ -1,3 +1,3 @@
 module CocoaPodsTrunk
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0.beta.1'.freeze
 end

data/lib/pod/command/trunk.rb

@@ -52,7 +52,7 @@ module Pod
         rescue JSON::ParserError
           json = {}
         end
-        error = json['error'] || "An unexpected error ocurred: #{body}"
+        error = json['error'] || "An unexpected error occurred: #{body}"
 
         case data = json['data']
         when Hash

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

@@ -31,12 +31,15 @@ module Pod
           [
             ['--allow-warnings', 'Allows push even if there are lint warnings'],
             ['--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.'],
           ].concat(super)
         end
 
         def initialize(argv)
           @allow_warnings = argv.flag?('allow-warnings', false)
           @use_frameworks = !argv.flag?('use-libraries')
+          @swift_version = argv.option('swift-version', nil)
           @path = argv.shift_argument || '.'
           find_podspec_file if File.directory?(@path)
           super
@@ -106,6 +109,7 @@ module Pod
           validator = Validator.new(spec, %w(https://github.com/CocoaPods/Specs.git))
           validator.allow_warnings = @allow_warnings
           validator.use_frameworks = @use_frameworks
+          validator.swift_version  = @swift_version
           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

@@ -103,6 +103,13 @@ module Pod
         end
       end
 
+      it 'passes the SWIFT_VERSION to the Validator' do
+        Validator.any_instance.expects(:swift_version=).with('3.0')
+
+        cmd = Command.parse(%w(trunk push spec/fixtures/BananaLib.podspec --swift-version=3.0))
+        cmd.send(:validate_podspec)
+      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)

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-trunk
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0.beta.1
 platform: ruby
 authors:
 - Eloy Durán
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -48,28 +48,28 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: 
@@ -79,12 +79,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .kick
-- .rubocop.yml
-- .rubocop_cocoapods.yml
-- .rubocop_todo.yml
-- .travis.yml
+- ".gitignore"
+- ".kick"
+- ".rubocop.yml"
+- ".rubocop_cocoapods.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -124,17 +124,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Interact with trunk.cocoapods.org