cocoapods 0.33.1 → 0.34.0.rc1

data/README.md

@@ -2,9 +2,9 @@
 
 ### CocoaPods: The Objective-C dependency manager
 
-[![Build Status](http://img.shields.io/travis/CocoaPods/CocoaPods/master.svg)](https://travis-ci.org/CocoaPods/CocoaPods)
-[![Gem Version](http://img.shields.io/gem/v/cocoapods.svg)](http://badge.fury.io/rb/cocoapods)
-[![Code Climate](http://img.shields.io/codeclimate/github/CocoaPods/CocoaPods.svg)](https://codeclimate.com/github/CocoaPods/CocoaPods)
+[![Build Status](http://img.shields.io/travis/CocoaPods/CocoaPods/master.svg?style=flat)](https://travis-ci.org/CocoaPods/CocoaPods)
+[![Gem Version](http://img.shields.io/gem/v/cocoapods.svg?style=flat)](http://badge.fury.io/rb/cocoapods)
+[![Code Climate](http://img.shields.io/codeclimate/github/CocoaPods/CocoaPods.svg?style=flat)](https://codeclimate.com/github/CocoaPods/CocoaPods)
 
 CocoaPods manages dependencies for your Xcode projects.
 
@@ -50,10 +50,10 @@ CocoaPods is composed by the following projects:
 
 | Status | Project | Description | Info |
 | :----- | :------ | :--- | :--- |
-| [![Build Status](http://img.shields.io/travis/CocoaPods/CocoaPods/master.svg)](http://travis-ci.org/CocoaPods/CocoaPods) | [CocoaPods](https://github.com/CocoaPods/CocoaPods) | The CocoaPods command line tool. | [docs](http://docs.cocoapods.org/cocoapods)
-| [![Build Status](http://img.shields.io/travis/CocoaPods/Core/master.svg)](http://travis-ci.org/CocoaPods/Core) | [CocoaPods Core](https://github.com/CocoaPods/Core) | Support for working with specifications and podfiles. | [docs](http://docs.cocoapods.org/cocoapods_core)
-| [![Build Status](http://img.shields.io/travis/CocoaPods/cocoapods-downloader/master.svg)](http://travis-ci.org/CocoaPods/cocoapods-downloader) |[CocoaPods Downloader](https://github.com/CocoaPods/cocoapods-downloader) |  Downloaders for various source types. |  [docs](http://docs.cocoapods.org/cocoapods_downloader/index.html)
-| [![Build Status](http://img.shields.io/travis/CocoaPods/Xcodeproj/master.svg)](https://travis-ci.org/CocoaPods/Xcodeproj) | [Xcodeproj](https://github.com/CocoaPods/Xcodeproj) | Create and modify Xcode projects from Ruby. |  [docs](http://docs.cocoapods.org/xcodeproj/index.html)
-| [![Build Status](http://img.shields.io/travis/CocoaPods/CLAide/master.svg)](https://travis-ci.org/CocoaPods/CLAide) | [CLAide](https://github.com/CocoaPods/CLAide) | A small command-line interface framework.  | [docs](http://docs.cocoapods.org/claide/index.html)
-| [![Build Status](http://img.shields.io/travis/CocoaPods/Specs/master.svg)](http://travis-ci.org/CocoaPods/Specs) | [Master Repo ](https://github.com/CocoaPods/Specs) | Master repository of specifications. | [guide](http://docs.cocoapods.org/guides/contributing_to_the_master_repo.html)
+| [![Build Status](http://img.shields.io/travis/CocoaPods/CocoaPods/master.svg?style=flat)](http://travis-ci.org/CocoaPods/CocoaPods) | [CocoaPods](https://github.com/CocoaPods/CocoaPods) | The CocoaPods command line tool. | [docs](http://docs.cocoapods.org/cocoapods)
+| [![Build Status](http://img.shields.io/travis/CocoaPods/Core/master.svg?style=flat)](http://travis-ci.org/CocoaPods/Core) | [CocoaPods Core](https://github.com/CocoaPods/Core) | Support for working with specifications and podfiles. | [docs](http://docs.cocoapods.org/cocoapods_core)
+| [![Build Status](http://img.shields.io/travis/CocoaPods/cocoapods-downloader/master.svg?style=flat)](http://travis-ci.org/CocoaPods/cocoapods-downloader) |[CocoaPods Downloader](https://github.com/CocoaPods/cocoapods-downloader) |  Downloaders for various source types. |  [docs](http://docs.cocoapods.org/cocoapods_downloader/index.html)
+| [![Build Status](http://img.shields.io/travis/CocoaPods/Xcodeproj/master.svg?style=flat)](https://travis-ci.org/CocoaPods/Xcodeproj) | [Xcodeproj](https://github.com/CocoaPods/Xcodeproj) | Create and modify Xcode projects from Ruby. |  [docs](http://docs.cocoapods.org/xcodeproj/index.html)
+| [![Build Status](http://img.shields.io/travis/CocoaPods/CLAide/master.svg?style=flat)](https://travis-ci.org/CocoaPods/CLAide) | [CLAide](https://github.com/CocoaPods/CLAide) | A small command-line interface framework.  | [docs](http://docs.cocoapods.org/claide/index.html)
+|  | [Master Repo ](https://github.com/CocoaPods/Specs) | Master repository of specifications. | [guide](http://docs.cocoapods.org/guides/contributing_to_the_master_repo.html)
 

data/bin/pod

@@ -2,7 +2,7 @@
 
 if RUBY_VERSION > '1.8.7' && Encoding.default_external != Encoding::UTF_8
   puts "\e[33mWARNING: CocoaPods requires your terminal to be using UTF-8 encoding."
-  if ENV["TRAVIS"]
+  if ENV['TRAVIS']
     puts <<-DOC
 Consider adding the following settings to .travis.yml
 
@@ -19,12 +19,12 @@ end
 
 if $PROGRAM_NAME == __FILE__ && !ENV['COCOAPODS_NO_BUNDLER']
   ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
-  require "rubygems"
-  require "bundler/setup"
+  require 'rubygems'
+  require 'bundler/setup'
   $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 elsif ENV['COCOAPODS_NO_BUNDLER']
-  require "rubygems"
-  gem "cocoapods"
+  require 'rubygems'
+  gem 'cocoapods'
 end
 
 STDOUT.sync = true if ENV['CP_STDOUT_SYNC'] == 'TRUE'

data/bin/sandbox-pod

@@ -52,7 +52,7 @@ PROFILE_ERB_TEMPLATE = <<-EOS
     "<%= pod_bin %>"
     "<%= ruby_bin %>"
   )
-  (regex 
+  (regex
 <% prefixes.each do |prefix| %>
     #"^<%= prefix %>/*"
 <% end %>
@@ -105,9 +105,7 @@ PROFILE_ERB_TEMPLATE = <<-EOS
 (deny default)
 EOS
 
-
 class Profile
-
   def pod_bin
     File.expand_path('../pod', __FILE__)
   end
@@ -159,14 +157,12 @@ class Profile
   def generate
     ERB.new(PROFILE_ERB_TEMPLATE, 0, '>').result(binding)
   end
-
 end
 
 # Ensure the `pod` bin doesn’t think it needs to use Bundler.
 ENV['COCOAPODS_NO_BUNDLER'] = '1'
 
 profile = Profile.new
-#puts profile.generate
+# puts profile.generate
 command = ['/usr/bin/sandbox-exec', '-p', profile.generate, profile.pod_bin, *ARGV]
 exec(*command)
-

data/lib/cocoapods.rb

@@ -35,17 +35,18 @@ module Pod
     end
   end
 
+  autoload :AggregateTarget,           'cocoapods/target/aggregate_target'
   autoload :Command,                   'cocoapods/command'
   autoload :Executable,                'cocoapods/executable'
   autoload :ExternalSources,           'cocoapods/external_sources'
   autoload :Installer,                 'cocoapods/installer'
-  autoload :SourcesManager,            'cocoapods/sources_manager'
-  autoload :Target,                    'cocoapods/target'
-  autoload :AggregateTarget,           'cocoapods/target/aggregate_target'
+  autoload :HooksManager,              'cocoapods/hooks_manager'
   autoload :PodTarget,                 'cocoapods/target/pod_target'
   autoload :Project,                   'cocoapods/project'
   autoload :Resolver,                  'cocoapods/resolver'
   autoload :Sandbox,                   'cocoapods/sandbox'
+  autoload :SourcesManager,            'cocoapods/sources_manager'
+  autoload :Target,                    'cocoapods/target'
   autoload :Validator,                 'cocoapods/validator'
 
   module Generator
@@ -65,7 +66,6 @@ module Pod
     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

@@ -7,8 +7,6 @@ module Pod
   end
 
   class Command < CLAide::Command
-
-    require 'cocoapods/command/help'
     require 'cocoapods/command/inter_process_communication'
     require 'cocoapods/command/lib'
     require 'cocoapods/command/list'
@@ -29,6 +27,8 @@ module Pod
     self.description = 'CocoaPods, the Objective-C library package manager.'
     self.plugin_prefix = 'cocoapods'
 
+    [Install, Update, Outdated, IPC::Podfile, IPC::Repl].each { |c| c.send(:include, ProjectDirectory) }
+
     def self.options
       [
         ['--silent',   'Show nothing'],
@@ -44,15 +44,18 @@ module Pod
     end
 
     def self.run(argv)
-      help! "You cannot run CocoaPods as root." if Process.uid == 0
+      help! 'You cannot run CocoaPods as root.' if Process.uid == 0
       super(argv)
       UI.print_warnings
     end
 
     def self.report_error(exception)
-      if exception.is_a?(Interrupt)
-        puts "[!] Cancelled".red
+      case exception
+      when Interrupt
+        puts '[!] Cancelled'.red
         Config.instance.verbose? ? raise : exit(1)
+      when SystemExit
+        raise
       else
         if ENV['COCOA_PODS_ENV'] != 'development'
           puts UI::ErrorReport.report(exception)
@@ -76,9 +79,9 @@ module Pod
     def initialize(argv)
       super
       config.silent = argv.flag?('silent', config.silent)
-      config.verbose = self.verbose? unless self.verbose.nil?
+      config.verbose = self.verbose? unless verbose.nil?
       unless self.ansi_output?
-        String.send(:define_method, :colorize) { |string , _| string }
+        String.send(:define_method, :colorize) { |string, _| string }
       end
     end
 
@@ -96,7 +99,7 @@ module Pod
     #
     def verify_podfile_exists!
       unless config.podfile
-        raise Informative, "No `Podfile' found in the current working directory."
+        raise Informative, "No `Podfile' found in the project directory."
       end
     end
 
@@ -108,9 +111,8 @@ module Pod
     #
     def verify_lockfile_exists!
       unless config.lockfile
-        raise Informative, "No `Podfile.lock' found in the current working directory, run `pod install'."
+        raise Informative, "No `Podfile.lock' found in the project directory, run `pod install'."
       end
     end
   end
 end
-

data/lib/cocoapods/command/init.rb

@@ -4,13 +4,12 @@ require 'active_support/core_ext/string/strip'
 module Pod
   class Command
     class Init < Command
-
       self.summary = 'Generate a Podfile for the current directory.'
       self.description = <<-DESC
         Creates a Podfile for the current directory if none currently exists. If
-        an Xcode project file is specified or if there is only a single project
-        file in the current directory, targets will be automatically generated
-        based on targets defined in the project.
+        an `XCODEPROJ` project file is specified or if there is only a single
+        project file in the current directory, targets will be automatically
+        generated based on targets defined in the project.
 
         It is possible to specify a list of dependencies which will be used by
         the template in the `Podfile.default` (normal targets) `Podfile.test`
@@ -18,11 +17,11 @@ module Pod
         `~/.cocoapods/templates` folder.
       DESC
       self.arguments = [
-          ['XCODEPROJ', :optional]
+        CLAide::Argument.new('XCODEPROJ', :false),
       ]
 
       def initialize(argv)
-        @podfile_path = Pathname.pwd + "Podfile"
+        @podfile_path = Pathname.pwd + 'Podfile'
         @project_path = argv.shift_argument
         @project_paths = Pathname.pwd.children.select { |pn| pn.extname == '.xcodeproj' }
         super
@@ -30,13 +29,13 @@ module Pod
 
       def validate!
         super
-        raise Informative, "Existing Podfile found in directory" unless config.podfile.nil?
+        raise Informative, 'Existing Podfile found in directory' unless config.podfile_path_in_dir(Pathname.pwd).nil?
         if @project_path
           help! "Xcode project at #{@project_path} does not exist" unless File.exist? @project_path
           project_path = @project_path
         else
-          raise Informative, "No xcode project found, please specify one" unless @project_paths.length > 0
-          raise Informative, "Multiple xcode projects found, please specify one" unless @project_paths.length == 1
+          raise Informative, 'No xcode project found, please specify one' unless @project_paths.length > 0
+          raise Informative, 'Multiple xcode projects found, please specify one' unless @project_paths.length == 1
           project_path = @project_paths.first
         end
         @xcode_project = Xcodeproj::Project.open(project_path)
@@ -60,7 +59,8 @@ module Pod
           # Uncomment this line to define a global platform for your project
           # platform :ios, "6.0"
         PLATFORM
-        for target in project.targets
+
+        project.targets.each do |target|
           podfile << target_module(target)
         end
         podfile << "\n"
@@ -82,12 +82,11 @@ module Pod
         target_module << "\nend\n"
       end
 
-
       def template_contents(path)
         if path.exist?
-          path.read.chomp.lines.map{ |line| "  #{line}" }.join("\n")
+          path.read.chomp.lines.map { |line| "  #{line}" }.join("\n")
         else
-          String.new
+          ''
         end
       end
     end

data/lib/cocoapods/command/inter_process_communication.rb

@@ -1,7 +1,6 @@
 module Pod
   class Command
     class IPC < Command
-
       self.abstract_command = true
       self.summary = 'Inter-process communication'
 
@@ -12,11 +11,10 @@ module Pod
       #-----------------------------------------------------------------------#
 
       class Spec < IPC
-
         self.summary = 'Converts a podspec to JSON.'
         self.description = 'Converts a podspec to JSON and prints it to STDOUT.'
         self.arguments = [
-            ['PATH', :required]
+          CLAide::Argument.new('PATH', true),
         ]
 
         def initialize(argv)
@@ -26,24 +24,23 @@ module Pod
 
         def validate!
           super
-          help! "A specification path is required." unless @path
+          help! 'A specification path is required.' unless @path
         end
 
         def run
+          require 'json'
           spec = Specification.from_file(@path)
-          output_pipe.puts spec.to_json
+          output_pipe.puts(JSON.pretty_generate(spec))
         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', :required]
+          CLAide::Argument.new('PATH', true),
         ]
 
         def initialize(argv)
@@ -53,20 +50,18 @@ module Pod
 
         def validate!
           super
-          help! "A Podfile path is required." unless @path
+          help! 'A Podfile path is required.' unless @path
         end
 
         def run
           podfile = Pod::Podfile.from_file(@path)
           output_pipe.puts podfile.to_yaml
         end
-
       end
 
       #-----------------------------------------------------------------------#
 
       class List < IPC
-
         self.summary = 'Lists the specifications known to CocoaPods.'
         self.description = <<-DESC
           Prints to STDOUT a YAML dictionary where the keys are the name of the
@@ -99,13 +94,11 @@ module Pod
           end
           output_pipe.puts result.to_yaml
         end
-
       end
 
       #-----------------------------------------------------------------------#
 
       class UpdateSearchIndex < IPC
-
         self.summary = 'Updates the search index.'
         self.description = <<-DESC
           Updates the search index and prints its path to standard output.
@@ -123,13 +116,11 @@ module Pod
           SourcesManager.updated_search_index
           output_pipe.puts(SourcesManager.search_index_path)
         end
-
       end
 
       #-----------------------------------------------------------------------#
 
       class Repl < IPC
-
         END_OF_OUTPUT_SIGNAL = "\n\r"
 
         self.summary = 'The repl listens to commands on standard input.'
@@ -172,11 +163,9 @@ module Pod
             signal_end_of_output
           end
         end
-
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end

data/lib/cocoapods/command/lib.rb

@@ -10,13 +10,15 @@ module Pod
         self.summary = 'Creates a new Pod'
 
         self.description = <<-DESC
-          Creates a scaffold for the development of a new Pod according to the CocoaPods best practices.
-          If a `TEMPLATE_URL`, pointing to a git repo containing a compatible template, is specified, it will be used in place of the default one.
+          Creates a scaffold for the development of a new Pod named `NAME`
+          according to the CocoaPods best practices.
+          If a `TEMPLATE_URL`, pointing to a git repo containing a compatible
+          template, is specified, it will be used in place of the default one.
         DESC
 
         self.arguments = [
-            ['NAME',         :required],
-            ['TEMPLATE_URL', :optional]
+          CLAide::Argument.new('NAME', true),
+          CLAide::Argument.new('TEMPLATE_URL', false),
         ]
 
         def initialize(argv)
@@ -27,8 +29,8 @@ module Pod
 
         def validate!
           super
-          help! "A name for the Pod is required." unless @name
-          help! "The Pod name cannot contain spaces." if @name.match(/\s/)
+          help! 'A name for the Pod is required.' unless @name
+          help! 'The Pod name cannot contain spaces.' if @name.match(/\s/)
           help! "The Pod name cannot begin with a '.'" if @name[0, 1] == '.'
         end
 
@@ -48,9 +50,9 @@ module Pod
         executable :git
         executable :ruby
 
-        TEMPLATE_REPO = "https://github.com/CocoaPods/pod-template.git"
-        TEMPLATE_INFO_URL = "https://github.com/CocoaPods/pod-template"
-        CREATE_NEW_POD_INFO_URL = "http://guides.cocoapods.org/making/making-a-cocoapod"
+        TEMPLATE_REPO = 'https://github.com/CocoaPods/pod-template.git'
+        TEMPLATE_INFO_URL = 'https://github.com/CocoaPods/pod-template'
+        CREATE_NEW_POD_INFO_URL = 'http://guides.cocoapods.org/making/making-a-cocoapod'
 
         # Clones the template from the remote in the working directory using
         # the name of the Pod.
@@ -59,7 +61,7 @@ module Pod
         #
         def clone_template
           UI.section("Cloning `#{template_repo_url}` into `#{@name}`.") do
-            git!"clone '#{template_repo_url}' #{@name}"
+            git! "clone '#{template_repo_url}' #{@name}"
           end
         end
 
@@ -70,10 +72,10 @@ module Pod
         def configure_template
           UI.section("Configuring #{@name} template.") do
             Dir.chdir(@name) do
-              if File.exists? "configure"
-                system "./configure #{@name}"
+              if File.exist?('configure')
+                system("./configure #{@name}")
               else
-                UI.warn "Template does not have a configure file."
+                UI.warn 'Template does not have a configure file.'
               end
             end
           end
@@ -107,11 +109,11 @@ module Pod
         DESC
 
         def self.options
-          [ ["--quick",       "Lint skips checks that would require to download and build the spec"],
-            ["--only-errors", "Lint validates even if warnings are present"],
-            ["--subspec=NAME","Lint validates only the given subspec"],
-            ["--no-subspecs", "Lint skips validation of subspecs"],
-            ["--no-clean",    "Lint leaves the build directory intact for inspection"] ].concat(super)
+          [['--quick',       'Lint skips checks that would require to download and build the spec'],
+           ['--only-errors', 'Lint validates even if warnings are present'],
+           ['--subspec=NAME', 'Lint validates only the given subspec'],
+           ['--no-subspecs', 'Lint skips validation of subspecs'],
+           ['--no-clean',    'Lint leaves the build directory intact for inspection']].concat(super)
         end
 
         def initialize(argv)
@@ -151,7 +153,7 @@ module Pod
               message = "#{validator.spec.name} did not pass validation."
               if @clean
                 message << "\nYou can use the `--no-clean` option to inspect " \
-                  "any issue."
+                  'any issue.'
               end
               raise Informative, message
             end
@@ -171,19 +173,20 @@ module Pod
         # @raise  If multiple podspecs are found.
         #
         def podspecs_to_lint
-          if !@podspecs_paths.empty? then
+          if !@podspecs_paths.empty?
             Array(@podspecs_paths)
-          else 
+          else
             podspecs = Pathname.glob(Pathname.pwd + '*.podspec{.yaml,}')
-            raise Informative, "Unable to find a podspec in the working directory" if podspecs.count.zero?
+            if podspecs.count.zero?
+              raise Informative, 'Unable to find a podspec in the working ' \
+                'directory'
+            end
             podspecs
           end
         end
-
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end