cocoapods 0.36.0.beta.2 → 0.36.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86bf745ff3beb43f547d72bdc3bb5561250836ef
-  data.tar.gz: 527fecbbab8649bf447a7fb6ea5130340a9ffd65
+  metadata.gz: ef4ce8ae91c04f6565e9e5607da50a2f6b6d96f1
+  data.tar.gz: e913792e08a80a242b1817fb186456219cc3cca1
 SHA512:
-  metadata.gz: 691fb6ca9b5324b5a1ac63a496e9cb87429941ce7d178b45501649890a5029a9eeb1801850e9a73e655405c016a40da7cfaa53326f63825123939e501f6ad9c5
-  data.tar.gz: bf435ded4cbcaca3b11a79aa9df3aecfcc65b9f54f070f98bf451f98a8dc2b010ce58d2353cb117f7a5488e8bf51b10ff8f9461aac0d7f6b9ec652544d3f64c1
+  metadata.gz: 697dbb533f3490b27c2683c110f6f7ddea96b2197be16d042d805ed3baa3a17e36807f24821abb559f43c4c0f0c44b6afbb4487d1a9f613ea265e9b5d9f85d57
+  data.tar.gz: 5a881818cfcc504b8f45e1bda435397279a806e357768c6520bd2fe198eb5521b35e32f85481d971a97e8b7e8ba69b8437effe506ee5aa7ffcb40f9b2cb514fd

data/CHANGELOG.md

@@ -4,6 +4,130 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 0.36.0.rc.1
+
+##### Enhancements
+
+* Set the `APPLICATION_EXTENSION_API_ONLY` build setting if integrating with a watch extension target.  
+  [Boris Bügling](https://github.com/neonichu)
+  [#3153](https://github.com/CocoaPods/CocoaPods/issues/3153)
+
+* Build for iOS simulator only during validation. This allows validation without having
+  provisioning profiles set up.  
+  [Boris Bügling](https://github.com/neonichu)
+  [#3083](https://github.com/CocoaPods/CocoaPods/issues/3083)
+  [Swift#13](https://github.com/CocoaPods/swift/issues/13)
+
+* Explicitly inform the user to close existing project when switching to
+  a workspace for the first time.  
+  [Kyle Fuller](https://github.com/kylef)
+  [#2996](https://github.com/CocoaPods/CocoaPods/issues/2996)
+
+* Automatically detect conflicts between framework names.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2943](https://github.com/CocoaPods/CocoaPods/issues/2943)
+
+* Use the proper `TMPDIR` for the CocoaPods process, instead of blindly using
+  `/tmp`.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Let lint fail for Swift pods supporting deployment targets below iOS 8.0.  
+  [Boris Bügling](https://github.com/neonichu)
+  [#2963](https://github.com/CocoaPods/CocoaPods/issues/2963)
+
+* Reject installation if a static library is used as a transitive dependency
+  while integrating Pods as frameworks.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2926](https://github.com/CocoaPods/CocoaPods/issues/2926)
+
+* Do not copy Swift standard libraries multiple times.  
+  [Boris Bügling](https://github.com/neonichu)
+  [#3131](https://github.com/CocoaPods/CocoaPods/issues/3131)
+
+* Check for Xcode License Agreement before running commands.  
+  [Xavi Matos](https://github.com/CalQL8ed-K-OS)
+  [#3002](https://github.com/CocoaPods/CocoaPods/issues/3002)
+
+* `pod update PODNAME` will update pods in a case-insensitive manner.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2992](https://github.com/CocoaPods/CocoaPods/issues/2992)
+
+* Allow specifying repo names to `pod {spec,lib} lint --sources`.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2685](https://github.com/CocoaPods/CocoaPods/issues/2685)
+
+* Require explicit use of `use_frameworks!` for Pods written in Swift.  
+  [Boris Bügling](https://github.com/neonichu)
+  [#3029](https://github.com/CocoaPods/CocoaPods/issues/3029)
+
+* Lint as framework automatically. If needed, `--use-libraries` option
+  allows linting as a static library.  
+  [Boris Bügling](https://github.com/neonichu)
+  [#2912](https://github.com/CocoaPods/CocoaPods/issues/2912)
+
+* Adding Xcode Legacy build location support for default Pods.xcodeproj.
+  It defaults to `${SRCROOT}/../build` but can be changed in a `post_install`
+  hook by using the `Project#symroot=` writer.  
+  [Sam Marshall](https://github.com/samdmarshall)
+
+##### Bug Fixes
+
+* Set `SKIP_INSTALL=YES` for all generated targets to avoid producing
+  *Generic Xcode Archives* on Archive.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+  [#3188](https://github.com/CocoaPods/CocoaPods/issues/3188)
+
+* Added support for .tpp C++ header files in specs (previously were getting
+  filtered out and symlinks wouldn't get created in the Pods/Headers folder.)  
+  [Honza Dvorsky](https://github.com/czechboy0)
+  [#3129](https://github.com/CocoaPods/CocoaPods/pull/3129)
+
+* Fixed installation for app-extension targets which had no dependencies
+  configured in the Podfile.  
+  [Boris Bügling](https://github.com/neonichu)
+  [#3102](https://github.com/CocoaPods/CocoaPods/issues/3102)
+
+* Correct escaping of resource bundles in 'Copy Pods Resources' script.  
+  [Seán Labastille](https://github.com/flufff42)
+  [#3082](https://github.com/CocoaPods/CocoaPods/issues/3082)
+
+* Correctly update sources when calling `pod outdated`, and also respect the
+  `--[no-]repo-update` flag.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#3137](https://github.com/CocoaPods/CocoaPods/issues/3137)
+
+* Fix the `OTHER_SWIFT_FLAGS` generated, so `#if COCOAPODS` works in Swift.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2983](https://github.com/CocoaPods/CocoaPods/issues/2983)
+
+* Output a properly-formed `Podfile` when running `pod init` with a target that
+  contains a `'` in its name.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#3136](https://github.com/CocoaPods/CocoaPods/issues/3136)
+
+* Remove the stored lockfile checkout source when switching to a development
+  pod.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#3141](https://github.com/CocoaPods/CocoaPods/issues/3141)
+
+* Migrate local Ruby podspecs to JSON, allowing updating those pods to work.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#3038](https://github.com/CocoaPods/CocoaPods/issues/3038)
+
+* Removing grep color markup in the embed frameworks script.  
+  [Adriano Bonat](https://github.com/tanob)
+  [#3117](https://github.com/CocoaPods/CocoaPods/issues/3117)
+
+* Fixes an issue where `pod ipc list` and `pod ipc podfile` was returning an
+  error.  
+  [Kyle Fuller](https://github.com/kylef)
+  [#3134](https://github.com/CocoaPods/CocoaPods/issues/3134)
+
+* Fixes an issue with spaces in the path to the user's developer tools.  
+  [Boris Bügling](https://github.com/neonichu)
+  [#3181](https://github.com/CocoaPods/CocoaPods/issues/3181)
+
+
 ## 0.36.0.beta.2
 
 [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.21.0...0.21.2)

data/lib/cocoapods.rb

@@ -16,6 +16,7 @@ end
 
 module Pod
   require 'pathname'
+  require 'tmpdir'
 
   require 'cocoapods/gem_version'
   require 'cocoapods-core'
@@ -35,6 +36,8 @@ module Pod
     end
   end
 
+  Xcodeproj::PlainInformative.send(:include, CLAide::InformativeError)
+
   autoload :AggregateTarget,           'cocoapods/target/aggregate_target'
   autoload :Command,                   'cocoapods/command'
   autoload :Executable,                'cocoapods/executable'

data/lib/cocoapods/command.rb

@@ -41,6 +41,7 @@ module Pod
 
     def self.run(argv)
       help! 'You cannot run CocoaPods as root.' if Process.uid == 0
+      verify_xcode_license_approved!
 
       super(argv)
       UI.print_warnings
@@ -121,5 +122,13 @@ module Pod
         raise Informative, "No `Podfile.lock' found in the project directory, run `pod install'."
       end
     end
+
+    def self.verify_xcode_license_approved!
+      if `/usr/bin/xcrun clang 2>&1` =~ /license/ && !$?.success?
+        raise Informative, 'You have not agreed to the Xcode license, which ' \
+          'you must do to use CocoaPods. Agree to the license by running: ' \
+          '`xcodebuild -license`.'
+      end
+    end
   end
 end

data/lib/cocoapods/command/init.rb

@@ -72,7 +72,7 @@ module Pod
       # @return [String] the text for the target module
       #
       def target_module(target)
-        target_module = "\ntarget '#{target.name}' do\n"
+        target_module = "\ntarget '#{target.name.gsub(/'/, "\\\\\'")}' do\n"
 
         if target.name =~ /tests?/i
           target_module << template_contents(config.default_test_podfile_path)

data/lib/cocoapods/command/inter_process_communication.rb

@@ -54,6 +54,7 @@ module Pod
         end
 
         def run
+          require 'yaml'
           podfile = Pod::Podfile.from_file(@path)
           output_pipe.puts podfile.to_yaml
         end
@@ -77,6 +78,7 @@ module Pod
         DESC
 
         def run
+          require 'yaml'
           sets = SourcesManager.aggregate.all_sets
           result = {}
           sets.each do |set|

data/lib/cocoapods/command/lib.rb

@@ -113,8 +113,8 @@ module Pod
            ['--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'],
-           ['--use-frameworks', 'Lint uses frameworks to install the spec'],
-           ['--sources=https://github.com/artsy/Specs', 'The sources from which to pull dependant pods ' \
+           ['--use-libraries', 'Lint uses static libraries to install the spec'],
+           ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to pull dependant pods ' \
             '(defaults to https://github.com/CocoaPods/Specs.git). '\
             'Multiple sources must be comma-delimited.']].concat(super)
         end
@@ -125,7 +125,7 @@ module Pod
           @clean           = argv.flag?('clean', true)
           @subspecs        = argv.flag?('subspecs', true)
           @only_subspec    = argv.option('subspec')
-          @use_frameworks  = argv.flag?('use-frameworks')
+          @use_frameworks  = !argv.flag?('use-libraries')
           @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
           @podspecs_paths  = argv.arguments!
           super

data/lib/cocoapods/command/outdated.rb

@@ -13,7 +13,7 @@ module Pod
       end
 
       def initialize(argv)
-        config.skip_repo_update = argv.flag?('repo-update', config.skip_repo_update)
+        config.skip_repo_update = !argv.flag?('repo-update', !config.skip_repo_update)
         super
       end
 
@@ -96,6 +96,7 @@ module Pod
 
       def spec_sets
         @spec_sets ||= begin
+          analyzer.send(:update_repositories_if_needed)
           aggregate = Source::Aggregate.new(analyzer.sources.map(&:repo))
           installed_pods.map do |pod_name|
             aggregate.search(Dependency.new(pod_name))

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

@@ -21,6 +21,7 @@ module Pod
 
         def self.options
           [['--allow-warnings', 'Allows pushing even if there are warnings'],
+           ['--use-libraries', 'Linter uses static libraries to install the spec'],
            ['--local-only', 'Does not perform the step of pushing REPO to its remote']].concat(super)
         end
 
@@ -29,6 +30,7 @@ module Pod
           @local_only = argv.flag?('local-only')
           @repo = argv.shift_argument
           @podspec = argv.shift_argument
+          @use_frameworks = !argv.flag?('use-libraries')
           super
         end
 
@@ -84,10 +86,12 @@ module Pod
           podspec_files.each do |podspec|
             validator = Validator.new(podspec, SourcesManager.all.map(&:url))
             validator.allow_warnings = @allow_warnings
+            validator.use_frameworks = @use_frameworks
             begin
               validator.validate
-            rescue
-              raise Informative, "The `#{podspec}` specification does not validate."
+            rescue => e
+              raise Informative, "The `#{podspec}` specification does not validate." \
+                                 "\n\n#{e.message}"
             end
             raise Informative, "The `#{podspec}` specification does not validate." unless validator.validated?
           end

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

@@ -20,8 +20,8 @@ module Pod
            ['--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'],
-           ['--use-frameworks', 'Lint uses frameworks to install the spec'],
-           ['--sources=https://github.com/artsy/Specs', 'The sources from which to pull dependant pods ' \
+           ['--use-libraries', 'Lint uses static libraries to install the spec'],
+           ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to pull dependant pods ' \
             '(defaults to https://github.com/CocoaPods/Specs.git). '\
             'Multiple sources must be comma-delimited.']].concat(super)
         end
@@ -32,9 +32,9 @@ module Pod
           @clean           = argv.flag?('clean', true)
           @subspecs        = argv.flag?('subspecs', true)
           @only_subspec    = argv.option('subspec')
-          @use_frameworks  = argv.flag?('use-frameworks')
+          @use_frameworks  = !argv.flag?('use-libraries')
           @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
-          @podspecs_paths = argv.arguments!
+          @podspecs_paths  = argv.arguments!
           super
         end
 
@@ -97,7 +97,7 @@ module Pod
         end
 
         def podspecs_tmp_dir
-          Pathname(File.join(Pathname.new('/tmp').realpath, '/CocoaPods/Lint_podspec'))
+          Pathname.new(Dir.tmpdir) + 'CocoaPods/Lint_podspec'
         end
       end
     end

data/lib/cocoapods/executable.rb

@@ -52,8 +52,9 @@ module Pod
       raise Informative, "Unable to locate the executable `#{executable}`" if bin.empty?
 
       require 'open4'
+      require 'shellwords'
 
-      full_command = "#{bin} #{command}"
+      full_command = "#{bin.shellescape} #{command}"
 
       if Config.instance.verbose?
         UI.message("$ #{full_command}")

data/lib/cocoapods/external_sources/abstract_external_source.rb

@@ -141,6 +141,9 @@ module Pod
         if spec.is_a? Pathname
           spec = Specification.from_file(spec).to_pretty_json
           json = true
+        elsif spec.is_a?(String) && !json
+          spec = Specification.from_string(spec, 'spec.podspec').to_pretty_json
+          json = true
         end
         sandbox.store_podspec(name, spec, true, json)
       end

data/lib/cocoapods/external_sources/path_source.rb

@@ -19,6 +19,7 @@ module Pod
           store_podspec(sandbox, podspec, podspec.extname == '.json')
           is_absolute = absolute?(declared_path)
           sandbox.store_local_path(name, podspec.dirname, is_absolute)
+          sandbox.remove_checkout_source(name)
         end
       end
 

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.36.0.beta.2' unless defined? Pod::VERSION
+  VERSION = '0.36.0.rc.1' unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -76,7 +76,7 @@ module Pod
           unless resources.empty?
             script += %(if [[ "$CONFIGURATION" == "#{config}" ]]; then\n)
             resources.each do |resource|
-              script += "  install_resource '#{resource}'\n"
+              script += %(  install_resource "#{resource}"\n)
             end
             script += "fi\n"
           end

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -57,7 +57,7 @@ module Pod
             local source="${BUILT_PRODUCTS_DIR}/#{target_definition.label}/$1"
             local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
-            if [ -L ${source} ]; then
+            if [ -L "${source}" ]; then
                 echo "Symlinked..."
                 source=$(readlink "${source}")
             fi
@@ -74,10 +74,10 @@ module Pod
             local basename
             basename=$(echo $1 | sed -E s/\\\\..+// && exit ${PIPESTATUS[0]})
             local swift_runtime_libs
-            swift_runtime_libs=$(xcrun otool -LX "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/$1/${basename}" | grep @rpath/libswift | sed -E s/@rpath\\\\/\\(.+dylib\\).*/\\\\1/g | uniq -u  && exit ${PIPESTATUS[0]})
+            swift_runtime_libs=$(xcrun otool -LX "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/$1/${basename}" | grep --color=never @rpath/libswift | sed -E s/@rpath\\\\/\\(.+dylib\\).*/\\\\1/g | uniq -u  && exit ${PIPESTATUS[0]})
             for lib in $swift_runtime_libs; do
-              echo "rsync -av \\"${SWIFT_STDLIB_PATH}/${lib}\\" \\"${destination}\\""
-              rsync -av "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
+              echo "rsync -auv \\"${SWIFT_STDLIB_PATH}/${lib}\\" \\"${destination}\\""
+              rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
               if [ "${CODE_SIGNING_REQUIRED}" == "YES" ]; then
                 code_sign "${destination}/${lib}"
               fi

data/lib/cocoapods/generator/xcconfig/private_pod_xcconfig.rb

@@ -54,6 +54,7 @@ module Pod
             'PODS_ROOT'  => '${SRCROOT}',
             'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(search_paths),
             'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
+            'SKIP_INSTALL' => 'YES',
             # 'USE_HEADERMAP' => 'NO'
           }
 

data/lib/cocoapods/generator/xcconfig/xcconfig_helper.rb

@@ -160,7 +160,7 @@ module Pod
         def self.add_language_specific_settings(target, xcconfig)
           if target.uses_swift?
             build_settings = {
-              'OTHER_SWIFT_FLAGS' => quote(['-D COCOAPODS']),
+              'OTHER_SWIFT_FLAGS' => quote(%w(-D COCOAPODS)),
             }
             xcconfig.merge!(build_settings)
           end

data/lib/cocoapods/installer.rb

@@ -90,6 +90,9 @@ module Pod
       resolve_dependencies
       download_dependencies
       determine_dependency_product_types
+      verify_no_duplicate_framework_names
+      verify_no_static_framework_transitive_dependencies
+      verify_framework_usage
       generate_pods_project
       integrate_user_project if config.integrate_targets?
       perform_post_install_actions
@@ -190,7 +193,7 @@ module Pod
     # Ensures that the white-listed build configurations are known to prevent
     # silent typos.
     #
-    # @raise  If a unknown user configuration is found.
+    # @raise  If an unknown user configuration is found.
     #
     def validate_build_configurations
       whitelisted_configs = pod_targets.map do |target|
@@ -327,6 +330,62 @@ module Pod
       end
     end
 
+    def verify_no_duplicate_framework_names
+      aggregate_targets.each do |aggregate_target|
+        aggregate_target.user_build_configurations.keys.each do |config|
+          pod_targets = aggregate_target.pod_targets_for_build_configuration(config)
+          vendored_frameworks = pod_targets.flat_map(&:file_accessors).flat_map(&:vendored_frameworks)
+          frameworks = vendored_frameworks.map { |fw| fw.basename('.framework') }
+          frameworks += pod_targets.select { |pt| pt.should_build? && pt.requires_frameworks? }.map(&:product_module_name)
+
+          duplicates = frameworks.group_by { |f| f }.select { |_, v| v.size > 1 }.keys
+          unless duplicates.empty?
+            raise Informative, "The '#{aggregate_target.label}' target has " \
+              "frameworks with conflicting names: #{duplicates.to_sentence}."
+          end
+        end
+      end
+    end
+
+    def verify_no_static_framework_transitive_dependencies
+      aggregate_targets.each do |aggregate_target|
+        next unless aggregate_target.requires_frameworks?
+
+        aggregate_target.user_build_configurations.keys.each do |config|
+          pod_targets = aggregate_target.pod_targets_for_build_configuration(config)
+
+          dependencies = pod_targets.flat_map(&:dependencies)
+          dependended_upon_targets = pod_targets.select { |t| dependencies.include?(t.pod_name) }
+
+          static_libs = dependended_upon_targets.flat_map(&:file_accessors).flat_map do |fa|
+            static_frameworks = fa.vendored_frameworks.reject { |fw| `file #{fw + fw.basename('.framework')} 2>&1` =~ /dynamically linked/ }
+            fa.vendored_libraries + static_frameworks
+          end
+
+          unless static_libs.empty?
+            raise Informative, "The '#{aggregate_target.label}' target has " \
+              "transitive dependencies that include static binaries: (#{static_libs.to_sentence})"
+          end
+        end
+      end
+    end
+
+    def verify_framework_usage
+      aggregate_targets.each do |aggregate_target|
+        next if aggregate_target.requires_frameworks?
+
+        aggregate_target.user_build_configurations.keys.each do |config|
+          pod_targets = aggregate_target.pod_targets_for_build_configuration(config)
+
+          if pod_targets.any?(&:uses_swift?)
+            raise Informative, 'Pods written in Swift can only be integrated as frameworks; this ' \
+              'feature is still in beta. Add `use_frameworks!` to your Podfile or target to opt ' \
+              'into using it.'
+          end
+        end
+      end
+    end
+
     # Performs any post-installation actions
     #
     # @return [void]
@@ -467,10 +526,12 @@ module Pod
     def set_target_dependencies
       frameworks_group = pods_project.frameworks_group
       aggregate_targets.each do |aggregate_target|
-        is_app_extension = aggregate_target.user_targets.map(&:symbol_type).include?(:app_extension)
-        configure_app_extension_api_only_for_target(aggregate_target) if is_app_extension
+        is_app_extension = !(aggregate_target.user_targets.map(&:symbol_type) &
+          [:app_extension, :watch_extension]).empty?
 
         aggregate_target.pod_targets.each do |pod_target|
+          configure_app_extension_api_only_for_target(aggregate_target) if is_app_extension
+
           unless pod_target.should_build?
             pod_target.resource_bundle_targets.each do |resource_bundle_target|
               aggregate_target.native_target.add_dependency(resource_bundle_target)

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

@@ -33,8 +33,8 @@ module Pod
             end
 
             pods_to_update = pods_to_update.flat_map do |u|
-              root_name = Specification.root_name(u)
-              dependency_graph.vertices.keys.select { |n| Specification.root_name(n) == root_name }
+              root_name = Specification.root_name(u).downcase
+              dependency_graph.vertices.keys.select { |n| Specification.root_name(n).downcase == root_name }
             end
 
             pods_to_update.each do |u|

data/lib/cocoapods/installer/migrator.rb

@@ -52,6 +52,14 @@ module Pod
         def migrate_to_0_36(sandbox)
           UI.message('Migrating to CocoaPods 0.36') do
             move(sandbox.root + 'Headers/Build', sandbox.root + 'Headers/Private')
+
+            sandbox.specifications_root.children.each do |child|
+              next unless child.basename.to_s =~ /\.podspec$/
+              spec = Specification.from_file(child)
+              child.delete
+              child = Pathname("#{child}.json")
+              File.open(child, 'w') { |f| f.write spec.to_pretty_json }
+            end
           end
         end
 

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

@@ -41,6 +41,7 @@ module Pod
           'OTHER_LDFLAGS'      => '',
           'OTHER_LIBTOOLFLAGS' => '',
           'PODS_ROOT'          => '$(SRCROOT)',
+          'SKIP_INSTALL'       => 'YES',
         }
         super.merge(settings)
       end
@@ -118,7 +119,7 @@ module Pod
         target.user_build_configurations.keys.each do |config|
           file_accessors = library_targets.select { |t| t.include_in_build_config?(config) }.flat_map(&:file_accessors)
           resource_paths = file_accessors.flat_map { |accessor| accessor.resources.flat_map { |res| res.relative_path_from(project.path.dirname) } }
-          resource_bundles = file_accessors.flat_map { |accessor| accessor.resource_bundles.keys.map { |name| "${BUILT_PRODUCTS_DIR}/#{name}.bundle" } }
+          resource_bundles = file_accessors.flat_map { |accessor| accessor.resource_bundles.keys.map { |name| "${BUILT_PRODUCTS_DIR}/#{name.shellescape}.bundle" } }
           resources_by_config[config] = resource_paths + resource_bundles
           resources_by_config[config] << bridge_support_file if bridge_support_file
         end

data/lib/cocoapods/installer/user_project_integrator.rb

@@ -94,7 +94,7 @@ module Pod
           end
 
         else
-          UI.notice "From now on use `#{workspace_path.basename}`."
+          UI.notice "Please close any current Xcode sessions and use `#{workspace_path.basename}` for this project from now on."
           workspace = Xcodeproj::Workspace.new(*file_references)
           workspace.save_as(workspace_path)
         end

data/lib/cocoapods/project.rb

@@ -17,6 +17,7 @@ module Pod
       @refs_by_absolute_path = {}
       @pods = new_group('Pods')
       @development_pods = new_group('Development Pods')
+      self.symroot = LEGACY_BUILD_ROOT
     end
 
     # @return [PBXGroup] The group for the support files of the aggregate
@@ -34,6 +35,25 @@ module Pod
 
     public
 
+    # @!group Legacy Xcode build root
+    #-------------------------------------------------------------------------#
+
+    LEGACY_BUILD_ROOT = '${SRCROOT}/../build'
+
+    # @param [String] symroot
+    #        The build root that is used when Xcode is configured to not use the
+    #        workspace’s build root. Defaults to `${SRCROOT}/../build`.
+    #
+    # @return [void]
+    #
+    def symroot=(symroot)
+      root_object.build_configuration_list.build_configurations.each do |config|
+        config.build_settings['SYMROOT'] = symroot
+      end
+    end
+
+    public
+
     # @!group Pod Groups
     #-------------------------------------------------------------------------#
 

data/lib/cocoapods/sandbox.rb

@@ -354,6 +354,18 @@ module Pod
       checkout_sources[root_name] = source
     end
 
+    # Removes the checkout source of a Pod.
+    #
+    # @param  [String] name
+    #         The name of the Pod.
+    #
+    # @return [void]
+    #
+    def remove_checkout_source(name)
+      root_name = Specification.root_name(name)
+      checkout_sources.delete(root_name)
+    end
+
     # @return [Hash{String=>Hash}] The options necessary to recreate the exact
     #         checkout of a given Pod grouped by its name.
     #

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -12,7 +12,7 @@ module Pod
       GLOB_PATTERNS = {
         :readme              => 'readme{*,.*}'.freeze,
         :license             => 'licen{c,s}e{*,.*}'.freeze,
-        :source_files        => '*.{h,hpp,hh,m,mm,c,cpp,swift}'.freeze,
+        :source_files        => '*.{h,hpp,tpp,hh,m,mm,c,cpp,swift}'.freeze,
         :public_header_files => "*{#{HEADER_EXTENSIONS.join(',')}}".freeze,
       }.freeze
 

data/lib/cocoapods/sources_manager.rb

@@ -57,6 +57,20 @@ module Pod
         source
       end
 
+      # Returns the source whose {Source#name} or {Source#url} is equal to the
+      # given `name_or_url`.
+      #
+      # @return [Source] The source whose {Source#name} or {Source#url} is equal to the
+      #                  given `name_or_url`.
+      #
+      # @param  [String] name_or_url
+      #                  The name or the URL of the source.
+      #
+      def source_with_name_or_url(name_or_url)
+        all.find { |s| s.name == name_or_url } ||
+          find_or_create_source_with_url(name_or_url)
+      end
+
       # @return [Array<Source>] The list of all the sources known to this
       #         installation of CocoaPods.
       #

data/lib/cocoapods/target.rb

@@ -91,13 +91,8 @@ module Pod
     # @return [Boolean] whether the generated target needs to be implemented
     #         as a framework
     #
-    # @note This applies either if Swift was used by the host, which was checked
-    #       eagerly by the analyzer before, or in the given target or its
-    #       dependents, which can only be checked after the specs were been
-    #       fetched.
-    #
     def requires_frameworks?
-      host_requires_frameworks? || uses_swift?
+      host_requires_frameworks? || false
     end
 
     #-------------------------------------------------------------------------#

data/lib/cocoapods/validator.rb

@@ -23,7 +23,7 @@ module Pod
     #         the Source URLs to use in creating a {Podfile}.
     #
     def initialize(spec_or_path, source_urls)
-      @source_urls = source_urls
+      @source_urls = source_urls.map { |url| SourcesManager.source_with_name_or_url(url) }.map(&:url)
       @linter = Specification::Linter.new(spec_or_path)
     end
 
@@ -183,7 +183,7 @@ module Pod
     # @return [Pathname] the temporary directory used by the linter.
     #
     def validation_dir
-      Pathname.new(File.join(Pathname.new('/tmp').realpath, 'CocoaPods/Lint'))
+      Pathname(Dir.tmpdir) + 'CocoaPods/Lint'
     end
 
     #-------------------------------------------------------------------------#
@@ -310,6 +310,11 @@ module Pod
       installer.install!
 
       file_accessors = installer.aggregate_targets.map do |target|
+        if target.pod_targets.any?(&:uses_swift?) && consumer.platform_name == :ios &&
+            (deployment_target.nil? || Version.new(deployment_target).major < 8)
+          error('swift', 'Swift support uses dynamic frameworks and is therefore only supported on iOS > 8.')
+        end
+
         target.pod_targets.map(&:file_accessors)
       end.flatten
 
@@ -473,14 +478,14 @@ module Pod
     # @note   The generated podfile takes into account whether the linter is
     #         in local mode.
     #
-    def podfile_from_spec(platform_name, deployment_target, use_frameworks = nil)
+    def podfile_from_spec(platform_name, deployment_target, use_frameworks = true)
       name     = subspec_name ? subspec_name : spec.name
       podspec  = file.realpath
       local    = local?
       urls     = source_urls
       podfile  = Pod::Podfile.new do
         urls.each { |u| source(u) }
-        use_frameworks!(use_frameworks) unless use_frameworks.nil?
+        use_frameworks!(use_frameworks)
         platform(platform_name, deployment_target)
         if local
           pod name, :path => podspec.dirname.to_s
@@ -504,13 +509,13 @@ module Pod
     def parse_xcodebuild_output(output)
       lines = output.split("\n")
       selected_lines = lines.select do |l|
-        l.include?('error: ') &&
+        l.include?('error: ') && (l !~ /frameworks only run on iOS 8/) &&
           (l !~ /errors? generated\./) && (l !~ /error: \(null\)/)  ||
           l.include?('warning: ') && (l !~ /warnings? generated\./) ||
           l.include?('note: ') && (l !~ /expanded from macro/)
       end
       selected_lines.map do |l|
-        new = l.gsub(%r{/tmp/CocoaPods/Lint/Pods/}, '')
+        new = l.gsub(%r{#{validation_dir}/Pods/}, '')
         new.gsub!(/^ */, ' ')
       end
     end
@@ -519,11 +524,12 @@ module Pod
     #         returns its output (both STDOUT and STDERR).
     #
     def xcodebuild
-      UI.puts 'xcodebuild clean build -target Pods' if config.verbose?
-      output = `xcodebuild clean build -target Pods 2>&1`
+      command = 'xcodebuild clean build -target Pods CODE_SIGN_IDENTITY=-'
+      command << ' -sdk iphonesimulator' if consumer.platform_name == :ios
+      output, status = _xcodebuild "#{command} 2>&1"
 
-      unless $?.success?
-        message = 'Returned a unsuccessful exit code.'
+      unless status.success?
+        message = 'Returned an unsuccessful exit code.'
         message += ' You can use `--verbose` for more information.' unless config.verbose?
         error('xcodebuild', message)
       end
@@ -531,6 +537,17 @@ module Pod
       output
     end
 
+    # Executes the given command in the current working directory.
+    #
+    # @return [(String, Status)] The output of the given command and its
+    #         resulting status.
+    #
+    def _xcodebuild(command)
+      UI.puts command if config.verbose
+      output = `#{command}`
+      [output, $?]
+    end
+
     #-------------------------------------------------------------------------#
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.36.0.beta.2
+  version: 0.36.0.rc.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -17,222 +17,222 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.36.0.beta.2
+        version: 0.36.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.36.0.beta.2
+        version: 0.36.0.rc.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: cocoapods-plugins
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: cocoapods-try
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: cocoapods-trunk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: molinillo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: escape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.15
 - !ruby/object:Gem::Dependency
   name: nap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 description: |-
@@ -250,40 +250,46 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE
+- README.md
+- bin/pod
+- bin/sandbox-pod
+- lib/cocoapods.rb
+- lib/cocoapods/command.rb
 - lib/cocoapods/command/init.rb
 - lib/cocoapods/command/inter_process_communication.rb
 - lib/cocoapods/command/lib.rb
 - lib/cocoapods/command/list.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
 - lib/cocoapods/command/repo/list.rb
 - lib/cocoapods/command/repo/push.rb
 - lib/cocoapods/command/repo/remove.rb
 - lib/cocoapods/command/repo/update.rb
-- lib/cocoapods/command/repo.rb
 - lib/cocoapods/command/search.rb
 - lib/cocoapods/command/setup.rb
+- lib/cocoapods/command/spec.rb
 - lib/cocoapods/command/spec/cat.rb
 - lib/cocoapods/command/spec/create.rb
 - lib/cocoapods/command/spec/edit.rb
 - lib/cocoapods/command/spec/lint.rb
 - lib/cocoapods/command/spec/which.rb
-- lib/cocoapods/command/spec.rb
-- lib/cocoapods/command.rb
 - lib/cocoapods/config.rb
 - lib/cocoapods/downloader.rb
 - lib/cocoapods/executable.rb
+- lib/cocoapods/external_sources.rb
 - lib/cocoapods/external_sources/abstract_external_source.rb
 - lib/cocoapods/external_sources/downloader_source.rb
 - lib/cocoapods/external_sources/path_source.rb
 - lib/cocoapods/external_sources/podspec_source.rb
-- lib/cocoapods/external_sources.rb
 - lib/cocoapods/gem_version.rb
+- lib/cocoapods/generator/acknowledgements.rb
 - lib/cocoapods/generator/acknowledgements/markdown.rb
 - lib/cocoapods/generator/acknowledgements/plist.rb
-- lib/cocoapods/generator/acknowledgements.rb
 - lib/cocoapods/generator/bridge_support.rb
 - lib/cocoapods/generator/copy_resources_script.rb
 - lib/cocoapods/generator/dummy_source.rb
@@ -294,50 +300,44 @@ files:
 - lib/cocoapods/generator/prefix_header.rb
 - lib/cocoapods/generator/target_environment_header.rb
 - lib/cocoapods/generator/umbrella_header.rb
+- lib/cocoapods/generator/xcconfig.rb
 - lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
 - lib/cocoapods/generator/xcconfig/private_pod_xcconfig.rb
 - lib/cocoapods/generator/xcconfig/public_pod_xcconfig.rb
 - lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
-- lib/cocoapods/generator/xcconfig.rb
 - lib/cocoapods/hooks/installer_representation.rb
 - lib/cocoapods/hooks/library_representation.rb
 - lib/cocoapods/hooks/pod_representation.rb
 - lib/cocoapods/hooks_manager.rb
+- lib/cocoapods/installer.rb
+- lib/cocoapods/installer/analyzer.rb
 - lib/cocoapods/installer/analyzer/locking_dependency_analyzer.rb
 - lib/cocoapods/installer/analyzer/sandbox_analyzer.rb
-- lib/cocoapods/installer/analyzer.rb
 - lib/cocoapods/installer/file_references_installer.rb
 - lib/cocoapods/installer/hooks_context.rb
 - lib/cocoapods/installer/migrator.rb
 - lib/cocoapods/installer/pod_source_installer.rb
+- lib/cocoapods/installer/target_installer.rb
 - lib/cocoapods/installer/target_installer/aggregate_target_installer.rb
 - lib/cocoapods/installer/target_installer/pod_target_installer.rb
-- lib/cocoapods/installer/target_installer.rb
-- lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb
-- lib/cocoapods/installer/user_project_integrator/target_integrator.rb
 - lib/cocoapods/installer/user_project_integrator.rb
-- lib/cocoapods/installer.rb
+- lib/cocoapods/installer/user_project_integrator/target_integrator.rb
+- lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb
 - lib/cocoapods/open_uri.rb
 - lib/cocoapods/project.rb
-- lib/cocoapods/resolver/lazy_specification.rb
 - lib/cocoapods/resolver.rb
+- lib/cocoapods/resolver/lazy_specification.rb
+- lib/cocoapods/sandbox.rb
 - lib/cocoapods/sandbox/file_accessor.rb
 - lib/cocoapods/sandbox/headers_store.rb
 - lib/cocoapods/sandbox/path_list.rb
-- lib/cocoapods/sandbox.rb
 - lib/cocoapods/sources_manager.rb
+- lib/cocoapods/target.rb
 - lib/cocoapods/target/aggregate_target.rb
 - lib/cocoapods/target/pod_target.rb
-- lib/cocoapods/target.rb
-- lib/cocoapods/user_interface/error_report.rb
 - lib/cocoapods/user_interface.rb
+- lib/cocoapods/user_interface/error_report.rb
 - lib/cocoapods/validator.rb
-- lib/cocoapods.rb
-- bin/pod
-- bin/sandbox-pod
-- README.md
-- LICENSE
-- CHANGELOG.md
 homepage: https://github.com/CocoaPods/CocoaPods
 licenses:
 - MIT
@@ -348,19 +348,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 3
 summary: The Cocoa library package manager.
 test_files: []
-has_rdoc: