cocoapods 0.17.2 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c25c65ce92bbe864c71397e829e4d3937bc688ba
-  data.tar.gz: 3d0be603cb93b99462a6b4dae722faadf80f01c4
+  metadata.gz: 5b1df58baee810ede899c2654dc4839739eb371c
+  data.tar.gz: b2d143a8e33bf73b380fe0666080379f05d3bbb0
 SHA512:
-  metadata.gz: 83945b68a115773fd383b35aa13040c20f7ee077b6465f3ae0408f7a8f2f31d0adc4509b3f6fe76f476b9aa147a8d9bd6c46ce3d957b037a4172e5b2bf4d84c2
-  data.tar.gz: da9910b5c607f58106c75a579ac3250b52bbeef09879c823785ad35305976e7568cfb07a568b97305f37d903603d9c62d71eac5c7f73ba7df55676c879939c6d
+  metadata.gz: f3f16d90e3a16e73916c0effbdbb0bd9eaa71bbcb50e6494394050b09d4857551400d16e5eb74bb9635018cca27656e4e29d7643d5a68f20f27b5584b4d2073b
+  data.tar.gz: 0954a3a480bad61c2fb5abeee3d95d55f723f65d58aca68d52ad42159e6868be9bbc1b1e3552cc3fc0109eb6d2ca033ca56c0374697bb7f69cc0ba54d239d3ac

data/CHANGELOG.md

@@ -1,3 +1,48 @@
+## 0.18.0 (unreleased)
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.17.2...0.17.3)
+• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.17.2...0.17.3)
+• [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.5.2...0.5.4)
+
+###### Enhancements
+
+* Added the ability to inhibit warnings per pod.
+  Just pass `:inhibit_warnings => true` inline.
+  This feature has been implemented by Marin Usalj (@mneorr).
+  [#10](https://github.com/CocoaPods/Core/pull/10)
+  [#934](https://github.com/CocoaPods/CocoaPods/pull/934)
+* Inhibiting warnings will also suppress the warnings of the static analyzer.
+* A new build phase has been added to check that your
+  installation is in sync with the `Podfile.lock` and fail the build otherwise.
+  The new build phase will not be added automatically to targets already
+  integrated with CocoaPods, for integrating targets manually see [this
+  comment](https://github.com/CocoaPods/CocoaPods/pull/946#issuecomment-16042419).
+  This feature has been implemented by Ullrich Schäfer (@stigi).
+  [#946](https://github.com/CocoaPods/CocoaPods/pull/946)
+* The `pod search` commands now accepts the `--ios` and the `--osx` arguments
+  to filter the results by platform.
+  [#625](https://github.com/CocoaPods/CocoaPods/issues/625)
+* The developer frameworks are automatically added if `SenTestingKit` is
+  detected. There is no need to specify them in specifications anymore.
+  [#771](https://github.com/CocoaPods/CocoaPods/issues/771)
+* The `--no-update` argument of the `install`, `update`, `outdated` subcommands
+  has been renamed to `--no-repo-update`.
+  [#913](https://github.com/CocoaPods/CocoaPods/issues/913)
+
+###### Bug fixes
+
+* Improved handling for Xcode projects containing non ASCII characters.
+  Special thanks to Cédric Luthi (@0xced), Vincent Isambart (@vincentisambart),
+  and Manfred Stienstra (@Manfred) for helping to develop the workaround.
+  [#926](https://github.com/CocoaPods/CocoaPods/issues/926)
+* Corrected improper configuration of the PODS_ROOT xcconfig variable in
+  non-integrating installations.
+  [#918](https://github.com/CocoaPods/CocoaPods/issues/918)
+* Improved support for pre-release versions using dashes.
+  [#935](https://github.com/CocoaPods/CocoaPods/issues/935)
+* Documentation sets are now namespaced by pod solving improper attribution.
+  [#659](https://github.com/CocoaPods/CocoaPods/issues/659)
+
+
 ## 0.17.2
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.17.1...0.17.2)
 • [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.17.1...0.17.2)

data/lib/cocoapods/command/outdated.rb

@@ -9,11 +9,11 @@ module Pod
       DESC
 
       def self.options
-        [["--no-update", "Skip running `pod repo update` before install"]].concat(super)
+        [["--no-repo-update", "Skip running `pod repo update` before install"]].concat(super)
       end
 
       def initialize(argv)
-        config.skip_repo_update = argv.flag?('update', config.skip_repo_update)
+        config.skip_repo_update = argv.flag?('repo-update', config.skip_repo_update)
         super
       end
 

data/lib/cocoapods/command/project.rb

@@ -8,10 +8,10 @@ module Pod
       module Options
         def options
           [
-            ["--no-clean",     "Leave SCM dirs like `.git' and `.svn' intact after downloading"],
-            ["--no-doc",       "Skip documentation generation with appledoc"],
-            ["--no-integrate", "Skip integration of the Pods libraries in the Xcode project(s)"],
-            ["--no-update",    "Skip running `pod repo update` before install"],
+            ["--no-clean",       "Leave SCM dirs like `.git' and `.svn' intact after downloading"],
+            ["--no-doc",         "Skip documentation generation with appledoc"],
+            ["--no-integrate",   "Skip integration of the Pods libraries in the Xcode project(s)"],
+            ["--no-repo-update", "Skip running `pod repo update` before install"],
           ].concat(super)
         end
       end
@@ -24,7 +24,7 @@ module Pod
         config.clean = argv.flag?('clean', config.clean)
         config.generate_docs = argv.flag?('doc', config.generate_docs)
         config.integrate_targets = argv.flag?('integrate', config.integrate_targets)
-        config.skip_repo_update = !argv.flag?('update', !config.skip_repo_update)
+        config.skip_repo_update = !argv.flag?('repo-update', !config.skip_repo_update)
         super
       end
 

data/lib/cocoapods/command/search.rb

@@ -14,13 +14,17 @@ module Pod
       def self.options
         [[
           "--full",  "Search by name, summary, and description",
-          "--stats", "Show additional stats (like GitHub watchers and forks)"
+          "--stats", "Show additional stats (like GitHub watchers and forks)",
+          "--ios",   "Restricts the search to Pods supported on iOS",
+          "--osx",   "Restricts the search to Pods supported on OS X",
         ]].concat(super)
       end
 
       def initialize(argv)
         @full_text_search = argv.flag?('full')
         @stats = argv.flag?('stats')
+        @supported_on_ios = argv.flag?('ios')
+        @supported_on_osx = argv.flag?('osx')
         @query = argv.shift_argument
         super
       end
@@ -32,10 +36,16 @@ module Pod
 
       def run
         sets = SourcesManager.search_by_name(@query.strip, @full_text_search)
+        if @supported_on_ios
+          sets.reject!{ |set| !set.specification.available_platforms.map(&:name).include?(:ios) }
+        end
+        if @supported_on_osx
+          sets.reject!{ |set| !set.specification.available_platforms.map(&:name).include?(:osx) }
+        end
         sets.each do |set|
           begin
             UI.pod(set, (@stats ? :stats : :normal))
-          rescue DSLError => e
+          rescue DSLError
             UI.warn "Skipping `#{set.name}` because the podspec contains errors."
           end
         end

data/lib/cocoapods/gem_version.rb

@@ -2,6 +2,6 @@ module Pod
 
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.17.2' unless defined? Pod::VERSION
+  VERSION = '0.18.0' unless defined? Pod::VERSION
 end
 

data/lib/cocoapods/generator/documentation.rb

@@ -54,8 +54,7 @@ module Pod
       #
       def generate(install_docset)
         if `which appledoc`.strip.empty?
-          UI.warn "[!] Skipping documentation generation because appledoc can't be found.",
-            actions = [], verbose_only = true
+          UI.warn "[!] Skipping documentation generation because appledoc can't be found.", [], true
           return
         end
 
@@ -106,10 +105,10 @@ module Pod
         specification.summary || specification.description || 'Generated by CocoaPods.'
       end
 
-      # @return [String] The id of the docset.
+      # @return [String] The id of the docset, uniq for every Pod.
       #
       def docs_id
-        'org.cocoapods'
+        "org.cocoapods.#{specification.name.downcase}"
       end
 
       #-----------------------------------------------------------------------#

data/lib/cocoapods/generator/xcconfig.rb

@@ -61,10 +61,7 @@ module Pod
         })
 
         spec_consumers.each do |consumer|
-          @xcconfig.merge!(consumer.xcconfig);
-          @xcconfig.libraries.merge(consumer.libraries);
-          @xcconfig.frameworks.merge(consumer.frameworks);
-          @xcconfig.weak_frameworks.merge(consumer.weak_frameworks);
+          add_spec_build_settings_to_xcconfig(consumer, @xcconfig)
         end
 
         @xcconfig
@@ -124,6 +121,63 @@ module Pod
       def quote(strings)
         strings.sort.map { |s| %W|"#{s}"| }.join(" ")
       end
+
+      # Configures the given Xcconfig according to the build settings of the
+      # given Specification.
+      #
+      # @param  [Specification::Consumer] consumer
+      #         The consumer of the specification.
+      #
+      # @param  [Xcodeproj::Config] xcconfig
+      #         The xcconfig to edit.
+      #
+      # @return [void]
+      #
+      def add_spec_build_settings_to_xcconfig(consumer, xcconfig)
+        xcconfig.merge!(consumer.xcconfig)
+        xcconfig.libraries.merge(consumer.libraries)
+        xcconfig.frameworks.merge(consumer.frameworks)
+        xcconfig.weak_frameworks.merge(consumer.weak_frameworks)
+        add_developers_frameworks_if_needed(consumer, xcconfig)
+      end
+
+      # @return [Array<String>] The search paths for the developer frameworks.
+      #
+      # @todo   Inheritance should be properly handled in Xcconfigs.
+      #
+      DEVELOPER_FRAMEWORKS_SEARCH_PATHS = [
+        '"$(inherited)"',
+        '"$(SDKROOT)/Developer/Library/Frameworks"',
+        '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
+      ]
+
+      # Adds the search paths of the developer frameworks to the specification
+      # if needed. This is done because the `SenTestingKit` requires them and 
+      # adding them to each specification which requires it is repetitive and
+      # error prone.
+      #
+      # @param  [Specification::Consumer] consumer
+      #         The consumer of the specification.
+      #
+      # @param  [Xcodeproj::Config] xcconfig
+      #         The xcconfig to edit.
+      #
+      # @return [void]
+      #
+      def add_developers_frameworks_if_needed(consumer, xcconfig)
+        if xcconfig.frameworks.include?('SenTestingKit')
+          search_paths = xcconfig.attributes['FRAMEWORK_SEARCH_PATHS'] ||= ''
+          DEVELOPER_FRAMEWORKS_SEARCH_PATHS.each do |search_path|
+            unless search_paths.include?(search_path)
+              search_paths << ' ' unless search_paths.empty?
+              search_paths << search_path
+            end
+          end
+        end
+      end
+
+      #-----------------------------------------------------------------------#
+
     end
   end
 end

data/lib/cocoapods/installer/analyzer.rb

@@ -179,18 +179,19 @@ module Pod
             user_project = Xcodeproj::Project.new(project_path)
             targets = compute_user_project_targets(target_definition, user_project)
 
-            lib.user_project_path         = project_path
-            lib.user_target_uuids         = targets.map(&:uuid)
+            lib.user_project_path = project_path
+            lib.client_root = project_path.dirname
+            lib.user_target_uuids = targets.map(&:uuid)
             lib.user_build_configurations = compute_user_build_configurations(target_definition, targets)
-            lib.platform                  = compute_platform_for_target_definition(target_definition, targets)
+            lib.platform = compute_platform_for_target_definition(target_definition, targets)
           else
             unless target_definition.platform
               raise Informative, "It is necessary to specify the platform in the Podfile if not integrating."
             end
-            lib.user_project_path         = config.installation_root
-            lib.user_target_uuids         = []
+            lib.client_root = config.installation_root
+            lib.user_target_uuids = []
             lib.user_build_configurations = {}
-            lib.platform                  = target_definition.platform
+            lib.platform = target_definition.platform
           end
           libraries << lib
         end

data/lib/cocoapods/installer/target_installer.rb

@@ -72,9 +72,6 @@ module Pod
         if library.platform.requires_legacy_ios_archs?
           settings['ARCHS'] = "armv6 armv7"
         end
-        if target_definition.inhibit_all_warnings?
-          settings['GCC_WARN_INHIBIT_ALL_WARNINGS'] = 'YES'
-        end
 
         @target.build_settings('Debug').merge!(settings)
         @target.build_settings('Release').merge!(settings)
@@ -362,7 +359,10 @@ module Pod
             flags << '-DOS_OBJECT_USE_OBJC=0'
           end
         end
-        flags = flags * " "
+        if target_definition.inhibits_warnings_for_pod?(consumer.spec.root.name)
+          flags << '-w -Xanalyzer -analyzer-disable-checker'
+        end
+        flags * " "
       end
 
       #-----------------------------------------------------------------------#

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

@@ -1,3 +1,5 @@
+require 'active_support'
+
 module Pod
   class Installer
     class UserProjectIntegrator
@@ -29,6 +31,7 @@ module Pod
             add_xcconfig_base_configuration
             add_pods_library
             add_copy_resources_script_phase
+            add_check_manifest_lock_script_phase
             save_user_project
           end
         end
@@ -129,6 +132,32 @@ module Pod
           end
         end
 
+        # Adds a shell script build phase responsible for checking if the Pods
+        # locked in the Pods/Manifest.lock file are in sync with the Pods defined
+        # in the Podfile.lock.
+        #
+        # @note   The build phase is appended to the front because to fail
+        #         fast.
+        #
+        # @return [void]
+        #
+        def add_check_manifest_lock_script_phase
+          targets.each do |target|
+            phase = target.project.new(Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
+            target.build_phases.unshift(phase)
+            phase.name = 'Check Pods Manifest.lock'
+            phase.shell_script = <<-EOS.strip_heredoc
+              diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
+              if [[ $? != 0 ]] ; then
+                  cat << EOM
+              error: The sanbox is not in sync with the Podfile.lock. Run 'pod install'.
+              EOM
+                  exit 1
+              fi
+            EOS
+          end
+        end
+
         # Saves the changes to the user project to the disk.
         #
         # @return [void]

data/lib/cocoapods/library.rb

@@ -53,6 +53,13 @@ module Pod
     #
     attr_accessor :support_files_root
 
+    # @return [Pathname] the folder where the client is stored used for
+    #         computing the relative paths. If integrating it should be the
+    #         folder where the user project is stored, otherwise it should
+    #         be the installation root.
+    #
+    attr_accessor :client_root
+
     # @return [Pathname] the path of the user project that this library will
     #         integrate as identified by the analyzer.
     #
@@ -157,7 +164,7 @@ module Pod
     #         variable of the user's project.
     #
     def relative_pods_root
-      "${SRCROOT}/#{support_files_root.relative_path_from(user_project_path.dirname)}"
+      "${SRCROOT}/#{support_files_root.relative_path_from(client_root)}"
     end
 
     # @return [String] the path of the xcconfig file relative to the root of
@@ -189,7 +196,7 @@ module Pod
     # @return [String] the computed path.
     #
     def relative_to_srcroot(path)
-      path.relative_path_from(user_project_path.dirname).to_s
+      path.relative_path_from(client_root).to_s
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.18.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.2
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.2
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement