cocoapods 0.19.1 → 0.20.0

data/lib/cocoapods/gem_version.rb

@@ -2,6 +2,6 @@ module Pod
 
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.19.1' unless defined? Pod::VERSION
+  VERSION = '0.20.0' unless defined? Pod::VERSION
 end
 

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -1,9 +1,88 @@
 module Pod
   module Generator
     class CopyResourcesScript
-      CONTENT = <<EOS
+
+      # @return [Array<#to_s>] A list of files relative to the project pods
+      #         root.
+      #
+      attr_reader :resources
+
+      # @return [Platform] The platform of the library for which the copy
+      #         resources script is needed.
+      #
+      attr_reader :platform
+
+      # @param  [Array<#to_s>] resources @see resources
+      # @param  [Platform] platform @see platform
+      #
+      def initialize(resources, platform)
+        @resources = resources
+        @platform = platform
+      end
+
+      # Saves the resource script to the given pathname.
+      #
+      # @param  [Pathname] pathname
+      #         The path where the copy resources script should be saved.
+      #
+      # @return [void]
+      #
+      def save_as(pathname)
+        pathname.open('w') do |file|
+          file.puts(script)
+        end
+        File.chmod(0755, pathname.to_s)
+      end
+
+      private
+
+      # @!group Private Helpers
+
+      # @return [Hash{Symbol=>Version}] The minimum deployment target which
+      #         supports the `--reference-external-strings-file` option for
+      #         the `ibtool` command.
+      #
+      EXTERNAL_STRINGS_FILE_MIMINUM_DEPLOYMENT_TARGET = {
+        :ios => Version.new('6.0'),
+        :osx => Version.new('10.8')
+      }
+
+      # @return [Bool] Whether the external strings file is supported by the
+      #         `ibtool` according to the deployment target of the platform.
+      #
+      def use_external_strings_file?
+        minimum_deployment_target = EXTERNAL_STRINGS_FILE_MIMINUM_DEPLOYMENT_TARGET[platform.name]
+        platform.deployment_target >= minimum_deployment_target
+      end
+
+      # @return [String] The install resources shell function.
+      #
+      def install_resources_function
+          if use_external_strings_file?
+            INSTALL_RESOURCES_FUCTION
+          else
+            INSTALL_RESOURCES_FUCTION.gsub(' --reference-external-strings-file', '')
+          end
+      end
+
+      # @return [String] The contents of the copy resources script.
+      #
+      def script
+        script = install_resources_function
+        resources.each do |resource|
+          script += "install_resource '#{resource}'\n"
+        end
+        script += RSYNC_CALL
+        script
+      end
+
+
+      INSTALL_RESOURCES_FUCTION = <<EOS
 #!/bin/sh
 
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+touch "$RESOURCES_TO_COPY"
+
 install_resource()
 {
   case $1 in
@@ -24,30 +103,20 @@ install_resource()
       xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
       ;;
     *)
-      echo "rsync -av --exclude '*/.svn/*' ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-      rsync -av --exclude '*/.svn/*' "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+      echo "${PODS_ROOT}/$1"
+      echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY"
       ;;
   esac
 }
 EOS
 
-      attr_reader :resources
 
-      # A list of files relative to the project pods root.
-      def initialize(resources = [])
-        @resources = resources
-      end
+      RSYNC_CALL = <<EOS
+
+rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+rm "$RESOURCES_TO_COPY"
+EOS
 
-      def save_as(pathname)
-        pathname.open('w') do |script|
-          script.puts CONTENT
-          @resources.each do |resource|
-            script.puts "install_resource '#{resource}'"
-          end
-        end
-        # @todo use File api
-        system("chmod +x '#{pathname}'")
-      end
     end
   end
 end

data/lib/cocoapods/installer.rb

@@ -254,8 +254,6 @@ module Pod
       @pod_installers ||= []
       pod_installer = PodSourceInstaller.new(sandbox, specs_by_platform)
       pod_installer.aggressive_cache = config.aggressive_cache?
-      pod_installer.generate_docs = config.generate_docs?
-      pod_installer.install_docs = config.install_docs?
       pod_installer.install!
       @pod_installers << pod_installer
       @installed_specs.concat(specs_by_platform.values.flatten.uniq)
@@ -282,7 +280,7 @@ module Pod
     def prepare_pods_project
       UI.message "- Creating Pods project" do
         @pods_project = Pod::Project.new(sandbox.project_path)
-        if config.podfile_path.exist?
+        if config.podfile_path
           @pods_project.add_podfile(config.podfile_path)
         end
         sandbox.project = @pods_project
@@ -416,8 +414,8 @@ module Pod
     def run_spec_pre_install_hook(spec, lib_representation)
       spec.pre_install!(pod_rep(spec.root.name), lib_representation)
     rescue => e
-      raise Informative, "The pre install hook of #{spec} is not " \
-        "compatible with this version of CocoaPods." \
+      raise Informative, "An error occurred while processing the pre-install " \
+        "hook of #{spec}." \
         "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
     end
 
@@ -430,8 +428,8 @@ module Pod
     def run_podfile_pre_install_hook
       podfile.pre_install!(installer_rep)
     rescue => e
-      raise Informative, "The pre install hook of the Podfile is not " \
-        "compatible with this version of CocoaPods." \
+      raise Informative, "An error occurred while processing the pre-install " \
+        "hook of the Podfile." \
         "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
     end
 
@@ -475,8 +473,8 @@ module Pod
     def run_spec_post_install_hook(spec, lib_representation)
       spec.post_install!(lib_representation)
     rescue => e
-      raise Informative, "The post install hook of #{spec} is not " \
-        "compatible with this version of CocoaPods." \
+      raise Informative, "An error occurred while processing the post-install " \
+        "hook of #{spec}." \
         "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
     end
 
@@ -489,8 +487,8 @@ module Pod
     def run_podfile_post_install_hook
       podfile.post_install!(installer_rep)
     rescue => e
-      raise Informative, "The post install hook of the Podfile is not " \
-        "compatible with this version of CocoaPods." \
+      raise Informative, "An error occurred while processing the post-install " \
+        "hook of the Podfile." \
         "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
     end
 

data/lib/cocoapods/installer/analyzer/sandbox_analyzer.rb

@@ -151,7 +151,7 @@ module Pod
           return true if sandbox.predownloaded?(pod)
           return true if folder_empty?(pod)
           if update_mode
-            return true if spec.version.head?
+            return true if sandbox.head_pod?(pod)
           end
           return false
         end

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -24,8 +24,6 @@ module Pod
         @sandbox = sandbox
         @specs_by_platform = specs_by_platform
 
-        @generate_docs    = false
-        @install_docs     = false
         @aggressive_cache = false
       end
 
@@ -41,18 +39,6 @@ module Pod
 
       # @!group Configuration
 
-      # @return [Bool] whether the documentation should be generated for the
-      #         Pod.
-      #
-      attr_accessor :generate_docs
-      alias_method  :generate_docs?, :generate_docs
-
-      # @return [Bool] whether the generated documentation should be installed
-      #         in Xcode.
-      #
-      attr_accessor :install_docs
-      alias_method  :install_docs?, :install_docs
-
       # @return [Bool] whether the downloader should always check against the
       #         remote if issues might be generated (mostly useful to speed up
       #         testing).
@@ -73,8 +59,7 @@ module Pod
       # @return [void]
       #
       def install!
-        download_source     unless predownloaded? || local?
-        generate_docs       if generate_docs?
+        download_source unless predownloaded? || local?
       end
 
       # Cleans the installations if appropriate.
@@ -106,7 +91,7 @@ module Pod
       #
       def download_source
         root.rmtree if root.exist?
-        if root_spec.version.head?
+        if head_pod?
           downloader.download_head
           @specific_source = downloader.checkout_options
         else
@@ -121,20 +106,6 @@ module Pod
         end
       end
 
-      # Generates the documentation for the Pod.
-      #
-      # @return [void]
-      #
-      def generate_docs
-        if documentation_generator.already_installed?
-          UI.section " > Using existing documentation"
-        else
-          UI.section " > Installing documentation" do
-            documentation_generator.generate(install_docs?)
-          end
-        end
-      end
-
       # Removes all the files not needed for the installation according to the
       # specs by platform.
       #
@@ -162,13 +133,6 @@ module Pod
         @downloader
       end
 
-      # @return [Generator::Documentation] The documentation generator to use
-      #         for generating the documentation.
-      #
-      def documentation_generator
-        @documentation_generator ||= Generator::Documentation.new(sandbox, root_spec, path_list)
-      end
-
       #-----------------------------------------------------------------------#
 
       private
@@ -208,6 +172,10 @@ module Pod
         sandbox.local?(root_spec.name)
       end
 
+      def head_pod?
+        sandbox.head_pod?(root_spec.name)
+      end
+
       #-----------------------------------------------------------------------#
 
       private

data/lib/cocoapods/installer/target_installer.rb

@@ -89,11 +89,6 @@ module Pod
         library.target = @target
       end
 
-      ENABLE_OBJECT_USE_OBJC_FROM = {
-        :ios => Version.new('6'),
-        :osx => Version.new('10.8')
-      }
-
       # Adds the build files of the pods to the target and adds a reference to
       # the frameworks of the Pods.
       #
@@ -222,7 +217,7 @@ module Pod
         UI.message "- Generating copy resources script at #{UI.path(path)}" do
           resources = library.file_accessors.map { |accessor| accessor.resources.flatten.map {|res| project.relativize(res)} }.flatten
           resources << bridge_support_file if bridge_support_file
-          generator = Generator::CopyResourcesScript.new(resources)
+          generator = Generator::CopyResourcesScript.new(resources, library.platform)
           generator.save_as(path)
           add_file_to_support_group(path)
         end
@@ -314,6 +309,11 @@ module Pod
         support_files_group.new_file(relative_path)
       end
 
+      ENABLE_OBJECT_USE_OBJC_FROM = {
+        :ios => Version.new('6'),
+        :osx => Version.new('10.8')
+      }
+
       # Returns the compiler flags for the source files of the given specification.
       #
       # The following behavior is regarding the `OS_OBJECT_USE_OBJC` flag. When

data/lib/cocoapods/resolver.rb

@@ -158,7 +158,10 @@ module Pod
             @loaded_specs << spec.name
             cached_specs[spec.name] = spec
             validate_platform(spec, target_definition)
-            spec.version.head = dependency.head?
+            if dependency.head? || sandbox.head_pod?(spec.name)
+              spec.version.head = true
+              sandbox.store_head_pod(spec.name)
+            end
 
             spec_dependencies = spec.all_dependencies(target_definition.platform)
             find_dependency_specs(spec, spec_dependencies, target_definition)

data/lib/cocoapods/sandbox.rb

@@ -70,6 +70,7 @@ module Pod
       @build_headers  = HeadersStore.new(self, "BuildHeaders")
       @public_headers = HeadersStore.new(self, "Headers")
       @predownloaded_pods = []
+      @head_pods = []
       @checkout_sources = {}
       @local_pods = {}
       FileUtils.mkdir_p(@root)
@@ -94,8 +95,9 @@ module Pod
       root.rmtree
     end
 
+    # Removes the files of the Pod with the given name from the sandbox.
     #
-    #
+    # @return [void]
     #
     def clean_pod(name)
       root_name = Specification.root_name(name)
@@ -279,6 +281,37 @@ module Pod
 
     #--------------------------------------#
 
+    # Marks a Pod as head.
+    #
+    # @param  [String] name
+    #         The name of the Pod.
+    #
+    # @return [void]
+    #
+    def store_head_pod(name)
+      root_name = Specification.root_name(name)
+      head_pods << root_name
+    end
+
+    # @return [Array<String>] The names of the pods that have been
+    #         marked as head.
+    #
+    attr_reader :head_pods
+
+    # Checks if a Pod should attempt to use the head source of the git repo.
+    #
+    # @param  [String] name
+    #         The name of the Pod.
+    #
+    # @return [Bool] Whether the Pod has been marked as head.
+    #
+    def head_pod?(name)
+      root_name = Specification.root_name(name)
+      head_pods.include?(root_name)
+    end
+
+    #--------------------------------------#
+
     # Stores the local path of a Pod.
     #
     # @param  [String] name

data/lib/cocoapods/user_interface.rb

@@ -148,7 +148,7 @@ module Pod
       #
       def path(pathname)
         if pathname
-          path = pathname.relative_path_from(config.podfile_path.dirname || Pathname.pwd)
+          path = pathname.relative_path_from((config.podfile_path.dirname if config.podfile_path) || Pathname.pwd)
           "`#{path}`"
         else
           ''

data/lib/cocoapods/user_interface/error_report.rb

@@ -45,7 +45,7 @@ Repositories : #{repo_information.join("\n               ")}
 #{'[!] Oh no, an error occurred.'.red}
 #{error_from_podfile(exception)}
 #{'Search for existing github issues similar to yours:'.yellow}
-#{"https://github.com/CocoaPods/CocoaPods/issues/search?q=#{CGI.escape(exception.message)}"}
+#{"https://github.com/CocoaPods/CocoaPods/search?q=#{CGI.escape(exception.message)}&type=Issues"}
 
 #{'If none exists, create a ticket, with the template displayed above, on:'.yellow}
 https://github.com/CocoaPods/CocoaPods/issues/new

data/lib/cocoapods/validator.rb

@@ -191,7 +191,6 @@ module Pod
       config.sandbox_root      = validation_dir + 'Pods'
       config.silent            = !config.verbose
       config.integrate_targets = false
-      config.generate_docs     = false
       config.skip_repo_update  = true
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -17,56 +17,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -230,7 +230,6 @@ files:
 - lib/cocoapods/generator/acknowledgements.rb
 - lib/cocoapods/generator/bridge_support.rb
 - lib/cocoapods/generator/copy_resources_script.rb
-- lib/cocoapods/generator/documentation.rb
 - lib/cocoapods/generator/dummy_source.rb
 - lib/cocoapods/generator/prefix_header.rb
 - lib/cocoapods/generator/target_environment_header.rb
@@ -260,6 +259,7 @@ files:
 - lib/cocoapods/validator.rb
 - lib/cocoapods.rb
 - bin/pod
+- bin/sandbox-pod
 - README.md
 - LICENSE
 - CHANGELOG.md
@@ -267,7 +267,86 @@ homepage: https://github.com/CocoaPods/CocoaPods
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |2+
+
+  CHANGELOG:
+
+  ## 0.20.0
+  [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.19.0...0.20.0)
+  • [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.19.0...0.20.0)
+  • [cocoapods-downloader](https://github.com/CocoaPods/CLAide/compare/0.1.0...0.1.1)
+  • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.5.5...0.6.0)
+  • [CLAide](https://github.com/CocoaPods/CLAide/compare/0.2.0...0.3.0)
+
+  ###### Enhancements
+
+  * Introduces an experimental sandbox feature.
+    [#939](https://github.com/CocoaPods/CocoaPods/issues/939)
+
+    Let’s face it, even though we have a great community that spends an amazing
+    amount of time on curating the specifications, the internet can be a hostile
+    place and the community is growing too large to take a naive approach any
+    longer.
+
+    As such, we have started leveraging OS X’s sandbox facilities to disallow
+    unsanctioned operations. This is still very experimental and therefore has to
+    be used explicitely, for now, but that does **not** mean we don’t want you to
+    start using it and **report issues**.
+
+    To use the sandbox, simply use the `sandbox-pod` command instead. E.g.:
+
+          $ sandbox-pod install
+
+    In case of issues, be sure to check `/var/log/system.log` for ‘deny’ messages.
+    For instance, here’s an example where the sandbox denies read access to `/`:
+
+          May 16 00:23:35 Khaos kernel[0]: Sandbox: ruby(98430) deny file-read-data /
+
+    **NOTE**: _The above example is actually one that we know of. We’re not sure
+    yet which process causes this, but there shouldn’t be a need for any process
+    to read data from the root path anyways._
+
+    **NOTE 2**: _At the moment the sandbox is not compatible with the `:path` option
+    when referencing Pods that are not stored within the directory of the Podfile._
+
+  * The naked `pod` command now defaults to `pod install`.
+    [#958](https://github.com/CocoaPods/CocoaPods/issues/958)
+
+  * CocoaPods will look for the Podfile in the ancestors paths if one is
+    not available in the working directory.
+    [#940](https://github.com/CocoaPods/CocoaPods/issues/940)
+
+  * Documentation generation has been removed from CocoaPods as it graduated
+    to CocoaDocs. This decision was taken because CocoaDocs is a much better
+    solution which doesn't clutter Xcode's docsets while still allowing
+    access to the docsets with Xcode and with Dash. Removing this feature
+    keeps the installer leaner and easier to develop and paves the way for the
+    upcoming sandbox. Private pods can use pre install hook to generate the
+    documentation. If there will be enough demand this feature might be
+    reintegrated as plugin (see
+    [#1037](https://github.com/CocoaPods/CocoaPods/issues/1037)).
+
+  * Improved performance of the copy resources script and thus build time of
+    the integrated targets. Contribution by [@onato](https://github.com/onato)
+    [#1050](https://github.com/CocoaPods/CocoaPods/issues/1050).
+
+  * The changelog for the current version is printed after CocoaPods is
+    installed/updated.
+    [#853](https://github.com/CocoaPods/CocoaPods/issues/853).
+
+
+  ###### Bug fixes
+
+  * Inheriting `inhibit_warnings` per pod is now working
+    [#1032](https://github.com/CocoaPods/CocoaPods/issues/1032)
+  * Fix copy resources script for iOS < 6 and OS X < 10.8 by removing the
+    `--reference-external-strings-file`
+    flag. [#1030](https://github.com/CocoaPods/CocoaPods/pull/1030)
+  * Fixed issues with the `:head` option of the Podfile.
+    [#1046](https://github.com/CocoaPods/CocoaPods/issues/1046)
+    [#1039](https://github.com/CocoaPods/CocoaPods/issues/1039)
+
+
 rdoc_options: []
 require_paths:
 - lib