cocoapods-core 0.37.2 → 0.38.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e053438b3db2de494ab0ee1d76eec36a4d3f087
-  data.tar.gz: 2544c41abf9e1658bb3cd4f18f1a0ac621c000c7
+  metadata.gz: 6424a1ddf29f5d1f2c1e0c105be4021f69e6bf79
+  data.tar.gz: f8b56bedf50e57284d111f8dc3199b8aa7ca7c7c
 SHA512:
-  metadata.gz: 31aa9c985163f24fcb8f1fbf9a769673861a39de5263d2ff1830890fdb8f354b61c2510d12d0b5ca2bf0d46a753f66632ac09b4ad26600a7fbe5c6a979bb818f
-  data.tar.gz: ec05ab1709917c93cdeef6ccbe48683ccf5e554b505cb7fdfe77fdd8219d4554bf6a64ebccc878a4cfd611379d49d956e515cd5d48ff3acceb4a5a92fb1448c6
+  metadata.gz: 58ec6a75d9be566df2a5c513263132cca2f51b19906a030ac1247ee86172871ee770b082989e94bd320d4b3cb1759507a7a053aa637309e46e9b1f73352e8aa1
+  data.tar.gz: 5496cd625328c5c1d6dc3a21a1db91c71cbb67fd36cf3ef6b999a56324d2e8ea6839d17efe037690cc6cd28e76d2be6caf3b074e23a96edfa27a4292571b10df

data/lib/cocoapods-core/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods-core.
   #
-  CORE_VERSION = '0.37.2' unless defined? Pod::CORE_VERSION
+  CORE_VERSION = '0.38.0.beta.1' unless defined? Pod::CORE_VERSION
 end

data/lib/cocoapods-core/platform.rb

@@ -67,6 +67,10 @@ module Pod
       new :osx
     end
 
+    def self.watchos
+      new :watchos
+    end
+
     # Checks if a platform is equivalent to another one or to a symbol
     # representation.
     #
@@ -188,6 +192,7 @@ module Pod
       case symbolic_name
       when :ios then 'iOS'
       when :osx then 'OS X'
+      when :watchos then 'watchOS'
       else symbolic_name.to_s end
     end
   end

data/lib/cocoapods-core/podfile.rb

@@ -234,29 +234,39 @@ module Pod
 
     # Configures a new Podfile from the given ruby string.
     #
-    # @param  [String] string
-    #         The ruby string which will configure the podfile with the DSL.
-    #
     # @param  [Pathname] path
     #         The path from which the Podfile is loaded.
     #
+    # @param  [String] contents
+    #         The ruby string which will configure the podfile with the DSL.
+    #
     # @return [Podfile] the new Podfile
     #
-    def self.from_ruby(path)
-      string = File.open(path, 'r:utf-8') { |f| f.read }
+    def self.from_ruby(path, contents = nil)
+      contents ||= File.open(path, 'r:utf-8') { |f| f.read }
+
       # Work around for Rubinius incomplete encoding in 1.9 mode
-      if string.respond_to?(:encoding) && string.encoding.name != 'UTF-8'
-        string.encode!('UTF-8')
+      if contents.respond_to?(:encoding) && contents.encoding.name != 'UTF-8'
+        contents.encode!('UTF-8')
       end
+
+      if contents.tr!('“”‘’‛', %(""'''))
+        # Changes have been made
+        CoreUI.warn "Your #{path.basename} has had smart quotes sanitised. " \
+                    'To avoid issues in the future, you should not use ' \
+                    'TextEdit for editing it. If you are not using TextEdit, ' \
+                    'you should turn off smart quotes in your editor of choice.'
+      end
+
       podfile = Podfile.new(path) do
         # rubocop:disable Lint/RescueException
         begin
           # rubocop:disable Eval
-          eval(string, nil, path.to_s)
+          eval(contents, nil, path.to_s)
           # rubocop:enable Eval
         rescue Exception => e
           message = "Invalid `#{path.basename}` file: #{e.message}"
-          raise DSLError.new(message, path, e.backtrace, string)
+          raise DSLError.new(message, path, e.backtrace, contents)
         end
         # rubocop:enable Lint/RescueException
       end

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

@@ -311,17 +311,17 @@ module Pod
 
       #-----------------------------------------------------------------------#
 
-      # Specifies the platform for which a static library should be build.
+      # Specifies the platform for which a static library should be built.
       #
       # CocoaPods provides a default deployment target if one is not specified.
-      # The current default values are `4.3` for iOS and `10.6` for OS X.
+      # The current default values are `4.3` for iOS, `10.6` for OS X and `2.0` for watchOS.
       #
       # If the deployment target requires it (iOS < `4.3`), `armv6`
       # architecture will be added to `ARCHS`.
       #
       # @param    [Symbol] name
-      #           the name of platform, can be either `:osx` for OS X or `:ios`
-      #           for iOS.
+      #           the name of platform, can be either `:osx` for OS X, `:ios`
+      #           for iOS or `:watchos` for watchOS.
       #
       # @param    [String, Version] target
       #           The optional deployment.  If not provided a default value
@@ -583,12 +583,12 @@ module Pod
       # been downloaded but before they are installed.
       #
       # It receives the
-      # [`Pod::Hooks::InstallerRepresentation`](http://rubydoc.info/gems/cocoapods/Pod/Hooks/InstallerRepresentation/)
+      # [`Pod::Installer`](http://rubydoc.info/gems/cocoapods/Pod/Installer/)
       # as its only argument.
       #
       # @example  Defining a pre install hook in a Podfile.
       #
-      #   pre_install do |installer_representation|
+      #   pre_install do |installer|
       #     # Do something fancy!
       #   end
       #
@@ -602,13 +602,13 @@ module Pod
       # to perform.
       #
       # It receives the
-      # [`Pod::Hooks::InstallerRepresentation`](http://rubydoc.info/gems/cocoapods/Pod/Hooks/InstallerRepresentation/)
+      # [`Pod::Installer`](http://rubydoc.info/gems/cocoapods/Pod/Installer/)
       # as its only argument.
       #
-      # @example  Customising the `OTHER_LDFLAGS` of all targets
+      # @example  Customising the build settings of all targets
       #
-      #   post_install do |installer_representation|
-      #     installer_representation.project.targets.each do |target|
+      #   post_install do |installer|
+      #     installer.pods_project.targets.each do |target|
       #       target.build_configurations.each do |config|
       #         config.build_settings['GCC_ENABLE_OBJC_GC'] = 'supported'
       #       end

data/lib/cocoapods-core/podfile/target_definition.rb

@@ -401,6 +401,8 @@ module Pod
 
       #--------------------------------------#
 
+      PLATFORM_DEFAULTS = { :ios => '4.3', :osx => '10.6', :watchos => '2.0' }.freeze
+
       # @return [Platform] the platform of the target definition.
       #
       # @note   If no deployment target has been specified a default value is
@@ -415,7 +417,7 @@ module Pod
           else
             name = name_or_hash.to_sym
           end
-          target ||= (name == :ios ? '4.3' : '10.6')
+          target ||= PLATFORM_DEFAULTS[name]
           Platform.new(name, target)
         else
           parent.platform unless root?
@@ -435,9 +437,9 @@ module Pod
       # @return [void]
       #
       def set_platform(name, target = nil)
-        unless [:ios, :osx].include?(name)
+        unless [:ios, :osx, :watchos].include?(name)
           raise StandardError, "Unsupported platform `#{name}`. Platform " \
-            'must be `:ios` or `:osx`.'
+            'must be `:ios`, `:osx`, or `:watchos`.'
         end
 
         if target

data/lib/cocoapods-core/specification.rb

@@ -583,6 +583,18 @@ module Pod
       end
       @defined_in_file = file
     end
+
+    # @!group Validation
+
+    # Validates the cocoapods_version in the specification against the current version of Core.
+    # It will raise an Informative error if the version is not satisfied.
+    #
+    def validate_cocoapods_version
+      unless cocoapods_version.satisfied_by?(Version.create(CORE_VERSION))
+        raise Informative, "`#{name}` requires CocoaPods version `#{cocoapods_version}`, " \
+                           "which is not satisified by your current version, `#{CORE_VERSION}`."
+      end
+    end
   end
 
   #---------------------------------------------------------------------------#

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

@@ -88,9 +88,20 @@ module Pod
       spec_attr_accessor :compiler_flags
 
       # @return [Hash{String => String}] the xcconfig flags for the current
-      #         specification.
+      #         specification for the pod target.
       #
-      spec_attr_accessor :xcconfig
+      def pod_target_xcconfig
+        attr = Specification::DSL.attributes[:pod_target_xcconfig]
+        merge_values(attr, value_for_attribute(:xcconfig), value_for_attribute(:pod_target_xcconfig))
+      end
+
+      # @return [Hash{String => String}] the xcconfig flags for the current
+      #         specification for the user target.
+      #
+      def user_target_xcconfig
+        attr = Specification::DSL.attributes[:user_target_xcconfig]
+        merge_values(attr, value_for_attribute(:xcconfig), value_for_attribute(:user_target_xcconfig))
+      end
 
       # @return [String] The contents of the prefix header.
       #

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

@@ -1,7 +1,6 @@
 require 'cocoapods-core/specification/dsl/attribute_support'
 require 'cocoapods-core/specification/dsl/attribute'
 require 'cocoapods-core/specification/dsl/platform_proxy'
-require 'cocoapods-core/specification/dsl/deprecations'
 
 module Pod
   class Specification
@@ -43,6 +42,9 @@ module Pod
     module DSL
       extend Pod::Specification::DSL::AttributeSupport
 
+      # Deprecations must be required after include AttributeSupport
+      require 'cocoapods-core/specification/dsl/deprecations'
+
       #-----------------------------------------------------------------------#
 
       # @!group Root specification
@@ -98,6 +100,22 @@ module Pod
       root_attribute :version,
                      :required => true
 
+      #-----------------------------------------------------------------------#
+
+      # @!method cocoapods_version=(cocoapods_version)
+      #
+      #   The version of CocoaPods that the sepcification supports.
+      #
+      # @example
+      #
+      #   spec.cocoapods_version = '>= 0.36'
+      #
+      # @param  [String] cocoapods_version
+      #         the CocoaPods version that the specification supports.
+      #         CocoaPods follows [semantic versioning](http://semver.org).
+      #
+      root_attribute :cocoapods_version
+
       #------------------#
 
       # @!method authors=(authors)
@@ -443,7 +461,7 @@ module Pod
 
       # The names of the platforms supported by the specification class.
       #
-      PLATFORMS = [:osx, :ios].freeze
+      PLATFORMS = [:osx, :ios, :watchos].freeze
 
       # @todo This currently is not used in the Ruby DSL.
       #
@@ -717,18 +735,53 @@ module Pod
 
       #------------------#
 
-      # @!method xcconfig=(value)
+      # @!method pod_target_xcconfig=(value)
+      #
+      #   Any flag to add to the final __private__ pod target xcconfig file.
+      #
+      #   @example
+      #
+      #     spec.pod_target_xcconfig = { 'OTHER_LDFLAGS' => '-lObjC' }
+      #
+      #   @param  [Hash{String => String}] value
+      #           Key-value pairs representing build settings.
+      #
+      attribute :pod_target_xcconfig,
+                :container => Hash,
+                :inherited => true
+
+      # @!method user_target_xcconfig=(value)
+      #
+      #   Specifies flags to add to the final aggregate target xcconfig file,
+      #   which propagates to non-overridden and inheriting build settings to
+      #   the integrated user targets.
       #
-      #   Any flag to add to the final xcconfig file.
+      #   ---
+      #
+      #   This attribute is __not recommended__ as Pods should not pollute the
+      #   build settings of the user project and this can cause conflicts.
+      #
+      #   Multiple definitions for build settings that take multiple values
+      #   will be merged. The user is warned on conflicting definitions for
+      #   custom build settings and build settings that take only one value.
+      #
+      #   Typically clang compiler flags or precompiler macro definitions go
+      #   in here if they are required when importing the pod in the user
+      #   target. Note that, this influences not only the compiler view of the
+      #   public interface of your pod, but also all other integrated pods
+      #   alongside to yours. You should always prefer [`pod_target_xcconfig`](
+      #   http://guides.cocoapods.org/syntax/podspec.html#pod_target_xcconfig),
+      #   which can contain the same settings, but only influence the
+      #   toolchain when compiling your pod target.
       #
       #   @example
       #
-      #     spec.xcconfig = { 'OTHER_LDFLAGS' => '-lObjC' }
+      #     spec.user_target_xcconfig = { 'MY_SUBSPEC' => 'YES' }
       #
       #   @param  [Hash{String => String}] value
-      #           A representing an xcconfig.
+      #           Key-value pairs representing build settings.
       #
-      attribute :xcconfig,
+      attribute :user_target_xcconfig,
                 :container => Hash,
                 :inherited => true
 
@@ -1316,6 +1369,10 @@ module Pod
       def osx
         PlatformProxy.new(self, :osx)
       end
+
+      def watchos
+        PlatformProxy.new(self, :watchos)
+      end
     end
   end
 end

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

@@ -9,6 +9,17 @@ module Pod
           CoreUI.warn "[#{self}] `preferred_dependency` has been renamed "\
             'to `default_subspecs`.'
         end
+
+        DSL.attribute :xcconfig,
+                      :container => Hash,
+                      :inherited => true
+
+        def xcconfig=(value)
+          self.pod_target_xcconfig = value
+          self.user_target_xcconfig = value
+          CoreUI.warn "[#{self}] `xcconfig` has been split into "\
+            '`pod_target_xcconfig` and `user_target_xcconfig`.'
+        end
       end
     end
   end

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

@@ -372,7 +372,9 @@ module Pod
         if git = s[:git]
           return unless git =~ /^#{URI.regexp}$/
           git_uri = URI.parse(git)
-          perform_github_uri_checks(git, git_uri) if git_uri.host.end_with?('github.com')
+          if git_uri.host
+            perform_github_uri_checks(git, git_uri) if git_uri.host.end_with?('github.com')
+          end
         end
       end
 

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

@@ -34,6 +34,12 @@ module Pod
           end
         end
 
+        # @return [Requirement] The CocoaPods version required to use the specification.
+        #
+        def cocoapods_version
+          @cocoapods_version ||= Requirement.create(attributes_hash['cocoapods_version'])
+        end
+
         # @return [Hash] a hash containing the authors as the keys and their
         #         email address as the values.
         #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 0.37.2
+  version: 0.38.0.beta.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 3
 summary: The models of CocoaPods