cocoapods 0.12.0 → 0.13.0

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.13.0
+
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.12.0...0.13.0)
+
+###### Enhancements
+
+- Add Podfile `podspec` which allows to use the dependencies of a podspec file. [#162](https://github.com/CocoaPods/CocoaPods/issues/162)
+- Check if any of the build settings defined in the xcconfig files is overridden. [#92](https://github.com/CocoaPods/CocoaPods/issues/92)
+- The Linter now checks that there are no compiler flags that disable warnings.
+
+###### Bug fixes
+
+- The final project isn’t affected anymore by the `inhibit_all_warnings!` option.
+- Support for redirects while using podspec from an url. [#462](https://github.com/CocoaPods/CocoaPods/issues/462)
+
 ## 0.12.0
 
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.11.1...0.12.0)
@@ -10,7 +25,7 @@
 - Don’t impose a certain structure of the user’s project by raising if no ‘Frameworks’ group exists. [#431](https://github.com/CocoaPods/CocoaPods/pull/431)
 - Support for GitHub Gists in the linter.
 - Allow specifying ARC settings in subspecs.
-- Add Podfile#inhibit_all_warnings! which will inhibit all warnings from the Pods library. [#209](https://github.com/CocoaPods/CocoaPods/issues/209)
+- Add Podfile `inhibit_all_warnings!` which will inhibit all warnings from the Pods library. [#209](https://github.com/CocoaPods/CocoaPods/issues/209)
 - Make the Pods Xcode project prettier by namespacing subspecs in nested groups. [#466](https://github.com/CocoaPods/CocoaPods/pull/466)
 
 

data/lib/cocoapods.rb

@@ -13,7 +13,7 @@ unless Gem::Version::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new(
 end
 
 module Pod
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 
   class PlainInformative < StandardError
   end

data/lib/cocoapods/command/linter.rb

@@ -218,14 +218,15 @@ module Pod
         source   = spec.source  || {}
         text     = @file.read
         messages = []
-        messages << "Missing license type"                                unless license[:type]
-        messages << "Sample license type"                                 if license[:type] && license[:type] =~ /\(example\)/
-        messages << "Invalid license type"                                if license[:type] && license[:type] =~ /\n/
-        messages << "The summary is not meaningful"                       if spec.summary =~ /A short description of/
-        messages << "The description is not meaningful"                   if spec.description && spec.description =~ /An optional longer description of/
-        messages << "The summary should end with a dot"                   if spec.summary !~ /.*\./
-        messages << "The description should end with a dot"               if spec.description !~ /.*\./ && spec.description != spec.summary
-        messages << "Comments must be deleted"                            if text.scan(/^\s*#/).length > 24
+        messages << "Missing license type"                                  unless license[:type]
+        messages << "Sample license type"                                   if license[:type] && license[:type] =~ /\(example\)/
+        messages << "Invalid license type"                                  if license[:type] && license[:type] =~ /\n/
+        messages << "The summary is not meaningful"                         if spec.summary =~ /A short description of/
+        messages << "The description is not meaningful"                     if spec.description && spec.description =~ /An optional longer description of/
+        messages << "The summary should end with a dot"                     if spec.summary !~ /.*\./
+        messages << "The description should end with a dot"                 if spec.description !~ /.*\./ && spec.description != spec.summary
+        messages << "Comments must be deleted"                              if text.scan(/^\s*#/).length > 24
+        messages << "Warnings must not be disabled (`-Wno' compiler flags)" if spec.compiler_flags.split(' ').any? {|flag| flag.start_with?('-Wno') }
 
         if (git_source = source[:git])
           messages << "Git sources should specify either a tag or a commit" unless source[:commit] || source[:tag]

data/lib/cocoapods/dependency.rb

@@ -1,4 +1,4 @@
-require 'open-uri'
+require 'cocoapods/open_uri'
 
 module Pod
   class Dependency < Gem::Dependency

data/lib/cocoapods/executable.rb

@@ -40,7 +40,7 @@ module Pod
           if should_raise
             raise Informative, "#{name} #{command}\n\n#{output}"
           else
-            puts (Config.instance.verbose? ? '   ' : '') << "[!] Failed: #{full_command}".red unless Config.instance.silent?
+            puts((Config.instance.verbose? ? '   ' : '') << "[!] Failed: #{full_command}".red) unless Config.instance.silent?
           end
         end
         output

data/lib/cocoapods/installer/target_installer.rb

@@ -16,8 +16,7 @@ module Pod
           'PODS_ROOT'                     => @target_definition.relative_pods_root,
           'PODS_HEADERS_SEARCH_PATHS'     => '${PODS_PUBLIC_HEADERS_SEARCH_PATHS}',
           'ALWAYS_SEARCH_USER_PATHS'      => 'YES', # needed to make EmbedReader build
-          'OTHER_LDFLAGS'                 => default_ld_flags,
-          'GCC_WARN_INHIBIT_ALL_WARNINGS' => @target_definition.inhibit_all_warnings? ? 'YES' : 'NO',
+          'OTHER_LDFLAGS'                 => default_ld_flags
         })
       end
 
@@ -93,6 +92,7 @@ module Pod
           config.build_settings['GCC_PREFIX_HEADER'] = @target_definition.prefix_header_name
           config.build_settings['PODS_ROOT'] = '${SRCROOT}'
           config.build_settings['PODS_HEADERS_SEARCH_PATHS'] = '${PODS_BUILD_HEADERS_SEARCH_PATHS}'
+          config.build_settings['GCC_WARN_INHIBIT_ALL_WARNINGS'] = @target_definition.inhibit_all_warnings? ? 'YES' : 'NO'
         end
       end
 
@@ -105,6 +105,8 @@ module Pod
         end
         puts "- Generating xcconfig file at `#{sandbox.root + @target_definition.xcconfig_name}'" if config.verbose?
         xcconfig.save_as(sandbox.root + @target_definition.xcconfig_name)
+        @target_definition.xcconfig = xcconfig
+
         puts "- Generating prefix header at `#{sandbox.root + @target_definition.prefix_header_name}'" if config.verbose?
         save_prefix_header_as(sandbox.root + @target_definition.prefix_header_name, pods)
         puts "- Generating copy resources script at `#{sandbox.root + @target_definition.copy_resources_script_name}'" if config.verbose?

data/lib/cocoapods/installer/user_project_integrator.rb

@@ -6,7 +6,6 @@ require 'active_support/core_ext/array/conversions'
 
 module Pod
   class Installer
-
     class UserProjectIntegrator
       include Pod::Config::Mixin
 
@@ -58,6 +57,8 @@ module Pod
       end
 
       class TargetIntegrator
+        include Pod::Config::Mixin
+
         attr_reader :target_definition
 
         def initialize(target_definition)
@@ -135,9 +136,30 @@ module Pod
         def add_xcconfig_base_configuration
           xcconfig = user_project.files.new('path' => @target_definition.xcconfig_relative_path)
           targets.each do |target|
+            config_build_names_by_overriden_key = {}
             target.build_configurations.each do |config|
+              config_name = config.attributes["name"]
+              if @target_definition.xcconfig
+                @target_definition.xcconfig.attributes.each do |key, value|
+                  target_value = config.build_settings[key]
+                  if target_value && !target_value.include?('$(inherited)')
+                    config_build_names_by_overriden_key[key] ||= []
+                    config_build_names_by_overriden_key[key] << config_name
+                  end
+                end
+              end
+
               config.base_configuration = xcconfig
             end
+
+            unless config.silent?
+              config_build_names_by_overriden_key.each do |key, config_build_names|
+                name = "#{target.attributes["name"]} [#{config_build_names.join(' - ')}]"
+                puts "\n[!] The target `#{name}' overrides the `#{key}' build setting defined in `#{@target_definition.xcconfig_relative_path}'.".yellow
+                puts "    - Use the `$(inherited)' flag, or"
+                puts "    - Remove the build settings from the target."
+              end
+            end
           end
         end
 

data/lib/cocoapods/open_uri.rb

@@ -0,0 +1,22 @@
+require 'open-uri'
+
+# Inspiration from: https://gist.github.com/1271420
+#
+# Allow open-uri to follow http to https redirects.
+# Relevant issue:
+# http://redmine.ruby-lang.org/issues/3719
+# Source here:
+# https://github.com/ruby/ruby/blob/trunk/lib/open-uri.rb
+
+module OpenURI
+  def OpenURI.redirectable?(uri1, uri2) # :nodoc:
+    # This test is intended to forbid a redirection from http://... to
+    # file:///etc/passwd, file:///dev/zero, etc.  CVE-2011-1521
+    # https to http redirect is also forbidden intentionally.
+    # It avoids sending secure cookie or referer by non-secure HTTP protocol.
+    # (RFC 2109 4.3.1, RFC 2965 3.3, RFC 2616 15.1.3)
+    # However this is ad hoc.  It should be extensible/configurable.
+    uri1.scheme.downcase == uri2.scheme.downcase ||
+    (/\A(?:http|ftp)\z/i =~ uri1.scheme && /\A(?:https?|ftp)\z/i =~ uri2.scheme)
+  end
+end

data/lib/cocoapods/podfile.rb

@@ -143,6 +143,8 @@ module Pod
         relative_to_srcroot("Pods/#{xcconfig_name}").to_s
       end
 
+      attr_accessor :xcconfig
+
       def copy_resources_script_name
         "#{label}-resources.sh"
       end
@@ -401,6 +403,26 @@ module Pod
       @target_definition.target_dependencies << Dependency.new(*name_and_version_requirements, &block)
     end
 
+    # Use the dependencies of a podspec file.
+    #
+    def podspec(options = nil)
+      if options && path = options[:path]
+        path = File.extname(path) == '.podspec' ? path : "#{path}.podspec"
+        file = Pathname.new(File.expand_path(path))
+      elsif options && name = options[:name]
+        name = File.extname(name) == '.podspec' ? name : "#{name}.podspec"
+        file = config.project_root + name
+      else
+        file = config.project_root.glob('*.podspec').first
+      end
+
+      spec = Specification.from_file(file)
+      spec.activate_platform(@target_definition.platform)
+      deps = spec.recursive_subspecs.push(spec).map {|specification| specification.external_dependencies }
+      deps = deps.flatten.uniq
+      @target_definition.target_dependencies.concat(deps)
+    end
+
     def dependency(*name_and_version_requirements, &block)
       warn "[DEPRECATED] `dependency' is deprecated (use `pod')"
       pod(*name_and_version_requirements, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -219,6 +219,7 @@ files:
 - lib/cocoapods/installer/user_project_integrator.rb
 - lib/cocoapods/installer.rb
 - lib/cocoapods/local_pod.rb
+- lib/cocoapods/open_uri.rb
 - lib/cocoapods/platform.rb
 - lib/cocoapods/podfile.rb
 - lib/cocoapods/project.rb
@@ -247,6 +248,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4262586361152659558
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -255,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An Objective-C library package manager.