cocoapods 0.16.0.rc4 → 0.16.0.rc5

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 0.16.0.rc5
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.0.rc4...0.16.0.rc5)
+
+###### Deprecated
+
+- The usage of specifications defined in a Podfile is deprecated. Use the
+  `:podspec` option with a file path instead. Complete removal will most
+  probably happen in 0.17.0.
+  [#549](https://github.com/CocoaPods/CocoaPods/issues/549)
+  [#616](https://github.com/CocoaPods/CocoaPods/issues/616)
+  [#525](https://github.com/CocoaPods/CocoaPods/issues/525)
+
+###### Bug fixes
+
+- Always consider inline podspecs as needing installation.
+- Fix detection when the lib has already been integrated with the user’s target.
+  [#643](https://github.com/CocoaPods/CocoaPods/issues/643)
+  [#614](https://github.com/CocoaPods/CocoaPods/issues/614)
+  [#613](https://github.com/CocoaPods/CocoaPods/issues/613)
+
+## 0.16.0.rc4
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.0.rc3...0.16.0.rc4)
+
+###### Bug fixes
+
+- Fix for Rake 0.9.3
+
 ## 0.16.0.rc3
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.0.rc2...0.16.0.rc3) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.4.0.rc1...0.4.0.rc6)
 

data/lib/cocoapods.rb

@@ -12,7 +12,7 @@ unless Gem::Version::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new(
 end
 
 module Pod
-  VERSION = '0.16.0.rc4'
+  VERSION = '0.16.0.rc5'
 
   class PlainInformative < StandardError
   end
@@ -59,4 +59,5 @@ end
 
 if ENV['COCOA_PODS_ENV'] == 'development'
   require 'awesome_print'
+  require 'pry'
 end

data/lib/cocoapods/command/spec.rb

@@ -258,7 +258,7 @@ Pod::Spec.new do |s|
   #
   # s.author       = '#{data[:author_name]}', 'other author'
 
-  # Specify the location from where the source should be retreived.
+  # Specify the location from where the source should be retrieved.
   #
   s.source       = { :git => "#{data[:source_url]}", #{data[:ref_type]} => "#{data[:ref]}" }
   # s.source       = { :svn => 'http://EXAMPLE/#{data[:name]}/tags/1.0.0' }
@@ -292,9 +292,9 @@ Pod::Spec.new do |s|
   # made available to the application. If the pattern is a directory then the
   # path will automatically have '*.h' appended.
   #
-  # Also allows the use of the FileList class like `source_files does.
+  # Also allows the use of the FileList class like `source_files' does.
   #
-  # If you do not explicitely set the list of public header files,
+  # If you do not explicitly set the list of public header files,
   # all headers of source_files will be made public.
   #
   # s.public_header_files = 'Classes/**/*.h'
@@ -302,7 +302,7 @@ Pod::Spec.new do |s|
   # A list of resources included with the Pod. These are copied into the
   # target bundle with a build phase script.
   #
-  # Also allows the use of the FileList class like `source_files does.
+  # Also allows the use of the FileList class like `source_files' does.
   #
   # s.resource  = "icon.png"
   # s.resources = "Resources/*.png"
@@ -310,7 +310,7 @@ Pod::Spec.new do |s|
   # A list of paths to preserve after installing the Pod.
   # CocoaPods cleans by default any file that is not used.
   # Please don't include documentation, example, and test files.
-  # Also allows the use of the FileList class like `source_files does.
+  # Also allows the use of the FileList class like `source_files' does.
   #
   # s.preserve_paths = "FilesToSave", "MoreFilesToSave"
 

data/lib/cocoapods/installer/user_project_integrator.rb

@@ -140,7 +140,7 @@ module Pod
             # Reject any target that already has this Pods library in one of its frameworks build phases
             target.frameworks_build_phase.files.any? do |build_file|
               file_ref = build_file.file_ref
-              !file_ref.proxy? && file_ref.name == @target_definition.lib_name
+              !file_ref.proxy? && file_ref.display_name == @target_definition.lib_name
             end
           end
          end

data/lib/cocoapods/lockfile.rb

@@ -192,7 +192,7 @@ module Pod
 
         if dependency.nil?
           result[:removed] << pod_name
-        elsif !dependency.match_version?(version) || dependency.external_source != external_source
+        elsif dependency.inline? || !dependency.match_version?(version) || dependency.external_source != external_source
           result[:changed] << pod_name
         else
           result[:unchanged] << pod_name

data/lib/cocoapods/podfile.rb

@@ -380,30 +380,16 @@ module Pod
     #
     #   pod 'JSONKit', :podspec => 'https://raw.github.com/gist/1346394/1d26570f68ca27377a27430c65841a0880395d72/JSONKit.podspec'
     #
+    # Or, if no living soul has created a podspec for the library that you want
+    # to use yet, you will have to specify the library yourself. In which case
+    # you can specify a file path with the `:podspec` option as well.
     #
-    # ### For a library without any available podspec
-    #
-    # Finally, if no living soul has created a podspec, for the library you want
-    # to use, yet, you will have to specify the library yourself.
-    #
-    #
-    # When you omit arguments and pass a block to `pod`, an instance of
-    # Pod::Specification is yielded to the block. This is the same class which
-    # is normally used to specify a Pod.
-    #
-    # ```
-    #   pod do |spec|
-    #     spec.name         = 'JSONKit'
-    #     spec.version      = '1.4'
-    #     spec.source       = { :git => 'https://github.com/johnezang/JSONKit.git', :tag => 'v1.4' }
-    #     spec.source_files = 'JSONKit.*'
-    #   end
-    # ```
     #
     #
     # For more info on the definition of a Pod::Specification see:
     # https://github.com/CocoaPods/CocoaPods/wiki/A-pod-specification
     def pod(*name_and_version_requirements, &block)
+      warn "[DEPRECATED] Inline specs are deprecated, use the `:podspec` option." if block_given?
       @target_definition.target_dependencies << Dependency.new(*name_and_version_requirements, &block)
     end
 

data/lib/cocoapods/resolver.rb

@@ -139,9 +139,9 @@ module Pod
     def removed_pods
       return [] unless lockfile
       unless @removed_pods
-        previusly_installed = lockfile.pods_names.map { |pod_name| pod_name.split('/').first }
+        previously_installed = lockfile.pods_names.map { |pod_name| pod_name.split('/').first }
         installed = specs.map { |spec| spec.name.split('/').first }
-        @removed_pods = previusly_installed - installed
+        @removed_pods = previously_installed - installed
       end
       @removed_pods
     end

data/lib/cocoapods/user_interface.rb

@@ -110,7 +110,7 @@ module Pod
       # that the user should take.
       #
       # @param [String]  message The message to print.
-      # @param [Actions] actions The actions that the user should take.
+      # @param [Array]   actions The actions that the user should take.
       #
       # return [void]
       #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.16.0.rc4
+  version: 0.16.0.rc5
   prerelease: 7
 platform: ruby
 authors:
@@ -254,9 +254,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2644456105808695160
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -265,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: An Objective-C library package manager.