cocoapods 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 089fd601f4b77b13ce571371163234e74681fc6a
-  data.tar.gz: 2ba921d00ae8b35bad6446d8d86bc4437766dcec
+  metadata.gz: eeda2d6ab232bd8f105714f6a51b3986ca80b775
+  data.tar.gz: 5fbdf86b804049c847b316843922500fd3d187d7
 SHA512:
-  metadata.gz: dc073ce49be6c7c75b2e80f4eb888bb68d623f9041721129877a1a074eafa231e984f3ff93b25756784cf43e0bb741a1e7405ceb7d177799f14b920d1c64afcc
-  data.tar.gz: b21370ae05fa41e645bcf4d7ce27ee6e2b13507098ce5b4540f54cdd2b042ff26981cea047169379d911eac0835a72575842195ff5acfd0c7699142fdbf235ff
+  metadata.gz: 871f362cd52240407bf82ae6d82c120fb44e4d00c2cf5d0c6ce1f71c05eea7efccbfa046224600b8a268357992bab0603e6d66b13544ef573427e49ef8fc3d69
+  data.tar.gz: 74971c13eded91890a16897f00dfab17a1d9d3248ba7e2a1b19fbb924ced964f76f711ff607cb065790b552d906c8d6ab6d476c05fb1fc302d465e51500f4e42

data/CHANGELOG.md

@@ -4,6 +4,50 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.0.1 (2016-06-02)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Symlink the header folders in the framework bundle's root directory
+  by a new shell script build phase if `header_mappings_dir` is used
+  with frameworks.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+  [#5313](https://github.com/CocoaPods/CocoaPods/issues/5313)
+
+* Removed emojis in Build Phases names — as it seems that some third party tools have trouble with them.  
+  [Olivier Halligon](https://github.com/AliSoftware)
+  [#5382](https://github.com/CocoaPods/CocoaPods/pull/5382)
+
+* Ensure `Set` is defined before using it.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#5287](https://github.com/CocoaPods/CocoaPods/issues/5287)
+
+* Add --target-device to ibtool invocation for XIBs
+  [Juan Civile](https://github.com/champo)
+  [#5282](https://github.com/CocoaPods/CocoaPods/issues/5282)
+
+* Fix error when executables cannot be found.
+  [Jan Berkel](https://github.com/jberkel)
+  [#5319](https://github.com/CocoaPods/CocoaPods/pull/5319)
+
+* Avoid removing all files when root directory contains unicode characters.  
+  [Marc Boquet](https://github.com/marcboquet)
+  [#5294](https://github.com/CocoaPods/CocoaPods/issues/5294)
+
+* Guarding from crash if pod lib create has a + character in the name.  
+  [William Entriken](https://github.com/fulldecent)
+  [CocoaPods/pod-template#69](https://github.com/CocoaPods/pod-template/issues/69)
+
+* Use target product types to determine whether a target is a test target when
+  running `pod init`.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#5378](https://github.com/CocoaPods/CocoaPods/issues/5378)
+
+
 ## 1.0.0 (2016-05-10)
 
 ##### Enhancements

data/lib/cocoapods/command.rb

@@ -22,7 +22,7 @@ module Pod
     require 'cocoapods/command/env'
     require 'cocoapods/command/init'
     require 'cocoapods/command/install'
-    require 'cocoapods/command/inter_process_communication'
+    require 'cocoapods/command/ipc'
     require 'cocoapods/command/lib'
     require 'cocoapods/command/list'
     require 'cocoapods/command/outdated'

data/lib/cocoapods/command/init.rb

@@ -63,7 +63,7 @@ module Pod
         # Split out the targets into app and test targets
         test_targets, app_targets = project.native_targets.
                               sort_by { |t| t.name.downcase }.
-                              partition { |t| t.name =~ /test/i }
+                              partition(&:test_target_type?)
 
         app_targets.each do |app_target|
           test_targets_for_app = test_targets.select do |target|

data/lib/cocoapods/command/ipc.rb

@@ -0,0 +1,18 @@
+require 'cocoapods/command/ipc/list'
+require 'cocoapods/command/ipc/podfile'
+require 'cocoapods/command/ipc/repl'
+require 'cocoapods/command/ipc/spec'
+require 'cocoapods/command/ipc/update_search_index'
+
+module Pod
+  class Command
+    class IPC < Command
+      self.abstract_command = true
+      self.summary = 'Inter-process communication'
+
+      def output_pipe
+        STDOUT
+      end
+    end
+  end
+end

data/lib/cocoapods/command/ipc/list.rb

@@ -0,0 +1,40 @@
+module Pod
+  class Command
+    class IPC < Command
+      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
+          specifications and each corresponding value is a dictionary with
+          the following keys:
+          - defined_in_file
+          - version
+          - authors
+          - summary
+          - description
+          - platforms
+        DESC
+
+        def run
+          require 'yaml'
+          sets = config.sources_manager.aggregate.all_sets
+          result = {}
+          sets.each do |set|
+            begin
+              spec = set.specification
+              result[spec.name] = {
+                'authors' => spec.authors.keys,
+                'summary' => spec.summary,
+                'description' => spec.description,
+                'platforms' => spec.available_platforms.map { |p| p.name.to_s },
+              }
+            rescue DSLError
+              next
+            end
+          end
+          output_pipe.puts result.to_yaml
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/command/ipc/podfile.rb

@@ -0,0 +1,31 @@
+module Pod
+  class Command
+    class IPC < Command
+      class Podfile < IPC
+        include ProjectDirectory
+
+        self.summary = 'Converts a Podfile to YAML'
+        self.description = 'Converts a Podfile to YAML and prints it to STDOUT.'
+        self.arguments = [
+          CLAide::Argument.new('PATH', true),
+        ]
+
+        def initialize(argv)
+          @path = argv.shift_argument
+          super
+        end
+
+        def validate!
+          super
+          help! 'A Podfile path is required.' unless @path
+        end
+
+        def run
+          require 'yaml'
+          podfile = Pod::Podfile.from_file(@path)
+          output_pipe.puts podfile.to_yaml
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/command/ipc/repl.rb

@@ -0,0 +1,51 @@
+module Pod
+  class Command
+    class IPC < Command
+      class Repl < IPC
+        include ProjectDirectory
+
+        END_OF_OUTPUT_SIGNAL = "\n\r".freeze
+
+        self.summary = 'The repl listens to commands on standard input'
+        self.description = <<-DESC
+          The repl listens to commands on standard input and prints their
+          result to standard output.
+          It accepts all the other ipc subcommands. The repl will signal the
+          end of output with the the ASCII CR+LF `\\n\\r`.
+        DESC
+
+        def run
+          print_version
+          signal_end_of_output
+          listen
+        end
+
+        def print_version
+          output_pipe.puts "version: '#{Pod::VERSION}'"
+        end
+
+        def signal_end_of_output
+          output_pipe.puts(END_OF_OUTPUT_SIGNAL)
+          STDOUT.flush
+        end
+
+        def listen
+          while repl_command = STDIN.gets
+            execute_repl_command(repl_command)
+          end
+        end
+
+        def execute_repl_command(repl_command)
+          unless repl_command == '\n'
+            repl_commands = repl_command.split
+            subcommand = repl_commands.shift.capitalize
+            arguments = repl_commands
+            subcommand_class = Pod::Command::IPC.const_get(subcommand)
+            subcommand_class.new(CLAide::ARGV.new(arguments)).run
+            signal_end_of_output
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/command/ipc/spec.rb

@@ -0,0 +1,29 @@
+module Pod
+  class Command
+    class IPC < Command
+      class Spec < IPC
+        self.summary = 'Converts a podspec to JSON'
+        self.description = 'Converts a podspec to JSON and prints it to STDOUT.'
+        self.arguments = [
+          CLAide::Argument.new('PATH', true),
+        ]
+
+        def initialize(argv)
+          @path = argv.shift_argument
+          super
+        end
+
+        def validate!
+          super
+          help! 'A specification path is required.' unless @path
+        end
+
+        def run
+          require 'json'
+          spec = Specification.from_file(@path)
+          output_pipe.puts(spec.to_pretty_json)
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/command/ipc/update_search_index.rb

@@ -0,0 +1,24 @@
+module Pod
+  class Command
+    class IPC < Command
+      class UpdateSearchIndex < IPC
+        self.summary = 'Updates the search index'
+        self.description = <<-DESC
+          Updates the search index and prints its path to standard output.
+          The search index is a YAML encoded dictionary where the keys
+          are the names of the Pods and the values are a dictionary containing
+          the following information:
+          - version
+          - summary
+          - description
+          - authors
+        DESC
+
+        def run
+          config.sources_manager.updated_search_index
+          output_pipe.puts(config.sources_manager.search_index_path)
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/command/lib.rb

@@ -1,215 +1,11 @@
+require 'cocoapods/command/lib/create'
+require 'cocoapods/command/lib/lint'
+
 module Pod
   class Command
     class Lib < Command
       self.abstract_command = true
       self.summary = 'Develop pods'
-
-      #-----------------------------------------------------------------------#
-
-      class Create < Lib
-        self.summary = 'Creates a new Pod'
-
-        self.description = <<-DESC
-          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 = [
-          CLAide::Argument.new('NAME', true),
-        ]
-
-        def self.options
-          [
-            ['--template-url=URL', 'The URL of the git repo containing a ' \
-                                  'compatible template'],
-          ].concat(super)
-        end
-
-        def initialize(argv)
-          @name = argv.shift_argument
-          @template_url = argv.option('template-url', TEMPLATE_REPO)
-          super
-          @additional_args = argv.remainder!
-        end
-
-        def validate!
-          super
-          help! 'A name for the Pod is required.' unless @name
-          help! 'The Pod name cannot contain spaces.' if @name =~ /\s/
-          help! "The Pod name cannot begin with a '.'" if @name[0, 1] == '.'
-        end
-
-        def run
-          clone_template
-          configure_template
-          print_info
-        end
-
-        private
-
-        #----------------------------------------#
-
-        # !@group Private helpers
-
-        extend Executable
-        executable :git
-
-        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.
-        #
-        # @return [void]
-        #
-        def clone_template
-          UI.section("Cloning `#{template_repo_url}` into `#{@name}`.") do
-            git! ['clone', template_repo_url, @name]
-          end
-        end
-
-        # Runs the template configuration utilities.
-        #
-        # @return [void]
-        #
-        def configure_template
-          UI.section("Configuring #{@name} template.") do
-            Dir.chdir(@name) do
-              if File.exist?('configure')
-                system('./configure', @name, *@additional_args)
-              else
-                UI.warn 'Template does not have a configure file.'
-              end
-            end
-          end
-        end
-
-        # Runs the template configuration utilities.
-        #
-        # @return [void]
-        #
-        def print_info
-          UI.puts "\nTo learn more about the template see `#{template_repo_url}`."
-          UI.puts "To learn more about creating a new pod, see `#{CREATE_NEW_POD_INFO_URL}`."
-        end
-
-        # Checks if a template URL is given else returns the TEMPLATE_REPO URL
-        #
-        # @return String
-        #
-        def template_repo_url
-          @template_url || TEMPLATE_REPO
-        end
-      end
-
-      #-----------------------------------------------------------------------#
-
-      class Lint < Lib
-        self.summary = 'Validates a Pod'
-
-        self.description = <<-DESC
-          Validates the Pod using the files in the working directory.
-        DESC
-
-        def self.options
-          [
-            ['--quick', 'Lint skips checks that would require to download and build the spec'],
-            ['--allow-warnings', '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'],
-            ['--fail-fast', 'Lint stops on the first failing platform or subspec'],
-            ['--use-libraries', 'Lint uses static libraries to install the spec'],
-            ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to pull dependent pods ' \
-             '(defaults to https://github.com/CocoaPods/Specs.git). ' \
-             'Multiple sources must be comma-delimited.'],
-            ['--private', 'Lint skips checks that apply only to public specs'],
-          ].concat(super)
-        end
-
-        def initialize(argv)
-          @quick           = argv.flag?('quick')
-          @allow_warnings  = argv.flag?('allow-warnings')
-          @clean           = argv.flag?('clean', true)
-          @fail_fast       = argv.flag?('fail-fast', false)
-          @subspecs        = argv.flag?('subspecs', true)
-          @only_subspec    = argv.option('subspec')
-          @use_frameworks  = !argv.flag?('use-libraries')
-          @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
-          @private         = argv.flag?('private', false)
-          @podspecs_paths  = argv.arguments!
-          super
-        end
-
-        def validate!
-          super
-        end
-
-        def run
-          UI.puts
-          podspecs_to_lint.each do |podspec|
-            validator                = Validator.new(podspec, @source_urls)
-            validator.local          = true
-            validator.quick          = @quick
-            validator.no_clean       = !@clean
-            validator.fail_fast      = @fail_fast
-            validator.allow_warnings = @allow_warnings
-            validator.no_subspecs    = !@subspecs || @only_subspec
-            validator.only_subspec   = @only_subspec
-            validator.use_frameworks = @use_frameworks
-            validator.ignore_public_only_results = @private
-            validator.validate
-
-            unless @clean
-              UI.puts "Pods workspace available at `#{validator.validation_dir}/App.xcworkspace` for inspection."
-              UI.puts
-            end
-            if validator.validated?
-              UI.puts "#{validator.spec.name} passed validation.".green
-            else
-              spec_name = podspec
-              spec_name = validator.spec.name if validator.spec
-              message = "#{spec_name} did not pass validation, due to #{validator.failure_reason}."
-
-              if @clean
-                message << "\nYou can use the `--no-clean` option to inspect " \
-                  'any issue.'
-              end
-              raise Informative, message
-            end
-          end
-        end
-
-        private
-
-        #----------------------------------------#
-
-        # !@group Private helpers
-
-        # @return [Pathname] The path of the podspec found in the current
-        #         working directory.
-        #
-        # @raise  If no podspec is found.
-        # @raise  If multiple podspecs are found.
-        #
-        def podspecs_to_lint
-          if !@podspecs_paths.empty?
-            Array(@podspecs_paths)
-          else
-            podspecs = Pathname.glob(Pathname.pwd + '*.podspec{.json,}')
-            if podspecs.count.zero?
-              raise Informative, 'Unable to find a podspec in the working ' \
-                'directory'
-            end
-            podspecs
-          end
-        end
-      end
-
-      #-----------------------------------------------------------------------#
     end
   end
 end

data/lib/cocoapods/command/lib/create.rb

@@ -0,0 +1,105 @@
+module Pod
+  class Command
+    class Lib < Command
+      class Create < Lib
+        self.summary = 'Creates a new Pod'
+
+        self.description = <<-DESC
+          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 = [
+          CLAide::Argument.new('NAME', true),
+        ]
+
+        def self.options
+          [
+            ['--template-url=URL', 'The URL of the git repo containing a ' \
+                                  'compatible template'],
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @name = argv.shift_argument
+          @template_url = argv.option('template-url', TEMPLATE_REPO)
+          super
+          @additional_args = argv.remainder!
+        end
+
+        def validate!
+          super
+          help! 'A name for the Pod is required.' unless @name
+          help! 'The Pod name cannot contain spaces.' if @name =~ /\s/
+          help! 'The Pod name cannot contain plusses.' if @name =~ /\+/
+          help! "The Pod name cannot begin with a '.'" if @name[0, 1] == '.'
+        end
+
+        def run
+          clone_template
+          configure_template
+          print_info
+        end
+
+        private
+
+        #----------------------------------------#
+
+        # !@group Private helpers
+
+        extend Executable
+        executable :git
+
+        TEMPLATE_REPO = 'https://github.com/CocoaPods/pod-template.git'.freeze
+        TEMPLATE_INFO_URL = 'https://github.com/CocoaPods/pod-template'.freeze
+        CREATE_NEW_POD_INFO_URL = 'http://guides.cocoapods.org/making/making-a-cocoapod'.freeze
+
+        # Clones the template from the remote in the working directory using
+        # the name of the Pod.
+        #
+        # @return [void]
+        #
+        def clone_template
+          UI.section("Cloning `#{template_repo_url}` into `#{@name}`.") do
+            git! ['clone', template_repo_url, @name]
+          end
+        end
+
+        # Runs the template configuration utilities.
+        #
+        # @return [void]
+        #
+        def configure_template
+          UI.section("Configuring #{@name} template.") do
+            Dir.chdir(@name) do
+              if File.exist?('configure')
+                system('./configure', @name, *@additional_args)
+              else
+                UI.warn 'Template does not have a configure file.'
+              end
+            end
+          end
+        end
+
+        # Runs the template configuration utilities.
+        #
+        # @return [void]
+        #
+        def print_info
+          UI.puts "\nTo learn more about the template see `#{template_repo_url}`."
+          UI.puts "To learn more about creating a new pod, see `#{CREATE_NEW_POD_INFO_URL}`."
+        end
+
+        # Checks if a template URL is given else returns the TEMPLATE_REPO URL
+        #
+        # @return String
+        #
+        def template_repo_url
+          @template_url || TEMPLATE_REPO
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/command/lib/lint.rb

@@ -0,0 +1,107 @@
+module Pod
+  class Command
+    class Lib < Command
+      class Lint < Lib
+        self.summary = 'Validates a Pod'
+
+        self.description = <<-DESC
+          Validates the Pod using the files in the working directory.
+        DESC
+
+        def self.options
+          [
+            ['--quick', 'Lint skips checks that would require to download and build the spec'],
+            ['--allow-warnings', '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'],
+            ['--fail-fast', 'Lint stops on the first failing platform or subspec'],
+            ['--use-libraries', 'Lint uses static libraries to install the spec'],
+            ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to pull dependent pods ' \
+             '(defaults to https://github.com/CocoaPods/Specs.git). ' \
+             'Multiple sources must be comma-delimited.'],
+            ['--private', 'Lint skips checks that apply only to public specs'],
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @quick           = argv.flag?('quick')
+          @allow_warnings  = argv.flag?('allow-warnings')
+          @clean           = argv.flag?('clean', true)
+          @fail_fast       = argv.flag?('fail-fast', false)
+          @subspecs        = argv.flag?('subspecs', true)
+          @only_subspec    = argv.option('subspec')
+          @use_frameworks  = !argv.flag?('use-libraries')
+          @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
+          @private         = argv.flag?('private', false)
+          @podspecs_paths  = argv.arguments!
+          super
+        end
+
+        def validate!
+          super
+        end
+
+        def run
+          UI.puts
+          podspecs_to_lint.each do |podspec|
+            validator                = Validator.new(podspec, @source_urls)
+            validator.local          = true
+            validator.quick          = @quick
+            validator.no_clean       = !@clean
+            validator.fail_fast      = @fail_fast
+            validator.allow_warnings = @allow_warnings
+            validator.no_subspecs    = !@subspecs || @only_subspec
+            validator.only_subspec   = @only_subspec
+            validator.use_frameworks = @use_frameworks
+            validator.ignore_public_only_results = @private
+            validator.validate
+
+            unless @clean
+              UI.puts "Pods workspace available at `#{validator.validation_dir}/App.xcworkspace` for inspection."
+              UI.puts
+            end
+            if validator.validated?
+              UI.puts "#{validator.spec.name} passed validation.".green
+            else
+              spec_name = podspec
+              spec_name = validator.spec.name if validator.spec
+              message = "#{spec_name} did not pass validation, due to #{validator.failure_reason}."
+
+              if @clean
+                message << "\nYou can use the `--no-clean` option to inspect " \
+                  'any issue.'
+              end
+              raise Informative, message
+            end
+          end
+        end
+
+        private
+
+        #----------------------------------------#
+
+        # !@group Private helpers
+
+        # @return [Pathname] The path of the podspec found in the current
+        #         working directory.
+        #
+        # @raise  If no podspec is found.
+        # @raise  If multiple podspecs are found.
+        #
+        def podspecs_to_lint
+          if !@podspecs_paths.empty?
+            Array(@podspecs_paths)
+          else
+            podspecs = Pathname.glob(Pathname.pwd + '*.podspec{.json,}')
+            if podspecs.count.zero?
+              raise Informative, 'Unable to find a podspec in the working ' \
+                'directory'
+            end
+            podspecs
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/command/repo/push.rb

@@ -49,14 +49,13 @@ module Pod
         end
 
         def validate!
+          super
           help! 'A spec-repo name is required.' unless @repo
           unless @source.repo.directory?
             raise Informative,
                   "Unable to find the `#{@repo}` repo. " \
                   'If it has not yet been cloned, add it via `pod repo add`.'
           end
-
-          super
         end
 
         def run

data/lib/cocoapods/config.rb

@@ -1,3 +1,5 @@
+require 'active_support/multibyte/unicode'
+
 module Pod
   # Stores the global configuration of CocoaPods.
   #
@@ -145,7 +147,8 @@ module Pod
     #         Podfile is located.
     #
     def installation_root
-      current_path = Pathname.pwd
+      current_dir = ActiveSupport::Multibyte::Unicode.normalize(Dir.pwd)
+      current_path = Pathname.new(current_dir)
       unless @installation_root
         until current_path.root?
           if podfile_path_in_dir(current_path)

data/lib/cocoapods/executable.rb

@@ -108,7 +108,7 @@ module Pod
     #
     def self.which!(program)
       which(program).tap do |bin|
-        raise Informative, "Unable to locate the executable `#{executable}`" unless bin
+        raise Informative, "Unable to locate the executable `#{program}`" unless bin
       end
     end
 

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the CocoaPods command line tool.
   #
-  VERSION = '1.0.0'.freeze unless defined? Pod::VERSION
+  VERSION = '1.0.1'.freeze unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -144,8 +144,8 @@ EOM
       ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}
       ;;
     *\.xib)
-      echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT}"
-      ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}"
+      echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}"
+      ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}
       ;;
     *.framework)
       echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"

data/lib/cocoapods/installer/analyzer/target_inspector.rb

@@ -72,7 +72,7 @@ module Pod
             else
               raise Informative, 'Could not automatically select an Xcode project. ' \
                 "Specify one in your Podfile like so:\n\n" \
-                "    xcodeproj 'path/to/Project.xcodeproj'\n"
+                "    project 'path/to/Project.xcodeproj'\n"
             end
           end
           path

data/lib/cocoapods/installer/target_installer/pod_target_installer.rb

@@ -32,6 +32,7 @@ module Pod
                                      target.file_accessors.flat_map(&:public_headers).map(&:basename)
               end
             end
+            create_build_phase_to_symlink_header_folders
           end
           create_prefix_header
           create_dummy_source
@@ -216,6 +217,26 @@ module Pod
         end
       end
 
+      # Creates a build phase which links the versioned header folders
+      # of the OS X into the framework bundle's root root directory.
+      # This is only necessary because the way how headers are copied
+      # via custom copy file build phases in combination with
+      # header_mappings_dir interferes with xcodebuild's expectations
+      # about the existence of private or public headers.
+      #
+      # @return [void]
+      #
+      def create_build_phase_to_symlink_header_folders
+        return unless target.platform.name == :osx && header_mappings_dir
+
+        build_phase = native_target.new_shell_script_build_phase('Create Symlinks to Header Folders')
+        build_phase.shell_script = <<-eos.strip_heredoc
+          cd "$CONFIGURATION_BUILD_DIR/$WRAPPER_NAME"
+          ln -fs ${PUBLIC_HEADERS_FOLDER_PATH\#$WRAPPER_NAME/} ${PUBLIC_HEADERS_FOLDER_PATH\#\$CONTENTS_FOLDER_PATH/}
+          ln -fs ${PRIVATE_HEADERS_FOLDER_PATH\#\$WRAPPER_NAME/} ${PRIVATE_HEADERS_FOLDER_PATH\#\$CONTENTS_FOLDER_PATH/}
+        eos
+      end
+
       # Creates a prefix header file which imports `UIKit` or `Cocoa` according
       # to the platform of the target. This file also include any prefix header
       # content reported by the specification of the pods.

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -11,7 +11,7 @@ module Pod
 
         # @return [String] the PACKAGE emoji to use as prefix for every build phase aded to the user project
         #
-        BUILD_PHASE_PREFIX = "\u{1F4E6} ".freeze
+        BUILD_PHASE_PREFIX = '[CP] '.freeze
 
         # @return [String] the name of the check manifest phase
         #
@@ -215,8 +215,7 @@ module Pod
         def create_or_update_build_phase(target, phase_name, phase_class = Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
           prefixed_phase_name = BUILD_PHASE_PREFIX + phase_name
           build_phases = target.build_phases.grep(phase_class)
-          build_phases.find { |phase| phase.name == prefixed_phase_name } ||
-            build_phases.find { |phase| phase.name == phase_name }.tap { |p| p.name = prefixed_phase_name if p } ||
+          build_phases.find { |phase| phase.name && phase.name.end_with?(phase_name) }.tap { |p| p.name = prefixed_phase_name if p } ||
             target.project.new(phase_class).tap do |phase|
               UI.message("Adding Build Phase '#{prefixed_phase_name}' to project.") do
                 phase.name = prefixed_phase_name

data/lib/cocoapods/sandbox/path_list.rb

@@ -1,3 +1,5 @@
+require 'active_support/multibyte/unicode'
+
 module Pod
   class Sandbox
     # The PathList class is designed to perform multiple glob matches against
@@ -20,7 +22,8 @@ module Pod
       # @param  [Pathname] root The root of the PathList.
       #
       def initialize(root)
-        @root = root
+        root_dir = ActiveSupport::Multibyte::Unicode.normalize(root.to_s)
+        @root = Pathname.new(root_dir)
         @glob_cache = {}
       end
 
@@ -47,15 +50,12 @@ module Pod
         unless root.exist?
           raise Informative, "Attempt to read non existent folder `#{root}`."
         end
-        root_length  = root.to_s.length + 1
         escaped_root = escape_path_for_glob(root)
-        paths = Dir.glob(escaped_root + '**/*', File::FNM_DOTMATCH).sort_by(&:upcase)
-        absolute_dirs  = paths.select { |path| File.directory?(path) }
-        relative_dirs  = absolute_dirs.map  { |p| p[root_length..-1] }
-        absolute_paths = paths.reject { |p| p == "#{root}/." || p == "#{root}/.." }
-        relative_paths = absolute_paths.map { |p| p[root_length..-1] }
-        @files = relative_paths - relative_dirs
-        @dirs  = relative_dirs.map { |d| d.gsub(/\/\.\.?$/, '') }.reject { |d| d == '.' || d == '..' } .uniq
+        absolute_paths = Pathname.glob(escaped_root + '**/*', File::FNM_DOTMATCH)
+        dirs_and_files = absolute_paths.reject { |path| path.basename.to_s =~ /^\.\.?$/ }
+        relative_paths = dirs_and_files.map { |path| path.relative_path_from(root) }
+        sorted_paths = relative_paths.map(&:to_s).sort_by(&:upcase)
+        @dirs, @files = sorted_paths.partition { |path| File.directory?(root + path) }
         @glob_cache = {}
       end
 

data/lib/cocoapods/sources_manager.rb

@@ -1,4 +1,5 @@
 require 'cocoapods-core/source'
+require 'set'
 
 module Pod
   class Source
@@ -141,8 +142,6 @@ module Pod
         "CocoaPods #{latest_cocoapods_version} is available.".green,
         "To update use: `#{install_message}`".green,
         ("[!] This is a test version we'd love you to try.".yellow if rc),
-        ("Until we reach version 1.0 the features of CocoaPods can and will change.\n" \
-         'We strongly recommend that you use the latest version at all times.'.yellow unless rc),
         '',
         'For more information, see https://blog.cocoapods.org ' \
         'and the CHANGELOG for this version at ' \

data/lib/cocoapods/user_interface.rb

@@ -7,7 +7,7 @@ module Pod
   module UserInterface
     require 'colored'
 
-    @title_colors      =  %w( yellow green    )
+    @title_colors      =  %w( yellow green )
     @title_level       =  0
     @indentation_level =  2
     @treat_titles_as_messages = false
@@ -117,9 +117,6 @@ module Pod
         self.title_level -= 1
       end
 
-      # def title(title, verbose_prefix = '', relative_indentation = 2)
-      # end
-
       # Prints a verbose message taking an optional verbose prefix and
       # a relative indentation valid for the UI action in the passed
       # block.

data/lib/cocoapods/validator.rb

@@ -575,7 +575,7 @@ module Pod
       end
       non_source_files = header_files - file_accessor.source_files
       unless non_source_files.empty?
-        error(attr_name, 'The pattern includes header files that are not listed' \
+        error(attr_name, 'The pattern includes header files that are not listed ' \
           "in source_files (#{non_source_files.join(', ')}).")
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +207,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -217,7 +217,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -363,8 +363,15 @@ files:
 - lib/cocoapods/command/env.rb
 - lib/cocoapods/command/init.rb
 - lib/cocoapods/command/install.rb
-- lib/cocoapods/command/inter_process_communication.rb
+- lib/cocoapods/command/ipc.rb
+- lib/cocoapods/command/ipc/list.rb
+- lib/cocoapods/command/ipc/podfile.rb
+- lib/cocoapods/command/ipc/repl.rb
+- lib/cocoapods/command/ipc/spec.rb
+- lib/cocoapods/command/ipc/update_search_index.rb
 - lib/cocoapods/command/lib.rb
+- lib/cocoapods/command/lib/create.rb
+- lib/cocoapods/command/lib/lint.rb
 - lib/cocoapods/command/list.rb
 - lib/cocoapods/command/options/project_directory.rb
 - lib/cocoapods/command/options/repo_update.rb

data/lib/cocoapods/command/inter_process_communication.rb

@@ -1,177 +0,0 @@
-module Pod
-  class Command
-    class IPC < Command
-      self.abstract_command = true
-      self.summary = 'Inter-process communication'
-
-      def output_pipe
-        STDOUT
-      end
-
-      #-----------------------------------------------------------------------#
-
-      class Spec < IPC
-        self.summary = 'Converts a podspec to JSON'
-        self.description = 'Converts a podspec to JSON and prints it to STDOUT.'
-        self.arguments = [
-          CLAide::Argument.new('PATH', true),
-        ]
-
-        def initialize(argv)
-          @path = argv.shift_argument
-          super
-        end
-
-        def validate!
-          super
-          help! 'A specification path is required.' unless @path
-        end
-
-        def run
-          require 'json'
-          spec = Specification.from_file(@path)
-          output_pipe.puts(spec.to_pretty_json)
-        end
-      end
-
-      #-----------------------------------------------------------------------#
-
-      class Podfile < IPC
-        include ProjectDirectory
-
-        self.summary = 'Converts a Podfile to YAML'
-        self.description = 'Converts a Podfile to YAML and prints it to STDOUT.'
-        self.arguments = [
-          CLAide::Argument.new('PATH', true),
-        ]
-
-        def initialize(argv)
-          @path = argv.shift_argument
-          super
-        end
-
-        def validate!
-          super
-          help! 'A Podfile path is required.' unless @path
-        end
-
-        def run
-          require 'yaml'
-          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
-          specifications and each corresponding value is a dictionary with
-          the following keys:
-
-          - defined_in_file
-          - version
-          - authors
-          - summary
-          - description
-          - platforms
-        DESC
-
-        def run
-          require 'yaml'
-          sets = config.sources_manager.aggregate.all_sets
-          result = {}
-          sets.each do |set|
-            begin
-              spec = set.specification
-              result[spec.name] = {
-                'authors' => spec.authors.keys,
-                'summary' => spec.summary,
-                'description' => spec.description,
-                'platforms' => spec.available_platforms.map { |p| p.name.to_s },
-              }
-            rescue DSLError
-              next
-            end
-          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.
-          The search index is a YAML encoded dictionary where the keys
-          are the names of the Pods and the values are a dictionary containing
-          the following information:
-
-          - version
-          - summary
-          - description
-          - authors
-        DESC
-
-        def run
-          config.sources_manager.updated_search_index
-          output_pipe.puts(config.sources_manager.search_index_path)
-        end
-      end
-
-      #-----------------------------------------------------------------------#
-
-      class Repl < IPC
-        include ProjectDirectory
-
-        END_OF_OUTPUT_SIGNAL = "\n\r"
-
-        self.summary = 'The repl listens to commands on standard input'
-        self.description = <<-DESC
-         The repl listens to commands on standard input and prints their
-         result to standard output.
-
-         It accepts all the other ipc subcommands. The repl will signal the
-         end of output with the the ASCII CR+LF `\\n\\r`.
-        DESC
-
-        def run
-          print_version
-          signal_end_of_output
-          listen
-        end
-
-        def print_version
-          output_pipe.puts "version: '#{Pod::VERSION}'"
-        end
-
-        def signal_end_of_output
-          output_pipe.puts(END_OF_OUTPUT_SIGNAL)
-          STDOUT.flush
-        end
-
-        def listen
-          while repl_command = STDIN.gets
-            execute_repl_command(repl_command)
-          end
-        end
-
-        def execute_repl_command(repl_command)
-          if (repl_command != "\n")
-            repl_commands = repl_command.split
-            subcommand = repl_commands.shift.capitalize
-            arguments = repl_commands
-            subcommand_class = Pod::Command::IPC.const_get(subcommand)
-            subcommand_class.new(CLAide::ARGV.new(arguments)).run
-            signal_end_of_output
-          end
-        end
-      end
-
-      #-----------------------------------------------------------------------#
-    end
-  end
-end