cocoapods 0.22.3 → 0.23.0.rc1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3567ec1832df6804c3e4e6d8e1914003910fdb18
+  data.tar.gz: 40decef521b811cd03fa6859477b3409dbdab2d8
+SHA512:
+  metadata.gz: d7d7136f56b6ee03c44ec8915852f67e4ae42dc3ab97b99c1d6d7b56bb1d73af9da153916403e03de6eaba935740e28f1046e1217f94e75187d39fbc56089e61
+  data.tar.gz: 01e3d5dc91d7cd0a31461f15c70509aff2a6171a98b880f259a77f0fc58d56ba652fd62b250c79700ece2383170d4f90d689867ff670c8e51e375249f18841da

data/CHANGELOG.md

@@ -2,6 +2,59 @@
 
 To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
 
+## Master
+
+## 0.23.0.rc1
+
+###### Enhancements
+
+* Added `resource_bundles` attribute to Specification DSL.  
+  [#743](https://github.com/CocoaPods/CocoaPods/issues/743),
+  [#1186](https://github.com/CocoaPods/CocoaPods/issues/1186)
+
+* Added `vendored_frameworks` attribute to Specification DSL.  
+  [#809](https://github.com/CocoaPods/CocoaPods/issues/809),
+  [#1075](https://github.com/CocoaPods/CocoaPods/issues/1075)
+
+* Added `vendored_libraries` attribute to Specification DSL.  
+  [#809](https://github.com/CocoaPods/CocoaPods/issues/809),
+  [#1075](https://github.com/CocoaPods/CocoaPods/issues/1075)
+
+* Added `prepare_command` attribute to Specification DSL. The prepare command
+  will replace the pre_install hook. The post_install hook has been deprecated.  
+  [#1247](https://github.com/CocoaPods/CocoaPods/issues/1247)
+
+* Restructured `.cocoapods` folder to contain repos in a subdirectory.  
+  [#1150](https://github.com/CocoaPods/CocoaPods/issues/1150)
+  [Ian Ynda-Hummel](https://github.com/ianyh)
+
+* Improved `pod spec create` template.  
+  [#1223](https://github.com/CocoaPods/CocoaPods/issues/1223)
+
+* Added copy&paste-friendly dependency to `pod search`.  
+  [#1073](https://github.com/CocoaPods/CocoaPods/issues/1073)
+
+* Improved performance of the installation of Pods with git
+  sources which specify a tag.  
+  [#1077](https://github.com/CocoaPods/CocoaPods/issues/1077)
+
+* Core Data `xcdatamodeld` files are now properly referenced from the Pods
+  project.  
+  [#1155](https://github.com/CocoaPods/CocoaPods/issues/1155)
+
+* Removed punctuation check from specification validations.  
+  [#1155](https://github.com/CocoaPods/CocoaPods/issues/1155)
+
+* Deprecated the `documentation` DSL attribute of the podspec format.  
+  [Core#20](https://github.com/CocoaPods/Core/issues/20)
+
+###### Bug Fixes
+
+* Fix copy resource script issue related to filenames with spaces.  
+  [#1231](https://github.com/CocoaPods/CocoaPods/issues/1231)
+
+<!------------------------------------------------------------------------ ->
+
 ## 0.22.3
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.2...0.22.3)
 
@@ -33,6 +86,7 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 * Fix handling of spaces in paths when compiling xcdatamodel(d) files.
   [#1201](https://github.com/CocoaPods/CocoaPods/pull/1201)
 
+<!------------------------------------------------------------------------ ->
 
 ## 0.22.2
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.1...0.22.2)

data/lib/cocoapods.rb

@@ -42,9 +42,6 @@ module Pod
     autoload :PrefixHeader,            'cocoapods/generator/prefix_header'
     autoload :TargetEnvironmentHeader, 'cocoapods/generator/target_environment_header'
     autoload :XCConfig,                'cocoapods/generator/xcconfig'
-    autoload :AggregateXCConfig,       'cocoapods/generator/xcconfig/aggregate_xcconfig'
-    autoload :PublicPodXCConfig,       'cocoapods/generator/xcconfig/public_pod_xcconfig'
-    autoload :PrivatePodXCConfig,      'cocoapods/generator/xcconfig/private_pod_xcconfig'
   end
 
   module Hooks

data/lib/cocoapods/command/podfile_info.rb

@@ -5,7 +5,7 @@ module Pod
 
       self.summary = 'Shows information on installed Pods.'
       self.description = <<-DESC
-        Shows information on installed Pods in current Project. 
+        Shows information on installed Pods in current Project.
         If optional `PODFILE_PATH` provided, the info will be shown for
         that specific Podfile
       DESC
@@ -21,13 +21,14 @@ module Pod
       def initialize(argv)
         @info_all = argv.flag?('all')
         @info_in_md = argv.flag?('md')
+        @info_license = argv.flag?('license')
         @podfile_path = argv.shift_argument
         super
       end
 
       def run
         use_podfile = (@podfile_path || !config.lockfile)
-          
+
         if !use_podfile
           UI.puts "Using lockfile" if config.verbose?
           verify_lockfile_exists!
@@ -57,7 +58,7 @@ module Pod
         pods.collect! {|pod| (pod.is_a?(Hash)) ? pod.keys.first : pod}
       end
 
-      def pods_info_hash(pods, keys=[:name, :homepage, :summary])
+      def pods_info_hash(pods, keys=[:name, :homepage, :summary, :license])
         pods_info = []
         pods.each do |pod|
           spec = (Pod::SourcesManager.search_by_name(pod).first rescue nil)
@@ -66,26 +67,27 @@ module Pod
             keys.each { |k| info[k] = spec.specification.send(k) }
             pods_info << info
           else
-            
+
           end
-          
+
         end
         pods_info
       end
 
       def pods_info(pods, in_md=false)
-        pods = pods_info_hash(pods, [:name, :homepage, :summary])
+        pods = pods_info_hash(pods, [:name, :homepage, :summary, :license])
 
-        pods.each do |pod| 
+        pods.each do |pod|
           if in_md
-            UI.puts "* [#{pod[:name]}](#{pod[:homepage]}) - #{pod[:summary]}" 
+            UI.puts "* [#{pod[:name]}](#{pod[:homepage]}) [#{pod[:license][:type]}] - #{pod[:summary]}"
           else
-            UI.puts "- #{pod[:name]} - #{pod[:summary]}" 
+            UI.puts "- #{pod[:name]} [#{pod[:license][:type]}]".green
+            UI.puts "  #{pod[:summary]}\n\n"
           end
         end
       end
 
     end
-    
+
   end
-end
+end

data/lib/cocoapods/command/push.rb

@@ -9,8 +9,8 @@ module Pod
       self.description = <<-DESC
         Validates NAME.podspec or `*.podspec' in the current working dir, creates
         a directory and version folder for the pod in the local copy of
-        REPO (~/.cocoapods/[REPO]), copies the podspec file into the version directory,
-        and finally it pushes REPO to its remote.
+        REPO (~/.cocoapods/repos/[REPO]), copies the podspec file into the version
+        directory, and finally it pushes REPO to its remote.
       DESC
 
       self.arguments = 'REPO [NAME.podspec]'

data/lib/cocoapods/command/repo.rb

@@ -13,7 +13,7 @@ module Pod
         self.summary = 'Add a spec repo.'
 
         self.description = <<-DESC
-          Clones `URL` in the local spec-repos directory at `~/.cocoapods`. The
+          Clones `URL` in the local spec-repos directory at `~/.cocoapods/repos/`. The
           remote can later be referred to by `NAME`.
         DESC
 
@@ -48,7 +48,7 @@ module Pod
 
         self.description = <<-DESC
           Updates the local clone of the spec-repo `NAME`. If `NAME` is omitted
-          this will update all spec-repos in `~/.cocoapods`.
+          this will update all spec-repos in `~/.cocoapods/repos`.
         DESC
 
         self.arguments = '[NAME]'

data/lib/cocoapods/command/setup.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Pod
   class Command
     class Setup < Command
@@ -30,6 +32,8 @@ module Pod
             set_master_repo_url
             set_master_repo_branch
             update_master_repo
+          elsif old_master_repo_dir.exist?
+            migrate_repos
           else
             add_master_repo
           end
@@ -43,6 +47,21 @@ module Pod
 
       # @!group Setup steps
 
+      # Migrates any repos from the old directory structure to the new directory
+      # structure.
+      #
+      # @return [void]
+      def migrate_repos
+        config.repos_dir.mkpath
+        Dir.foreach old_master_repo_dir.parent do |repo_dir|
+          source_repo_dir = old_master_repo_dir.parent + repo_dir
+          target_repo_dir = config.repos_dir + repo_dir
+          if not repo_dir =~ /\.+/ and source_repo_dir != config.repos_dir
+            FileUtils.mv source_repo_dir, target_repo_dir
+          end
+        end
+      end
+
       # Sets the url of the master repo according to whether it is push.
       #
       # @return [void]
@@ -129,6 +148,12 @@ module Pod
       def master_repo_dir
         SourcesManager.master_repo_dir
       end
+
+      # @return [Pathname] the directory of the old master repo.
+      #
+      def old_master_repo_dir
+        Pathname.new('~/.cocoapods/master').expand_path
+      end
     end
   end
 end

data/lib/cocoapods/command/spec.rb

@@ -437,109 +437,137 @@ module Pod
       def spec_template(data)
         return <<-SPEC
 #
-# Be sure to run `pod spec lint #{data[:name]}.podspec' to ensure this is a
-# valid spec and remove all comments before submitting the spec.
+#  Be sure to run `pod spec lint #{data[:name]}.podspec' to ensure this is a
+#  valid spec and to remove all comments including this before submitting the spec.
 #
-# To learn more about the attributes see http://docs.cocoapods.org/specification.html
+#  To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html
+#  To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/
 #
+
 Pod::Spec.new do |s|
+
+  # ―――  Spec Metadata  ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  #
+  #  These will help people to find your library, and whilst it
+  #  can feel like a chore to fill in it's definitely to your advantage. The
+  #  summary should be tweet-length, and the description more in depth.
+  #
+
   s.name         = "#{data[:name]}"
   s.version      = "#{data[:version]}"
   s.summary      = "#{data[:summary]}"
-  # s.description  = <<-DESC
-  #                   An optional longer description of #{data[:name]}
-  #
-  #                   * Markdown format.
-  #                   * Don't worry about the indent, we strip it!
-  #                  DESC
+
+  s.description  = <<-DESC
+                   A longer description of #{data[:name]} in Markdown format.
+
+                   * Think: Why did you write this? What is the focus? What does it do?
+                   * CocoaPods will be using this to generate tags, and improve search results.
+                   * Try to keep it short, snappy and to the point.
+                   * Finally, don't worry about the indent, CocoaPods strips it!
+                   DESC
+
   s.homepage     = "#{data[:homepage]}"
   # s.screenshots  = "www.example.com/screenshots_1", "www.example.com/screenshots_2"
 
-  # Specify the license type. CocoaPods detects automatically the license file if it is named
-  # 'LICENCE*.*' or 'LICENSE*.*', however if the name is different, specify it.
-  s.license      = 'MIT (example)'
-  # s.license      = { :type => 'MIT (example)', :file => 'FILE_LICENSE' }
 
-  # Specify the authors of the library, with email addresses. You can often find
-  # the email addresses of the authors by using the SCM log. E.g. $ git log
-  #
-  s.author       = { "#{data[:author_name]}" => "#{data[:author_email]}" }
-  # s.authors      = { "#{data[:author_name]}" => "#{data[:author_email]}", "other author" => "and email address" }
+  # ―――  Spec License  ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   #
-  # If absolutely no email addresses are available, then you can use this form instead.
+  #  Licensing your code is important. See http://choosealicense.com for more info.
+  #  CocoaPods will detect a license file if there is a named LICENSE*
+  #  Popular ones are 'MIT', 'BSD' and 'Apache License, Version 2.0'.
   #
-  # s.author       = '#{data[:author_name]}', 'other author'
 
-  # Specify the location from where the source should be retrieved.
-  #
-  s.source       = { :git => "#{data[:source_url]}", #{data[:ref_type]} => "#{data[:ref]}" }
+  s.license      = 'MIT (example)'
+  # s.license      = { :type => 'MIT', :file => 'FILE_LICENSE' }
 
 
-  # If this Pod runs only on iOS or OS X, then specify the platform and
-  # the deployment target.
+  # ――― Author Metadata  ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  #
+  #  Specify the authors of the library, with email addresses. Email addresses
+  #  of the authors by using the SCM log. E.g. $ git log. If no email can be
+  #  found CocoaPods accept just the names.
   #
-  # s.platform     = :ios, '5.0'
 
-  # ――― MULTI-PLATFORM VALUES ――――――――――――――――――――――――――――――――――――――――――――――――― #
+  s.author       = { "#{data[:author_name]}" => "#{data[:author_email]}" }
+  # s.authors      = { "#{data[:author_name]}" => "#{data[:author_email]}", "other author" => "email@address.com" }
+  # s.author       = '#{data[:author_name]}', 'other author'
+
 
-  # If this Pod runs on both platforms, then specify the deployment
-  # targets.
+  # ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   #
+  #  If this Pod runs only on iOS or OS X, then specify the platform and
+  #  the deployment target. You can optionally include the target after the platform.
+  #
+
+  # s.platform     = :ios
+  # s.platform     = :ios, '5.0'
+
+  #  When using multiple platforms
   # s.ios.deployment_target = '5.0'
   # s.osx.deployment_target = '10.7'
 
-  # A list of file patterns which select the source files that should be
-  # added to the Pods project. If the pattern is a directory then the
-  # path will automatically have '*.{h,m,mm,c,cpp}' appended.
+
+  # ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   #
-  s.source_files = 'Classes', 'Classes/**/*.{h,m}'
-  s.exclude_files = 'Classes/Exclude'
+  #  Specify the location from where the source should be retrieved.
+  #  Supports git, hg, svn and HTTP.
+  #
+
+  s.source       = { :git => "#{data[:source_url]}", #{data[:ref_type]} => "#{data[:ref]}" }
 
-  # A list of file patterns which select the header files that should be
-  # made available to the application. If the pattern is a directory then the
-  # path will automatically have '*.h' appended.
+
+  # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   #
-  # If you do not explicitly set the list of public header files,
-  # all headers of source_files will be made public.
+  #  CocoaPods is smart about how it include source code, for source files
+  #  giving a folder will include any h, m, mm, c & cpp files. For header
+  #  files it will include any header in the folder.
+  #  Not including the public_header_files will make all headers public.
   #
+
+  s.source_files  = 'Classes', 'Classes/**/*.{h,m}'
+  s.exclude_files = 'Classes/Exclude'
+
   # s.public_header_files = 'Classes/**/*.h'
 
-  # A list of resources included with the Pod. These are copied into the
-  # target bundle with a build phase script.
+
+  # ――― Resources ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  #
+  #  A list of resources included with the Pod. These are copied into the
+  #  target bundle with a build phase script. Anything else will be cleaned.
+  #  You can preserve files from being cleaned, please don't preserve
+  #  non-essential files like tests, examples and documentation.
   #
+
   # s.resource  = "icon.png"
   # s.resources = "Resources/*.png"
 
-  # A list of paths to preserve after installing the Pod.
-  # CocoaPods cleans by default any file that is not used.
-  # Please don't include documentation, example, and test files.
-  #
   # s.preserve_paths = "FilesToSave", "MoreFilesToSave"
 
-  # Specify a list of frameworks that the application needs to link
-  # against for this Pod to work.
+
+  # ――― Project Linking ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   #
+  #  Link your library with frameworks, or libraries. Libraries do not include
+  #  the lib prefix of their name.
+  #
+
   # s.framework  = 'SomeFramework'
   # s.frameworks = 'SomeFramework', 'AnotherFramework'
 
-  # Specify a list of libraries that the application needs to link
-  # against for this Pod to work.
-  #
   # s.library   = 'iconv'
   # s.libraries = 'iconv', 'xml2'
 
-  # If this Pod uses ARC, specify it like so.
-  #
-  s.requires_arc = true
 
-  # If you need to specify any other build settings, add them to the
-  # xcconfig hash.
+  # ――― Project Settings ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   #
-  # s.xcconfig = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' }
+  #  If your library depends on compiler flags you can set them in the xcconfig hash
+  #  where they will only apply to your library. If you depend on other Podspecs
+  #  you can include multiple dependencies to ensure it works.
 
-  # Finally, specify any Pods that this Pod depends on.
-  #
+  # s.requires_arc = true
+
+  # s.xcconfig = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' }
   # s.dependency 'JSONKit', '~> 1.4'
+
 end
       SPEC
     end

data/lib/cocoapods/config.rb

@@ -132,10 +132,17 @@ module Pod
 
     # @!group Paths
 
+    # @return [Pathname] the directory where repos, templates and configuration
+    #         files are stored.
+    #
+    def home_dir
+      @home_dir ||= Pathname.new(ENV['CP_HOME_DIR'] || "~/.cocoapods").expand_path
+    end
+
     # @return [Pathname] the directory where the CocoaPods sources are stored.
     #
     def repos_dir
-      @repos_dir ||= Pathname.new(ENV['CP_REPOS_DIR'] || "~/.cocoapods").expand_path
+      @repos_dir ||= Pathname.new(ENV['CP_REPOS_DIR'] || "~/.cocoapods/repos").expand_path
     end
 
     attr_writer :repos_dir
@@ -261,7 +268,7 @@ module Pod
     # @return [Pathname] The path of the file which contains the user settings.
     #
     def user_settings_file
-      repos_dir + "config.yaml"
+      home_dir + "config.yaml"
     end
 
     # Sets the values of the attributes with the given hash.