cocoapods-core 0.22.3 → 0.23.0.rc1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ab4d5851e3f4fc7b7155e44625f61e892b2ca7ae
+  data.tar.gz: 9e995723829362c41b3a6f149fd0e14e52e26dcf
+SHA512:
+  metadata.gz: ac262293aba8175d638309837b5742251aacf8f2e8ee376d66384901e5164f3e2b12b8d9393ee24e005671a8f80e2553a56b7d26844c423d20efbca27575e18b
+  data.tar.gz: e05d53477c86dc846ebfe4776e79d3b752cf7607b76bd097efc81e228c2060d10156e2fe4da60e72ef0a5c620afef1e64486ba19c87d39f90410227c28ed1e92

data/lib/cocoapods-core/gem_version.rb

@@ -2,5 +2,5 @@ module Pod
 
   # The version of the cocoapods-core.
   #
-  CORE_VERSION = '0.22.3' unless defined? Pod::CORE_VERSION
+  CORE_VERSION = '0.23.0.rc1' unless defined? Pod::CORE_VERSION
 end

data/lib/cocoapods-core/specification/consumer.rb

@@ -123,6 +123,22 @@ module Pod
       #
       spec_attr_accessor :private_header_files
 
+      # @return [Array<String>] The paths of the framework bundles shipped with
+      #         the Pod.
+      #
+      spec_attr_accessor :vendored_frameworks
+
+      # @return [Array<String>] The paths of the libraries shipped with the
+      #         Pod.
+      #
+      spec_attr_accessor :vendored_libraries
+
+      # @return [Hash{String=>String}]]  hash where the keys are the names of
+      #         the resource bundles and the values are their relative file
+      #         patterns.
+      #
+      spec_attr_accessor :resource_bundles
+
       # @return [Array<String>] A hash where the key represents the
       #         paths of the resources to copy and the values the paths of
       #         the resources that should be copied.
@@ -332,22 +348,23 @@ module Pod
         value.is_a?(Array) ? value * "\n" : value
       end
 
-      # Converts the resources file patterns to a hash defaulting to the
-      # resource key if they are defined as an Array or a String.
+      # Ensures that the file patterns of the resource bundles are contained in
+      # an array.
       #
       # @param  [String, Array, Hash] value.
       #         The value of the attribute as specified by the user.
       #
       # @return [Hash] the resources.
       #
-      # def _prepare_resources_bundle(value)
-      #   value = { :resources => value } unless value.is_a?(Hash)
-      #   result = {}
-      #   value.each do |key, patterns|
-      #     result[key] = [*patterns].compact
-      #   end
-      #   result
-      # end
+      def _prepare_resource_bundles(value)
+        result = {}
+        if value
+          value.each do |key, patterns|
+            result[key] = [*patterns].compact
+          end
+        end
+        result
+      end
 
       #-----------------------------------------------------------------------#
 

data/lib/cocoapods-core/specification/dsl.rb

@@ -199,10 +199,10 @@ module Pod
       # The keys accepted by the hash of the source attribute.
       #
       SOURCE_KEYS = {
-        :git   => [:tag, :branch, :commit, :submodules],
-        :svn   => [:folder, :tag, :revision],
-        :hg    => [:revision],
-        :http  => nil,
+        :git => [:tag, :branch, :commit, :submodules],
+        :svn => [:folder, :tag, :revision],
+        :hg => [:revision],
+        :http => nil,
         :path => nil
       }.freeze
 
@@ -302,22 +302,31 @@ module Pod
 
       #------------------#
 
-      # @!method documentation=(documentation)
+      # @!method prepare_command=(command)
       #
-      #   Additional options to pass to the
-      #   [appledoc](http://gentlebytes.com/appledoc/) tool.
+      #   A bash script that will be executed after the Pod is downloaded. This
+      #   command can be used to create, delete and modify any file downloaded
+      #   and will be ran before any paths for other file attributes of the
+      #   specification are collected.
+      #
+      #   This command is executed before the Pod is cleaned and before the
+      #   Pods project is created.
       #
       #   @example
       #
-      #     spec.documentation = { :appledoc => ['--no-repeat-first-par',
-      #                                          '--no-warn-invalid-crossref'] }
+      #     spec.prepare_command = 'ruby build_files.rb'
       #
-      #   @param  [Hash{Symbol=>Array<String>}] documentation
-      #           Additional options to pass to the appledoc tool.
+      #   @example
       #
-      root_attribute :documentation, {
-        :container => Hash,
-      }
+      #     spec.prepare_command = <<-CMD
+      #                             sed -i 's/MyNameSpacedHeader/Header/g' ./**/*.h
+      #                             sed -i 's/MyNameOtherSpacedHeader/OtherHeader/g' ./**/*.h
+      #                        CMD
+      #
+      #   @param  [String] command
+      #           the prepare command of the pod.
+      #
+      root_attribute :prepare_command
 
       #-----------------------------------------------------------------------#
 
@@ -338,8 +347,8 @@ module Pod
       # @todo This currently is not used in the Ruby DSL.
       #
       attribute :platforms, {
-        :container      => Hash,
-        :keys           => PLATFORMS,
+        :container => Hash,
+        :keys => PLATFORMS,
         :multi_platform => false,
         :inherited => true,
       }
@@ -473,7 +482,8 @@ module Pod
 
       # @!method frameworks=(*frameworks)
       #
-      #   A list of frameworks that the user’s target needs to link against.
+      #   A list of system frameworks that the user’s target needs to link
+      #   against.
       #
       #   @example
       #
@@ -501,7 +511,7 @@ module Pod
       #
       #   @example
       #
-      #     spec.framework = 'Twitter'
+      #     spec.weak_framework = 'Twitter'
       #
       #   @param  [String, Array<String>] weak_frameworks
       #           A list of frameworks names.
@@ -809,75 +819,116 @@ module Pod
 
       #------------------#
 
-      # @!method resources=(resources)
+      # @!method vendored_frameworks=(*frameworks)
       #
-      #   A list of resources that should be copied into the target bundle.
+      #   The paths of the framework bundles that come shipped with the Pod.
       #
       #   @example
       #
-      #     spec.resource = "Resources/HockeySDK.bundle"
+      #     spec.ios.vendored_frameworks = 'Frameworks/MyFramework.framework'
       #
       #   @example
       #
-      #     spec.resources = ["Images/*.png", "Sounds/*"]
+      #     spec.vendored_frameworks = 'MyFramework.framework', 'TheirFramework.framework'
       #
-      #   @param  [String, Array<String>] resources the resources of the Pod.
+      #   @param  [String, Array<String>] vendored_frameworks
+      #           A list of framework bundles paths.
       #
-      attribute :resources, {
-        :container     => Array,
+      attribute :vendored_frameworks, {
+        :container => Array,
         :file_patterns => true,
-        :singularize   => true,
+        :singularize => true,
       }
 
       #------------------#
 
-      # The possible destinations for the `resources` attribute. Extracted form
-      # `Xcodeproj::Constants.COPY_FILES_BUILD_PHASE_DESTINATIONS`.
+      # @!method vendored_libraries=(*frameworks)
+      #
+      #   The paths of the libraries that come shipped with the Pod.
+      #
+      #   @example
+      #
+      #     spec.ios.vendored_library = 'Libraries/libProj4.a'
+      #
+      #   @example
+      #
+      #     spec.vendored_libraries = 'libProj4.a', 'libJavaScriptCore.a'
       #
-      RESOURCES_DESTINATIONS = [
-        :products_directory,
-        :wrapper,
-        :resources,
-        :executables,
-        :java_resources,
-        :frameworks,
-        :shared_frameworks,
-        :shared_support,
-        :plug_ins,
-      ].freeze
+      #   @param  [String, Array<String>] vendored_libraries
+      #           A list of library paths.
+      #
+      attribute :vendored_libraries, {
+        :container => Array,
+        :file_patterns => true,
+        :singularize => true,
+      }
 
-      # @todo Implement in CP 0.18
-      # method resources_bundle=(resources)
+      #------------------#
+
+      # @!method resource_bundles=(*frameworks)
       #
-      #   A list of resources that should be copied into the target bundle.
+      #   This attribute allows to define the name and the file of the resource
+      #   bundles which should be built for the Pod. They are specified as a
+      #   hash where the keys represent the name of the bundles and the values
+      #   the file patterns that they should include.
       #
-      #   ---
+      #   We strongly **recommend** library developers to adopt resource
+      #   bundles as there can be name collisions using the resources
+      #   attribute.
       #
-      #   It is possible to specify a destination, if not specified the files
-      #   are copied to the `resources` folder of the bundle.
+      #   The names of the bundles should at least include the name of the Pod
+      #   to minimize the change of name collisions.
+      #
+      #   To provide different resources per platform namespaced bundles *must*
+      #   be used.
       #
       #   @example
       #
-      #     spec.resource = "Resources/HockeySDK.bundle"
+      #     spec.ios.resource_bundle = { 'MapBox' => 'MapView/Map/Resources/*.png' }
       #
       #   @example
       #
-      #     spec.resources = "Resources/*.png"
+      #     spec.resource_bundles = { 'MapBox' => ['MapView/Map/Resources/*.png'], 'OtherResources' => ['MapView/Map/OtherResources/*.png'] }
+      #
+      #   @param  [Hash{String=>String}] resource_bundles
+      #           A hash where the keys are the names of the resource bundles
+      #           and the values are their relative file patterns.
+      #
+      attribute :resource_bundles, {
+        :types => [String, Array],
+        :container => Hash,
+        :file_patterns => true,
+        :singularize => true,
+      }
+
+      #------------------#
+
+      # @!method resources=(resources)
+      #
+      #   A list of resources that should be copied into the target bundle.
+      #
+      #   We strongly **recommend** library developers to adopt [resource
+      #   bundles](http://docs.cocoapods.org/specification.html#resources) as
+      #   there can be name collisions using the resources attribute. Moreover
+      #   resources specified with this attribute are copied directly to the
+      #   client target and therefore they are not optimized by Xcode.
+      #
+      #   @example
+      #
+      #     spec.resource = "Resources/HockeySDK.bundle"
       #
       #   @example
       #
-      #     spec.resources = { :frameworks => 'frameworks/CrashReporter.framework' }
+      #     spec.resources = ["Images/*.png", "Sounds/*"]
       #
-      #   @param  [Hash, String, Array<String>] resources
-      #           the resources of the Pod.
+      #   @param  [String, Array<String>] resources
+      #           The resources shipped with the Pod.
       #
-      # attribute :resources_bundle, {
-      #   :types         => [String, Array],
-      #   :file_patterns => true,
-      #   :container     => Hash,
-      #   :keys          => RESOURCES_DESTINATIONS,
-      #   :singularize   => true,
-      # }
+      attribute :resources, {
+        :container     => Array,
+        :file_patterns => true,
+        :singularize   => true,
+      }
 
       #------------------#
 
@@ -962,6 +1013,9 @@ module Pod
       #   end
       #
       def pre_install(&block)
+        CoreUI.warn "The pre install hook of the specification DSL has been " \
+          "deprecated, use the `resource_bundles` or the `prepare_command` " \
+          "attributes."
         @pre_install_callback = block
       end
 
@@ -989,6 +1043,9 @@ module Pod
       #   end
       #
       def post_install(&block)
+        CoreUI.warn "The post install hook of the specification DSL has been " \
+          "deprecated, use the `resource_bundles` or the `prepare_command` " \
+          "attributes."
         @post_install_callback = block
       end
 

data/lib/cocoapods-core/specification/dsl/deprecations.rb

@@ -34,6 +34,10 @@ module Pod
           end
         end
 
+        def documentation=(value)
+          CoreUI.warn "The `documentation` DSL directive of the podspec format has been deprecated."
+        end
+
         def clean_paths=(value)
           raise Informative, "[#{to_s}] Clean paths are deprecated. CocoaPods now " \
             "cleans unused files by default. Use the `preserve_paths` attribute if needed."

data/lib/cocoapods-core/specification/linter.rb

@@ -96,6 +96,7 @@ module Pod
         comments_lines_count = text.scan(/^\s*#\s+/).length
         comments_ratio = comments_lines_count.fdiv(all_lines_count)
         warning "Comments must be deleted." if comments_lines_count > 20 && comments_ratio > 0.2
+        warning "Comments placed at the top of the specification must be deleted." if text.lines.first =~ /^\s*#\s+/
       end
 
       # Checks that every root only attribute which is required has a value.
@@ -145,6 +146,7 @@ module Pod
             validate_file_patterns
             check_tmp_arc_not_nil
             check_if_spec_is_empty
+            check_install_hooks
             @consumer = nil
           end
         end
@@ -207,14 +209,12 @@ module Pod
       def _validate_summary(s)
         warning "The summary should be a short version of `description` (max 140 characters)." if s.length > 140
         warning "The summary is not meaningful." if s =~ /A short description of/
-        warning "The summary should end with proper punctuation." if s !~ /(\.|\?|!)$/
       end
 
       # Performs validations related to the `description` attribute.
       #
       def _validate_description(d)
         warning "The description is not meaningful." if d =~ /An optional longer description of/
-        warning "The description should end with proper punctuation." if d !~ /(\.|\?|!)$/
         warning "The description is equal to the summary." if d == spec.summary
         warning "The description is shorter than the summary." if d.length < spec.summary.length
       end
@@ -302,6 +302,18 @@ module Pod
         end
       end
 
+      # Check the hooks
+      #
+      def check_install_hooks
+        warning "The pre install hook of the specification DSL has been " \
+          "deprecated, use the `resource_bundles` or the `prepare_command` " \
+          "attributes." unless consumer.spec.pre_install_callback.nil?
+
+        warning "The post install hook of the specification DSL has been " \
+          "deprecated, use the `resource_bundles` or the `prepare_command` " \
+          "attributes." unless consumer.spec.post_install_callback.nil?
+      end
+
       #-----------------------------------------------------------------------#
 
       # !@group Result Helpers

data/lib/cocoapods-core/specification/root_attribute_accessors.rb

@@ -118,11 +118,8 @@ module Pod
           [*value]
         end
 
-        # @return [Hash{Symbol=>Array<String>}] The options to pass to the
-        #         appledoc tool.
-        #
-        def documentation
-          convert_keys_to_symbol(attributes_hash["documentation"])
+        def prepare_command
+          attributes_hash["prepare_command"]
         end
 
         #-----------------------------------------------------------------------#

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 0.22.3
-  prerelease: 
+  version: 0.23.0.rc1
 platform: ruby
 authors:
 - Eloy Duran
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nap
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -71,14 +63,14 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-description: ! "The CocoaPods-Core gem provides support to work with the models of
-  CocoaPods.\n\n It is intended to be used in place of the CocoaPods when the the
-  installation of the dependencies is not needed."
+description: |-
+  The CocoaPods-Core gem provides support to work with the models of CocoaPods.
+
+   It is intended to be used in place of the CocoaPods when the the installation of the dependencies is not needed.
 email:
 - eloy.de.enige@gmail.com
 - fabiopelosin@gmail.com
@@ -125,25 +117,24 @@ files:
 homepage: https://github.com/CocoaPods/CocoaPods
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 3
 summary: The models of CocoaPods