cocoapods-core 0.36.0.beta.2 → 0.36.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39b20311877e6a8f1059d7178ed1f40829995d49
-  data.tar.gz: dd35dbdc688039420676c4e447df3d8b31e48496
+  metadata.gz: 915aaad78d648c3ce0ccf1c18c1423a3e79e4ba7
+  data.tar.gz: f92077229e395bdfdd2746ac914186fdf8e676f5
 SHA512:
-  metadata.gz: d6e2c6c3264cedf3b6ea2030cb7abbd301757317b154bdf8f6c1552886fcbd875304efc80b3d381d3bed86512d1e910d777aa62e863977976f7717434306516f
-  data.tar.gz: 0fc6afdc18a2b0750b50504bafb5d22ea5dab61e787490aca7118be44ecb4d277073fe2dd65ec58d7e028632c73c4f4846a05cce6c82f874cd700151ec5b04ad
+  metadata.gz: c79c0b0771df003f6525b815c6878dc22c2d7d04f10776c3cc4d3ec7d4441b7a9fb1eabde0594e1b2009c5dc0f05e6bc5fb1be0be1b7074c6cc363f5535c33fc
+  data.tar.gz: 7dab87e277f4d6d3eefbdbbd3f658fe45452ef0ac9255d7f12340b2e48f3ad3f5ecd398acf03c366ca44ec194fa347a5f993506f624046c5ffb9b81cac5d270c

data/lib/cocoapods-core/gem_version.rb

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

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

@@ -680,7 +680,7 @@ module Pod
       #
       def podspec_path_from_options(options)
         if path = options[:path]
-          if File.extname(path) == '.podspec'
+          if File.basename(path).include?('.podspec')
             path_with_ext = path
           else
             path_with_ext = "#{path}.podspec"
@@ -688,10 +688,10 @@ module Pod
           path_without_tilde = path_with_ext.gsub('~', ENV['HOME'])
           podfile.defined_in_file.dirname + path_without_tilde
         elsif name = options[:name]
-          name = File.extname(name) == '.podspec' ? name : "#{name}.podspec"
+          name = File.basename(name).include?('.podspec') ? name : "#{name}.podspec"
           podfile.defined_in_file.dirname + name
         elsif options[:autodetect]
-          glob_pattern = podfile.defined_in_file.dirname + '*.podspec'
+          glob_pattern = podfile.defined_in_file.dirname + '*.podspec{,.json}'
           Pathname.glob(glob_pattern).first
         end
       end

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

@@ -40,7 +40,7 @@ module Pod
           @default_value  = options.delete(:default_value)  { nil       }
           @ios_default    = options.delete(:ios_default)    { nil       }
           @osx_default    = options.delete(:osx_default)    { nil       }
-          @types          = options.delete(:types)          { [String] }
+          @types          = options.delete(:types)          { [String]  }
 
           unless options.empty?
             raise StandardError, "Unrecognized options: #{options} for #{self}"

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

@@ -53,16 +53,13 @@ module Pod
           unknown_keys = keys - valid_keys
 
           unknown_keys.each do |key|
-            results.add_warning('attributes', "Unrecognized `#{key}` key")
+            results.add_warning('attributes', "Unrecognized `#{key}` key.")
           end
 
           Pod::Specification::DSL.attributes.each do |_key, attribute|
-            if attribute.keys && attribute.name != :platforms
-              if attribute.root_only?
-                value = consumer.spec.send(attribute.name)
-              else
-                value = consumer.send(attribute.name)
-              end
+            validate_attribute_type(attribute, consumer.spec.attributes_hash[attribute.name.to_s])
+            if attribute.name != :platforms
+              value = value_for_attribute(attribute)
               validate_attribute_value(attribute, value) if value
             end
           end
@@ -83,7 +80,7 @@ module Pod
 
             if patterns.respond_to?(:each)
               patterns.each do |pattern|
-                if pattern.start_with?('/')
+                if pattern.respond_to?(:start_with?) && pattern.start_with?('/')
                   results.add_error('File Patterns', 'File patterns must be ' \
                     "relative and cannot start with a slash (#{attrb.name}).")
                 end
@@ -109,6 +106,17 @@ module Pod
 
         private
 
+        def value_for_attribute(attribute)
+          if attribute.root_only?
+            consumer.spec.send(attribute.name)
+          else
+            consumer.send(attribute.name) if consumer.respond_to?(attribute.name)
+          end
+        rescue => e
+          results.add_error('attributes', "Unable to validate `#{attribute.name}` (#{e}).")
+          nil
+        end
+
         # Validates the given value for the given attribute.
         #
         # @param  [Spec::DSL::Attribute] attribute
@@ -125,6 +133,15 @@ module Pod
           end
         end
 
+        def validate_attribute_type(attribute, value)
+          return unless value
+          types = attribute.supported_types
+          if types.none? { |klass| value.class == klass }
+            results.add_error('attributes', 'Unacceptable type ' \
+              "`#{value.class}` for `#{attribute.name}`. Allowed values: `#{types.inspect}`.")
+          end
+        end
+
         def validate_attribute_array_keys(attribute, value)
           unknown_keys = value.keys.map(&:to_s) - attribute.keys.map(&:to_s)
           unknown_keys.each do |unknown_key|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 0.36.0.beta.2
+  version: 0.36.0.rc.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,62 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.15
 - !ruby/object:Gem::Dependency
   name: nap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: fuzzy_match
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 description: |-
@@ -78,6 +78,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- lib/cocoapods-core.rb
 - lib/cocoapods-core/core_ui.rb
 - lib/cocoapods-core/dependency.rb
 - lib/cocoapods-core/gem_version.rb
@@ -86,37 +89,34 @@ files:
 - lib/cocoapods-core/lockfile.rb
 - lib/cocoapods-core/metrics.rb
 - lib/cocoapods-core/platform.rb
+- lib/cocoapods-core/podfile.rb
 - lib/cocoapods-core/podfile/dsl.rb
 - lib/cocoapods-core/podfile/target_definition.rb
-- lib/cocoapods-core/podfile.rb
 - lib/cocoapods-core/requirement.rb
+- lib/cocoapods-core/source.rb
 - lib/cocoapods-core/source/acceptor.rb
 - lib/cocoapods-core/source/aggregate.rb
 - lib/cocoapods-core/source/health_reporter.rb
-- lib/cocoapods-core/source.rb
+- lib/cocoapods-core/specification.rb
 - lib/cocoapods-core/specification/consumer.rb
+- lib/cocoapods-core/specification/dsl.rb
 - lib/cocoapods-core/specification/dsl/attribute.rb
 - lib/cocoapods-core/specification/dsl/attribute_support.rb
 - lib/cocoapods-core/specification/dsl/deprecations.rb
 - lib/cocoapods-core/specification/dsl/platform_proxy.rb
-- lib/cocoapods-core/specification/dsl.rb
 - lib/cocoapods-core/specification/json.rb
+- lib/cocoapods-core/specification/linter.rb
 - lib/cocoapods-core/specification/linter/analyzer.rb
 - lib/cocoapods-core/specification/linter/result.rb
-- lib/cocoapods-core/specification/linter.rb
 - lib/cocoapods-core/specification/root_attribute_accessors.rb
-- lib/cocoapods-core/specification/set/presenter.rb
 - lib/cocoapods-core/specification/set.rb
-- lib/cocoapods-core/specification.rb
+- lib/cocoapods-core/specification/set/presenter.rb
 - lib/cocoapods-core/standard_error.rb
+- lib/cocoapods-core/vendor.rb
 - lib/cocoapods-core/vendor/requirement.rb
 - lib/cocoapods-core/vendor/version.rb
-- lib/cocoapods-core/vendor.rb
 - lib/cocoapods-core/version.rb
 - lib/cocoapods-core/yaml_helper.rb
-- lib/cocoapods-core.rb
-- README.md
-- LICENSE
 homepage: https://github.com/CocoaPods/CocoaPods
 licenses:
 - MIT
@@ -127,17 +127,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 3
 summary: The models of CocoaPods