cocoapods-trunk 1.0.0.beta.1 → 1.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eb4cae6ccbe9e620949aa8af58097cfa5022000
-  data.tar.gz: e056c037de70a65beadd3ecfed9ec2ea7952a9de
+  metadata.gz: 1c41415e0fb060d2aeeab80a8d5feacaca2597c6
+  data.tar.gz: f98ea9c2582d5420292044aa1fc4f6630cd4e3b7
 SHA512:
-  metadata.gz: b4eea927a092373d22fa7c06a602dda5ae2c1d400a44123af721fe0006e2dc3669d32986bb43da125cae32275b009e0119123e1c596b8b82b436d031df108004
-  data.tar.gz: 023e5b4ee7b5cd4829cc9b4287eba4b01a56632a919ffe6754ec34996f8f56469c75c4230e6136996b237650172691e71c8264187ea2bd7b3ca0ecef04875704
+  metadata.gz: ac7dd609a4f0534c96fd7a0bdf4e8d7976b7347c7e7ca6c2c111e3188df3b42fba7b2fbd2d2948ffd3398df0d94f3b3381ceba4d97f46eef155f5ccf49452644
+  data.tar.gz: 57d32e37e9217cc7275fd1af902b5a74c6bf1ca1b123270ebe8ab16d2bf263fb2d6555cb571e363162410e553c020245dff4234601194f6b072c28358286aa6f

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.0.0.beta.2 (2016-02-03)
+
+##### Bug Fixes
+
+* Send a body with the `PATCH` request to deprecate a pod.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#52](https://github.com/CocoaPods/cocoapods-trunk/issues/52)
+
+
 ## 1.0.0.beta.1 (2015-12-30)
 
 ##### Enhancements

data/Gemfile.lock

@@ -39,7 +39,7 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods-trunk (1.0.0.beta.1)
+    cocoapods-trunk (1.0.0.beta.2)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
 

data/lib/cocoapods_trunk.rb

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

data/lib/pod/command/trunk.rb

@@ -109,7 +109,7 @@ module Pod
 
       def formatted_time(time_string)
         require 'active_support/time'
-        @tz_offset ||= Time.zone_offset(`/bin/date +%Z`.strip)
+        @tz_offset ||= Time.zone_offset(time_zone)
         @current_year ||= Date.today.year
 
         time = Time.parse(time_string) + @tz_offset
@@ -120,6 +120,11 @@ module Pod
         end
         formatted
       end
+
+      def time_zone
+        out, = Executable.execute_command('/bin/date', %w(+%Z), :capture => :out)
+        out.strip
+      end
     end
   end
 end

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

@@ -30,7 +30,10 @@ module Pod
         end
 
         def deprecate
-          response = request_path(:patch, "pods/#{@name}/deprecated", auth_headers)
+          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

data/spec/command/trunk/deprecate_spec.rb

@@ -14,8 +14,8 @@ module Pod
       lambda { command.validate! }.should.raise CLAide::Help
     end
 
-    it 'should show information for a pod' do
-      response = {
+    before do
+      @push_response = {
         'messages' => [
           {
             '2015-12-05 02:00:25 UTC' => 'Push for `Stencil 0.96.3` initiated.',
@@ -26,11 +26,33 @@ module Pod
         ],
         '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)
+    end
+
+    it 'should show information for a pod' do
+      Command::Trunk::Deprecate.any_instance.expects(:deprecate).returns(@push_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
+
+    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')).
+        to_return(:status => 201, :headers => { :location => redirect })
+
+      WebMock::API.stub_request(:get, redirect).
+        to_return(:status => 200, :body => @push_response.to_json)
+
+      Command::Trunk::Deprecate.invoke(%w(Stencil --in-favor-of=Stamp))
+
+      UI.output.should == <<-EOS
+  - Data URL: https://raw.githubusercontent.com/CocoaPods/Specs/ce4efe9f986d297008e8c61010a4b0d5881c50d0/Specs/Stencil/0.96.3/Stencil.podspec.json
+- Log messages:
+  - December 5th, 2015 02:00: Push for `Stencil 0.96.3` initiated.
+  - December 5th, 2015 02:00: Push for `Stencil 0.96.3` has been pushed (1.02409270 s).
+      EOS
+    end
   end
 end

data/spec/spec_helper.rb

@@ -64,6 +64,12 @@ module Pod
       end
     end
   end
+
+  class Command::Trunk
+    def time_zone
+      'UTC'
+    end
+  end
 end
 
 module Bacon

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-trunk
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.1
+  version: 1.0.0.beta.2
 platform: ruby
 authors:
 - Eloy Durán
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nap
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Interact with trunk.cocoapods.org