cocoapods 1.0.0.beta.5 → 1.0.0.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 351bd282c885de91d29ea0ce21df2f9fbebe22ad
-  data.tar.gz: a2b17616d19c1cc6971232c77fde0e36c1c559e1
+  metadata.gz: 82ef0fd2f13afd200f730d294d1e85d7aac49aba
+  data.tar.gz: c2b830bfc6c0edb7dd4e8ed8ab40409126825420
 SHA512:
-  metadata.gz: b165cefed02d0efd9088f9acfaad7ca9e92a07df8e827b655965a9a42eabbc25796bd716e5fc7fd28feb3975411d5b7b57904bb1b8cd5b67c6d8944057ba79a9
-  data.tar.gz: 172057ccdbbba5eac50a33abb6d611d9f5409db97748e1fd36e348a8fbdea458101f534bfc4d4f0849f05e8a7cb9fc54dd4609dfff100525c8182f7fc9a0ef37
+  metadata.gz: e426d23e4284592fbdb93d1591d5a30d96b30dfc6b98b51a1da55476a0678075599892f82b9bf4d3d4885e5840f6d10efc986bcc52ba1e7d25889ccee0256b5f
+  data.tar.gz: 55d32672b07f933172d9e6cd3d90112a0fa4d0a863db32a3ea7747399312ffddc3ab6ee2b4df772a638d6abe12eee4aa84d48b2fef99755c9ea30cbebcecb068

data/CHANGELOG.md

@@ -4,15 +4,74 @@ 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.0.beta.6 (2016-03-15)
+
+##### Breaking
+
+* Running `pod install` doesn't imply an automatic spec repo update.  
+  The old behavior can be achieved by passing in the option `--repo-update`
+  or running `pod repo update`.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+  [#5004](https://github.com/CocoaPods/CocoaPods/issues/5004)
+
+* Remove the configuration variable `skip_repo_update` as the default behavior
+  varies now between `pod install` and `pod (update|outdated)`.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+  [#5017](https://github.com/CocoaPods/CocoaPods/issues/5017)
+
+##### Enhancements
+
+* The master specs repo will no longer perform 'no-op' git fetches. This should
+  help to reduce the load on GitHub's servers.  
+  [Daniel Tomlinson](https://github.com/DanielTomlinson)
+  [#5005](https://github.com/CocoaPods/CocoaPods/issues/5005)
+  [#4989](https://github.com/CocoaPods/CocoaPods/issues/4989)
+
+* The specs repos will no longer support shallow clones to reduce CPU load
+  on git servers. Pre-existing shallow clones of the `master` repo will
+  automatically be upgraded to deep clones when the repo is updated.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#5016](https://github.com/CocoaPods/CocoaPods/issues/5016)
+
+* The validator will check that all `public_header_files` and
+  `private_header_files` are also present in `source_files`.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4936](https://github.com/CocoaPods/CocoaPods/issues/4936)
+
+##### Bug Fixes
+
+* The master specs repository can no longer be added via `pod repo add`, but
+  instead must be done via `pod setup`.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Print a friendly error message when the platform for a target cannot be
+  inferred.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4790](https://github.com/CocoaPods/CocoaPods/issues/4790)
+
+* Rely on `TARGET_BUILD_DIR` instead of `CONFIGURATION_BUILD_DIR` in the
+  generated embed frameworks build phase's script, so that UI test targets can
+  be run.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+  [#5022](https://github.com/CocoaPods/CocoaPods/issues/5022)
+
+* Fix build paths for resources bundles.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+  [#5028](https://github.com/CocoaPods/CocoaPods/pull/5028)
+
+* Validate that a Podfile does not declare the same target twice.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#5029](https://github.com/CocoaPods/CocoaPods/issues/5029)
+
+
 ## 1.0.0.beta.5 (2016-03-08)
 
 ##### Breaking
 
-* Development pods will no longer be implicitly unlocked. This makes CocoaPods
-  to respect constraints related to dependencies of development pods in the
-  lockfile.
+* Development pods will no longer be implicitly unlocked. This makes CocoaPods respect
+  constraints related to dependencies of development pods in the lockfile.
 
-  If you change constraints of a dependency of your development pod, and want to
+  If you change the constraints of a dependency of your development pod and want to
   override the locked version, you will have to use
   `pod update ${DEPENDENCY_NAME}` manually.  
   [Muhammed Yavuz Nuzumlalı](https://github.com/manuyavuz)

data/lib/cocoapods/command.rb

@@ -14,17 +14,22 @@ module Pod
   end
 
   class Command < CLAide::Command
+    require 'cocoapods/command/options/repo_update'
+    require 'cocoapods/command/options/project_directory'
+    include Options
+
+    require 'cocoapods/command/cache'
+    require 'cocoapods/command/env'
+    require 'cocoapods/command/init'
+    require 'cocoapods/command/install'
     require 'cocoapods/command/inter_process_communication'
     require 'cocoapods/command/lib'
     require 'cocoapods/command/list'
     require 'cocoapods/command/outdated'
-    require 'cocoapods/command/project'
     require 'cocoapods/command/repo'
     require 'cocoapods/command/setup'
     require 'cocoapods/command/spec'
-    require 'cocoapods/command/init'
-    require 'cocoapods/command/cache'
-    require 'cocoapods/command/env'
+    require 'cocoapods/command/update'
 
     self.abstract_command = true
     self.command = 'pod'
@@ -32,9 +37,6 @@ module Pod
     self.description = 'CocoaPods, the Cocoa library package manager.'
     self.plugin_prefixes = %w(claide cocoapods)
 
-    [Install, Update, Outdated, IPC::Podfile, IPC::Repl].each { |c| c.send(:include, ProjectDirectory) }
-    [Outdated].each { |c| c.send(:include, Project) }
-
     def self.options
       [
         ['--silent', 'Show nothing'],
@@ -102,6 +104,14 @@ module Pod
 
     private
 
+    # Returns a new {Installer} parametrized from the {Config}.
+    #
+    # @return [Installer]
+    #
+    def installer_for_config
+      Installer.new(config.sandbox, config.podfile, config.lockfile)
+    end
+
     # Checks that the podfile exists.
     #
     # @raise  If the podfile does not exists.

data/lib/cocoapods/command/install.rb

@@ -0,0 +1,41 @@
+module Pod
+  class Command
+    class Install < Command
+      include RepoUpdate
+      include ProjectDirectory
+
+      self.summary = 'Install project dependencies to Podfile.lock versions'
+
+      self.description = <<-DESC
+        Downloads all dependencies defined in `Podfile` and creates an Xcode
+        Pods library project in `./Pods`.
+
+        The Xcode project file should be specified in your `Podfile` like this:
+
+            project 'path/to/XcodeProject.xcodeproj'
+
+        If no project is specified, then a search for an Xcode project will
+        be made. If more than one Xcode project is found, the command will
+        raise an error.
+
+        This will configure the project to reference the Pods static library,
+        add a build configuration file, and add a post build script to copy
+        Pod resources.
+      DESC
+
+      def self.options
+        [
+          ['--repo-update', 'Force running `pod repo update` before install'],
+        ].concat(super).reject { |(name, _)| name == '--no-repo-update' }
+      end
+
+      def run
+        verify_podfile_exists!
+        installer = installer_for_config
+        installer.repo_update = repo_update?(:default => false)
+        installer.update = false
+        installer.install!
+      end
+    end
+  end
+end

data/lib/cocoapods/command/inter_process_communication.rb

@@ -37,6 +37,8 @@ module Pod
       #-----------------------------------------------------------------------#
 
       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 = [
@@ -123,6 +125,8 @@ module Pod
       #-----------------------------------------------------------------------#
 
       class Repl < IPC
+        include ProjectDirectory
+
         END_OF_OUTPUT_SIGNAL = "\n\r"
 
         self.summary = 'The repl listens to commands on standard input'

data/lib/cocoapods/command/options/project_directory.rb

@@ -0,0 +1,36 @@
+module Pod
+  class Command
+    module Options
+      # Provides support for commands to take a user-specified `project directory`
+      #
+      module ProjectDirectory
+        module Options
+          def options
+            [
+              ['--project-directory=/project/dir/', 'The path to the root of the project directory'],
+            ].concat(super)
+          end
+        end
+
+        def self.included(base)
+          base.extend(Options)
+        end
+
+        def initialize(argv)
+          if project_directory = argv.option('project-directory')
+            @project_directory = Pathname.new(project_directory).expand_path
+          end
+          config.installation_root = @project_directory
+          super
+        end
+
+        def validate!
+          super
+          if @project_directory && !@project_directory.directory?
+            raise Informative, "`#{@project_directory}` is not a valid directory."
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/command/options/repo_update.rb

@@ -0,0 +1,34 @@
+module Pod
+  class Command
+    module Options
+      # Provides support for commands to skip updating the spec repositories.
+      #
+      module RepoUpdate
+        module Options
+          def options
+            [
+              ['--no-repo-update', 'Skip running `pod repo update` before install'],
+            ].concat(super)
+          end
+        end
+
+        def self.included(base)
+          base.extend(Options)
+        end
+
+        def repo_update?(default: false)
+          if @repo_update.nil?
+            default
+          else
+            @repo_update
+          end
+        end
+
+        def initialize(argv)
+          @repo_update = argv.flag?('repo-update')
+          super
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/command/outdated.rb

@@ -1,6 +1,9 @@
 module Pod
   class Command
     class Outdated < Command
+      include RepoUpdate
+      include ProjectDirectory
+
       self.summary = 'Show outdated project dependencies'
 
       self.description = <<-DESC
@@ -90,8 +93,8 @@ module Pod
 
       def spec_sets
         @spec_sets ||= begin
-          analyzer.send(:update_repositories) unless config.skip_repo_update?
-          aggregate = Source::Aggregate.new(analyzer.sources.map(&:repo))
+          analyzer.send(:update_repositories) if repo_update?(:default => true)
+          aggregate = Source::Aggregate.new(analyzer.sources)
           installed_pods.map do |pod_name|
             aggregate.search(Dependency.new(pod_name))
           end.compact.uniq

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

@@ -15,14 +15,7 @@ module Pod
           CLAide::Argument.new('BRANCH', false),
         ]
 
-        def self.options
-          [
-            ['--shallow', 'Create a shallow clone (fast clone, but no push capabilities)'],
-          ].concat(super)
-        end
-
         def initialize(argv)
-          @shallow = argv.flag?('shallow', false)
           @name = argv.shift_argument
           @url = argv.shift_argument
           @branch = argv.shift_argument
@@ -34,11 +27,16 @@ module Pod
           unless @name && @url
             help! 'Adding a repo needs a `NAME` and a `URL`.'
           end
+          if @name == 'master' || @url =~ %r{github.com[:/]+cocoapods/specs}i
+            raise Informative,
+                  'To setup the master specs repo, please run `pod setup`.'
+          end
         end
 
         def run
-          prefix = @shallow ? 'Creating shallow clone of' : 'Cloning'
-          UI.section("#{prefix} spec repo `#{@name}` from `#{@url}`#{" (branch `#{@branch}`)" if @branch}") do
+          section = "Cloning spec repo `#{@name}` from `#{@url}`"
+          section << " (branch `#{@branch}`)" if @branch
+          UI.section(section) do
             create_repos_dir
             clone_repo
             checkout_branch
@@ -70,7 +68,6 @@ module Pod
         def clone_repo
           Dir.chdir(config.repos_dir) do
             command = ['clone', @url, @name]
-            command << '--depth=1' if @shallow
             git!(command)
           end
         end

data/lib/cocoapods/command/setup.rb

@@ -14,20 +14,9 @@ module Pod
         If the clone already exists, it will ensure that it is up-to-date.
       DESC
 
-      def self.options
-        [
-          ['--no-shallow', 'Clone full history so push will work'],
-        ].concat(super)
-      end
-
       extend Executable
       executable :git
 
-      def initialize(argv)
-        @shallow = argv.flag?('shallow', true)
-        super
-      end
-
       def run
         UI.section 'Setting up CocoaPods master repo' do
           if master_repo_dir.exist?
@@ -62,7 +51,6 @@ module Pod
       #
       def add_master_repo
         cmd = ['master', url, 'master']
-        cmd << '--shallow' if @shallow
         Repo::Add.parse(cmd).run
       end
 

data/lib/cocoapods/command/update.rb

@@ -0,0 +1,64 @@
+module Pod
+  class Command
+    class Update < Command
+      include RepoUpdate
+      include ProjectDirectory
+
+      self.summary = 'Update outdated project dependencies and create new ' \
+        'Podfile.lock'
+
+      self.description = <<-DESC
+        Updates the Pods identified by the specified `POD_NAMES`. If no
+        `POD_NAMES` are specified it updates all the Pods ignoring the contents
+        of the Podfile.lock.
+        This command is reserved to the update of dependencies and pod install
+        should be used to install changes to the Podfile.
+      DESC
+
+      self.arguments = [
+        CLAide::Argument.new('POD_NAMES', false, true),
+      ]
+
+      def initialize(argv)
+        @pods = argv.arguments! unless argv.arguments.empty?
+        super
+      end
+
+      # Check if all given pods are installed
+      #
+      def verify_pods_are_installed!
+        lockfile_roots = config.lockfile.pod_names.map { |p| Specification.root_name(p) }
+        missing_pods = @pods.map { |p| Specification.root_name(p) }.select do |pod|
+          !lockfile_roots.include?(pod)
+        end
+
+        unless missing_pods.empty?
+          message = if missing_pods.length > 1
+                      "Pods `#{missing_pods.join('`, `')}` are not " \
+                          'installed and cannot be updated'
+                    else
+                      "The `#{missing_pods.first}` Pod is not installed " \
+                          'and cannot be updated'
+                    end
+          raise Informative, message
+        end
+      end
+
+      def run
+        verify_podfile_exists!
+
+        installer = installer_for_config
+        installer.repo_update = repo_update?(:default => true)
+        if @pods
+          verify_lockfile_exists!
+          verify_pods_are_installed!
+          installer.update = { :pods => @pods }
+        else
+          UI.puts 'Update all pods'.yellow
+          installer.update = true
+        end
+        installer.install!
+      end
+    end
+  end
+end

data/lib/cocoapods/config.rb

@@ -14,7 +14,6 @@ module Pod
     DEFAULTS = {
       :verbose             => false,
       :silent              => false,
-      :skip_repo_update    => false,
       :skip_download_cache => !ENV['COCOAPODS_SKIP_CACHE'].nil?,
 
       :new_version_message => ENV['COCOAPODS_SKIP_UPDATE_MESSAGE'].nil?,
@@ -69,11 +68,6 @@ module Pod
 
     # @!group Installation
 
-    # @return [Bool] Whether the installer should skip the repos update.
-    #
-    attr_accessor :skip_repo_update
-    alias_method :skip_repo_update?, :skip_repo_update
-
     # @return [Bool] Whether the installer should skip the download cache.
     #
     attr_accessor :skip_download_cache

data/lib/cocoapods/executable.rb

@@ -137,9 +137,9 @@ module Pod
       case capture
       when :merge then Open3.capture2e(bin, *command)
       when :both then Open3.capture3(bin, *command)
-      when :out then Open3.capture2(bin, *command)
+      when :out then Open3.capture3(bin, *command).values_at(0, -1)
       when :err then Open3.capture3(bin, *command).drop(1)
-      when :none then Open3.capture2(bin, *command).last
+      when :none then Open3.capture3(bin, *command).last
       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.beta.5'.freeze unless defined? Pod::VERSION
+  VERSION = '1.0.0.beta.6'.freeze unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -53,7 +53,7 @@ module Pod
               local source="$1"
             fi
 
-            local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+            local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
             if [ -L "${source}" ]; then
                 echo "Symlinked..."

data/lib/cocoapods/installer.rb

@@ -84,6 +84,11 @@ module Pod
     #
     attr_accessor :update
 
+    # @return [Bool] Whether the spec repos should be updated.
+    #
+    attr_accessor :repo_update
+    alias_method :repo_update?, :repo_update
+
     # @return [Boolean] Whether default plugins should be used during
     #                   installation. Defaults to true.
     #
@@ -140,7 +145,7 @@ module Pod
 
       UI.section 'Updating local specs repositories' do
         analyzer.update_repositories
-      end unless config.skip_repo_update?
+      end if repo_update?
 
       UI.section 'Analyzing dependencies' do
         analyze(analyzer)

data/lib/cocoapods/installer/analyzer.rb

@@ -212,7 +212,7 @@ module Pod
 
       public
 
-      # Updates the git source repositories unless the config indicates to skip it.
+      # Updates the git source repositories.
       #
       def update_repositories
         sources.each do |source|

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

@@ -153,6 +153,11 @@ module Pod
             end
           end
 
+          unless name
+            raise Informative,
+                  "Unable to determine the platform for the `#{target_definition.name}` target."
+          end
+
           target_definition.set_platform(name, deployment_target)
           Platform.new(name, deployment_target)
         end

data/lib/cocoapods/installer/podfile_validator.rb

@@ -34,6 +34,7 @@ module Pod
         validate_pod_directives
         validate_no_abstract_only_pods!
         validate_dependencies_are_present!
+        validate_no_duplicate_targets!
 
         @validated = true
       end
@@ -122,6 +123,16 @@ module Pod
           add_error "The dependency `#{dep}` is not used in any concrete target."
         end
       end
+
+      def validate_no_duplicate_targets!
+        podfile.target_definition_list.group_by { |td| [td.name, td.user_project_path] }.
+          each do |(name, project), definitions|
+          next unless definitions.size > 1
+          error = "The target `#{name}` is declared twice"
+          error << " for the project `#{project}`" if project
+          add_error(error << '.')
+        end
+      end
     end
   end
 end

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

@@ -154,7 +154,7 @@ module Pod
           end
           frameworks_by_config[config] = relevant_pod_targets.flat_map do |pod_target|
             frameworks = pod_target.file_accessors.flat_map(&:vendored_dynamic_artifacts).map { |fw| "${PODS_ROOT}/#{fw.relative_path_from(sandbox.root)}" }
-            frameworks << pod_target.build_product_path if pod_target.should_build? && pod_target.requires_frameworks?
+            frameworks << pod_target.build_product_path('$BUILT_PRODUCTS_DIR') if pod_target.should_build? && pod_target.requires_frameworks?
             frameworks
           end
         end

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

@@ -177,9 +177,7 @@ module Pod
               c.build_settings['PRODUCT_NAME'] = bundle_name
               relative_info_plist_path = info_plist_path.relative_path_from(sandbox.root)
               c.build_settings['INFOPLIST_FILE'] = relative_info_plist_path.to_s
-              if target.requires_frameworks? && target.scoped?
-                c.build_settings['CONFIGURATION_BUILD_DIR'] = target.configuration_build_dir
-              end
+              c.build_settings['CONFIGURATION_BUILD_DIR'] = target.configuration_build_dir
 
               # Set the correct device family for this bundle, based on the platform
               device_family_by_platform = {

data/lib/cocoapods/resolver.rb

@@ -352,7 +352,7 @@ module Pod
       if dependency && dependency.podspec_repo
         return SourcesManager.aggregate_for_dependency(dependency)
       else
-        @aggregate ||= Source::Aggregate.new(sources.map(&:repo))
+        @aggregate ||= Source::Aggregate.new(sources)
       end
     end
 

data/lib/cocoapods/sources_manager.rb

@@ -41,7 +41,7 @@ module Pod
       #
       def sources(names)
         dirs = names.map { |name| source_dir(name) }
-        dirs.map { |repo| Source.new(repo) }
+        dirs.map { |repo| source_from_path(repo) }
       end
 
       # Returns the source whose {Source#url} is equal to `url`, adding the repo
@@ -61,9 +61,11 @@ module Pod
           previous_title_level = UI.title_level
           UI.title_level = 0
           begin
-            argv = [name, url]
-            argv << '--shallow' if name =~ /^master(-\d+)?$/
-            Command::Repo::Add.new(CLAide::ARGV.new(argv)).run
+            if name =~ /^master(-\d+)?$/
+              Command::Setup.parse([]).run
+            else
+              Command::Repo::Add.parse([name, url]).run
+            end
           rescue Informative
             raise Informative, "Unable to add a source with url `#{url}` " \
               "named `#{name}`.\nYou can try adding it manually in " \
@@ -97,7 +99,7 @@ module Pod
       def all
         return [] unless config.repos_dir.exist?
         dirs = config.repos_dir.children.select(&:directory?)
-        dirs.map { |repo| Source.new(repo) }
+        dirs.map { |repo| source_from_path(repo) }
       end
 
       # @return [Array<Source>] The CocoaPods Master Repo source.
@@ -323,7 +325,7 @@ module Pod
         changed_spec_paths = {}
         sources.each do |source|
           UI.section "Updating spec repo `#{source.name}`" do
-            changed_source_paths = source.update(show_output && !config.verbose?)
+            changed_source_paths = source.update(show_output)
             changed_spec_paths[source] = changed_source_paths if changed_source_paths.count > 0
             check_version_information(source.repo)
           end
@@ -468,14 +470,25 @@ module Pod
 
       private
 
+      # @return [Source] The Source at a given path.
+      #
+      # @param [Pathname] path
+      #        The local file path to one podspec repo.
+      #
+      def source_from_path(path)
+        return Source.new(path) unless path.basename.to_s == 'master'
+        MasterSource.new(path)
+      end
+
       # @return [Source::Aggregate] The aggregate of the sources from repos.
       #
       # @param  [Array<Pathname>] repos
       #         The local file paths to one or more podspec repo caches.
       #
       def aggregate_with_repos(repos)
+        sources = repos.map { |path| source_from_path(path) }
         @aggregates_by_repos ||= {}
-        @aggregates_by_repos[repos] ||= Source::Aggregate.new(repos)
+        @aggregates_by_repos[repos] ||= Source::Aggregate.new(sources)
       end
 
       # @return [Bool] Whether the given path is writable by the current user.
@@ -609,9 +622,15 @@ module Pod
     extend Executable
     executable :git
 
+    def git(args, include_error: false)
+      Executable.capture_command('git', args, :capture => include_error ? :merge : :out).first.strip
+    end
+
     def update_git_repo(show_output = false)
-      output = git! %w(pull --ff-only)
-      UI.puts output if show_output
+      ensure_in_repo!
+      Config.instance.with_changes(:verbose => show_output) do
+        git!(%w(pull --ff-only))
+      end
     rescue
       UI.warn 'CocoaPods was not able to update the ' \
                 "`#{name}` repo. If this is an unexpected issue " \
@@ -619,4 +638,16 @@ module Pod
                 '`pod repo update --verbose`'
     end
   end
+
+  class MasterSource
+    def update_git_repo(show_output = false)
+      ensure_in_repo!
+      if repo.join('.git', 'shallow').file?
+        UI.info "Performing a deep fetch of the `#{name}` specs repo to improve future performance" do
+          git!(%w(fetch --unshallow))
+        end
+      end
+      super
+    end
+  end
 end

data/lib/cocoapods/target/pod_target.rb

@@ -16,26 +16,10 @@ module Pod
     #
     attr_reader :build_headers
 
-    # @return [Bool] whether the target needs to be scoped by target definition,
-    #         because the spec is used with different subspec sets across them.
-    #
-    # @note   The target products of {PodTarget}s are named after their specs.
-    #         The namespacing cannot directly happen in the product name itself,
-    #         because this must be equal to the module name and this will be
-    #         used in source code, which should stay agnostic over the
-    #         dependency manager.
-    #         We need namespacing because multiple targets can exist for the
-    #         same podspec and their products should not collide. This
-    #         duplication is needed when multiple user targets have the same
-    #         dependency, but they require different sets of subspecs or they
-    #         are on different platforms.
-    #
-    def scoped?
-      !scope_suffix.nil?
-    end
-
-    # @return [String] used for the label and the directory name, which is used to
-    #         scope the build product in the default configuration build dir.
+    # @return [String] used as suffix in the label
+    #
+    # @note This affects the value returned by #configuration_build_dir
+    #       and accessors relying on this as #build_product_path.
     #
     attr_reader :scope_suffix
 
@@ -44,10 +28,10 @@ module Pod
     #
     attr_accessor :dependent_targets
 
-    # @param [Array<Specification>] @spec #see spec
-    # @param [Array<TargetDefinition>] target_definitions @see target_definitions
-    # @param [Sandbox] sandbox @see sandbox
-    # @param [String] scope_suffix @see scope_suffix
+    # @param [Array<Specification>] specs @see #specs
+    # @param [Array<TargetDefinition>] target_definitions @see #target_definitions
+    # @param [Sandbox] sandbox @see #sandbox
+    # @param [String] scope_suffix @see #scope_suffix
     #
     def initialize(specs, target_definitions, sandbox, scope_suffix = nil)
       raise "Can't initialize a PodTarget without specs!" if specs.nil? || specs.empty?
@@ -89,14 +73,10 @@ module Pod
     # @return [String] the label for the target.
     #
     def label
-      if scoped?
-        if scope_suffix[0] == '.'
-          "#{root_spec.name}#{scope_suffix}"
-        else
-          "#{root_spec.name}-#{scope_suffix}"
-        end
+      if scope_suffix.nil? || scope_suffix[0] == '.'
+        "#{root_spec.name}#{scope_suffix}"
       else
-        root_spec.name
+        "#{root_spec.name}-#{scope_suffix}"
       end
     end
 

data/lib/cocoapods/validator.rb

@@ -349,7 +349,6 @@ module Pod
       @original_config = Config.instance.clone
       config.installation_root   = validation_dir
       config.silent              = !config.verbose
-      config.skip_repo_update    = true
     end
 
     def tear_down_validation_environment
@@ -560,12 +559,18 @@ module Pod
     # Ensures that a list of header files only contains header files.
     #
     def _validate_header_files(attr_name)
-      non_header_files = file_accessor.send(attr_name).
+      header_files = file_accessor.send(attr_name)
+      non_header_files = header_files.
         select { |f| !Sandbox::FileAccessor::HEADER_EXTENSIONS.include?(f.extname) }.
         map { |f| f.relative_path_from(file_accessor.root) }
       unless non_header_files.empty?
         error(attr_name, "The pattern matches non-header files (#{non_header_files.join(', ')}).")
       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' \
+          "in source_files (#{non_source_files.join(', ')}).")
+      end
     end
 
     def _validate_header_mappings_dir

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.5
+  version: 1.0.0.beta.6
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,21 +19,21 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.5
+        version: 1.0.0.beta.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.5
+        version: 1.0.0.beta.6
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.2
+        version: 1.0.0.beta.3
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.2
+        version: 1.0.0.beta.3
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -73,7 +73,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.1
+        version: 1.0.0.beta.2
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.1
+        version: 1.0.0.beta.2
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -173,7 +173,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.2
+        version: 1.0.0.beta.3
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -183,7 +183,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.2
+        version: 1.0.0.beta.3
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -362,11 +362,13 @@ files:
 - lib/cocoapods/command/cache/list.rb
 - 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/lib.rb
 - lib/cocoapods/command/list.rb
+- lib/cocoapods/command/options/project_directory.rb
+- lib/cocoapods/command/options/repo_update.rb
 - lib/cocoapods/command/outdated.rb
-- lib/cocoapods/command/project.rb
 - lib/cocoapods/command/repo.rb
 - lib/cocoapods/command/repo/add.rb
 - lib/cocoapods/command/repo/lint.rb
@@ -382,6 +384,7 @@ files:
 - lib/cocoapods/command/spec/env_spec.rb
 - lib/cocoapods/command/spec/lint.rb
 - lib/cocoapods/command/spec/which.rb
+- lib/cocoapods/command/update.rb
 - lib/cocoapods/config.rb
 - lib/cocoapods/downloader.rb
 - lib/cocoapods/downloader/cache.rb
@@ -473,7 +476,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 3
 summary: The Cocoa library package manager.

data/lib/cocoapods/command/project.rb

@@ -1,157 +0,0 @@
-module Pod
-  class Command
-    # Provides support for commands to take a user-specified `project directory`
-    #
-    module ProjectDirectory
-      module Options
-        def options
-          [
-            ['--project-directory=/project/dir/', 'The path to the root of the project directory'],
-          ].concat(super)
-        end
-      end
-
-      def self.included(base)
-        base.extend(Options)
-      end
-
-      def initialize(argv)
-        if project_directory = argv.option('project-directory')
-          @project_directory = Pathname.new(project_directory).expand_path
-        end
-        config.installation_root = @project_directory
-        super
-      end
-
-      def validate!
-        super
-        if @project_directory && !@project_directory.directory?
-          raise Informative,
-                "`#{@project_directory}` is not a valid directory."
-        end
-      end
-    end
-
-    # Provides support for the common behaviour of the `install` and `update`
-    # commands.
-    #
-    module Project
-      module Options
-        def options
-          [
-            ['--no-repo-update', 'Skip running `pod repo update` before install'],
-          ].concat(super)
-        end
-      end
-
-      def self.included(base)
-        base.extend Options
-      end
-
-      def initialize(argv)
-        config.skip_repo_update = !argv.flag?('repo-update', !config.skip_repo_update)
-        super
-      end
-
-      # Runs the installer.
-      #
-      # @param  [Hash, Boolean, nil] update
-      #         Pods that have been requested to be updated or true if all Pods
-      #         should be updated
-      #
-      # @return [void]
-      #
-      def run_install_with_update(update)
-        installer = Installer.new(config.sandbox, config.podfile, config.lockfile)
-        installer.update = update
-        installer.install!
-      end
-    end
-
-    #-------------------------------------------------------------------------#
-
-    class Install < Command
-      include Project
-
-      self.summary = 'Install project dependencies to Podfile.lock versions'
-
-      self.description = <<-DESC
-        Downloads all dependencies defined in `Podfile` and creates an Xcode
-        Pods library project in `./Pods`.
-
-        The Xcode project file should be specified in your `Podfile` like this:
-
-            project 'path/to/XcodeProject'
-
-        If no project is specified, then a search for an Xcode project will
-        be made. If more than one Xcode project is found, the command will
-        raise an error.
-
-        This will configure the project to reference the Pods static library,
-        add a build configuration file, and add a post build script to copy
-        Pod resources.
-      DESC
-
-      def run
-        verify_podfile_exists!
-        run_install_with_update(false)
-      end
-    end
-
-    #-------------------------------------------------------------------------#
-
-    class Update < Command
-      include Project
-
-      self.summary = 'Update outdated project dependencies and create new ' \
-        'Podfile.lock'
-
-      self.description = <<-DESC
-        Updates the Pods identified by the specified `POD_NAMES`. If no
-        `POD_NAMES` are specified it updates all the Pods ignoring the contents
-        of the Podfile.lock.
-        This command is reserved to the update of dependencies and pod install
-        should be used to install changes to the Podfile.
-      DESC
-
-      self.arguments = [
-        CLAide::Argument.new('POD_NAMES', false, true),
-      ]
-
-      def initialize(argv)
-        @pods = argv.arguments! unless argv.arguments.empty?
-        super
-      end
-
-      def run
-        verify_podfile_exists!
-
-        if @pods
-          verify_lockfile_exists!
-
-          # Check if all given pods are installed
-          lockfile_roots = config.lockfile.pod_names.map { |p| Specification.root_name(p) }
-          missing_pods = @pods.map { |p| Specification.root_name(p) }.select do |pod|
-            !lockfile_roots.include?(pod)
-          end
-
-          unless missing_pods.empty?
-            message = if missing_pods.length > 1
-                        "Pods `#{missing_pods.join('`, `')}` are not " \
-                          'installed and cannot be updated'
-                      else
-                        "The `#{missing_pods.first}` Pod is not installed " \
-                          'and cannot be updated'
-            end
-            raise Informative, message
-          end
-
-          run_install_with_update(:pods => @pods)
-        else
-          UI.puts 'Update all pods'.yellow unless @pods
-          run_install_with_update(true)
-        end
-      end
-    end
-  end
-end