cocoapods 0.32.1 → 0.33.0

data/lib/cocoapods/installer/user_project_integrator.rb

@@ -81,21 +81,22 @@ module Pod
       #
       def create_workspace
         all_projects = user_project_paths.sort.push(sandbox.project_path).uniq
-        projpaths = all_projects.map do |path|
-          path.relative_path_from(workspace_path.dirname).to_s
+        file_references = all_projects.map do |path|
+          relative_path = path.relative_path_from(workspace_path.dirname).to_s
+          Xcodeproj::Workspace::FileReference.new(relative_path, 'group')
         end
 
         if workspace_path.exist?
           workspace = Xcodeproj::Workspace.new_from_xcworkspace(workspace_path)
-          new_projpaths = projpaths - workspace.projpaths
-          unless new_projpaths.empty?
-            workspace.projpaths.concat(new_projpaths)
+          new_file_references = file_references - workspace.file_references
+          unless new_file_references.empty?
+            workspace.file_references.concat(new_file_references)
             workspace.save_as(workspace_path)
           end
 
         else
           UI.notice "From now on use `#{workspace_path.basename}`."
-          workspace = Xcodeproj::Workspace.new(*projpaths)
+          workspace = Xcodeproj::Workspace.new(*file_references)
           workspace.save_as(workspace_path)
         end
       end

data/lib/cocoapods/sources_manager.rb

@@ -152,8 +152,13 @@ module Pod
         sources.each do |source|
           UI.section "Updating spec repo `#{source.name}`" do
             Dir.chdir(source.data_provider.repo) do
-              output = git!("pull --no-rebase --no-commit")
-              UI.puts output if show_output && !config.verbose?
+              begin
+                output = git!("pull --ff-only")
+                UI.puts output if show_output && !config.verbose?
+              rescue Informative => e
+                raise Informative, 'An error occurred while performing ' \
+                  "`git pull` on repo `#{source.name}`.\n" + e.message
+              end
             end
             check_version_information(source.data_provider.repo)
           end
@@ -201,13 +206,16 @@ module Pod
           min, max = versions['min'], versions['max']
           version_msg = ( min == max ) ? min : "#{min} - #{max}"
           raise Informative, "The `#{dir.basename}` repo requires " \
-          "CocoaPods #{version_msg}\n".red +
+          "CocoaPods #{version_msg} (currently using #{Pod::VERSION})\n".red +
           "Update CocoaPods, or checkout the appropriate tag in the repo."
         end
 
+        needs_sudo = path_writable?(__FILE__)
+
         if config.new_version_message? && cocoapods_update?(versions)
           UI.puts "\nCocoaPods #{versions['last']} is available.\n" \
-            "To update use: [sudo] gem install cocoapods\n".green
+            "To update use: #{needs_sudo ? 'sudo ' : ''}" \
+            'gem install cocoapods\n'.green
         end
       end
 
@@ -259,7 +267,16 @@ module Pod
       def version_information(dir)
         require 'yaml'
         yaml_file  = dir + 'CocoaPods-version.yml'
-        yaml_file.exist? ? YAML.load_file(yaml_file) : {}
+        return {} unless yaml_file.exist?
+        begin
+          yaml = Pathname.new(yaml_file).read
+          YAMLHelper.load(yaml)
+        rescue Informative => e
+          raise Informative, "There was an error reading '#{yaml_file}'.\n" \
+            'Please consult http://blog.cocoapods.org/' \
+            'Repairing-Our-Broken-Specs-Repository/ ' \
+            'for more information.'
+        end
       end
 
       public
@@ -284,6 +301,12 @@ module Pod
 
       #-----------------------------------------------------------------------#
 
+      private
+
+      def path_writable?(path)
+        Pathname(path).dirname.writable?
+      end
+
     end
   end
 end

data/lib/cocoapods/user_interface.rb

@@ -184,10 +184,10 @@ module Pod
 
       # Prints a message with a label.
       #
-      def labeled(label, value)
+      def labeled(label, value, justification = 16)
         if value
           ''.tap do |t|
-            t << "    - #{label}:".ljust(16)
+            t << "    - #{label}:".ljust(justification)
             if value.is_a?(Array)
               separator = "\n  - "
               puts_indented t << separator << value.join(separator)

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/search?q=#{CGI.escape(exception.message)}&type=Issues"}
+#{issues_url(exception)}
 
 #{'If none exists, create a ticket, with the template displayed above, on:'.yellow}
 https://github.com/CocoaPods/CocoaPods/issues/new
@@ -57,6 +57,10 @@ EOS
 
         private
 
+        def pathless_exception_message(message)
+          message.gsub(/- \(.*\):/, '-')
+        end
+
         def markdown_podfile
           return '' unless Config.instance.podfile_path && Config.instance.podfile_path.exist?
           <<-EOS
@@ -75,6 +79,16 @@ EOS
           end
         end
 
+        def remove_color(string)
+          string.gsub(/\e\[(\d+)m/, '')
+        end
+
+        def issues_url(exception)
+          message = remove_color(pathless_exception_message(exception.message))
+          'https://github.com/CocoaPods/CocoaPods/search?q=' \
+          "#{CGI.escape(message)}&type=Issues"
+        end
+
         def host_information
           product, version, build =`sw_vers`.strip.split("\n").map { |line| line.split(":").last.strip }
           "#{product} #{version} (#{build})"

data/lib/cocoapods/validator.rb

@@ -198,6 +198,9 @@ module Pod
     def perform_extensive_analysis(spec)
       validate_homepage(spec)
       validate_screenshots(spec)
+      validate_social_media_url(spec)
+      validate_documentation_url(spec)
+      validate_docset_url(spec)
 
       spec.available_platforms.each do |platform|
         UI.message "\n\n#{spec} - Analyzing on #{platform} platform.".green.reversed
@@ -223,38 +226,14 @@ module Pod
     attr_accessor :consumer
     attr_accessor :subspec_name
 
-    MAX_HTTP_REDIRECTS = 3
-
     # Performs validation of a URL
     #
     def validate_url(url)
-      require 'rest'
-
-      begin
-        redirects = 0
-        resp = nil
-        loop do
-          resp = ::REST.head(url)
+      resp = Pod::HTTP::validate_url(url)
 
-          if resp.status_code >= 400
-            resp = ::REST.get(url)
-          end
-
-          if [301, 302, 303, 307, 308].include? resp.status_code
-            url = resp.headers['location'].first
-            redirects += 1
-          else
-            break
-          end
-
-          break unless redirects < MAX_HTTP_REDIRECTS
-        end
-      rescue
+      if !resp
         warning "There was a problem validating the URL #{url}."
-        resp = nil
-      end
-
-      if resp && !resp.success?
+      elsif !resp.success?
         warning "The URL (#{url}) is not reachable."
       end
 
@@ -280,6 +259,24 @@ module Pod
       end
     end
 
+    # Performs validations related to the `social_media_url` attribute.
+    #
+    def validate_social_media_url(spec)
+      validate_url(spec.social_media_url) if spec.social_media_url
+    end
+
+    # Performs validations related to the `documentation_url` attribute.
+    #
+    def validate_documentation_url(spec)
+      validate_url(spec.documentation_url) if spec.documentation_url
+    end
+
+    # Performs validations related to the `docset_url` attribute.
+    #
+    def validate_docset_url(spec)
+      validate_url(spec.docset_url) if spec.docset_url
+    end
+
     def setup_validation_environment
       validation_dir.rmtree if validation_dir.exist?
       validation_dir.mkpath

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.32.1
+  version: 0.33.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -17,58 +17,58 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.33.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.33.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: cocoapods-downloader
+  name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
-  name: xcodeproj
+  name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: cocoapods-try
+  name: cocoapods-plugins
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -81,6 +81,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: cocoapods-try
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: cocoapods-trunk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
@@ -216,6 +244,7 @@ files:
 - lib/cocoapods/command/project.rb
 - lib/cocoapods/command/push.rb
 - lib/cocoapods/command/repo.rb
+- lib/cocoapods/command/repo/push.rb
 - lib/cocoapods/command/search.rb
 - lib/cocoapods/command/setup.rb
 - lib/cocoapods/command/spec.rb
@@ -272,9 +301,49 @@ homepage: https://github.com/CocoaPods/CocoaPods
 licenses:
 - MIT
 metadata: {}
-post_install_message: "\nCHANGELOG:\n\n## 0.32.1\n\n##### Bug Fixes\n\n* Fixed the
-  Podfile `default_subspec` attribute in nested subspecs.  \n  [Fabio Pelosin][irrationalfab]\n
-  \ [#2050](https://github.com/CocoaPods/CocoaPods/issues/2050)\n\n\n"
+post_install_message: "\nCHANGELOG:\n\n## 0.33.0\n\n##### Breaking\n\n* The deprecated
+  `pre_install` and the `pod_install` hooks of the specification\n  class have been
+  removed.  \n  [Fabio Pelosin][irrationalfab]\n  [#2151](https://github.com/CocoaPods/CocoaPods/issues/2151)\n
+  \ [#2153](https://github.com/CocoaPods/CocoaPods/pull/2153)\n\n##### Enhancements\n\n*
+  Added the `cocoapods-trunk` plugin which introduces the `trunk` subcommand.  \n
+  \ [Fabio Pelosin][irrationalfab]\n  [#2151](https://github.com/CocoaPods/CocoaPods/issues/2151)\n
+  \ [#2153](https://github.com/CocoaPods/CocoaPods/pull/2153)\n\n* The `pod push`
+  sub-command has been moved to the `pod repo push` sub-command.\n  Moreover pushing
+  to the master repo from it has been disabled.  \n  [Fabio Pelosin][irrationalfab]\n
+  \ [#2151](https://github.com/CocoaPods/CocoaPods/issues/2151)\n  [#2153](https://github.com/CocoaPods/CocoaPods/pull/2153)\n\n*
+  Overhauled command line interface. Add support for auto-completion script\n  (d).
+  If auto-completion is enabled for your shell you can configure it for\n  CocoaPods
+  with the following command:\n\n      rm -f /usr/local/share/zsh/site-functions/_pod\n
+  \     dpod --completion-script > /usr/local/share/zsh/site-functions/_pod\n      exec
+  zsh\n\n  Currently only the Z shell is supported.  \n  [Fabio Pelosin][irrationalfab]\n
+  \ [CLAide#25](https://github.com/CocoaPods/CLAide/issues/25)\n  [CLAide#20](https://github.com/CocoaPods/CLAide/issues/20)\n
+  \ [CLAide#19](https://github.com/CocoaPods/CLAide/issues/19)\n  [CLAide#17](https://github.com/CocoaPods/CLAide/issues/17)\n
+  \ [CLAide#12](https://github.com/CocoaPods/CLAide/issues/12)\n\n* The `--version`
+  flag is now only supported for the root `pod` command. If\n  used in conjunction
+  with the `--verbose` flag the version of the detected\n  plugins will be printed
+  as well.  \n  [Fabio Pelosin][irrationalfab]\n  [CLAide#13](https://github.com/CocoaPods/CLAide/issues/13)\n
+  \ [CLAide#14](https://github.com/CocoaPods/CLAide/issues/14)\n\n* The extremely
+  meta `cocoaPods-plugins` is now installed by default providing\n  information about
+  the available and the installed plug-ins.  \n  [David Grandinetti](https://github.com/dbgrandi)\n
+  \ [Olivier Halligon](https://github.com/AliSoftware)\n  [Fabio Pelosin][irrationalfab]\n
+  \ [#2092](https://github.com/CocoaPods/CocoaPods/issues/2092)\n\n* Validate the
+  reachability of `social_media_url`, `documentation_url` and\n  `docset_url` in podspecs
+  we while linting a specification.  \n  [Kyle Fuller](https://github.com/kylef)\n
+  \ [#2025](https://github.com/CocoaPods/CocoaPods/issues/2025)\n\n* Print the current
+  version when the repo/lockfile requires a higher version.  \n  [Samuel E. Giddins](https://github.com/segiddins)\n
+  \ [#2049](https://github.com/CocoaPods/CocoaPods/issues/2049)\n\n* Show `help` when
+  running the `pod` command instead of defaulting to `pod\n  install`.  \n  [Kyle
+  Fuller](https://github.com/kylef)\n  [#1771](https://github.com/CocoaPods/CocoaPods/issues/1771)\n\n#####
+  Bug Fixes\n\n* Show the actual executable when external commands fail.  \n  [Boris
+  Bügling][neonichu]\n  [#2102](https://github.com/CocoaPods/CocoaPods/issues/2102)\n\n*
+  Fixed support for file references in the workspace generated by CocoaPods.  \n  [Kyle
+  Fuller][kylef]\n  [Fabio Pelosin][irrationalfab]\n  [Xcodeproj#105](https://github.com/CocoaPods/Xcodeproj/pull/150)\n\n*
+  Show a helpful error message when reading version information with merge\n  conflict.
+  \ \n  [Samuel E. Giddins][segiddins]\n  [#1853](https://github.com/CocoaPods/CocoaPods/issues/1853)\n\n*
+  Show deprecated specs when invoking `pod outdated`.  \n  [Samuel E. Giddins](https://github.com/segiddins)\n
+  \ [#2003](https://github.com/CocoaPods/CocoaPods/issues/2003)\n\n* Fixes an issue
+  where `pod repo update` may start an un-committed merge.  \n  [Kyle Fuller][kylef]\n
+  \ [#2024](https://github.com/CocoaPods/CocoaPods/issues/2024)\n\n"
 rdoc_options: []
 require_paths:
 - lib