cocoapods 0.22.3 → 0.23.0.rc1

data/lib/cocoapods/gem_version.rb

@@ -1,6 +1,6 @@
 module Pod
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.22.3' unless defined? Pod::VERSION
+  VERSION = '0.23.0.rc1' unless defined? Pod::VERSION
 end
 

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -70,7 +70,7 @@ module Pod
       def script
         script = install_resources_function
         resources.each do |resource|
-          script += "install_resource '#{resource}'\n"
+          script += %Q[install_resource "#{resource}"\n]
         end
         script += RSYNC_CALL
         script
@@ -102,12 +102,16 @@ install_resource()
       cp -fpR "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
       ;;
     *.xcdatamodel)
-      echo xcrun momc \"${PODS_ROOT}/$1\" ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom
-      xcrun momc \"${PODS_ROOT}/$1\" ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom
+      echo "xcrun momc \\"${PODS_ROOT}/$1\\" \\"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\\""
+      xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom"
       ;;
     *.xcdatamodeld)
-      echo  xcrun momc \"${PODS_ROOT}/$1\" ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd
-      xcrun momc \"${PODS_ROOT}/$1\" ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd
+      echo "xcrun momc \\"${PODS_ROOT}/$1\\" \\"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\\""
+      xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd"
+      ;;
+    /*)
+      echo "$1"
+      echo "$1" >> "$RESOURCES_TO_COPY"
       ;;
     *)
       echo "${PODS_ROOT}/$1"

data/lib/cocoapods/generator/xcconfig.rb

@@ -5,124 +5,12 @@ module Pod
     # for each Pod and for each Pod target definition. The aggregates the
     # configurations of the Pods and define target specific settings.
     #
-    class XCConfig
+    module XCConfig
 
-      # @return [Target] the target represented by this xcconfig.
-      #
-      attr_reader :target
-
-      # @param  [Target] target @see target
-      #
-      def initialize(target)
-        @target = target
-      end
-
-      # @return [Sandbox] the sandbox of this target.
-      #
-      def sandbox
-        target.sandbox
-      end
-
-      # @return [Xcodeproj::Config] The generated xcconfig.
-      #
-      attr_reader :xcconfig
-
-      # Generates and saves the xcconfig to the given path.
-      #
-      # @param  [Pathname] path
-      #         the path where the prefix header should be stored.
-      #
-      # @return [void]
-      #
-      def save_as(path)
-        generate.save_as(path)
-      end
-
-      #-----------------------------------------------------------------------#
-
-      # @!group Private helpers.
-
-      private
-
-      # @return [String] the default linker flags. `-ObjC` is always included
-      #         while `-fobjc-arc` is included only if requested in the
-      #         Podfile.
-      #
-      def default_ld_flags
-        ld_flags = '-ObjC'
-        if target.target_definition.podfile.set_arc_compatibility_flag? and
-           target.spec_consumers.any? { |consumer| consumer.requires_arc? }
-          ld_flags << ' -fobjc-arc'
-        end
-        ld_flags
-      end
-
-      # Converts an array of strings to a single string where the each string
-      # is surrounded by double quotes and separated by a space. Used to
-      # represent strings in a xcconfig file.
-      #
-      # @param  [Array<String>] strings
-      #         a list of strings.
-      #
-      # @return [String] the resulting string.
-      #
-      def quote(strings)
-        strings.sort.map { |s| %W|"#{s}"| }.join(" ")
-      end
-
-      # Configures the given Xcconfig according to the build settings of the
-      # given Specification.
-      #
-      # @param  [Specification::Consumer] consumer
-      #         The consumer of the specification.
-      #
-      # @param  [Xcodeproj::Config] xcconfig
-      #         The xcconfig to edit.
-      #
-      def add_spec_build_settings_to_xcconfig(consumer, xcconfig)
-        xcconfig.merge!(consumer.xcconfig)
-        xcconfig.libraries.merge(consumer.libraries)
-        xcconfig.frameworks.merge(consumer.frameworks)
-        xcconfig.weak_frameworks.merge(consumer.weak_frameworks)
-        add_developers_frameworks_if_needed(consumer, xcconfig)
-      end
-
-      # @return [Array<String>] The search paths for the developer frameworks.
-      #
-      # @todo   Inheritance should be properly handled in Xcconfigs.
-      #
-      DEVELOPER_FRAMEWORKS_SEARCH_PATHS = [
-        '$(inherited)',
-        '"$(SDKROOT)/Developer/Library/Frameworks"',
-        '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
-      ]
-
-      # Adds the search paths of the developer frameworks to the specification
-      # if needed. This is done because the `SenTestingKit` requires them and
-      # adding them to each specification which requires it is repetitive and
-      # error prone.
-      #
-      # @param  [Specification::Consumer] consumer
-      #         The consumer of the specification.
-      #
-      # @param  [Xcodeproj::Config] xcconfig
-      #         The xcconfig to edit.
-      #
-      # @return [void]
-      #
-      def add_developers_frameworks_if_needed(consumer, xcconfig)
-        if xcconfig.frameworks.include?('SenTestingKit')
-          search_paths = xcconfig.attributes['FRAMEWORK_SEARCH_PATHS'] ||= ''
-          DEVELOPER_FRAMEWORKS_SEARCH_PATHS.each do |search_path|
-            unless search_paths.include?(search_path)
-              search_paths << ' ' unless search_paths.empty?
-              search_paths << search_path
-            end
-          end
-        end
-      end
-
-      #-----------------------------------------------------------------------#
+      autoload :AggregateXCConfig,  'cocoapods/generator/xcconfig/aggregate_xcconfig'
+      autoload :PublicPodXCConfig,  'cocoapods/generator/xcconfig/public_pod_xcconfig'
+      autoload :PrivatePodXCConfig, 'cocoapods/generator/xcconfig/private_pod_xcconfig'
+      autoload :XCConfigHelper,     'cocoapods/generator/xcconfig/xcconfig_helper'
 
     end
   end

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

@@ -1,9 +1,35 @@
 module Pod
   module Generator
+    module XCConfig
 
     # Generates the xcconfigs for the aggregate targets.
     #
-    class AggregateXCConfig < XCConfig
+    class AggregateXCConfig
+
+      # @return [Target] the target represented by this xcconfig.
+      #
+      attr_reader :target
+
+      # @param  [Target] target @see target
+      #
+      def initialize(target)
+        @target = target
+      end
+
+      # @return [Xcodeproj::Config] The generated xcconfig.
+      #
+      attr_reader :xcconfig
+
+      # Generates and saves the xcconfig to the given path.
+      #
+      # @param  [Pathname] path
+      #         the path where the prefix header should be stored.
+      #
+      # @return [void]
+      #
+      def save_as(path)
+        generate.save_as(path)
+      end
 
       # Generates the xcconfig.
       #
@@ -12,19 +38,28 @@ module Pod
       #         Each namespaced configuration value is merged into the Pod
       #         xcconfig file.
       #
+      # @todo   This doesn't include the specs xcconfigs anymore and now the
+      #         logic is duplicated.
+      #
       # @return [Xcodeproj::Config]
       #
       def generate
         @xcconfig = Xcodeproj::Config.new({
-          'OTHER_LDFLAGS'                => default_ld_flags,
-          'HEADER_SEARCH_PATHS'          => quote(sandbox.public_headers.search_paths),
-          'PODS_ROOT'                    => target.relative_pods_root,
+          'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
+          'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(target.sandbox.public_headers.search_paths),
+          'PODS_ROOT' => target.relative_pods_root,
           'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
         })
 
         target.pod_targets.each do |pod_target|
-          pod_target.spec_consumers.each do |consumer|
-            add_spec_build_settings_to_xcconfig(consumer, @xcconfig)
+          pod_target.file_accessors.each do |file_accessor|
+            XCConfigHelper.add_spec_build_settings_to_xcconfig(file_accessor.spec_consumer, @xcconfig)
+            file_accessor.vendored_frameworks.each do |vendored_framework|
+              XCConfigHelper.add_framework_build_settings(vendored_framework, @xcconfig, target.sandbox.root)
+            end
+            file_accessor.vendored_libraries.each do |vendored_library|
+              XCConfigHelper.add_library_build_settings(vendored_library, @xcconfig, target.sandbox.root)
+            end
           end
         end
 
@@ -42,3 +77,4 @@ module Pod
     end
   end
 end
+end

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

@@ -1,5 +1,6 @@
 module Pod
   module Generator
+    module XCConfig
 
     # Generates the private xcconfigs for the pod targets.
     #
@@ -7,7 +8,11 @@ module Pod
     # values of the public namespaced xcconfig with the default private
     # configuration values required by CocoaPods.
     #
-    class PrivatePodXCConfig < XCConfig
+    class PrivatePodXCConfig
+
+      # @return [Target] the target represented by this xcconfig.
+      #
+      attr_reader :target
 
       # @return [Xcodeproj::Config] The public xcconfig which this one will
       #         use.
@@ -18,21 +23,37 @@ module Pod
       # @param  [Xcodeproj::Config] public_xcconfig @see public_xcconfig
       #
       def initialize(target, public_xcconfig)
-        super(target)
+        @target = target
         @public_xcconfig = public_xcconfig
       end
 
+      # @return [Xcodeproj::Config] The generated xcconfig.
+      #
+      attr_reader :xcconfig
+
+      # Generates and saves the xcconfig to the given path.
+      #
+      # @param  [Pathname] path
+      #         the path where the prefix header should be stored.
+      #
+      # @return [void]
+      #
+      def save_as(path)
+        generate.save_as(path)
+      end
+
       # Generates the xcconfig.
       #
       # @return [Xcodeproj::Config]
       #
       def generate
+        search_pahts = target.build_headers.search_paths.concat(target.sandbox.public_headers.search_paths)
         config = {
-          'OTHER_LDFLAGS'                => default_ld_flags,
-          'PODS_ROOT'                    => '${SRCROOT}',
-          'HEADER_SEARCH_PATHS'          => quote(target.build_headers.search_paths) + ' ' + quote(sandbox.public_headers.search_paths),
+          'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
+          'PODS_ROOT'  => '${SRCROOT}',
+          'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(search_pahts),
           'GCC_PREPROCESSOR_DEFINITIONS' => 'COCOAPODS=1',
-          # 'USE_HEADERMAP'                => 'NO'
+          # 'USE_HEADERMAP' => 'NO'
         }
 
         xcconfig_hash = add_xcconfig_namespaced_keys(public_xcconfig.to_hash, config, target.xcconfig_prefix)
@@ -93,3 +114,4 @@ module Pod
     end
   end
 end
+end

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

@@ -1,5 +1,6 @@
 module Pod
   module Generator
+    module XCConfig
 
     # Generates the public xcconfigs for the pod targets.
     #
@@ -8,7 +9,21 @@ module Pod
     # xcconfig includes the standard podspec defined values including
     # libraries, frameworks, weak frameworks and xcconfig overrides.
     #
-    class PublicPodXCConfig < XCConfig
+    class PublicPodXCConfig
+
+      # @return [Target] the target represented by this xcconfig.
+      #
+      attr_reader :target
+
+      # @param  [Target] target @see target
+      #
+      def initialize(target)
+        @target = target
+      end
+
+      # @return [Xcodeproj::Config] The generated xcconfig.
+      #
+      attr_reader :xcconfig
 
       # Generates and saves the xcconfig to the given path.
       #
@@ -27,8 +42,14 @@ module Pod
       #
       def generate
         @xcconfig = Xcodeproj::Config.new
-        target.spec_consumers.each do |consumer|
-          add_spec_build_settings_to_xcconfig(consumer, @xcconfig)
+        target.file_accessors.each do |file_accessor|
+          XCConfigHelper.add_spec_build_settings_to_xcconfig(file_accessor.spec_consumer, @xcconfig)
+          file_accessor.vendored_frameworks.each do |vendored_framework|
+            XCConfigHelper.add_framework_build_settings(vendored_framework, @xcconfig, target.sandbox.root)
+          end
+          file_accessor.vendored_libraries.each do |vendored_library|
+            XCConfigHelper.add_library_build_settings(vendored_library, @xcconfig, target.sandbox.root)
+          end
         end
         @xcconfig
       end
@@ -38,3 +59,4 @@ module Pod
     end
   end
 end
+end

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

@@ -0,0 +1,124 @@
+module Pod
+  module Generator
+    module XCConfig
+
+      # Stores the shared logic of the classes of the XCConfig module.
+      #
+      module XCConfigHelper
+
+        # Converts an array of strings to a single string where the each string
+        # is surrounded by double quotes and separated by a space. Used to
+        # represent strings in a xcconfig file.
+        #
+        # @param  [Array<String>] strings
+        #         a list of strings.
+        #
+        # @return [String] the resulting string.
+        #
+        def self.quote(strings)
+          strings.sort.map { |s| %W|"#{s}"| }.join(" ")
+        end
+
+        # @return [String] the default linker flags. `-ObjC` is always included
+        #         while `-fobjc-arc` is included only if requested in the
+        #         Podfile.
+        #
+        def self.default_ld_flags(target)
+          ld_flags = '-ObjC'
+          if target.target_definition.podfile.set_arc_compatibility_flag? and
+            target.spec_consumers.any? { |consumer| consumer.requires_arc? }
+            ld_flags << ' -fobjc-arc'
+          end
+          ld_flags
+        end
+
+        # Configures the given Xcconfig according to the build settings of the
+        # given Specification.
+        #
+        # @param  [Specification::Consumer] consumer
+        #         The consumer of the specification.
+        #
+        # @param  [Xcodeproj::Config] xcconfig
+        #         The xcconfig to edit.
+        #
+        def self.add_spec_build_settings_to_xcconfig(consumer, xcconfig)
+          xcconfig.merge!(consumer.xcconfig)
+          xcconfig.libraries.merge(consumer.libraries)
+          xcconfig.frameworks.merge(consumer.frameworks)
+          xcconfig.weak_frameworks.merge(consumer.weak_frameworks)
+          add_developers_frameworks_if_needed(xcconfig)
+        end
+
+        # Configures the given Xcconfig with the the build settings for the given
+        # framework path.
+        #
+        # @param  [Pathanme] framework_path
+        #         The path of the framework.
+        #
+        # @param  [Xcodeproj::Config] xcconfig
+        #         The xcconfig to edit.
+        #
+        def self.add_framework_build_settings(framework_path, xcconfig, sandbox_root)
+          name = File.basename(framework_path, ".framework")
+          dirname = File.dirname(framework_path).sub(sandbox_root.to_s, '$(PODS_ROOT)')
+          build_settings = {
+            'OTHER_LDFLAGS' => "-framework #{name}",
+            'FRAMEWORK_SEARCH_PATHS' => quote([dirname])
+          }
+          xcconfig.merge!(build_settings)
+        end
+
+        # Configures the given Xcconfig with the the build settings for the given
+        # framework path.
+        #
+        # @param  [Pathanme] framework_path
+        #         The path of the framework.
+        #
+        # @param  [Xcodeproj::Config] xcconfig
+        #         The xcconfig to edit.
+        #
+        def self.add_library_build_settings(library_path, xcconfig, sandbox_root)
+          name = File.basename(library_path, ".a").sub(/\Alib/, '')
+          dirname = File.dirname(library_path).sub(sandbox_root.to_s, '$(PODS_ROOT)')
+          build_settings = {
+            'OTHER_LDFLAGS' => "-l#{name}",
+            'LIBRARY_SEARCH_PATHS' => quote([dirname])
+          }
+          xcconfig.merge!(build_settings)
+        end
+
+        # @return [Array<String>] The search paths for the developer frameworks.
+        #
+        DEVELOPER_FRAMEWORKS_SEARCH_PATHS = [
+          '$(inherited)',
+          '"$(SDKROOT)/Developer/Library/Frameworks"',
+          '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
+        ]
+
+        # Adds the search paths of the developer frameworks to the specification
+        # if needed. This is done because the `SenTestingKit` requires them and
+        # adding them to each specification which requires it is repetitive and
+        # error prone.
+        #
+        # @param  [Xcodeproj::Config] xcconfig
+        #         The xcconfig to edit.
+        #
+        # @return [void]
+        #
+        def self.add_developers_frameworks_if_needed(xcconfig)
+          if xcconfig.frameworks.include?('SenTestingKit')
+            search_paths = xcconfig.attributes['FRAMEWORK_SEARCH_PATHS'] ||= ''
+            DEVELOPER_FRAMEWORKS_SEARCH_PATHS.each do |search_path|
+              unless search_paths.include?(search_path)
+                search_paths << ' ' unless search_paths.empty?
+                search_paths << search_path
+              end
+            end
+          end
+        end
+
+        #---------------------------------------------------------------------#
+      end
+    end
+  end
+end