cocoapods-trunk 0.6.4 → 1.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17e21dfb6285d252cda0bcd124a81026d21873d4
-  data.tar.gz: 437d05d888bc2e82bed5dea531e8a1a1dda0cc62
+  metadata.gz: 3eb4cae6ccbe9e620949aa8af58097cfa5022000
+  data.tar.gz: e056c037de70a65beadd3ecfed9ec2ea7952a9de
 SHA512:
-  metadata.gz: 73fc1f1024bb8377648b5fa8f4294e9bb8a7b8a438eca95180f10e3374c63848ee58862a431d43063edceb3df8a59c17d4b152bd1e2732c8cd79791c98d39b86
-  data.tar.gz: 9404536c85f9bfb049c769bc3052658cccce4e32d9c816e5770ae74f4157dcb3ef5038b7927dca3f6e36f65a46ee09eb18865dfb6ac5a3b1a1a06a6e9d305f97
+  metadata.gz: b4eea927a092373d22fa7c06a602dda5ae2c1d400a44123af721fe0006e2dc3669d32986bb43da125cae32275b009e0119123e1c596b8b82b436d031df108004
+  data.tar.gz: 023e5b4ee7b5cd4829cc9b4287eba4b01a56632a919ffe6754ec34996f8f56469c75c4230e6136996b237650172691e71c8264187ea2bd7b3ca0ecef04875704

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 1.0.0.beta.1 (2015-12-30)
+
+##### Enhancements
+
+* The `pod deprecate PODNAME` command has been added to deprecate all versions
+  of a pod.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#31](https://github.com/CocoaPods/cocoapods-trunk/issues/31)
+
+* The `pod delete PODNAME VERSION` command has been added to delete a single
+  version of a pod.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+##### Bug Fixes
+
+* If the master repo has not been setup when pushing a spec, run `pod setup`
+  instead of failing.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#48](https://github.com/CocoaPods/cocoapods-trunk/issues/48)
+
+
 ## 0.6.4 (2015-08-28)
 
 ##### Bug Fixes

data/Gemfile.lock

@@ -1,44 +1,45 @@
 GIT
   remote: https://github.com/CocoaPods/CLAide.git
-  revision: 4e7b02d849c3e82dff7c1cdacf33df45516acaf3
+  revision: b44534d04023fbe82182a8be33d5c728f74c1b9c
   branch: master
   specs:
     claide (0.9.1)
 
 GIT
   remote: https://github.com/CocoaPods/CocoaPods.git
-  revision: 0c9f24807f53a93bff0628f799ade47a1a4f7f1c
+  revision: b34c7148a3952195f1eddb684d7eae2a941eb431
   branch: master
   specs:
-    cocoapods (0.38.2)
-      activesupport (>= 3.2.15)
+    cocoapods (0.39.0)
+      activesupport (>= 4.0.2)
       claide (~> 0.9.1)
-      cocoapods-core (= 0.38.2)
-      cocoapods-downloader (~> 0.9.1)
+      cocoapods-core (= 0.39.0)
+      cocoapods-downloader (~> 0.9.3)
       cocoapods-plugins (~> 0.4.2)
-      cocoapods-stats (~> 0.5.3)
-      cocoapods-trunk (~> 0.6.1)
-      cocoapods-try (~> 0.4.5)
+      cocoapods-search (~> 0.1.0)
+      cocoapods-stats (~> 0.6.2)
+      cocoapods-trunk (~> 1.0.0.beta.1)
+      cocoapods-try (~> 0.5.1)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      molinillo (~> 0.3.1)
+      molinillo (~> 0.4.0)
       nap (~> 1.0)
-      xcodeproj (~> 0.26.3)
+      xcodeproj (~> 0.28.2)
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: 32917a36cbf71117d5da1c8f785b65d108c6f815
+  revision: c91e84a264ce9ab5fc500cc8bd8ffad9c9ecd3cf
   branch: master
   specs:
-    cocoapods-core (0.38.2)
-      activesupport (>= 3.2.15)
+    cocoapods-core (0.39.0)
+      activesupport (>= 4.0.2)
       fuzzy_match (~> 2.0.4)
-      nap (~> 1.0.0)
+      nap (~> 1.0)
 
 PATH
   remote: .
   specs:
-    cocoapods-trunk (0.6.4)
+    cocoapods-trunk (1.0.0.beta.1)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
 
@@ -56,12 +57,12 @@ GEM
     astrolabe (1.3.1)
       parser (~> 2.2)
     bacon (1.2.0)
-    cocoapods-downloader (0.9.1)
+    cocoapods-downloader (0.9.3)
     cocoapods-plugins (0.4.2)
       nap
-    cocoapods-stats (0.5.3)
-      nap (~> 1.0)
-    cocoapods-try (0.4.5)
+    cocoapods-search (0.1.0)
+    cocoapods-stats (0.6.2)
+    cocoapods-try (0.5.1)
     codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
     colored (1.2)
@@ -81,12 +82,12 @@ GEM
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     metaclass (0.0.4)
-    minitest (5.8.0)
+    minitest (5.8.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.2)
       mocha (>= 0.13.0)
-    molinillo (0.3.1)
+    molinillo (0.4.0)
     multi_json (1.11.2)
     nap (1.0.0)
     netrc (0.7.8)
@@ -122,7 +123,7 @@ GEM
     webmock (1.21.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    xcodeproj (0.26.3)
+    xcodeproj (0.28.2)
       activesupport (>= 3)
       claide (~> 0.9.1)
       colored (~> 1.2)
@@ -148,4 +149,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/lib/cocoapods_trunk.rb

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

data/lib/pod/command/trunk.rb

@@ -13,12 +13,14 @@ module Pod
       SCHEME_AND_HOST = ENV['TRUNK_SCHEME_AND_HOST'] || 'https://trunk.cocoapods.org'
       BASE_URL = "#{SCHEME_AND_HOST}/api/v1"
 
-      require 'pod/command/trunk/register'
-      require 'pod/command/trunk/me'
       require 'pod/command/trunk/add_owner'
-      require 'pod/command/trunk/remove_owner'
-      require 'pod/command/trunk/push'
+      require 'pod/command/trunk/delete'
+      require 'pod/command/trunk/deprecate'
       require 'pod/command/trunk/info'
+      require 'pod/command/trunk/me'
+      require 'pod/command/trunk/push'
+      require 'pod/command/trunk/register'
+      require 'pod/command/trunk/remove_owner'
 
       private
 
@@ -68,6 +70,18 @@ module Pod
         raise Informative, error
       end
 
+      def print_messages(data_url, messages)
+        # 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.
+        UI.puts "  - Data URL: #{data_url}"
+
+        messages = messages.map do |entry|
+          at, message = entry.to_a.flatten
+          "#{formatted_time(at)}: #{message}"
+        end
+        UI.labeled 'Log messages', messages
+      end
+
       def json(response)
         JSON.parse(response.body)
       end

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

@@ -0,0 +1,68 @@
+module Pod
+  class Command
+    class Trunk
+      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'])
+        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,43 @@
+module Pod
+  class Command
+    class Trunk
+      class Deprecate < Trunk
+        self.summary = 'Deprecates a pod.'
+        self.arguments = [
+          CLAide::Argument.new('NAME', true),
+        ]
+
+        def 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'])
+        end
+
+        def deprecate
+          response = request_path(:patch, "pods/#{@name}/deprecated", 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/push.rb

@@ -57,28 +57,23 @@ module Pod
         def run
           update_master_repo
           validate_podspec
-          response = request_path(:post, "pods?allow_warnings=#{@allow_warnings}",
-                                  spec.to_json, auth_headers)
-          url = response.headers['location'].first
-          json = json(request_url(:get, url, default_headers))
+          json = push_to_trunk
           update_master_repo
+          print_messages(json['data_url'], json['messages'])
+        end
 
-          # 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.
-          UI.puts "  - Data URL: #{json['data_url']}"
+        private
 
-          messages = json['messages'].map do |entry|
-            at, message = entry.to_a.flatten
-            "#{formatted_time(at)}: #{message}"
-          end
-          UI.labeled 'Log messages', messages
+        def push_to_trunk
+          response = request_path(:post, "pods?allow_warnings=#{@allow_warnings}",
+                                  spec.to_json, auth_headers)
+          url = response.headers['location'].first
+          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
@@ -116,7 +111,11 @@ module Pod
         end
 
         def update_master_repo
-          SourcesManager.update('master')
+          if SourcesManager.master_repo_functional?
+            SourcesManager.update('master')
+          else
+            Setup.invoke
+          end
         end
       end
     end

data/spec/command/trunk/delete_spec.rb

@@ -0,0 +1,70 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'tmpdir'
+
+module Pod
+  describe Command::Trunk::Delete do
+    describe 'CLAide' do
+      it 'registers it self' do
+        Command.parse(%w( trunk delete )).should.be.instance_of Command::Trunk::Delete
+      end
+    end
+
+    it 'should error without a pod name' do
+      command = Command.parse(%w( trunk delete ))
+      lambda { command.validate! }.should.raise CLAide::Help
+    end
+
+    it 'should error without a version' do
+      command = Command.parse(%w( trunk delete Stencil ))
+      lambda { command.validate! }.should.raise CLAide::Help
+    end
+
+    it 'confirms deletion' do
+      UI.inputs += %w(garbage true false)
+      command = Command.parse(%w( trunk delete Stencil 1.0.0 ))
+      command.send(:confirm_deletion?).should.be.true
+      command.send(:confirm_deletion?).should.be.false
+
+      # rubocop:disable Metrics/LineLength
+      UI.output.should == <<-OUTPUT.gsub(/^>$/, '> ')
+\e[33mWARNING: It is generally considered bad behavior to remove versions of a Pod that others are depending on!
+Please consider using the `deprecate` command instead.\e[0m
+Are you sure you want to delete this Pod version?
+>
+Are you sure you want to delete this Pod version?
+>
+\e[33mWARNING: It is generally considered bad behavior to remove versions of a Pod that others are depending on!
+Please consider using the `deprecate` command instead.\e[0m
+Are you sure you want to delete this Pod version?
+>
+      OUTPUT
+      # rubocop:enable Metrics/LineLength
+    end
+
+    it 'does not delete if the user does not confirm' do
+      Command::Trunk::Delete.any_instance.expects(:confirm_deletion?).returns(false)
+      Command::Trunk::Delete.any_instance.expects(:delete).never
+      Command::Trunk::Delete.invoke(%w(Stencil 1.0.0))
+    end
+
+    it 'should show information for a pod' do
+      response = {
+        'messages' => [
+          {
+            '2015-12-05 02:00:25 UTC' => 'Push for `Stencil 1.0.0` initiated.',
+          },
+          {
+            '2015-12-05 02:00:26 UTC' => 'Push for `Stencil 1.0.0` has been pushed (1.02409270 s).',
+          },
+        ],
+        'data_url' => 'https://raw.githubusercontent.com/CocoaPods/Specs/ce4efe9f986d297008e8c61010a4b0d5881c50d0/Specs/Stencil/1.0.0/Stencil.podspec.json',
+      }
+      Command::Trunk::Delete.any_instance.expects(:delete).returns(response)
+      UI.inputs << 'TRUE '
+      Command::Trunk::Delete.invoke(%w(Stencil 1.0.0))
+
+      UI.output.should.include 'Data URL: https://raw.githubusercontent'
+      UI.output.should.include 'Push for `Stencil 1.0.0` initiated'
+    end
+  end
+end

data/spec/command/trunk/deprecate_spec.rb

@@ -0,0 +1,36 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'tmpdir'
+
+module Pod
+  describe Command::Trunk::Deprecate do
+    describe 'CLAide' do
+      it 'registers it self' do
+        Command.parse(%w( trunk deprecate )).should.be.instance_of Command::Trunk::Deprecate
+      end
+    end
+
+    it 'should error without a pod name' do
+      command = Command.parse(%w( trunk deprecate ))
+      lambda { command.validate! }.should.raise CLAide::Help
+    end
+
+    it 'should show information for a pod' do
+      response = {
+        'messages' => [
+          {
+            '2015-12-05 02:00:25 UTC' => 'Push for `Stencil 0.96.3` initiated.',
+          },
+          {
+            '2015-12-05 02:00:26 UTC' => 'Push for `Stencil 0.96.3` has been pushed (1.02409270 s).',
+          },
+        ],
+        'data_url' => 'https://raw.githubusercontent.com/CocoaPods/Specs/ce4efe9f986d297008e8c61010a4b0d5881c50d0/Specs/Stencil/0.96.3/Stencil.podspec.json',
+      }
+      Command::Trunk::Deprecate.any_instance.expects(:deprecate).returns(response)
+      Command::Trunk::Deprecate.invoke(%w(Stencil))
+
+      UI.output.should.include 'Data URL: https://raw.githubusercontent'
+      UI.output.should.include 'Push for `Stencil 0.96.3` initiated'
+    end
+  end
+end

data/spec/command/trunk/push_spec.rb

@@ -104,6 +104,8 @@ module Pod
           with(:ios, nil, true).once.returns(Podfile.new)
         Validator.any_instance.expects(:podfile_from_spec).
           with(:osx, nil, true).once.returns(Podfile.new)
+        Validator.any_instance.expects(:podfile_from_spec).
+          with(:tvos, nil, true).once.returns(Podfile.new)
         Validator.any_instance.expects(:podfile_from_spec).
           with(:watchos, nil, true).once.returns(Podfile.new)
 
@@ -116,6 +118,8 @@ module Pod
           with(:ios, nil, false).once.returns(Podfile.new)
         Validator.any_instance.expects(:podfile_from_spec).
           with(:osx, nil, false).once.returns(Podfile.new)
+        Validator.any_instance.expects(:podfile_from_spec).
+          with(:tvos, nil, false).once.returns(Podfile.new)
         Validator.any_instance.expects(:podfile_from_spec).
           with(:watchos, nil, false).once.returns(Podfile.new)
 
@@ -123,5 +127,40 @@ module Pod
         cmd.send(:validate_podspec)
       end
     end
+
+    describe 'updating the master repo' do
+      before do
+        @cmd = Command.parse(%w(trunk push spec/fixtures/BananaLib.podspec))
+        @cmd.stubs(:validate_podspec)
+        version_response = {
+          'messages' => [
+            {
+              '2015-12-05 02:00:25 UTC' => "Push for `BananaLib 0.96.3' initiated.",
+            },
+            {
+              '2015-12-05 02:00:26 UTC' => "Push for `BananaLib 0.96.3' has been pushed (1.02409270 s).",
+            },
+          ],
+          'data_url' => 'https://raw.githubusercontent.com/CocoaPods/Specs/ce4efe9f986d297008e8c61010a4b0d5881c50d0/Specs/BananaLib/0.96.3/BananaLib.podspec.json',
+        }
+        @cmd.stubs(:push_to_trunk).returns(version_response)
+        Command::Trunk::Push.any_instance.unstub(:update_master_repo)
+      end
+
+      it 'updates the master repo when it exists' do
+        SourcesManager.stubs(:master_repo_functional?).returns(true)
+        SourcesManager.expects(:update).with('master').twice
+
+        @cmd.run
+      end
+
+      it 'sets up the master repo when it does not exist' do
+        SourcesManager.stubs(:master_repo_functional?).returns(false)
+        SourcesManager.expects(:update).never
+        Command::Setup.any_instance.expects(:run).twice
+
+        @cmd.run
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -45,6 +45,11 @@ module Pod
     class << self
       attr_accessor :output
       attr_accessor :warnings
+      attr_accessor :inputs
+
+      def gets
+        inputs.shift
+      end
 
       def puts(message = '')
         @output << "#{message}\n"
@@ -63,12 +68,21 @@ end
 
 module Bacon
   class Context
-    alias_method :after_webmock, :after
-    def after(&block)
-      after_webmock do
-        block.call
-        WebMock.reset!
-      end
+    old_run_requirement = instance_method(:run_requirement)
+    define_method(:run_requirement) do |description, spec|
+      ::Pod::Config.instance = nil
+      ::Pod::UI.output = ''
+      ::Pod::UI.warnings = ''
+      ::Pod::UI.inputs = []
+      # The following prevents a nasty behaviour where the increments are not
+      # balanced when testing informative which might lead to sections not
+      # being printed to the output as they are too nested.
+      ::Pod::UI.indentation_level = 0
+      ::Pod::UI.title_level = 0
+
+      WebMock.reset!
+
+      old_run_requirement.bind(self).call(description, spec)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-trunk
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 1.0.0.beta.1
 platform: ruby
 authors:
 - Eloy Durán
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nap
@@ -96,12 +96,16 @@ files:
 - lib/cocoapods_trunk.rb
 - lib/pod/command/trunk.rb
 - lib/pod/command/trunk/add_owner.rb
+- lib/pod/command/trunk/delete.rb
+- lib/pod/command/trunk/deprecate.rb
 - lib/pod/command/trunk/info.rb
 - lib/pod/command/trunk/me.rb
 - lib/pod/command/trunk/push.rb
 - lib/pod/command/trunk/register.rb
 - lib/pod/command/trunk/remove_owner.rb
 - spec/command/trunk/addowner_spec.rb
+- spec/command/trunk/delete_spec.rb
+- spec/command/trunk/deprecate_spec.rb
 - spec/command/trunk/info_spec.rb
 - spec/command/trunk/me_spec.rb
 - spec/command/trunk/push_spec.rb
@@ -125,17 +129,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       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.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Interact with trunk.cocoapods.org
 test_files:
 - spec/command/trunk/addowner_spec.rb
+- spec/command/trunk/delete_spec.rb
+- spec/command/trunk/deprecate_spec.rb
 - spec/command/trunk/info_spec.rb
 - spec/command/trunk/me_spec.rb
 - spec/command/trunk/push_spec.rb