cocoapods 0.34.2 → 0.34.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03befb1a6d0cf06ee2e98b1481e48b0bb52a51bf
-  data.tar.gz: ab7cf2b6bae37b12bebca53f6fb40075d3d9c4c1
+  metadata.gz: 3f3abb2d3de142a65e9ee1f6f6aa56f207b049ff
+  data.tar.gz: 3c0e8b8c8051aaf81e528ed63b6e2677a4d0ccb9
 SHA512:
-  metadata.gz: f3ab1e18fa19d113c2e6dad3e550da01e79fe806de57b7cf193e579b8cf11d68cccafb209af289f2f69705413652c504d6acd890e974387d31a64893e6879fb2
-  data.tar.gz: 00fc7c1ee370f63d52433411419640b26f32b69c2f98dafad30ae982d685048f72d6d4cd7631cb1dbf8cc8e04be8f042fbbae5cc16040255b0aff37ce769d536
+  metadata.gz: 12b256248b4daee4938865e5f94fa85df245592b712d4877c8cb4385a81dd22511fcc6789477ad2d0eb760c58c037256f5b87d2b1e16fe8da466e31a483cd889
+  data.tar.gz: fb256b64d4ad70edbefcff2a4c8f37e746c13dfcaf43b75ae95854f05dc4af7e71b13f9b8066dd1a32528a35f69a56aa3f04dac518b0cf6c8a347276509e2658

data/CHANGELOG.md

@@ -2,6 +2,52 @@
 
 To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
 
+## 0.34.4
+
+##### Bug Fixes
+
+* Fixes a crash when running `pod outdated`.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2624](https://github.com/CocoaPods/CocoaPods/issues/2624)
+
+* Ensure that external sources (as specified in the `Podfile`) are downloaded
+  when their source is missing, even if their specification is present.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2494](https://github.com/CocoaPods/CocoaPods/issues/2494)
+
+* Fixes an issue where running `pod install/update` while the Xcode project
+  is open can cause the open project to have build failures until Xcode
+  is restarted.  
+  [Kyle Fuller](https://github.com/kylef)
+  [#2627](https://github.com/CocoaPods/CocoaPods/issues/2627)
+  [#2665](https://github.com/CocoaPods/CocoaPods/issues/2665)
+
+* Fixes a crash when using file URLs as a source.  
+  [Kurry Tran](https://github.com/kurry)
+  [#2683](https://github.com/CocoaPods/CocoaPods/issues/2683)
+
+* Fixes an issue when using pods in static library targets and building with
+  Xcode 6 which requires `OTHER_LIBTOOLFLAGS` instead of `OTHER_LDFLAGS`, thus
+  basically reverting to the previous Xcode behaviour, for now at least.  
+  [Kyle Fuller](https://github.com/kylef)
+  [Eloy Durán](https://github.com/alloy)
+  [#2666](https://github.com/CocoaPods/CocoaPods/issues/2666)
+
+* Fixes an issue running the resources script when Xcode is installed to a
+  directory with a space when compiling xcassets.  
+  [Kyle Fuller](https://github.com/kylef)
+  [#2684](https://github.com/CocoaPods/CocoaPods/issues/2684)
+
+* Fixes an issue when installing Pods with resources to a target which
+  doesn't have any resources.  
+  [Kyle Fuller](https://github.com/kylef)
+  [#2083](https://github.com/CocoaPods/CocoaPods/issues/2083)
+
+* Ensure that git 1.7.5 or newer is installed when running pod.  
+  [Kyle Fuller](https://github.com/kylef)
+  [#2651](https://github.com/CocoaPods/CocoaPods/issues/2651)
+
+
 ## 0.34.2
 
 ##### Enhancements
@@ -2589,7 +2635,7 @@ podspec, then update these method calls.
   generated Pods project file.
 
 * [#142](https://github.com/CocoaPods/CocoaPods/issues/): Add `-fobjc-arc` to
-  `OTHER_LD_FLAGS` if _any_ pods require ARC.
+  `OTHER_LDFLAGS` if _any_ pods require ARC.
 
 * [#148](https://github.com/CocoaPods/CocoaPods/issues/148): External encoding
   set to UTF-8 on Ruby 1.9 to fix crash caused by non-ascii characters in pod

data/LICENSE

@@ -1,7 +1,7 @@
 This project is licensed under the MIT license.
 
-Copyright (c) 2011 - 2013 Eloy Durán <eloy.de.enige@gmail.com>
-Copyright (c) 2012 - 2013 Fabio Pelosin <fabiopelosin@gmail.com>
+Copyright (c) 2011 - 2014 Eloy Durán <eloy.de.enige@gmail.com>
+Copyright (c) 2012 - 2014 Fabio Pelosin <fabiopelosin@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/cocoapods/command.rb

@@ -45,6 +45,8 @@ module Pod
 
     def self.run(argv)
       help! 'You cannot run CocoaPods as root.' if Process.uid == 0
+      verify_git_version!
+
       super(argv)
       UI.print_warnings
     end
@@ -114,5 +116,18 @@ module Pod
         raise Informative, "No `Podfile.lock' found in the project directory, run `pod install'."
       end
     end
+
+    def self.verify_git_version!
+      begin
+        git_version = `git version`.strip
+      rescue Errno::ENOENT
+        help! 'CocoaPods requires you to have `git` installed.'
+      end
+
+      git_version = Version.new(git_version.split[2])
+      if git_version < Pod::Version.new('1.7.5')
+        help! 'CocoaPods requires git version 1.7.5 or newer. Please update git.'
+      end
+    end
   end
 end

data/lib/cocoapods/command/outdated.rb

@@ -98,7 +98,7 @@ module Pod
 
       def spec_sets
         @spec_sets ||= begin
-          aggregate = Source::Aggregate.new(analyzer.sources)
+          aggregate = Source::Aggregate.new(analyzer.sources.map(&:repo))
           installed_pods.map do |pod_name|
             aggregate.search(Dependency.new(pod_name))
           end.compact.uniq

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -80,6 +80,8 @@ module Pod
 #!/bin/sh
 set -e
 
+mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+
 RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 
@@ -133,7 +135,7 @@ EOS
 
       XCASSETS_COMPILE = <<EOS
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ `xcrun --find actool` ] && [ `find . -name '*.xcassets' | wc -l` -ne 0 ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ `find . -name '*.xcassets' | wc -l` -ne 0 ]
 then
   case "${TARGETED_DEVICE_FAMILY}" in
     1,2)

data/lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb

@@ -50,6 +50,7 @@ module Pod
           header_search_path_flags = target.sandbox.public_headers.search_paths
           @xcconfig = Xcodeproj::Config.new(
                                               'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
+                                              'OTHER_LIBTOOLFLAGS' => '$(OTHER_LDFLAGS)',
                                               'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(target.sandbox.public_headers.search_paths),
                                               'PODS_ROOT' => target.relative_pods_root,
                                               'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',

data/lib/cocoapods/generator/xcconfig/private_pod_xcconfig.rb

@@ -109,6 +109,6 @@ module Pod
 
         #-----------------------------------------------------------------------#
       end
+    end
   end
 end
-end

data/lib/cocoapods/installer/analyzer.rb

@@ -283,7 +283,7 @@ module Pod
           end
           deps_to_fetch = deps_with_external_source.select { |dep| pods_to_fetch.include?(dep.root_name) }
           deps_to_fetch_if_needed = deps_with_external_source.select { |dep| result.podfile_state.unchanged.include?(dep.root_name) }
-          deps_to_fetch += deps_to_fetch_if_needed.select { |dep| sandbox.specification(dep.root_name).nil? || !dep.external_source[:local].nil? || !dep.external_source[:path].nil? }
+          deps_to_fetch += deps_to_fetch_if_needed.select { |dep| sandbox.specification(dep.root_name).nil? || !dep.external_source[:local].nil? || !dep.external_source[:path].nil? || !sandbox.pod_dir(dep.root_name).directory? }
         end
 
         unless deps_to_fetch.empty?

data/lib/cocoapods/installer/target_installer.rb

@@ -45,7 +45,7 @@ module Pod
           configuration = @target.add_build_configuration(bc_name, type)
         end
 
-        settings = {}
+        settings = { 'OTHER_LDFLAGS' => '', 'OTHER_LIBTOOLFLAGS' => '' }
         if library.archs
           settings['ARCHS'] = library.archs
         end

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -27,14 +27,30 @@ module Pod
         #
         def integrate!
           UI.section(integration_message) do
-            user_project.save if XCConfigIntegrator.integrate(target, native_targets)
-            user_project.save if update_to_cocoapods_0_34
+            # TODO: refactor into Xcodeproj https://github.com/CocoaPods/Xcodeproj/issues/202
+            project_is_dirty = [
+              XCConfigIntegrator.integrate(target, native_targets),
+              update_to_cocoapods_0_34,
+              unless native_targets_to_integrate.empty?
+                add_pods_library
+                add_copy_resources_script_phase
+                add_check_manifest_lock_script_phase
+                true
+              end
+            ].any?
 
-            unless native_targets_to_integrate.empty?
-              add_pods_library
-              add_copy_resources_script_phase
-              add_check_manifest_lock_script_phase
+            if project_is_dirty
               user_project.save
+            else
+              # There is a bug in Xcode where the process of deleting and
+              # re-creating the xcconfig files used in the build
+              # configuration cause building the user project to fail until
+              # Xcode is relaunched.
+              #
+              # Touching/saving the project causes Xcode to reload these.
+              #
+              # https://github.com/CocoaPods/CocoaPods/issues/2665
+              FileUtils.touch(user_project.path + 'project.pbxproj')
             end
           end
         end

data/lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb

@@ -89,10 +89,10 @@ module Pod
             file_ref = group.files.find { |f| f.path == path }
             if config.base_configuration_reference != file_ref
               UI.warn 'CocoaPods did not set the base configuration of your ' \
-              'project because because your project already has a custom ' \
+              'project because your project already has a custom ' \
               'config set. In order for CocoaPods integration to work at ' \
               'all, please either set the base configurations of the target ' \
-              "#{target.name}` to `#{path}` or include the `#{path}` in your " \
+              "`#{target.name}` to `#{path}` or include the `#{path}` in your " \
               'build configuration.'
               false
             elsif !file_ref

data/lib/cocoapods/sources_manager.rb

@@ -410,6 +410,11 @@ module Pod
       #          name_for_url('https://sourceforge.org/Artsy/Specs.git')
       #            # sourceforge-artsy-specs
       #
+      # @example A file URL
+      # 
+      #           name_for_url('file:///Artsy/Specs.git')
+      #             # artsy-specs
+      #
       # @param  [#to_s] url
       #         The URL of the source.
       #
@@ -417,8 +422,13 @@ module Pod
       #
       def name_for_url(url)
         base_from_host_and_path = lambda do |host, path|
-          base = host.split('.')[-2] || host
-          base += '-' + path.gsub(/.git$/, '').gsub(/^\//, '').
+          if host
+            base = host.split('.')[-2] || host
+            base += '-'
+          else
+            base = ''
+          end
+          base += path.gsub(/.git$/, '').gsub(/^\//, '').
             split('/').join('-')
         end
 

data/lib/cocoapods/user_interface/error_report.rb

@@ -29,6 +29,7 @@ module Pod
     RubyGems : #{Gem::VERSION}
         Host : #{host_information}
        Xcode : #{xcode_information}
+         Git : #{git_information}
 Ruby lib dir : #{RbConfig::CONFIG['libdir']}
 Repositories : #{repo_information.join("\n               ")}
 ```
@@ -105,6 +106,10 @@ EOS
           "#{version} (#{build})"
         end
 
+        def git_information
+          `git --version`.strip.split("\n").first
+        end
+
         def installed_plugins
           CLAide::Command::PluginsHelper.specifications.
             reduce({}) { |hash, s| hash.tap { |h| h[s.name] = s.version.to_s } }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.34.2
+  version: 0.34.4
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.34.2
+        version: 0.34.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.34.2
+        version: 0.34.4
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: 0.19.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: 0.19.4
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement