cocoapods-core 1.0.0.beta.2 → 1.0.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c46c2b94d7609c8e8670ee44d014675305bbda0
-  data.tar.gz: 7f3969b645f87aa6e328352014a8d873b63467cc
+  metadata.gz: 7613d5a3dbfbfd8dffb9d4c7994a1780ea3dd33b
+  data.tar.gz: 1ce8e16c31c7582cc9ebb33361ec626cce500c5e
 SHA512:
-  metadata.gz: 734616dc29c304891a67a3d45c4f59dc5eb712a80ac02d25983d674e313a8ec69bb82ff853c99caf8571f01fd441036b6793e3eee6435edd1a9b06aa3930c6f0
-  data.tar.gz: 768e07f278330b95cf658079a20e08b610c62fd72ebcc2864a9825d70b19ea7e7fc44f3444b5a53bfdfb5fdd7a4163afd271d9594195dc5683f9ca4c56376c8e
+  metadata.gz: 0e42ac029d73c53192a00efc00666a3868f6201e33d5725192f325e9fb57debfbe0a528a5c586b5beeb9395effe36a426bd61c64df3e8328a9f0639877303bcd
+  data.tar.gz: 35d2626af08e1ef52418e5c21b8e653ff450ff476317bbf4fa25ef7154206182e42edefc8107ebe1a0545b4150f3a0015528e29134fa030645ec965ff8847217

data/lib/cocoapods-core/dependency.rb

@@ -350,7 +350,7 @@ module Pod
       version = match_data[2]
       version = version.gsub(/[()]/, '') if version
       case version
-      when ' HEAD'
+      when / HEAD( \(based on #{Pod::Version::VERSION_PATTERN}\))?/
         CoreUI.warn "Ignoring obsolete `HEAD` specifier in `#{string}`"
         Dependency.new(name)
       when nil, /from `(.*)(`|')/

data/lib/cocoapods-core/gem_version.rb

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

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

@@ -9,6 +9,7 @@ module Pod
     #
     # A Podfile can be very simple:
     #
+    #     target 'MyApp'
     #     pod 'AFNetworking', '~> 1.0'
     #
     # An example of a more complex Podfile can be:
@@ -33,6 +34,39 @@ module Pod
     #     end
     #
     module DSL
+      # @!group Root Options
+      #   Configuration that applies to the Podfile as a whole.
+      #
+      #   * `install!` declares the installation method and options to be used
+      #     during installation.
+
+      # Specifies the installation method to be used when CocoaPods installs
+      # this Podfile.
+      #
+      # @param   [String] installation_method
+      #          the name of the installation strategy.
+      #
+      # @param   [Hash] options
+      #          the installation options.
+      #
+      # @example Specifying custom CocoaPods installation options
+      #
+      #          install! 'cocoapods',
+      #                   :deterministic_uuids => false,
+      #                   :integrate_targets => false
+      #
+      # @return  [void]
+      #
+      def install!(installation_method, options = {})
+        unless current_target_definition.root?
+          raise Informative, 'The installation method can only be set at the root level of the Podfile.'
+        end
+
+        set_hash_value('installation_method', 'name' => installation_method, 'options' => options)
+      end
+
+      #-----------------------------------------------------------------------#
+
       # @!group Dependencies
       #   The Podfile specifies the dependencies of each user target.
       #
@@ -246,8 +280,7 @@ module Pod
       #             pod 'SSZipArchive'
       #           end
       #
-      # @example  Defining a test target which can access SSZipArchive via Pods
-      #           for it's parent target.
+      # @example  Defining a test target accessing SSZipArchive pod from its parent
       #
       #           target "ZipApp" do
       #             pod 'SSZipArchive'
@@ -258,8 +291,7 @@ module Pod
       #             end
       #           end
       #
-      # @example  Defining a target applies Pods to multiple targets via its
-      #           parent target
+      # @example  Defining a target applies Pods to multiple targets via its parent target
       #
       #           target "ShowsApp" do
       #             pod 'ShowsKit'
@@ -358,7 +390,8 @@ module Pod
 
       # Sets the inheritance mode for the current target.
       #
-      # @param   [:complete, :none, :search_paths] the inheritance mode to set.
+      # @param   [:complete, :none, :search_paths] inheritance
+      #          the inheritance mode to set.
       #
       # @example Inheriting only search paths
       #
@@ -374,35 +407,10 @@ module Pod
         current_target_definition.inheritance = inheritance
       end
 
-      # Specifies the installation method to be used when CocoaPods installs
-      # this Podfile.
-      #
-      # @param   [String] installation_method
-      #          the name of the installation strategy.
-      #
-      # @param   [Hash] options
-      #          the installation options.
-      #
-      # @example Specifying custom CocoaPods installation options
-      #
-      #          install! 'cocoapods',
-      #                   :deterministic_uuids => false,
-      #                   :integrate_targets => false
-      #
-      # @return  [void]
-      #
-      def install!(installation_method, options = {})
-        unless current_target_definition.root?
-          raise Informative, 'The installation method can only be set at the root level of the Podfile.'
-        end
-
-        set_hash_value('installation_method', 'name' => installation_method, 'options' => options)
-      end
-
       #-----------------------------------------------------------------------#
 
       # @!group Target configuration
-      #   These settings are used to control the  CocoaPods generated project.
+      #   These settings are used to control the CocoaPods generated project.
       #
       #   This starts out simply with stating what `platform` you are working
       #   on. `xcodeproj` allows you to state specifically which project to
@@ -470,27 +478,39 @@ module Pod
       #
       #           # This Target can be found in a Xcode project called `FastGPS`
       #           target "MyGPSApp" do
-      #             xcodeproj 'FastGPS'
+      #             project 'FastGPS'
       #             ...
       #           end
       #
       #           # Same Podfile, multiple Xcodeprojects
       #           target "MyNotesApp" do
-      #             xcodeproj 'FastNotes'
+      #             project 'FastNotes'
       #             ...
       #           end
       #
       # @example  Using custom build configurations
       #
-      #           xcodeproj 'TestProject', 'Mac App Store' => :release, 'Test' => :debug
+      #           project 'TestProject', 'Mac App Store' => :release, 'Test' => :debug
       #
       # @return   [void]
       #
-      def xcodeproj(path, build_configurations = {})
+      def project(path, build_configurations = {})
         current_target_definition.user_project_path = path
         current_target_definition.build_configurations = build_configurations
       end
 
+      # @!visibility private
+      #
+      # @deprecated #{xcodeproj} was renamed to #{project}.
+      #
+      # TODO: This method can be deleted once people have migrated to this 1.0
+      # DSL.
+      #
+      def xcodeproj(*args)
+        CoreUI.warn 'xcodeproj was renamed to `project`. Please use that from now on.'
+        project(*args)
+      end
+
       # @!visibility private
       #
       # @deprecated linking a single target with multiple Xcode targets is no
@@ -516,6 +536,11 @@ module Pod
       #
       #     pod 'SSZipArchive', :inhibit_warnings => true
       #
+      # Additionally, when you use `inhibit_all_warnings!` attribute,
+      # you can exclude a particular Pod from being inhibited using the following:
+      #
+      #     pod 'SSZipArchive', :inhibit_warnings => false
+      #
       def inhibit_all_warnings!
         current_target_definition.inhibit_all_warnings = true
       end

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

@@ -284,7 +284,9 @@ module Pod
       #         return true for any asked pod.
       #
       def inhibits_warnings_for_pod?(pod_name)
-        if raw_inhibit_warnings_hash['all']
+        if Array(inhibit_warnings_hash['not_for_pods']).include?(pod_name)
+          false
+        elsif inhibit_warnings_hash['all']
           true
         elsif !root? && parent.inhibits_warnings_for_pod?(pod_name)
           true
@@ -307,14 +309,27 @@ module Pod
 
       # Inhibits warnings for a specific pod during compilation.
       #
-      # @param  [String] pod name
-      #         Whether the warnings should be suppressed.
+      # @param  [String] pod_name
+      #         Name of the pod for which the warnings will be inhibited or not.
+      #
+      # @param  [Bool] should_inhibit
+      #         Whether the warnings should be inhibited or not for given pod.
       #
       # @return [void]
       #
-      def inhibit_warnings_for_pod(pod_name)
-        raw_inhibit_warnings_hash['for_pods'] ||= []
-        raw_inhibit_warnings_hash['for_pods'] << pod_name
+      def set_inhibit_warnings_for_pod(pod_name, should_inhibit)
+        hash_key = case should_inhibit
+                   when true
+                     'for_pods'
+                   when false
+                     'not_for_pods'
+                   when nil
+                     return
+                   else
+                     raise ArgumentError, "Got `#{should_inhibit.inspect}`, should be a boolean"
+                   end
+        raw_inhibit_warnings_hash[hash_key] ||= []
+        raw_inhibit_warnings_hash[hash_key] << pod_name
       end
 
       #--------------------------------------#
@@ -622,7 +637,8 @@ module Pod
         unless HASH_KEYS.include?(key)
           raise StandardError, "Unsupported hash key `#{key}`"
         end
-        internal_hash[key] ||= base_value
+        internal_hash[key] = base_value if internal_hash[key].nil?
+        internal_hash[key]
       end
 
       def raw_inhibit_warnings_hash
@@ -633,14 +649,28 @@ module Pod
       # Returns the inhibit_warnings hash pre-populated with default values.
       #
       # @return [Hash<String, Array>] Hash with :all key for inhibiting all
-      #         warnings, and :for_pods key for inhibiting warnings per Pod.
+      #         warnings, :for_pods key for inhibiting warnings per Pod,
+      #         and :not_for_pods key for not inhibiting warnings per Pod.
       #
       def inhibit_warnings_hash
         inhibit_hash = raw_inhibit_warnings_hash
         if exclusive?
           inhibit_hash
         else
-          parent.send(:inhibit_warnings_hash).merge(inhibit_hash) { |l, r| (l + r).uniq }
+          parent_hash = parent.send(:inhibit_warnings_hash).dup
+          if parent_hash['not_for_pods']
+            # Remove pods that are set to not inhibit inside parent if they are set to inhibit inside current target.
+            parent_hash['not_for_pods'] -= Array(inhibit_hash['for_pods'])
+          end
+          if parent_hash['for_pods']
+            # Remove pods that are set to inhibit inside parent if they are set to not inhibit inside current target.
+            parent_hash['for_pods'] -= Array(inhibit_hash['for_pods'])
+          end
+          if inhibit_hash['all']
+            # Clean pods that are set to not inhibit inside parent if inhibit_all_warnings! was set.
+            parent_hash['not_for_pods'] = nil
+          end
+          parent_hash.merge(inhibit_hash) { |_, l, r| (l + r).uniq }
         end
       end
 
@@ -747,7 +777,8 @@ module Pod
         return requirements unless options.is_a?(Hash)
 
         should_inhibit = options.delete(:inhibit_warnings)
-        inhibit_warnings_for_pod(Specification.root_name name) if should_inhibit
+        pod_name = Specification.root_name(name)
+        set_inhibit_warnings_for_pod(pod_name, should_inhibit)
 
         requirements.pop if options.empty?
       end

data/lib/cocoapods-core/podfile.rb

@@ -292,7 +292,7 @@ module Pod
           # rubocop:enable Eval
         rescue Exception => e
           message = "Invalid `#{path.basename}` file: #{e.message}"
-          raise DSLError.new(message, path, e.backtrace, contents)
+          raise DSLError.new(message, path, e, contents)
         end
         # rubocop:enable Lint/RescueException
       end

data/lib/cocoapods-core/specification.rb

@@ -618,6 +618,6 @@ module Pod
   rescue Exception => e
     # rubocop:enable Lint/RescueException
     message = "Invalid `#{path.basename}` file: #{e.message}"
-    raise DSLError.new(message, path, e.backtrace, string)
+    raise DSLError.new(message, path, e, string)
   end
 end

data/lib/cocoapods-core/standard_error.rb

@@ -17,19 +17,19 @@ module Pod
     #
     attr_reader :dsl_path
 
-    # @return [Exception] the backtrace of the exception raised by the
+    # @return [Exception] the exception raised by the
     #         evaluation of the dsl file.
     #
-    attr_reader :backtrace
+    attr_reader :underlying_exception
 
-    # @param [Exception] backtrace @see backtrace
+    # @param [Exception] underlying_exception @see underlying_exception
     # @param [String]    dsl_path  @see dsl_path
     #
-    def initialize(description, dsl_path, backtrace, contents = nil)
-      @description = description
-      @dsl_path    = dsl_path
-      @backtrace   = backtrace
-      @contents    = contents
+    def initialize(description, dsl_path, underlying_exception, contents = nil)
+      @description          = description
+      @dsl_path             = dsl_path
+      @underlying_exception = underlying_exception
+      @contents             = contents
     end
 
     # @return [String] the contents of the DSL that cause the exception to
@@ -63,11 +63,10 @@ module Pod
       @message ||= begin
         trace_line, description = parse_line_number_from_description
 
-        m = "\n[!] "
-        m << description
-        m << ". Updating CocoaPods might fix the issue.\n"
+        m = "\n[!] #{description}.\n"
         m = m.red if m.respond_to?(:red)
 
+        backtrace = underlying_exception.backtrace
         return m unless backtrace && dsl_path && contents
 
         trace_line = backtrace.find { |l| l.include?(dsl_path.to_s) } || trace_line

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.2
+  version: 1.0.0.beta.3
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-02-02 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.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 3
 summary: The models of CocoaPods