cocoapods 0.34.0 → 0.34.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e3f9247d1861693b949301b9ce508e9fd7ccd0a
-  data.tar.gz: 552a01f721ebbb407d651c3081132be962453ea5
+  metadata.gz: 174371936987af5ebf634f8938b27a6e7a1cae0a
+  data.tar.gz: e8cd374fd60fae5c74abadcaf57a42dd55f56d39
 SHA512:
-  metadata.gz: 23e31603631c405854d4a4f5f9d14c5c391126200950c630ee3d5608e2ff61023f8f4f4710812e184f38a4111d603e2ae7951932057018aafbb1b9a33f8e5932
-  data.tar.gz: 62a7fe7c9e7b10eb9b39deac6b2d8a82daefcdf0cf83ab37260d350843f4837db254e1804bd4059f85b07cabb1ef6599b21e7187f6ae05ec1792589d1ccbdccb
+  metadata.gz: 6cbeb3597d3f77e5805a9effaf094c84d49907db8d2584b98ca57bd93af8a271a06ad4bd6f26d410c2fbd38211df33cf012e83a0eae8300e08d565f97033ec3e
+  data.tar.gz: 7e47cd82d59b7fbf5a784ebfedd44148f54c0d2eb6ce787161c97a027bcbf61b260a7c4bd421c58dec06453690fc3e013ec335d896c1d178f32757e52a74ac48

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
 
+## 0.34.1
+
+##### Bug Fixes
+
+* Doesn't take into account the trailing `.git` in repository URLs when
+  trying to find a matching specs repo.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2526](https://github.com/CocoaPods/CocoaPods/issues/2526)
+
+
 ## 0.34.0
 
 ##### Breaking
@@ -10,7 +20,7 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
   `sources`. By default, when there are no sources specified in a Podfile all
   source repos will be used. This has always been the case. However, this
   implicit use of sources is now deprecated. Once you specify specific sources,
-  **no** repos wil be included by default. For example:
+  **no** repos will be included by default. For example:
 
         source 'https://github.com/artsy/Specs.git'
         source 'https://github.com/CocoaPods/Specs.git'

data/README.md

@@ -20,7 +20,6 @@ Installing and updating CocoaPods is very easy. Don't miss the [Installation
 guide](http://guides.cocoapods.org/using/getting-started.html#installation) and the
 [Getting started guide](http://guides.cocoapods.org/using/getting-started.html).
 
-
 ## Sponsors
 
 Lovingly sponsored by [Fingertips](http://www.fngtps.com),
@@ -41,12 +40,12 @@ we welcome with joy new contributors.
 [Blog](http://blog.cocoapods.org) | The CocoaPods blog.
 [Mailing List](http://groups.google.com/group/cocoapods) | Feel free to ask any kind of question.
 [Documentation](http://docs.cocoapods.org) | Everything you want to know about CocoaPods.
-[Changelog](https://github.com/CocoaPods/CocoaPods/blob/master/CHANGELOG.md) | See the changes introduced by each CocoaPods version.
-[New Pods RSS](http://feeds.cocoapods.org/new-pods.rss) | Don't miss any new Pod.
+[Changelog](https://github.com/CocoaPods/CocoaPods/blob/master/CHANGELOG.md) | See the changes introduced in each CocoaPods version.
+[New Pods RSS](http://feeds.cocoapods.org/new-pods.rss) | Don't miss any new Pods.
 
 ## Projects
 
-CocoaPods is composed by the following projects:
+CocoaPods is composed of the following projects:
 
 | Status | Project | Description | Info |
 | :----- | :------ | :--- | :--- |

data/lib/cocoapods/command/lib.rb

@@ -48,7 +48,6 @@ module Pod
 
         extend Executable
         executable :git
-        executable :ruby
 
         TEMPLATE_REPO = 'https://github.com/CocoaPods/pod-template.git'
         TEMPLATE_INFO_URL = 'https://github.com/CocoaPods/pod-template'

data/lib/cocoapods/command/list.rb

@@ -11,9 +11,6 @@ module Pod
         ]].concat(super)
       end
 
-      extend Executable
-      executable :git
-
       def initialize(argv)
         @update = argv.flag?('update')
         @stats  = argv.flag?('stats')

data/lib/cocoapods/command/setup.rb

@@ -17,7 +17,6 @@ module Pod
       def self.options
         [
           ['--no-shallow', 'Clone full history so push will work'],
-          ['--push', 'Use this option to enable push access once granted'],
         ].concat(super)
       end
 
@@ -25,8 +24,7 @@ module Pod
       executable :git
 
       def initialize(argv)
-        @push_option = argv.flag?('push')
-        @shallow     = argv.flag?('shallow', !@push_option)
+        @shallow = argv.flag?('shallow', true)
         super
       end
 
@@ -43,8 +41,7 @@ module Pod
           end
         end
 
-        access_type = push? ? 'push' : 'read-only'
-        UI.puts "Setup completed (#{access_type} access)".green
+        UI.puts "Setup completed".green
       end
 
       #--------------------------------------#
@@ -116,7 +113,7 @@ module Pod
       #         be enabled.
       #
       def url
-        push? ? self.class.read_write_url : self.class.read_only_url
+        self.class.read_only_url
       end
 
       # @return [String] the read only url of the master repo.
@@ -125,31 +122,6 @@ module Pod
         'https://github.com/CocoaPods/Specs.git'
       end
 
-      # @return [String] the read-write url of the master repo.
-      #
-      def self.read_write_url
-        'git@github.com:CocoaPods/Specs.git'
-      end
-
-      # Checks if the user asked to setup the master repo in push mode or if
-      # the repo was already in push mode.
-      #
-      # @return [String] whether the master repo should be set up in push mode.
-      #
-      def push?
-        @push ||= (@push_option || master_repo_is_push?)
-      end
-
-      # @return [Bool] if the master repo is already configured in push mode.
-      #
-      def master_repo_is_push?
-        return false unless master_repo_dir.exist?
-        Dir.chdir(master_repo_dir) do
-          url = git('config --get remote.origin.url')
-          url.chomp == self.class.read_write_url
-        end
-      end
-
       # @return [Pathname] the directory of the master repo.
       #
       def master_repo_dir

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.34.0' unless defined? Pod::VERSION
+  VERSION = '0.34.1' unless defined? Pod::VERSION
 end

data/lib/cocoapods/sources_manager.rb

@@ -232,7 +232,7 @@ module Pod
         versions = version_information(dir)
         unless repo_compatible?(dir)
           min, max = versions['min'], versions['max']
-          version_msg = ( min == max) ? min : "#{min} - #{max}"
+          version_msg = (min == max) ? min : "#{min} - #{max}"
           raise Informative, "The `#{dir.basename}` repo requires " \
           "CocoaPods #{version_msg} (currently using #{Pod::VERSION})\n".red +
           'Update CocoaPods, or checkout the appropriate tag in the repo.'
@@ -381,8 +381,8 @@ module Pod
       #         The URL of the source.
       #
       def source_with_url(url)
-        url = url.downcase
-        aggregate.sources.find { |s| s.url.downcase == url }
+        url = url.downcase.gsub(/.git$/, '')
+        aggregate.sources.find { |s| s.url.downcase.gsub(/.git$/, '') == url }
       end
 
       # Returns a suitable repository name for `url`.

data/lib/cocoapods/validator.rb

@@ -357,7 +357,7 @@ module Pod
       end
 
       if consumer.spec.root?
-        unless file_accessor.license || spec.license && ( spec.license[:type] == 'Public Domain' || spec.license[:text])
+        unless file_accessor.license || spec.license && (spec.license[:type] == 'Public Domain' || spec.license[:text])
           warning 'Unable to find a license file'
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.34.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -17,228 +17,228 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.34.0
+        version: 0.34.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.34.0
+        version: 0.34.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.19.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.19.2
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: cocoapods-plugins
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: cocoapods-try
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: cocoapods-trunk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: escape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.15
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.15
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: nap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 description: |-
@@ -338,12 +338,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []