cocoapods-trunk 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94cb63750c2a1c96259b49e0f5a551cdb70cf456
-  data.tar.gz: 52a4b68041e9c1fe535f39e24390b6244a3fbbdb
+  metadata.gz: 59b4de692c8f9b3d9e59e840e3293eec2d40d491
+  data.tar.gz: 1ac058c477bf478299066aab29c63f47b404fbdf
 SHA512:
-  metadata.gz: 3a71c8f8aae5896c00ecd59fb8693929ae5862e3e9c0d4c2d565a17c75a662418e8fba83e1355e66d67c7ab0a56740e0add1c11a44fbcec576b9c9eed3bc0e46
-  data.tar.gz: ee6ba3be0dcc8972b15ad510e7364df215d72372956a09683a902b491d6428e017d2b3db7d436db31e6490bd8e276cfc4f2cdddc40c7b3fe2f01fb88c957a634
+  metadata.gz: 250a29d1c1052e3f042a4d3aa1b114f665c303f288fab9912baecbfd65d8c9016310eb58f6f90ba58a196a1cd5147738bf94069323a962a1e1b6ef09b4462d61
+  data.tar.gz: d54b60e9653e0e37f0cc4a7182f3a80681727e583d8e67706ac538af8ebf7f0c07a6b0115853f7e0e3cdecb6494cb7974e8a2a32e26eda490e9baa907e849bcf

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.5.0
+
+##### Enhancements
+
+* Added `pod trunk remove-owner` command to remove an owner from a pod.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#35](https://github.com/CocoaPods/cocoapods-trunk/issues/35)
+
+* Added `pod trunk info` command to get information for a pod, including the
+  owners.  
+  [Kyle Fuller](https://github.com/kylef)
+  [#15](https://github.com/CocoaPods/cocoapods-trunk/issues/15)
+
+
 ## 0.4.1
 
 ##### Enhancements

data/Gemfile

@@ -15,6 +15,7 @@ group :development do
   gem 'mocha'
   gem 'mocha-on-bacon'
   gem 'prettybacon'
+  gem 'webmock'
 
   gem 'codeclimate-test-reporter', :require => nil
   gem 'rubocop'

data/Gemfile.lock

@@ -1,36 +1,36 @@
 GIT
   remote: https://github.com/CocoaPods/CLAide.git
-  revision: b1eccc296b68b1a432e42ecf0c4b799d8551c75c
+  revision: 9e8b9072fd66f69b91999cd3838a4bbba043a7e5
   branch: master
   specs:
-    claide (0.7.0)
+    claide (0.8.0)
 
 GIT
   remote: https://github.com/CocoaPods/CocoaPods.git
-  revision: 1703a3464674baecf54bd7e766f4b37ed8fc43f7
+  revision: 26b9a555f1fa57675d46a0fb678f8ed7f37e361f
   branch: master
   specs:
-    cocoapods (0.35.0.rc2)
+    cocoapods (0.35.0)
       activesupport (>= 3.2.15)
-      claide (~> 0.7.0)
-      cocoapods-core (= 0.35.0.rc2)
+      claide (~> 0.8.0)
+      cocoapods-core (= 0.35.0)
       cocoapods-downloader (~> 0.8.0)
       cocoapods-plugins (~> 0.3.1)
-      cocoapods-trunk (~> 0.4.0)
-      cocoapods-try (~> 0.4.2)
+      cocoapods-trunk (~> 0.5.0)
+      cocoapods-try (~> 0.4.3)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      molinillo (~> 0.1.1)
+      molinillo (~> 0.2.0)
       nap (~> 0.8)
       open4 (~> 1.3)
-      xcodeproj (~> 0.20.2)
+      xcodeproj (~> 0.21.0)
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: 60a486e8141323390dc5ff7f6676cf893a251a48
+  revision: 7d2b3c0cba15d4c62639c5b390df306a30cc1d40
   branch: master
   specs:
-    cocoapods-core (0.35.0.rc2)
+    cocoapods-core (0.35.0)
       activesupport (>= 3.2.15)
       fuzzy_match (~> 2.0.4)
       nap (~> 0.8.0)
@@ -38,19 +38,20 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods-trunk (0.4.1)
+    cocoapods-trunk (0.5.0)
       nap (>= 0.8)
       netrc (= 0.7.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.8)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.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)
@@ -58,15 +59,17 @@ GEM
     cocoapods-downloader (0.8.0)
     cocoapods-plugins (0.3.2)
       nap
-    cocoapods-try (0.4.2)
+    cocoapods-try (0.4.3)
     codeclimate-test-reporter (0.4.1)
       simplecov (>= 0.7.1, < 1.0.0)
     colored (1.2)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
     docile (1.1.5)
     escape (0.0.4)
     ffi (1.9.6)
     fuzzy_match (2.0.4)
-    i18n (0.6.11)
+    i18n (0.7.0)
     json (1.7.7)
     kicker (3.0.0)
       listen (~> 1.3.0)
@@ -76,18 +79,18 @@ GEM
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     metaclass (0.0.4)
-    minitest (5.4.3)
+    minitest (5.5.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.2)
       mocha (>= 0.13.0)
-    molinillo (0.1.1)
+    molinillo (0.2.0)
     multi_json (1.10.1)
     nap (0.8.0)
     netrc (0.7.8)
     notify (0.5.2)
     open4 (1.3.4)
-    parser (2.2.0.pre.7)
+    parser (2.2.0.pre.8)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
@@ -107,6 +110,7 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.7.0)
+    safe_yaml (1.0.4)
     simplecov (0.9.1)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
@@ -116,7 +120,10 @@ GEM
     thread_safe (0.3.4)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    xcodeproj (0.20.2)
+    webmock (1.20.4)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+    xcodeproj (0.21.0)
       activesupport (>= 3)
       colored (~> 1.2)
 
@@ -138,3 +145,4 @@ DEPENDENCIES
   prettybacon
   rake
   rubocop
+  webmock

data/lib/cocoapods_trunk.rb

@@ -1,3 +1,3 @@
 module CocoaPodsTrunk
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

data/lib/pod/command/trunk.rb

@@ -16,7 +16,9 @@ module Pod
       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/info'
 
       private
 

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

@@ -7,7 +7,7 @@ module Pod
                 Adds the registered user with specified `OWNER-EMAIL` as an owner
                 of the given `POD`.
                 An ‘owner’ is a registered user whom is allowed to make changes to a
-                pod, such as pushing new versions and adding other ‘owners’.
+                pod, such as pushing new versions and adding and removing other ‘owners’.
         DESC
 
         self.arguments = [

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

@@ -0,0 +1,33 @@
+module Pod
+  class Command
+    class Trunk
+      class Info < Trunk
+        self.summary = 'Returns information about a Pod.'
+        self.arguments = [
+          CLAide::Argument.new('NAME', true),
+        ]
+
+        def initialize(argv)
+          @name = argv.shift_argument
+          super
+        end
+
+        def validate!
+          super
+          help! 'Please specify a pod name.' unless @name
+        end
+
+        def run
+          response = json(request_path(:get, "pods/#{@name}", auth_headers))
+          versions = response['versions'] || []
+          owners = response['owners'] || []
+
+          UI.title(@name) do
+            UI.labeled 'Versions', versions.map { |v| "#{v['name']} (#{v['created_at']})" }
+            UI.labeled 'Owners', owners.map { |o| "#{o['name']} <#{o['email']}>" }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+module Pod
+  class Command
+    class Trunk
+      class RemoveOwner < Trunk
+        self.summary = 'Remove an owner from a pod'
+        self.description = <<-DESC
+          Removes the user with specified `OWNER-EMAIL` from being an owner
+          of the given `POD`.
+          An ‘owner’ is a registered user whom is allowed to make changes to a
+          pod, such as pushing new versions and adding and removing other ‘owners’.
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('POD', true),
+          CLAide::Argument.new('OWNER-EMAIL', true),
+        ]
+
+        def initialize(argv)
+          @pod, @email = argv.shift_argument, argv.shift_argument
+          super
+        end
+
+        def validate!
+          super
+          unless token
+            help! 'You need to register a session first.'
+          end
+          unless @pod && @email
+            help! 'Specify the pod name and the owner’s email address.'
+          end
+        end
+
+        def run
+          json = json(request_path(:delete, "pods/#{@pod}/owners/#{@email}", auth_headers))
+          UI.labeled 'Owners', json.map { |o| "#{o['name']} <#{o['email']}>" }
+        rescue REST::Error => e
+          raise Informative, "There was an error removing #{@email} from " \
+                                   "#{@pod} on trunk: #{e.message}"
+        end
+      end
+    end
+  end
+end

data/spec/command/trunk/addowner_spec.rb

@@ -4,8 +4,49 @@ module Pod
   describe Command::Trunk::AddOwner do
     describe 'CLAide' do
       it 'registers it self' do
-        Command.parse(%w(        trunk add-owner        )).should.be.instance_of Command::Trunk::AddOwner
+        Command.parse(%w( trunk add-owner )).should.be.instance_of Command::Trunk::AddOwner
       end
     end
+
+    describe 'validation' do
+      it "should error if we don't have a token" do
+        Netrc.any_instance.stubs(:[]).returns(nil)
+        command = Command.parse(%w( trunk push ))
+        exception = lambda { command.validate! }.should.raise CLAide::Help
+        exception.message.should.include 'register a session'
+      end
+
+      it 'should error if pod name is not supplied' do
+        command = Command.parse(%w( trunk add-owner ))
+        command.stubs(:token).returns('token')
+        exception = lambda { command.validate! }.should.raise CLAide::Help
+        exception.message.should.include 'pod name'
+      end
+
+      it 'should error if new owners email is not supplied' do
+        command = Command.parse(%w( trunk add-owner QueryKit ))
+        command.stubs(:token).returns('token')
+        exception = lambda { command.validate! }.should.raise CLAide::Help
+        exception.message.should.include 'email'
+      end
+
+      it 'should should validate with valid pod and email' do
+        command = Command.parse(%w( trunk add-owner QueryKit kyle@cocoapods.org ))
+        command.stubs(:token).returns('token')
+        lambda { command.validate! }.should.not.raise CLAide::Help
+      end
+    end
+
+    it 'should successfully add an owner' do
+      url = 'https://trunk.cocoapods.org/api/v1/pods/QueryKit/owners'
+      WebMock::API.stub_request(:patch, url).
+        with(:body => "{\"email\":\"kyle@cocoapods.org\"}",
+             :headers => { 'Authorization' => 'Token 527d11fe429f3426cb8dbeba183a0d80' }).
+        to_return(:status => 200, :body => '[]', :headers => {})
+
+      command = Command.parse(%w( trunk add-owner QueryKit kyle@cocoapods.org ))
+      command.stubs(:token).returns('527d11fe429f3426cb8dbeba183a0d80')
+      lambda { command.run }.should.not.raise
+    end
   end
 end

data/spec/command/trunk/info_spec.rb

@@ -0,0 +1,36 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'tmpdir'
+
+module Pod
+  describe Command::Trunk::Info do
+    describe 'CLAide' do
+      it 'registers it self' do
+        Command.parse(%w( trunk info )).should.be.instance_of Command::Trunk::Info
+      end
+    end
+
+    it 'should error without a pod name' do
+      command = Command.parse(%w( trunk info ))
+      lambda { command.validate! }.should.raise CLAide::Help
+    end
+
+    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 => {
+        'owners' => [
+          {
+            'name' => 'Kyle Fuller',
+            'email' => 'kyle@example.com',
+          },
+        ],
+      }.to_json)
+
+      command = Command.parse(%w( trunk info Stencil ))
+      lambda { command.validate! }.should.not.raise CLAide::Help
+      command.run
+
+      UI.output.should.include 'Owners'
+      UI.output.should.include 'Kyle Fuller <kyle@example.com>'
+    end
+  end
+end

data/spec/command/trunk/push_spec.rb

@@ -9,6 +9,13 @@ module Pod
       end
     end
 
+    it "should error if we don't have a token" do
+      Netrc.any_instance.stubs(:[]).returns(nil)
+      command = Command.parse(%w( trunk push ))
+      exception = lambda { command.validate! }.should.raise CLAide::Help
+      exception.message.should.include 'register a session'
+    end
+
     describe 'PATH' do
       before do
         UI.output = ''

data/spec/command/trunk/register_spec.rb

@@ -4,8 +4,28 @@ module Pod
   describe Command::Trunk::Register do
     describe 'CLAide' do
       it 'registers it self' do
-        Command.parse(%w(        trunk register        )).should.be.instance_of Command::Trunk::Register
+        Command.parse(%w( trunk register )).should.be.instance_of Command::Trunk::Register
       end
     end
+
+    it 'should error if email is not supplied' do
+      Netrc.any_instance.stubs(:[]).returns(nil)
+      command = Command.parse(%w( trunk register ))
+      exception = lambda { command.validate! }.should.raise CLAide::Help
+      exception.message.should.include 'email address'
+    end
+
+    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')).
+        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'])
+      Netrc.any_instance.expects(:save)
+
+      command = Command.parse(%w( trunk register kyle@cocoapods.org ))
+      lambda { command.run }.should.not.raise
+    end
   end
 end

data/spec/command/trunk/remove_owner_spec.rb

@@ -0,0 +1,51 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+module Pod
+  describe Command::Trunk::RemoveOwner do
+    describe 'CLAide' do
+      it 'registers itself' do
+        Command.parse(%w( trunk remove-owner )).should.be.instance_of Command::Trunk::RemoveOwner
+      end
+    end
+
+    describe 'validation' do
+      it "should error if we don't have a token" do
+        Netrc.any_instance.stubs(:[]).returns(nil)
+        command = Command.parse(%w( trunk remove-owner ))
+        exception = lambda { command.validate! }.should.raise CLAide::Help
+        exception.message.should.include 'register a session'
+      end
+
+      it 'should error if pod name is not supplied' do
+        command = Command.parse(%w( trunk remove-owner ))
+        command.stubs(:token).returns('token')
+        exception = lambda { command.validate! }.should.raise CLAide::Help
+        exception.message.should.include 'pod name'
+      end
+
+      it 'should error if new owners email is not supplied' do
+        command = Command.parse(%w( trunk remove-owner QueryKit ))
+        command.stubs(:token).returns('token')
+        exception = lambda { command.validate! }.should.raise CLAide::Help
+        exception.message.should.include 'email'
+      end
+
+      it 'should should validate with valid pod and email' do
+        command = Command.parse(%w( trunk remove-owner QueryKit kyle@cocoapods.org ))
+        command.stubs(:token).returns('token')
+        lambda { command.validate! }.should.not.raise CLAide::Help
+      end
+    end
+
+    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).
+        with(:headers => { 'Authorization' => 'Token 527d11fe429f3426cb8dbeba183a0d80' }).
+        to_return(:status => 200, :body => '[]', :headers => {})
+
+      command = Command.parse(%w( trunk remove-owner QueryKit kyle@cocoapods.org ))
+      command.stubs(:token).returns('527d11fe429f3426cb8dbeba183a0d80')
+      lambda { command.run }.should.not.raise
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -21,6 +21,9 @@ require 'bundler/setup'
 require 'bacon'
 require 'mocha-on-bacon'
 require 'pretty_bacon'
+require 'webmock'
+WebMock.disable_net_connect!(:allow => 'codeclimate.com')
+
 require 'cocoapods'
 
 require 'cocoapods_plugin'
@@ -57,3 +60,15 @@ module Pod
     end
   end
 end
+
+module Bacon
+  class Context
+    alias_method :after_webmock, :after
+    def after(&block)
+      after_webmock do
+        block.call
+        WebMock.reset!
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-trunk
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Eloy Durán
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nap
@@ -90,13 +90,17 @@ files:
 - lib/cocoapods_trunk.rb
 - lib/pod/command/trunk.rb
 - lib/pod/command/trunk/add_owner.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/info_spec.rb
 - spec/command/trunk/me_spec.rb
 - spec/command/trunk/push_spec.rb
 - spec/command/trunk/register_spec.rb
+- spec/command/trunk/remove_owner_spec.rb
 - spec/command/trunk_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -125,8 +129,10 @@ specification_version: 4
 summary: Interact with trunk.cocoapods.org
 test_files:
 - spec/command/trunk/addowner_spec.rb
+- spec/command/trunk/info_spec.rb
 - spec/command/trunk/me_spec.rb
 - spec/command/trunk/push_spec.rb
 - spec/command/trunk/register_spec.rb
+- spec/command/trunk/remove_owner_spec.rb
 - spec/command/trunk_spec.rb
 - spec/spec_helper.rb