cocoapods 0.16.4 → 0.17.0.rc1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6013129b296437d543853413a5ee6e835811f6e1
+  data.tar.gz: dd3f63d981dbd29df23b124c6002730de9c71745
+SHA512:
+  metadata.gz: 2c7de94a11c4a79a00f46ff265e2a281058142511d671c5b284c504d8162a666bbcd2b39e807193e9dc57a36574a9e3a4d96f2650d3415e2e3a6939e50382046
+  data.tar.gz: 8c18695b3ad7b32d16f6fc4d0ae95d6295b46e7e8309c8511222560d3dfa8e0e7e1d0314243f00e7d7381641731243321b02cac727d5f56d7f6080c1b1a04173

data/CHANGELOG.md

@@ -1,3 +1,110 @@
+## 0.17.0.rc1
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/master...0.17)
+• [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.5.0...master)
+• [cocoapods-core](https://github.com/CocoaPods/Core)
+• [cocoapods-downloader](https://github.com/CocoaPods/cocoapods-downloader)
+
+###### __Notice__
+
+At some point in future the master repo will be switched to the YAML format of
+specifications. This means that specifications with hooks (or any other kind of
+dynamic logic) will not be accepted. Please let us know if there is need for
+other DSL attributes or any other kind of support.
+
+Currently the following specifications fail to load as they depended on the
+CocoaPods internals and need to be updated:
+
+- LibComponentLogging-pods/0.0.1/LibComponentLogging-pods.podspec
+- RestKit/0.9.3/RestKit.podspec
+- Three20/1.0.11/Three20.podspec
+
+Other specifications, might present compatibility issues for the reasons
+presented below.
+
+###### __Breaking__
+
+- Subspecs do **not** inherit the files patterns from the parent spec anymore.
+  This feature made the implementation more complicated and was not easy to
+  explain to podspecs maintainers. Compatibility can be easily fixed by adding
+  a 'Core' subspec.
+- Support for inline podspecs has been removed.
+- The support for Rake::FileList is being deprecated, in favor of a more
+  consistent DSL. Rake::FileList also presented issues because it would access
+  the file system as soon as it was converted to an array.
+- The hooks architecture has been re-factored and might present
+  incompatibilities (please open an issue if appropriate).
+- The `requires_arc` attribute default value is transitioning from `false` to
+  `true`. In the meanwhile a value is needed to pass the lint.
+- Deprecated `copy_header_mapping` hook.
+- Deprecated `exclude_header_search_paths` attribute.
+- External sources are not supported in the dependencies of specifications
+  anymore. Actually they never have been supported, they just happened to work.
+
+###### DSL
+
+- Podfile:
+  - It is not needed to specify the platform anymore (unless not integrating)
+    as CocoaPods now can infer the platform from the integrated targets.
+- Specification:
+  - `preferred_dependency` has been renamed to `default_subspec`.
+  - Added `exclude_files` attribute.
+  - Added `screenshots` attribute.
+  - Added default values for attributes like `source_files`.
+
+###### Enhancements
+
+- Released preview [documentation](docs.cocoapods.org).
+- CocoaPods now has support for working in teams and not committing the Pods
+  folder, as it will keep track of the status of the Pods folder.
+  [#552](https://github.com/CocoaPods/CocoaPods/issues/552)
+- Simplified installation: no specific version of ruby gems is required anymore.
+- The workspace is written only if needed greatly reducing the occasions in
+  which Xcode asks to revert.
+- The Lockfile is sorted reducing the SCM noise.
+  [#591](https://github.com/CocoaPods/CocoaPods/issues/591)
+- Added Podfile, Frameworks, and Resources to the Pods project.
+  [#647](https://github.com/CocoaPods/CocoaPods/issues/647)
+  [#588](https://github.com/CocoaPods/CocoaPods/issues/588)
+- Adds new subcommand `pod spec cat NAME` to print a spec file to standard output.
+- Specification hooks are only called when the specification is installed.
+- The `--no-clean` option of the `pod spec lint` command now displays the Pods
+  project for inspection.
+- It is now possible to specify default values for the configuration in
+  `~/.cocoapods/config.yaml` ([default values](https://github.com/CocoaPods/CocoaPods/blob/master/lib/cocoapods/config.rb#L17)).
+- CocoaPods now checks the checksums of the installed specifications and
+  reinstalls them if needed.
+- Support for YAML formats of the Podfile and the Specification.
+- Added new command `pod ipc` to provide support for inter process
+  communication through YAML formats.
+- CocoaPods now detects if the folder of a Pod is empty and reinstalls it.
+  [#534](https://github.com/CocoaPods/CocoaPods/issues/534)
+- Install hooks and the `prefix_header_contents` attribute are supported in subspecs.
+  [#617](https://github.com/CocoaPods/CocoaPods/issues/617)
+- Dashes are now supported in the versions of the Pods. 
+  [#293](https://github.com/CocoaPods/CocoaPods/issues/293)
+
+###### Bug fixes
+
+- CocoaPods is not confused anymore by target definitions with different activated subspec.
+  [#535](https://github.com/CocoaPods/CocoaPods/issues/535)
+- CocoaPods is not confused anymore by to dependencies from external sources.
+  [#548](https://github.com/CocoaPods/CocoaPods/issues/548)
+- The git cache will always update against the remote if a tag is requested,
+  resolving issues where library maintainers where updating the tag after a
+  lint and would be confused by CocoaPods using the cached commit for the tag.
+  [#407](https://github.com/CocoaPods/CocoaPods/issues/407)
+  [#596](https://github.com/CocoaPods/CocoaPods/issues/596)
+
+###### Codebase
+
+- Major clean up and refactor of the whole code base.
+- Extracted the core classes into
+  [cocoapods-core](https://github.com/CocoaPods/Core) gem.
+- Extracted downloader into
+  [cocoapods-downloader](https://github.com/CocoaPods/cocoapods-downloader).
+- Extracted command-line command & option handling into
+  [CLAide](https://github.com/CocoaPods/CLAide).
+
 ## 0.16.4
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.3...0.16.4)
 
@@ -317,6 +424,7 @@
 - The subversion downloader now does an export instead of a checkout, which
   makes it play nicer with SCMs that store metadata in each directory.
   [#245](https://github.com/CocoaPods/CocoaPods/issues/245)
+- Now the Podfile is added to the Pods project for convenient editing.
 
 ###### Bug fixes
 

data/README.md

@@ -1,8 +1,8 @@
 # CocoaPods – an Objective-C library manager
 
-| CocoaPods | Xcodeproj | Specs |
-| :---: | :---: | :---: |
-[![Master Build Status](https://secure.travis-ci.org/CocoaPods/CocoaPods.png?branch=master)](https://secure.travis-ci.org/CocoaPods/CocoaPods)|[![Build Status](https://secure.travis-ci.org/CocoaPods/Xcodeproj.png?branch=master)](http://travis-ci.org/CocoaPods/Xcodeproj)|[![Build Status](https://secure.travis-ci.org/CocoaPods/Specs.png?branch=master)](http://travis-ci.org/CocoaPods/Specs)
+| CocoaPods | Xcodeproj | Specs | Dependencies |
+| :---: | :---: | :---: | :---: |
+[![Build Status](https://travis-ci.org/CocoaPods/CocoaPods.png)](https://travis-ci.org/CocoaPods/CocoaPods)|[![Build Status](https://secure.travis-ci.org/CocoaPods/Xcodeproj.png?branch=master)](http://travis-ci.org/CocoaPods/Xcodeproj)|[![Build Status](https://secure.travis-ci.org/CocoaPods/Specs.png?branch=master)](http://travis-ci.org/CocoaPods/Specs)|[![Dependency Status](https://gemnasium.com/CocoaPods/CocoaPods.png)](https://gemnasium.com/CocoaPods/CocoaPods)
 
 
 CocoaPods manages library dependencies for your Xcode project.

data/bin/pod

@@ -13,4 +13,4 @@ end
 
 require 'cocoapods'
 
-Pod::Command.run(*ARGV)
+Pod::Command.run(ARGV)

data/lib/cocoapods.rb

@@ -1,60 +1,60 @@
 require 'rubygems'
 
-# Better to fail early and clear then during installation of pods.
-#
-# RubyGems 1.3.6 (which ships with OS X >= 10.7) up to 1.4.0 have a couple of
-# bugs related to comparing prerelease versions.
-#
-# E.g. https://github.com/CocoaPods/CocoaPods/issues/398
-unless Gem::Version::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new(Gem::VERSION))
-  STDERR.puts "\e[1;31m" + "Your RubyGems version (#{Gem::VERSION}) is too old, please update with: `gem update --system`" + "\e[0m"
-  exit 1
-end
-
 module Pod
-  VERSION = '0.16.4'
+  require 'cocoapods/gem_version'
 
-  class PlainInformative < StandardError
-  end
+  # Indicates a runtime error **not** caused by a bug.
+  #
+  class PlainInformative < StandardError; end
 
+  # Indicates a runtime error **not** caused by a bug which should be
+  # highlighted to the user.
+  #
   class Informative < PlainInformative
     def message
-      # TODO: remove formatting from raise calls and remove conditional
-      super !~ /\[!\]/ ? "[!] #{super}\n".red : super
+      "[!] #{super}".red
     end
   end
 
+  require 'cocoapods-core'
+  require 'xcodeproj'
+  require 'cocoapods/downloader'
+  require 'cocoapods/file_list'
+  require 'cocoapods/config'
+
   autoload :Command,                'cocoapods/command'
-  autoload :Config,                 'cocoapods/config'
-  autoload :Dependency,             'cocoapods/dependency'
-  autoload :Downloader,             'cocoapods/downloader'
   autoload :Executable,             'cocoapods/executable'
+  autoload :ExternalSources,        'cocoapods/external_sources'
   autoload :Installer,              'cocoapods/installer'
-  autoload :LocalPod,               'cocoapods/local_pod'
-  autoload :Lockfile,               'cocoapods/lockfile'
-  autoload :Platform,               'cocoapods/platform'
-  autoload :Podfile,                'cocoapods/podfile'
+  autoload :SourcesManager,         'cocoapods/sources_manager'
+  autoload :Library,                'cocoapods/library'
   autoload :Project,                'cocoapods/project'
   autoload :Resolver,               'cocoapods/resolver'
   autoload :Sandbox,                'cocoapods/sandbox'
-  autoload :Source,                 'cocoapods/source'
-  autoload :Spec,                   'cocoapods/specification'
-  autoload :Specification,          'cocoapods/specification'
   autoload :UI,                     'cocoapods/user_interface'
-  autoload :Version,                'cocoapods/version'
+  autoload :Validator,              'cocoapods/validator'
 
   autoload :Pathname,               'pathname'
-  autoload :FileList,               'cocoapods/file_list'
 
   module Generator
+    autoload :Acknowledgements,     'cocoapods/generator/acknowledgements'
     autoload :BridgeSupport,        'cocoapods/generator/bridge_support'
     autoload :CopyResourcesScript,  'cocoapods/generator/copy_resources_script'
     autoload :Documentation,        'cocoapods/generator/documentation'
-    autoload :Acknowledgements,     'cocoapods/generator/acknowledgements'
-    autoload :Plist,                'cocoapods/generator/acknowledgements/plist'
-    autoload :Markdown,             'cocoapods/generator/acknowledgements/markdown'
     autoload :DummySource,          'cocoapods/generator/dummy_source'
+    autoload :Markdown,             'cocoapods/generator/acknowledgements/markdown'
+    autoload :Plist,                'cocoapods/generator/acknowledgements/plist'
+    autoload :PrefixHeader,         'cocoapods/generator/prefix_header'
+    autoload :TargetHeader,         'cocoapods/generator/target_header'
+    autoload :XCConfig,             'cocoapods/generator/xcconfig'
   end
+
+  module Hooks
+    autoload :InstallerRepresentation, 'cocoapods/hooks/installer_representation'
+    autoload :LibraryRepresentation,   'cocoapods/hooks/library_representation'
+    autoload :PodRepresentation,       'cocoapods/hooks/pod_representation'
+  end
+
 end
 
 if ENV['COCOA_PODS_ENV'] == 'development'

data/lib/cocoapods/command.rb

@@ -1,142 +1,88 @@
 require 'colored'
+require 'claide'
 
 module Pod
-  class Command
-    autoload :ErrorReport, 'cocoapods/command/error_report'
-    autoload :Install,     'cocoapods/command/install'
-    autoload :List,        'cocoapods/command/list'
-    autoload :Linter,      'cocoapods/command/linter'
-    autoload :Outdated,    'cocoapods/command/outdated'
-    autoload :Push,        'cocoapods/command/push'
-    autoload :Repo,        'cocoapods/command/repo'
-    autoload :Search,      'cocoapods/command/search'
-    autoload :Setup,       'cocoapods/command/setup'
-    autoload :Spec,        'cocoapods/command/spec'
-    autoload :Update,      'cocoapods/command/update'
-
-    class Help < Informative
-      def initialize(command_class, argv, unrecognized_command = nil)
-        @command_class, @argv, @unrecognized_command = command_class, argv, unrecognized_command
-      end
-
-      def message
-        message = [
-          '',
-          @command_class.banner.gsub(/\$ pod (.*)/, '$ pod \1'.green),
-          '',
-          'Options:',
-          '',
-          options,
-          "\n",
-        ].join("\n")
-        message << "[!] Unrecognized command: `#{@unrecognized_command}'\n".red if @unrecognized_command
-        message << "[!] Unrecognized argument#{@argv.count > 1 ? 's' : ''}: `#{@argv.join(' - ')}'\n".red unless @argv.empty?
-        message
-      end
-
-      private
-
-      def options
-        options  = @command_class.options
-        keys     = options.map(&:first)
-        key_size = keys.inject(0) { |size, key| key.size > size ? key.size : size }
-        options.map { |key, desc| "    #{key.ljust(key_size)}   #{desc}" }.join("\n")
-      end
-    end
+  class PlainInformative
+    include CLAide::InformativeError
+  end
 
-    class ARGV < Array
-      def options;        select { |x| x.to_s[0,1] == '-' };   end
-      def arguments;      self - options;                      end
-      def option(name);   !!delete(name);                      end
-      def shift_argument; (arg = arguments[0]) && delete(arg); end
-    end
+  class Command < CLAide::Command
 
-    def self.banner
-      commands = ['install', 'update', 'outdated', 'list', 'push', 'repo', 'search', 'setup', 'spec'].sort
-      banner   = "To see help for the available commands run:\n\n"
-      banner + commands.map { |cmd| "  * $ pod #{cmd.green} --help" }.join("\n")
-    end
+    self.abstract_command = true
+    self.command = 'pod'
+    self.description = 'CocoaPods, the Objective-C library package manager.'
 
     def self.options
       [
-        ['--help',     'Show help information'],
-        ['--silent',   'Print nothing'],
-        ['--no-color', 'Print output without color'],
-        ['--verbose',  'Print more information while working'],
-        ['--version',  'Prints the version of CocoaPods'],
-      ]
+        ['--silent',   'Show nothing'],
+        ['--version',  'Show the version of CocoaPods'],
+      ].concat(super)
     end
 
-    def self.run(*argv)
-      sub_command = parse(*argv)
-      unless sub_command.is_a?(Setup) || ENV['SKIP_SETUP']
-        Setup.new(ARGV.new).run_if_needed
+    def self.parse(argv)
+      command = super
+      unless SourcesManager.master_repo_functional? || command.is_a?(Setup) || ENV['SKIP_SETUP']
+        Setup.new(CLAide::ARGV.new([])).run
       end
-      sub_command.run
-      UI.puts
-
-    rescue Interrupt
-      puts "[!] Cancelled".red
-      Config.instance.verbose? ? raise : exit(1)
-
-    rescue Exception => e
-      if e.is_a?(PlainInformative) || ENV['COCOA_PODS_ENV'] == 'development' # also catches Informative
-        puts e.message
-        puts *e.backtrace if Config.instance.verbose? || ENV['COCOA_PODS_ENV'] == 'development'
-      else
-        puts ErrorReport.report(e)
-      end
-      exit 1
+      command
     end
 
-    def self.parse(*argv)
-      argv = ARGV.new(argv)
-      if argv.option('--version')
+    def self.run(argv)
+      argv = CLAide::ARGV.new(argv)
+      if argv.flag?('version')
         puts VERSION
         exit!(0)
       end
+      super(argv)
+      UI.print_warnings
+    end
 
-      show_help = argv.option('--help')
-      Config.instance.silent = argv.option('--silent')
-      Config.instance.verbose = argv.option('--verbose')
-
-      String.send(:define_method, :colorize) { |string , _| string } if argv.option( '--no-color' )
-
-      command_class = case command_argument = argv.shift_argument
-      when 'install'  then Install
-      when 'list'     then List
-      when 'outdated' then Outdated
-      when 'push'     then Push
-      when 'repo'     then Repo
-      when 'search'   then Search
-      when 'setup'    then Setup
-      when 'spec'     then Spec
-      when 'update'   then Update
-      end
-
-      if command_class.nil?
-        raise Help.new(self, argv, command_argument)
-      elsif show_help
-        raise Help.new(command_class, argv)
+    def self.report_error(error)
+      if error.is_a?(Interrupt)
+        puts "[!] Cancelled".red
+        Config.instance.verbose? ? raise : exit(1)
       else
-        command_class.new(argv)
+        puts UI::ErrorReport.report(error)
+        exit 1
       end
     end
 
-    include Config::Mixin
-
+    # @todo If a command is run inside another one some settings which where
+    #       true might return false.
+    #
+    # @todo We should probably not even load colored unless needed.
+    #
     def initialize(argv)
-      raise Help.new(self.class, argv)
+      config.silent = argv.flag?('silent', config.silent)
+      config.verbose = argv.flag?('verbose', config.verbose?)
+      String.send(:define_method, :colorize) { |string , _| string } unless self.colorize_output?
+      super
     end
 
+    #-------------------------------------------------------------------------#
+
+    include Config::Mixin
+
     private
 
+    # Checks that the podfile exists.
+    #
+    # @raise  If the podfile does not exists.
+    #
+    # @return [void]
+    #
     def verify_podfile_exists!
       unless config.podfile
         raise Informative, "No `Podfile' found in the current working directory."
       end
     end
 
+    # Checks that the lockfile exists.
+    #
+    # @raise  If the lockfile does not exists.
+    #
+    # @return [void]
+    #
     def verify_lockfile_exists!
       unless config.lockfile
         raise Informative, "No `Podfile.lock' found in the current working directory, run `pod install'."
@@ -145,3 +91,12 @@ module Pod
   end
 end
 
+require 'cocoapods/command/list'
+require 'cocoapods/command/outdated'
+require 'cocoapods/command/project'
+require 'cocoapods/command/push'
+require 'cocoapods/command/repo'
+require 'cocoapods/command/search'
+require 'cocoapods/command/setup'
+require 'cocoapods/command/spec'
+require 'cocoapods/command/inter_process_communication'

data/lib/cocoapods/command/inter_process_communication.rb

@@ -0,0 +1,103 @@
+module Pod
+  class Command
+    class IPC < Command
+
+      self.abstract_command = true
+      self.summary = 'Inter-process communication'
+
+      #-----------------------------------------------------------------------#
+
+      class Spec < IPC
+
+        self.summary = 'Converts a podspec to YAML.'
+        self.description = 'Converts a podspec to YAML and prints it to STDOUT.'
+        self.arguments = 'PATH'
+
+        def initialize(argv)
+          @path = argv.shift_argument
+          super
+        end
+
+        def validate!
+          super
+          help! "A specification path is required." unless @path
+        end
+
+        def run
+          spec = Specification.from_file(@path)
+          UI.puts spec.to_yaml
+        end
+
+      end
+
+      #-----------------------------------------------------------------------#
+
+      class Podfile < IPC
+
+        self.summary = 'Converts a Podfile to YAML.'
+        self.description = 'Converts a Podfile to YAML and prints it to STDOUT.'
+        self.arguments = 'PATH'
+
+        def initialize(argv)
+          @path = argv.shift_argument
+          super
+        end
+
+        def validate!
+          super
+          help! "A Podfile path is required." unless @path
+        end
+
+        def run
+          podfile = Pod::Podfile.from_file(@path)
+          UI.puts podfile.to_yaml
+        end
+
+      end
+
+      #-----------------------------------------------------------------------#
+
+      class List < IPC
+
+        self.summary = 'Lists the specifications know to CocoaPods.'
+        self.description = <<-DESC
+          Prints to STDOUT a YAML dictionary where the keys are the name of the
+          specifications and the values are a dictionary with the following
+          keys.
+
+          - defined_in_file
+          - version
+          - authors
+          - summary
+          - description
+          - platforms
+        DESC
+
+        def run
+          sets = SourcesManager.all_sets
+          result = {}
+          sets.each do |set|
+            begin
+              spec = set.specification
+              result[spec.name] = {
+                'defined_in_file' => spec.defined_in_file.to_s,
+                'version' => spec.version,
+                'authors' => spec.authors,
+                'summary' => spec.summary,
+                'description' => spec.description,
+                'platforms' => spec.available_platforms.map { |p| p.name.to_s },
+              }
+            rescue DSLError
+              next
+            end
+          end
+          UI.puts result.to_yaml
+        end
+
+      end
+
+      #-----------------------------------------------------------------------#
+
+    end
+  end
+end