cocoapods-trunk 1.1.0.beta.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2420bad5c8404637a01a359be2f5e6a5102985dd
-  data.tar.gz: 7278abfb6ecdb18b3b7b632e21e58f140aee9bde
+  metadata.gz: 30da116433de3df7e249cb9d66efa4c0fc652b62
+  data.tar.gz: 77a48ab9bca55b783c12ec6863980d983b0f3a71
 SHA512:
-  metadata.gz: 1ee5c3d4c895415ac0c42c96f85508878785d5ea9c117aa506ebc144cb2795c4d75191260faa09bef2c1cad7b5a2822d833fcbbe1a148a1c5533adc55e24c8e7
-  data.tar.gz: a524a78baee39eaa47247134e22a9869e06e2d6058977db31560a6c460e6e68d9cc038388e7f407c7e04a161135d6e2e1137e3c628e62318b400dc6aa95aff41
+  metadata.gz: 7ccba11bb345a7c31fe6f7e67166fbfc207288f2580acb812e76ab83e2e37682e337763fda1caa65059cd591a0d51f616948c67799bbffc4d3218a1cec61e69a
+  data.tar.gz: edc020e706c3d2dd56a12a6b20622130251800588e53e258572dfa7517185e497b6109cb4b4d2f0b3ab9fcd97d3ff8be852cae1e1c16ed3f5e314ca77d4622bd

data/.travis.yml

@@ -1,23 +1,21 @@
 # Sets Travis to run the Ruby specs on OS X machines to be as close as possible
 # to the user environment.
 #
+osx_image: xcode7.3
 language: objective-c
+cache: bundler
+rvm:
+  - system
+  - 2.0.0-p451
+
 addons:
  code_climate:
    repo_token: 937468c2cbb0d7c0546b62d0fcbcba8a2a8b82714a64a52ffd0b951e71df626d
 
-env:
-  - RVM_RUBY_VERSION=system
-  # - RVM_RUBY_VERSION=1.8.7-p358
-
 before_install:
-  - export LANG=en_US.UTF-8
-  - curl http://curl.haxx.se/ca/cacert.pem -o /usr/local/share/cacert.pem
-  - 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
+  - export GEM_HOME=$HOME/.gem
+  - export PATH=$GEM_HOME/bin:$PATH
+  - sudo gem install bundler
 
 install:
   - bundle install --without=documentation

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 1.1.0 (2016-10-19)
+
+##### Enhancements
+
+* Passes the pod's version of Swift used for deployment to the CocoaPods Specs repo  
+  [Orta](https://github.com/orta)
+  [#92](https://github.com/CocoaPods/cocoapods-trunk/pull/72)
+
+* Prettier success message when successfully pushed a new version
+  [Marin](https://github.com/icanzilb)
+  [#76](https://github.com/CocoaPods/cocoapods-trunk/pull/76)
+
+##### Bug Fixes
+
+* None.  
+
+
 ## 1.1.0.beta.1 (2016-10-10)
 
 ##### Enhancements

data/Gemfile.lock

@@ -19,7 +19,7 @@ GIT
       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-trunk (= 1.1.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
@@ -49,7 +49,7 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods-trunk (1.1.0.beta.1)
+    cocoapods-trunk (1.1.0)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
 

data/lib/cocoapods_trunk.rb

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

data/lib/pod/command/trunk.rb

@@ -70,16 +70,32 @@ 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}"
+      def print_messages(data_url, messages, spec = nil, action = nil)
+        if verbose? || spec.nil?
+          # 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}"
+
+          server_logs = messages.map do |entry|
+            at, message = entry.to_a.flatten
+            "#{formatted_time(at)}: #{message}"
+          end
+          UI.labeled 'Log messages', server_logs
+        else
+          separator = '-' * 80
+          UI.puts
+          UI.puts separator
+          UI.puts " 🎉  Congrats"
+          UI.puts
+          UI.puts " 🚀  #{spec.name} (#{spec.version}) successfully #{action}"
+          unless messages.empty?
+            at = messages.first.to_a.flatten.first
+            UI.puts " 📅  #{formatted_time(at)}"
+          end
+          UI.puts " 🌎  https://cocoapods.org/pods/#{spec.name}"
+          UI.puts " 👍  Tell your friends!"
+          UI.puts separator
         end
-        UI.labeled 'Log messages', messages
       end
 
       def json(response)

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

@@ -34,7 +34,7 @@ module Pod
         def run
           return unless confirm_deletion?
           json = delete
-          print_messages(json['data_url'], json['messages'])
+          print_messages(json['data_url'], json['messages'], nil, nil)
         end
 
         private

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

@@ -28,7 +28,7 @@ module Pod
 
         def run
           json = deprecate
-          print_messages(json['data_url'], json['messages'])
+          print_messages(json['data_url'], json['messages'], nil, nil)
         end
 
         def deprecate

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

@@ -62,18 +62,24 @@ module Pod
         def run
           update_master_repo
           validate_podspec
-          json = push_to_trunk
+          status, json = push_to_trunk
           update_master_repo
-          print_messages(json['data_url'], json['messages'])
+
+          if (400...600).cover?(status)
+            print_messages(json['data_url'], json['messages'], nil)
+          else
+            print_messages(json['data_url'], json['messages'], spec, 'published')
+          end
         end
 
         private
 
         def push_to_trunk
+          spec.attributes_hash[:pushed_with_swift_version] = @swift_version
           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))
+          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}"
@@ -114,6 +120,10 @@ module Pod
           unless validator.validated?
             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.used_swift_version
         end
 
         def update_master_repo

data/spec/command/trunk/push_spec.rb

@@ -3,6 +3,20 @@ require 'tmpdir'
 
 module Pod
   describe Command::Trunk::Push do
+    def success_json
+      {
+        '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',
+      }
+    end
+
     before do
       Command::Trunk::Push.any_instance.stubs(:update_master_repo)
     end
@@ -98,6 +112,7 @@ module Pod
         Validator.any_instance.stubs(:install_pod)
         Validator.any_instance.stubs(:build_pod)
         Validator.any_instance.stubs(:add_app_project_import)
+        Validator.any_instance.stubs(:used_swift_version).returns(nil)
         %i(prepare resolve_dependencies download_dependencies).each do |m|
           Installer.any_instance.stubs(m)
         end
@@ -110,6 +125,14 @@ module Pod
         cmd.send(:validate_podspec)
       end
 
+      it 'passes a swift version back to command, to handle .swift-version files' do
+        Validator.any_instance.stubs(:used_swift_version).returns('1.2.3')
+
+        cmd = Command.parse(%w(trunk push spec/fixtures/BananaLib.podspec))
+        cmd.send(:validate_podspec)
+        cmd.instance_variable_get(:@swift_version).should == '1.2.3'
+      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)
@@ -149,22 +172,44 @@ module Pod
       end
     end
 
+    describe 'sending the swift version up to trunk' do
+      before do
+        # This won't get called
+        Command::Trunk::Push.any_instance.unstub(:update_master_repo)
+        # For faking the networking when sending
+        Pod::Command::Trunk.any_instance.expects(:json).returns({})
+        Pod::Command::Trunk.any_instance.expects(:auth_headers).returns({})
+      end
+
+      it 'passes the value to trunk' do
+        # Fakes for the network response
+        response = mock
+        response.expects(:headers).returns('location' => ['http://theinternet.com'])
+        response.expects(:status_code).returns(200)
+
+        cmd = Command.parse(%w(trunk push spec/fixtures/BananaLib.podspec --swift-version=1.1.2))
+
+        # Using a blank podspec - JSON should include `"pushed_with_swift_version":"1.1.2"`
+        cmd.stubs(:spec).returns(Pod::Specification.new)
+
+        json = <<-JSON
+{"name":null,"pushed_with_swift_version":"1.1.2","platforms":{"osx":null,"ios":null,"tvos":null,"watchos":null}}
+        JSON
+
+        cmd.stubs(:validate_podspec)
+        cmd.stubs(:request_url)
+
+        api_route = 'pods?allow_warnings=false'
+        cmd.expects(:request_path).with(:post, api_route, json, {}).returns(response)
+        cmd.send(:push_to_trunk)
+      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)
+        @cmd.stubs(:push_to_trunk).returns([200, success_json])
         Command::Trunk::Push.any_instance.unstub(:update_master_repo)
       end
 
@@ -183,5 +228,39 @@ module Pod
         @cmd.run
       end
     end
+
+    describe 'Presenting Responses to the user' do
+      before do
+        Command::Trunk::Push.any_instance.stubs(:update_master_repo)
+        Config.instance.sources_manager.stubs(:master_repo_functional?).returns(true)
+      end
+
+      it 'shows full logs when verbose' do
+        cmd = Command.parse(%w(trunk push spec/fixtures/BananaLib.podspec --verbose))
+        cmd.stubs(:validate_podspec)
+        cmd.stubs(:push_to_trunk).returns([200, success_json])
+
+        cmd.run
+        UI.output.should.match %r{- Data URL: https://raw.githubusercontent.com/CocoaPods/Specs}
+      end
+
+      it 'shows full logs when errored' do
+        cmd = Command.parse(%w(trunk push spec/fixtures/BananaLib.podspec --verbose))
+        cmd.stubs(:validate_podspec)
+        cmd.stubs(:push_to_trunk).returns([400, success_json])
+
+        cmd.run
+        UI.output.should.match %r{- Data URL: https://raw.githubusercontent.com/CocoaPods/Specs}
+      end
+
+      it 'shows thanks emojis when success' do
+        cmd = Command.parse(%w(trunk push spec/fixtures/BananaLib.podspec))
+        cmd.stubs(:validate_podspec)
+        cmd.stubs(:push_to_trunk).returns([200, success_json])
+        cmd.run
+
+        UI.output.should.match %r{https://cocoapods.org/pods/BananaLib}
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-trunk
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Eloy Durán
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nap
@@ -129,9 +129,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1