cocoapods-trunk 0.6.0 → 1.4.1

data/Gemfile.lock

@@ -1,76 +1,101 @@
 GIT
   remote: https://github.com/CocoaPods/CLAide.git
-  revision: 4cb13d48a907d8acf8d398f1104843df029def6d
+  revision: b5ced9cc141df732e8027078543eb92fc6447567
   branch: master
   specs:
-    claide (0.8.1)
+    claide (1.0.3)
 
 GIT
   remote: https://github.com/CocoaPods/CocoaPods.git
-  revision: 187a851ad197507286373418bb6daeb5a9596d66
+  revision: af83e4713771bc98dd7f903cc81c4fbc8866812c
   branch: master
   specs:
-    cocoapods (0.36.0.rc.1)
-      activesupport (>= 3.2.15)
-      claide (~> 0.8.1)
-      cocoapods-core (= 0.36.0.rc.1)
-      cocoapods-downloader (~> 0.8.1)
-      cocoapods-plugins (~> 0.4.1)
-      cocoapods-trunk (~> 0.6.0)
-      cocoapods-try (~> 0.4.3)
-      colored (~> 1.2)
+    cocoapods (1.8.0.beta.1)
+      activesupport (>= 4.0.2, < 5)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.8.0.beta.1)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 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.4.1)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
       escape (~> 0.0.4)
-      molinillo (~> 0.2.1)
-      nap (~> 0.8)
-      open4 (~> 1.3)
-      xcodeproj (~> 0.23.0)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.6.6)
+      nap (~> 1.0)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.11.1, < 2.0)
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: 549c77f41de847cb519b5594a3d5099c53a1e5a3
+  revision: 0a6dea961da236995dfde3c7927e4daaf2045820
   branch: master
   specs:
-    cocoapods-core (0.36.0.rc.1)
-      activesupport (>= 3.2.15)
+    cocoapods-core (1.8.0.beta.1)
+      activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.0)
       fuzzy_match (~> 2.0.4)
-      nap (~> 0.8.0)
+      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 (0.6.0)
-      nap (>= 0.8)
-      netrc (= 0.7.8)
+    cocoapods-trunk (1.4.1)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.0)
+    CFPropertyList (3.0.0)
+    activesupport (4.2.11.1)
       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.6)
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
+    algoliasearch (1.26.1)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    ast (2.2.0)
+    atomos (0.1.3)
     bacon (1.2.0)
-    cocoapods-downloader (0.8.1)
-    cocoapods-plugins (0.4.1)
+    cocoapods-deintegrate (1.0.4)
+    cocoapods-downloader (1.2.2)
+    cocoapods-plugins (1.0.0)
       nap
-    cocoapods-try (0.4.3)
-    codeclimate-test-reporter (0.4.1)
+    cocoapods-search (1.0.0)
+    cocoapods-stats (1.1.0)
+    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)
+    concurrent-ruby (1.1.5)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
     docile (1.1.5)
     escape (0.0.4)
-    ffi (1.9.6)
+    ffi (1.9.10)
+    fourflusher (2.3.1)
     fuzzy_match (2.0.4)
-    i18n (0.7.0)
-    json (1.7.7)
+    gh_inspector (1.1.3)
+    hashdiff (0.3.4)
+    httpclient (2.8.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     kicker (3.0.0)
       listen (~> 1.3.0)
       notify (~> 0.5.2)
@@ -79,53 +104,58 @@ GEM
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     metaclass (0.0.4)
-    minitest (5.5.1)
+    minitest (5.11.3)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.2)
       mocha (>= 0.13.0)
-    molinillo (0.2.1)
-    multi_json (1.10.1)
-    nap (0.8.0)
-    netrc (0.7.8)
+    molinillo (0.6.6)
+    multi_json (1.11.2)
+    nanaimo (0.2.6)
+    nap (1.1.0)
+    netrc (0.11.0)
     notify (0.5.2)
-    open4 (1.3.4)
-    parser (2.2.0.pre.8)
-      ast (>= 1.1, < 3.0)
-      slop (~> 3.4, >= 3.4.5)
-    powerpack (0.0.9)
+    parser (2.3.0.7)
+      ast (~> 2.2)
+    powerpack (0.1.1)
     prettybacon (0.0.2)
       bacon (~> 1.2)
-    rainbow (2.0.0)
-    rake (10.3.2)
-    rb-fsevent (0.9.4)
+    public_suffix (2.0.5)
+    rainbow (2.1.0)
+    rake (10.4.2)
+    rb-fsevent (0.9.5)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.3)
+    rb-kqueue (0.2.4)
       ffi (>= 0.5.0)
-    rubocop (0.27.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.0.pre.7, < 3.0)
-      powerpack (~> 0.0.6)
+    rubocop (0.39.0)
+      parser (>= 2.3.0.7, < 3.0)
+      powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-macho (1.4.0)
+    ruby-progressbar (1.7.5)
     safe_yaml (1.0.4)
-    simplecov (0.9.1)
+    simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slop (3.6.0)
-    thread_safe (0.3.4)
-    tzinfo (1.2.2)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    webmock (1.20.4)
+    unicode-display_width (1.0.3)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    xcodeproj (0.23.0)
-      activesupport (>= 3)
-      colored (~> 1.2)
+      hashdiff
+    xcodeproj (1.12.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.6)
 
 PLATFORMS
   ruby
@@ -138,11 +168,14 @@ DEPENDENCIES
   cocoapods-core!
   cocoapods-trunk!
   codeclimate-test-reporter
-  json (= 1.7.7)
+  json!
   kicker
   mocha
   mocha-on-bacon
   prettybacon
-  rake
+  rake (~> 10.0)
   rubocop
   webmock
+
+BUNDLED WITH
+   1.17.3

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/cocoapods-trunk.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Eloy Durán"]
   spec.email         = ["eloy.de.enige@gmail.com"]
   spec.summary       = "Interact with trunk.cocoapods.org"
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/CocoaPods/cocoapods-trunk"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -17,10 +17,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'nap', '>= 0.8'
-  spec.add_dependency 'netrc', '0.7.8'
+  spec.add_dependency 'nap', '>= 0.8', '< 2.0'
+  spec.add_dependency 'netrc', '~> 0.11'
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", '~> 10.0'
 
   spec.required_ruby_version = '>= 2.0.0'
 end

data/lib/cocoapods_trunk.rb

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

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

@@ -1,6 +1,8 @@
 module Pod
   class Command
     class Trunk
+      # @CocoaPods 0.33.0
+      #
       class AddOwner < Trunk
         self.summary = 'Add an owner to a pod'
         self.description = <<-DESC
@@ -16,7 +18,8 @@ module Pod
         ]
 
         def initialize(argv)
-          @pod, @email = argv.shift_argument, argv.shift_argument
+          @pod = argv.shift_argument
+          @email = argv.shift_argument
           super
         end
 

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

@@ -0,0 +1,70 @@
+module Pod
+  class Command
+    class Trunk
+      # @CocoaPods 1.0.0.beta.1
+      #
+      class Delete < Trunk
+        self.summary = 'Deletes a version of a pod.'
+        self.description = <<-DESC
+              WARNING: It is generally considered bad behavior to remove
+              versions of a Pod that others are depending on! Please
+              consider using the deprecate command instead.
+
+              Deletes the specified pod version from trunk and the master specs
+              repo. Once deleted, this version can never be pushed again.
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('NAME', true),
+          CLAide::Argument.new('VERSION', true),
+        ]
+
+        def initialize(argv)
+          @name = argv.shift_argument
+          @version = argv.shift_argument
+          super
+        end
+
+        def validate!
+          super
+          help! 'Please specify a pod name.' unless @name
+          help! 'Please specify a version.' unless @version
+        end
+
+        def run
+          return unless confirm_deletion?
+          json = delete
+          print_messages(json['data_url'], json['messages'], nil, nil)
+        end
+
+        private
+
+        WARNING_MESSAGE = 'WARNING: It is generally considered bad behavior ' \
+          "to remove versions of a Pod that others are depending on!\n" \
+          'Please consider using the `deprecate` command instead.'.freeze
+
+        def confirm_deletion?
+          UI.puts(WARNING_MESSAGE.yellow)
+          loop do
+            UI.print("Are you sure you want to delete this Pod version?\n> ")
+            answer = UI.gets.strip.downcase
+            UI.puts # ensures a newline is printed after the user input
+            affirmatives = %w(y yes true 1)
+            negatives = %w(n no false 0)
+            return true if affirmatives.include?(answer)
+            return false if negatives.include?(answer)
+          end
+        end
+
+        def delete
+          response = request_path(:delete, "pods/#{@name}/#{@version}", auth_headers)
+          url = response.headers['location'].first
+          json(request_url(:get, url, default_headers))
+        rescue REST::Error => e
+          raise Informative, 'There was an error deleting the pod version ' \
+                                   "from trunk: #{e.message}"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+module Pod
+  class Command
+    class Trunk
+      # @CocoaPods 1.0.0.beta.1
+      #
+      class Deprecate < Trunk
+        self.summary = 'Deprecates a pod.'
+        self.arguments = [
+          CLAide::Argument.new('NAME', true),
+        ]
+
+        def self.options
+          [
+            ['--in-favor-of=OTHER_NAME', 'The pod to deprecate this pod in favor of.'],
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @name = argv.shift_argument
+          @in_favor_of = argv.option('in-favor-of')
+          super
+        end
+
+        def validate!
+          super
+          help! 'Please specify a pod name.' unless @name
+        end
+
+        def run
+          json = deprecate
+          print_messages(json['data_url'], json['messages'], nil, nil)
+        end
+
+        def deprecate
+          body = {
+            :in_favor_of => @in_favor_of,
+          }.to_json
+          response = request_path(:patch, "pods/#{@name}/deprecated", body, auth_headers)
+          url = response.headers['location'].first
+          json(request_url(:get, url, default_headers))
+        rescue REST::Error => e
+          raise Informative, 'There was an error deprecating the pod ' \
+                                   "via trunk: #{e.message}"
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,8 @@
 module Pod
   class Command
     class Trunk
+      # @CocoaPods 0.33.0
+      #
       class Info < Trunk
         self.summary = 'Returns information about a Pod.'
         self.arguments = [

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

@@ -1,6 +1,8 @@
 module Pod
   class Command
     class Trunk
+      # @CocoaPods 0.33.0
+      #
       class Me < Trunk
         self.summary = 'Display information about your sessions'
         self.description = <<-DESC

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

@@ -1,11 +1,13 @@
 module Pod
   class Command
     class Trunk
+      # @CocoaPods 0.33.0
+      #
       class Push < Trunk
         self.summary = 'Publish a podspec'
         self.description = <<-DESC
                 Publish the podspec at `PATH` to make it available to all users of
-                the ‘master’ spec-repo. If `PATH` is not provided, defaults to the
+                the ‘trunk’ spec-repo. If `PATH` is not provided, defaults to the
                 current directory.
 
                 Before pushing the podspec to cocoapods.org, this will perform a local
@@ -29,12 +31,21 @@ module Pod
           [
             ['--allow-warnings', 'Allows push even if there are lint warnings'],
             ['--use-libraries', 'Linter uses static libraries to install the spec'],
+            ['--use-modular-headers', 'Lint uses modular headers during installation'],
+            ['--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
 
         def initialize(argv)
-          @allow_warnings = argv.flag?('allow-warnings')
+          @allow_warnings = argv.flag?('allow-warnings', false)
           @use_frameworks = !argv.flag?('use-libraries')
+          @use_modular_headers = argv.flag?('use-modular-headers')
+          @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
@@ -43,7 +54,7 @@ module Pod
         def validate!
           super
           unless token
-            help! 'You need to register a session first.'
+            help! 'You need to run `pod trunk register` to register a session first.'
           end
           unless @path
             help! 'Please specify the path to the podspec file.'
@@ -55,27 +66,31 @@ module Pod
         end
 
         def run
+          update_master_repo
           validate_podspec
-          response = request_path(:post, 'pods', spec.to_json, auth_headers)
-          url = response.headers['location'].first
-          json = json(request_url(:get, url, default_headers))
-
-          # Using UI.labeled here is dangerous, as it wraps the URL and indents
-          # it, which breaks the URL when you try to copy-paste it.
-          $stdout.puts "  - Data URL: #{json['data_url']}"
+          status, json = push_to_trunk
+          update_master_repo
 
-          messages = json['messages'].map do |entry|
-            at, message = entry.to_a.flatten
-            "#{formatted_time(at)}: #{message}"
+          if (400...600).cover?(status)
+            print_messages(json['data_url'], json['messages'], nil)
+          else
+            print_messages(json['data_url'], json['messages'], spec, 'published')
           end
-          UI.labeled 'Log messages', messages
+        end
+
+        private
+
+        def push_to_trunk
+          spec.attributes_hash[:pushed_with_swift_version] = @swift_version if @swift_version
+          response = request_path(:post, "pods?allow_warnings=#{@allow_warnings}",
+                                  spec.to_json, auth_headers)
+          url = response.headers['location'].first
+          return response.status_code, json(request_url(:get, url, default_headers))
         rescue REST::Error => e
           raise Informative, 'There was an error pushing a new version ' \
                                    "to trunk: #{e.message}"
         end
 
-        private
-
         def find_podspec_file
           podspecs = Dir[Pathname(@path) + '*.podspec{.json,}']
           case podspecs.count
@@ -92,9 +107,9 @@ module Pod
 
         def spec
           @spec ||= Pod::Specification.from_file(@path)
-        rescue Informative # TODO: this should be a more specific error
-          raise Informative, 'Unable to interpret the specified path as a ' \
-                               'podspec.'
+        rescue Informative => e # TODO: this should be a more specific error
+          raise Informative, 'Unable to interpret the specified path ' \
+                             "#{UI.path(@path)} as a podspec (#{e})."
         end
 
         # Performs a full lint against the podspecs.
@@ -103,12 +118,49 @@ module Pod
         def validate_podspec
           UI.puts 'Validating podspec'.yellow
 
-          validator = Validator.new(spec, %w(https://github.com/CocoaPods/Specs.git))
+          validator = Validator.new(spec, [master_repo_url])
           validator.allow_warnings = @allow_warnings
           validator.use_frameworks = @use_frameworks
+          if validator.respond_to?(:use_modular_headers=)
+            validator.use_modular_headers = @use_modular_headers
+          end
+          if validator.respond_to?(:swift_version=)
+            validator.swift_version = @swift_version
+          end
+          validator.skip_import_validation = @skip_import_validation
+          validator.skip_tests = @skip_tests
           validator.validate
           unless validator.validated?
-            raise Informative, 'The podspec does not validate.'
+            raise Informative, "The spec did not pass validation, due to #{validator.failure_reason}."
+          end
+
+          # Let the validator's logic for the swift version
+          # set the value for the trunk JSON uploader
+          @swift_version = validator.respond_to?(:used_swift_version) && validator.used_swift_version
+        end
+
+        def update_master_repo
+          # 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
+          sources_manager.master.first.name
+        end
+
+        def master_repo_url
+          sources_manager.master.first.url
+        end
+
+        def sources_manager
+          if defined?(Pod::SourcesManager)
+            Pod::SourcesManager
+          else
+            config.sources_manager
           end
         end
       end

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

@@ -1,14 +1,16 @@
 module Pod
   class Command
     class Trunk
+      # @CocoaPods 0.33.0
+      #
       class Register < Trunk
         self.summary = 'Manage sessions'
         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
@@ -25,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
@@ -38,7 +40,8 @@ module Pod
 
         def initialize(argv)
           @session_description = argv.option('description')
-          @email, @name = argv.shift_argument, argv.shift_argument
+          @email = argv.shift_argument
+          @name = argv.shift_argument
           super
         end
 
@@ -58,8 +61,8 @@ module Pod
           json = json(request_path(:post, 'sessions', body, default_headers))
           save_token(json['token'])
           # TODO UI.notice inserts an empty line :/
-          puts '[!] Please verify the session by clicking the link in the ' \
-                   "verification email that has been sent to #{@email}".yellow
+          UI.puts '[!] Please verify the session by clicking the link in the ' \
+                  "verification email that has been sent to #{@email}".yellow
         rescue REST::Error => e
           raise Informative, 'There was an error registering with trunk: ' \
                                  "#{e.message}"

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

@@ -1,6 +1,8 @@
 module Pod
   class Command
     class Trunk
+      # @CocoaPods 0.33.0
+      #
       class RemoveOwner < Trunk
         self.summary = 'Remove an owner from a pod'
         self.description = <<-DESC
@@ -16,7 +18,8 @@ module Pod
         ]
 
         def initialize(argv)
-          @pod, @email = argv.shift_argument, argv.shift_argument
+          @pod = argv.shift_argument
+          @email = argv.shift_argument
           super
         end