cocoapods 0.3.2 → 0.3.3

data/lib/cocoapods.rb

@@ -1,5 +1,5 @@
 module Pod
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 
   class Informative < StandardError
   end
@@ -20,6 +20,11 @@ module Pod
 
   autoload :Pathname,               'pathname'
   autoload :FileList,               'cocoapods/file_list'
+
+  module Generator
+    autoload :BridgeSupport,        'cocoapods/generator/bridge_support'
+    autoload :CopyResourcesScript,  'cocoapods/generator/copy_resources_script'
+  end
 end
 
 module Xcodeproj

data/lib/cocoapods/generator/bridge_support.rb

@@ -0,0 +1,25 @@
+module Pod
+  module Generator
+    class BridgeSupport
+      include Config::Mixin
+
+      extend Executable
+      executable :gen_bridge_metadata
+
+      attr_reader :headers
+
+      def initialize(headers)
+        @headers = headers
+      end
+
+      def search_paths
+        @headers.map { |header| "-I '#{header.dirname}'" }.uniq
+      end
+
+      def save_as(pathname)
+        puts "==> Generating BridgeSupport metadata file at `#{pathname}'" unless config.silent?
+        gen_bridge_metadata %{-c "#{search_paths.join(' ')}" -o '#{pathname}' '#{headers.join("' '")}'}
+      end
+    end
+  end
+end

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -0,0 +1,33 @@
+module Pod
+  module Generator
+    class CopyResourcesScript
+      CONTENT = <<EOS
+#!/bin/sh
+
+install_resource()
+{
+  echo "cp -R ${SRCROOT}/Pods/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  cp -R ${SRCROOT}/Pods/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}
+}
+EOS
+
+      attr_reader :resources
+
+      # A list of files relative to the project pods root.
+      def initialize(resources)
+        @resources = resources
+      end
+
+      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

@@ -1,5 +1,3 @@
-require 'yaml'
-
 module Pod
   class Installer
     module Shared
@@ -16,36 +14,6 @@ module Pod
       end
     end
 
-    class CopyResourcesScript
-      CONTENT = <<EOS
-#!/bin/sh
-
-install_resource()
-{
-  echo "cp -R ${SRCROOT}/Pods/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-  cp -R ${SRCROOT}/Pods/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}
-}
-EOS
-
-      attr_reader :resources
-
-      # A list of files relative to the project pods root.
-      def initialize(resources)
-        @resources = resources
-      end
-
-      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
-
     class TargetInstaller
       include Config::Mixin
       include Shared
@@ -72,7 +40,7 @@ EOS
       end
 
       def copy_resources_script
-        @copy_resources_script ||= CopyResourcesScript.new(build_specifications.map do |spec|
+        @copy_resources_script ||= Generator::CopyResourcesScript.new(build_specifications.map do |spec|
           spec.expanded_resources
         end.flatten)
       end
@@ -82,7 +50,7 @@ EOS
       end
 
       def bridge_support_generator
-        BridgeSupportGenerator.new(build_specifications.map do |spec|
+        Generator::BridgeSupport.new(build_specifications.map do |spec|
           spec.header_files.map do |header|
             config.project_pods_root + header
           end
@@ -93,7 +61,7 @@ EOS
         "#{@definition.lib_name}.bridgesupport"
       end
 
-      # TODO move out
+      # TODO move out to Generator::PrefixHeader
       def save_prefix_header_as(pathname)
         pathname.open('w') do |header|
           header.puts "#ifdef __OBJC__"
@@ -131,6 +99,12 @@ EOS
         end
         xcconfig.merge!('USER_HEADER_SEARCH_PATHS' => user_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|
@@ -261,6 +235,7 @@ EOS
     # 3. Let the user specify the app target name as an extra argument, but this
     #    seems to be a less good version of the variation on #2.
     def configure_project(projpath)
+      # TODO use more of Pathname’s API here
       root = File.dirname(projpath)
       xcworkspace = File.join(root, File.basename(projpath, '.xcodeproj') + '.xcworkspace')
       workspace = Xcodeproj::Workspace.new_from_xcworkspace(xcworkspace)
@@ -293,6 +268,10 @@ EOS
       app_project.targets.each { |target| target.buildPhases << copy_resources }
       
       app_project.save_as(projpath)
+
+      unless config.silent?
+        puts "[!] From now on use `#{File.basename(xcworkspace)}' instead of `#{File.basename(projpath)}'."
+      end
     end
   end
 end

data/lib/cocoapods/xcodeproj_ext.rb

@@ -12,10 +12,23 @@ module Xcodeproj
       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
+    end
+
     class PBXCopyFilesBuildPhase
       def self.new_pod_dir(project, pod_name, path)
         new(project, nil, {
-          "dstPath" => "$(PRODUCT_NAME)/#{path}",
+          "dstPath" => "Pods/#{path}",
           "name"    => "Copy #{pod_name} Public Headers",
         })
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Eloy Duran
@@ -45,7 +45,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/cocoapods/bridge_support_generator.rb
 - lib/cocoapods/command/install.rb
 - lib/cocoapods/command/repo.rb
 - lib/cocoapods/command/search.rb
@@ -57,6 +56,8 @@ files:
 - lib/cocoapods/downloader.rb
 - lib/cocoapods/executable.rb
 - lib/cocoapods/file_list.rb
+- lib/cocoapods/generator/bridge_support.rb
+- lib/cocoapods/generator/copy_resources_script.rb
 - lib/cocoapods/installer.rb
 - lib/cocoapods/podfile.rb
 - lib/cocoapods/resolver.rb

data/lib/cocoapods/bridge_support_generator.rb

@@ -1,23 +0,0 @@
-module Pod
-  class BridgeSupportGenerator
-    include Config::Mixin
-
-    extend Executable
-    executable :gen_bridge_metadata
-
-    attr_reader :headers
-
-    def initialize(headers)
-      @headers = headers
-    end
-
-    def search_paths
-      @headers.map { |header| "-I '#{header.dirname}'" }.uniq
-    end
-
-    def save_as(pathname)
-      puts "==> Generating BridgeSupport metadata file at `#{pathname}'" unless config.silent?
-      gen_bridge_metadata %{-c "#{search_paths.join(' ')}" -o '#{pathname}' '#{headers.join("' '")}'}
-    end
-  end
-end