cocoapods 0.3.10 → 0.5.0

data/README.md

@@ -1,5 +1,7 @@
 # CocoaPods – an Objective-C library manager
 
+[![Build Status](https://secure.travis-ci.org/CocoaPods/CocoaPods.png)](https://secure.travis-ci.org/CocoaPods/CocoaPods)
+
 CocoaPods manages library dependencies for your Xcode project.
 
 You specify the dependencies for your project in one easy text file. CocoaPods resolves dependencies between libraries, fetches source code for the dependencies, and creates and maintains an Xcode workspace to build your project.
@@ -13,15 +15,9 @@ See [the wiki](https://github.com/CocoaPods/CocoaPods/wiki) for more in depth in
 
 Downloading and installing CocoaPods only takes a few minutes.
 
-CocoaPods runs on [MacRuby](http://macruby.org). If you don't have a recent version of MacRuby installed you will need to download it. CocoaPods works best on version 0.10.
-
-    $ curl -O http://www.macruby.org/files/MacRuby%200.10.zip
-    $ open MacRuby%200.10.zip
-    # open MacRuby\ 0.10/MacRuby\ 0.10.pkg
-
-After that you can install CocoaPods itself.
+CocoaPods runs on [Ruby](http://www.ruby-lang.org/en/). To install it run the following commands:
 
-    $ sudo macgem install cocoapods
+    $ sudo gem install cocoapods
     $ pod setup
 
 Now that you've got CocoaPods installed you can easily add it to your project.

data/lib/cocoapods.rb

@@ -1,5 +1,5 @@
 module Pod
-  VERSION = '0.3.10'
+  VERSION = '0.5.0'
 
   class Informative < StandardError
   end
@@ -11,6 +11,7 @@ module Pod
   autoload :Downloader,             'cocoapods/downloader'
   autoload :Executable,             'cocoapods/executable'
   autoload :Installer,              'cocoapods/installer'
+  autoload :Platform,               'cocoapods/platform'
   autoload :Podfile,                'cocoapods/podfile'
   autoload :Resolver,               'cocoapods/resolver'
   autoload :Source,                 'cocoapods/source'
@@ -29,7 +30,7 @@ end
 
 module Xcodeproj
   autoload :Config,                 'xcodeproj/config'
-  autoload :Project,                'cocoapods/xcodeproj_ext'
+  autoload :Project,                'cocoapods/xcodeproj_pods'
   autoload :Workspace,              'xcodeproj/workspace'
 end
 

data/lib/cocoapods/dependency.rb

@@ -98,6 +98,23 @@ module Pod
       end
     end
 
+    # Taken from RubyGems 1.3.7
+    unless public_method_defined?(:match?)
+      def match?(spec_name, spec_version)
+        pattern = name
+
+        if Regexp === pattern
+          return false unless pattern =~ spec_name
+        else
+          return false unless pattern == spec_name
+        end
+
+        return true if requirement.to_s == ">= 0"
+
+        requirement.satisfied_by? Gem::Version.new(spec_version)
+      end
+    end
+
     # Taken from a newer version of RubyGems
     unless public_method_defined?(:merge)
       def merge other

data/lib/cocoapods/file_list.rb

@@ -1,4 +1,8 @@
-require 'rake'
+if RUBY_VERSION >= "1.9"
+  require 'rake/file_list'
+else
+  require 'rake'
+end
 
 # This makes Rake::FileList usable with the Specification attributes
 # source_files, clean_paths, and resources.
@@ -19,6 +23,10 @@ module Rake
   end
 end
 
+module Pod
+  FileList = Rake::FileList
+end
+
 class Pathname
   alias_method :_original_sum, :+
   def +(other)
@@ -30,5 +38,3 @@ class Pathname
     end
   end
 end
-
-

data/lib/cocoapods/installer.rb

@@ -55,8 +55,10 @@ module Pod
 
     def install_dependencies!
       build_specifications.each do |spec|
-        if spec.pod_destroot.exist?
-          puts "Using #{spec}" unless config.silent?
+        if spec.pod_destroot.exist? || spec.local?
+          message = "Using #{spec}"
+          message += " [LOCAL]" if spec.local?
+          puts message unless config.silent?
         else
           puts "Installing #{spec}" unless config.silent?
           spec = spec.part_of_specification if spec.part_of_other_pod?

data/lib/cocoapods/installer/target_installer.rb

@@ -90,12 +90,6 @@ module Pod
         end
         xcconfig.merge!('HEADER_SEARCH_PATHS' => header_search_paths.sort.uniq.join(" "))
 
-        # Now that we have added all the source files and copy header phases,
-        # move the compile build phase to the end, so that headers are copied
-        # to the build products dir first, and thus Pod source files can enjoy
-        # the same namespacing of headers as the app would.
-        @target.move_compile_phase_to_end!
-
         # Add all the target related support files to the group, even the copy
         # resources script although the project doesn't actually use them.
         support_files_group = @project.groups.find do |group|

data/lib/cocoapods/platform.rb

@@ -0,0 +1,45 @@
+module Pod
+  class Platform
+    attr_reader :options
+    
+    def initialize(symbolic_name, options = {})
+      @symbolic_name = symbolic_name
+      @options = options
+    end
+    
+    def name
+      @symbolic_name
+    end
+    
+    def ==(other_platform_or_symbolic_name)
+      if other_platform_or_symbolic_name.is_a?(Symbol)
+        @symbolic_name == other_platform_or_symbolic_name
+      else
+        self == (other_platform_or_symbolic_name.name)
+      end
+    end
+    
+    def to_s
+      name.to_s
+    end
+    
+    def to_sym
+      name
+    end
+    
+    def nil?
+      name.nil?
+    end
+    
+    def deployment_target
+      if (opt = options[:deployment_target])
+        Pod::Version.new(opt)
+      end
+    end
+    
+    def requires_legacy_ios_archs?
+      return unless deployment_target
+      (name == :ios) && (deployment_target < Pod::Version.new("4.3"))
+    end
+  end
+end

data/lib/cocoapods/podfile.rb

@@ -48,8 +48,15 @@ module Pod
     #
     # This can be either `:osx` for Mac OS X applications, or `:ios` for iOS
     # applications.
-    def platform(platform = nil)
-      platform ? @platform = platform : @platform
+    #
+    # For iOS applications, you can set the deployment target by passing a :deployment_target
+    # option, e.g:
+    #
+    #   platform :ios, :deployment_target => "4.0"
+    #
+    # If the deployment target requires it (< 4.3), armv6 will be added to ARCHS.
+    def platform(platform = nil, options={})
+      platform ? @platform = Platform.new(platform, options) : @platform
     end
 
     # Specifies a dependency of the project.
@@ -236,7 +243,7 @@ module Pod
 
     def validate!
       lines = []
-      lines << "* the `platform` attribute should be either `:osx` or `:ios`" unless [:osx, :ios].include?(@platform)
+      lines << "* the `platform` attribute should be either `:osx` or `:ios`" unless @platform && [:osx, :ios].include?(@platform.name)
       lines << "* no dependencies were specified, which is, well, kinda pointless" if dependencies.empty?
       raise(Informative, (["The Podfile at `#{@defined_in_file}' is invalid:"] + lines).join("\n")) unless lines.empty?
     end

data/lib/cocoapods/specification.rb

@@ -28,6 +28,7 @@ module Pod
     # TODO This is just to work around a MacRuby bug
     def post_initialize
       @dependencies, @source_files, @resources, @clean_paths, @subspecs = [], [], [], [], []
+      @platform = Platform.new(nil)
       @xcconfig = Xcodeproj::Config.new
     end
 
@@ -123,7 +124,10 @@ module Pod
       flags
     end
 
-    attr_accessor :platform
+    def platform=(platform)
+      @platform = Platform.new(platform)
+    end
+    attr_reader :platform
 
     attr_accessor :requires_arc
 
@@ -148,6 +152,14 @@ module Pod
     attr_accessor :defined_in_set
 
     include Config::Mixin
+    
+    def local?
+      !source[:local].nil?
+    end
+    
+    def local_path
+      Pathname.new(File.expand_path(source[:local]))
+    end
 
     def wrapper?
       source_files.empty? && !subspecs.empty?
@@ -191,6 +203,8 @@ module Pod
     def pod_destroot
       if part_of_other_pod?
         part_of_specification.pod_destroot
+      elsif local?
+        local_path
       else
         config.project_pods_root + @name
       end
@@ -321,7 +335,7 @@ module Pod
 
       incorrect = []
       allowed = [nil, :ios, :osx]
-      incorrect << ["`platform'", allowed] unless allowed.include?(platform)
+      incorrect << ["`platform'", allowed] unless allowed.include?(platform.name)
 
       unless missing.empty? && incorrect.empty?
         message = "The following #{(missing + incorrect).size == 1 ? 'attribute is' : 'attributes are'}:\n"

data/lib/cocoapods/specification/set.rb

@@ -26,7 +26,8 @@ module Pod
 
       def required_by(specification)
         dependency = specification.dependency_by_top_level_spec_name(name)
-        unless @required_by.empty? || dependency.requirement.satisfied_by?(required_version)
+        # TODO we don’t actually do anything in our Version subclass. Maybe we should just remove that.
+        unless @required_by.empty? || dependency.requirement.satisfied_by?(Gem::Version.new(required_version.to_s))
           # TODO add graph that shows which dependencies led to this.
           raise Informative, "#{specification} tries to activate `#{dependency}', " \
                              "but already activated version `#{required_version}' " \

data/lib/cocoapods/{xcodeproj_ext.rb → xcodeproj_pods.rb}

@@ -1,4 +1,4 @@
-require 'xcodeproj'
+require 'xcodeproj/project'
 
 module Xcodeproj
   class Project
@@ -11,18 +11,14 @@ module Xcodeproj
     def add_pod_group(name)
       pods.groups.new('name' => name)
     end
-
-    class PBXNativeTarget
-      def move_compile_phase_to_end!
-        reflection = self.class.reflection(:buildPhases)
-        uuids = send(reflection.uuids_getter)
-        phase = buildPhases.find { |phase| phase.is_a?(PBXSourcesBuildPhase) }
-        uuids.delete(phase.uuid)
-        uuids << phase.uuid
-        phase = buildPhases.find { |phase| phase.is_a?(PBXFrameworksBuildPhase) }
-        uuids.delete(phase.uuid)
-        uuids << phase.uuid
-      end
+    
+    # Shortcut access to build configurations
+    def build_configurations
+      objects[root_object.attributes['buildConfigurationList']].buildConfigurations
+    end
+    
+    def build_configuration(name)
+      build_configurations.find { |c| c.name == name }
     end
 
     class PBXCopyFilesBuildPhase
@@ -97,8 +93,11 @@ module Xcodeproj
     }
 
     def self.build_settings(platform, scheme)
-      settings = COMMON_BUILD_SETTINGS[:all].merge(COMMON_BUILD_SETTINGS[platform])
+      settings = COMMON_BUILD_SETTINGS[:all].merge(COMMON_BUILD_SETTINGS[platform.name])
       settings['COPY_PHASE_STRIP'] = scheme == :debug ? 'NO' : 'YES'
+      if platform.requires_legacy_ios_archs?
+        settings['ARCHS'] = "armv6 armv7"
+      end
       if scheme == :debug
         settings.merge!(COMMON_BUILD_SETTINGS[:debug])
         settings['ONLY_ACTIVE_ARCH'] = 'YES' if platform == :osx

metadata

@@ -1,50 +1,43 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cocoapods
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 10
-  version: 0.3.10
+version: !ruby/object:Gem::Version
+  version: 0.5.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-22 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: xcodeproj
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: &70184002384740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 2
-        version: 0.0.2
+      - !ruby/object:Gem::Version
+        version: 0.1.0
   type: :runtime
-  version_requirements: *id001
-description: |-
-  CocoaPods manages library dependencies for your Xcode project.
-  
-  You specify the dependencies for your project in one easy text file. CocoaPods resolves dependencies between libraries, fetches source code for the dependencies, and creates and maintains an Xcode workspace to build your project.
-  
-  Ultimately, the goal is to improve discoverability of, and engagement in, third party open-source libraries, by creating a more centralized ecosystem.
+  prerelease: false
+  version_requirements: *70184002384740
+description: ! 'CocoaPods manages library dependencies for your Xcode project.
+
+
+  You specify the dependencies for your project in one easy text file. CocoaPods resolves
+  dependencies between libraries, fetches source code for the dependencies, and creates
+  and maintains an Xcode workspace to build your project.
+
+
+  Ultimately, the goal is to improve discoverability of, and engagement in, third
+  party open-source libraries, by creating a more centralized ecosystem.'
 email: eloy.de.enige@gmail.com
-executables: 
+executables:
 - pod
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/cocoapods/command/install.rb
 - lib/cocoapods/command/list.rb
 - lib/cocoapods/command/repo.rb
@@ -64,47 +57,43 @@ files:
 - lib/cocoapods/generator/copy_resources_script.rb
 - lib/cocoapods/installer/target_installer.rb
 - lib/cocoapods/installer.rb
+- lib/cocoapods/platform.rb
 - lib/cocoapods/podfile.rb
 - lib/cocoapods/resolver.rb
 - lib/cocoapods/source.rb
 - lib/cocoapods/specification/set.rb
 - lib/cocoapods/specification.rb
 - lib/cocoapods/version.rb
-- lib/cocoapods/xcodeproj_ext.rb
+- lib/cocoapods/xcodeproj_pods.rb
 - lib/cocoapods.rb
 - bin/pod
 - README.md
 - LICENSE
 - CHANGELOG.md
-has_rdoc: true
 homepage: https://github.com/CocoaPods/CocoaPods
-licenses: 
+licenses:
 - MIT
-post_install_message: "[!] If this is your first time install of CocoaPods, or if you are upgrading, first run: $ pod setup"
+post_install_message: ! '[!] If this is your first time install of CocoaPods, or if
+  you are upgrading, first run: $ pod setup'
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: An Objective-C library package manager. (Requires MacRuby.)
 test_files: []
-