cocoapods 0.16.0 → 0.16.1

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 0.16.1
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.0...0.16.1) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.4.0...0.4.1)
+
+###### Bug fixes
+
+- After unpacking source from a HTTP location, move the source into the parent
+  dir if the archive contained only one child. This is done to make it
+  consistent with how source from other types of locations are described in a
+  podspec.
+  **NOTE** This might break some podspecs that assumed the incorrect layout.
+  [#727](https://github.com/CocoaPods/CocoaPods/issues/727)
+  [#728](https://github.com/CocoaPods/CocoaPods/pull/728)
+- Remove duplicate option in `pod update` command.
+  [#725](https://github.com/CocoaPods/CocoaPods/issues/725)
+- Memory fixes in Xcodeproj.
+  [#43](https://github.com/CocoaPods/Xcodeproj/pull/43)
+
+###### Xcodeproj Enhancements
+
+- Sort contents of xcconfig files by setting name.
+  [#591](https://github.com/CocoaPods/CocoaPods/issues/591)
+- Add helpers to get platform name, deployment target, and frameworks build phases
+- Take SDKROOT into account when adding frameworks.
+
 ## 0.16.0
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.0.rc5...master)
 
@@ -6,7 +30,6 @@
 - Use Rake 0.9.4
   [#657](https://github.com/CocoaPods/CocoaPods/issues/657)
 
-
 ## 0.16.0.rc5
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.0.rc4...0.16.0.rc5)
 

data/lib/cocoapods.rb

@@ -7,12 +7,12 @@ require 'rubygems'
 #
 # E.g. https://github.com/CocoaPods/CocoaPods/issues/398
 unless Gem::Version::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new(Gem::VERSION))
-  STDERR.puts "\e[1;31m" + "Your RubyGems version (1.8.24) is too old, please update with: `gem update --system`" + "\e[0m"
+  STDERR.puts "\e[1;31m" + "Your RubyGems version (#{Gem::VERSION}) is too old, please update with: `gem update --system`" + "\e[0m"
   exit 1
 end
 
 module Pod
-  VERSION = '0.16.0'
+  VERSION = '0.16.1'
 
   class PlainInformative < StandardError
   end

data/lib/cocoapods/command/push.rb

@@ -27,7 +27,12 @@ module Pod
         @allow_warnings = argv.option('--allow-warnings')
         @local_only = argv.option('--local-only')
         @repo = argv.shift_argument
-        @podspec = argv.shift_argument
+        if @repo.end_with? ".podspec"
+          @podspec = @repo
+          @repo = "master"
+        else
+          @podspec = argv.shift_argument
+        end
         super unless argv.empty? && @repo
       end
 
@@ -82,7 +87,7 @@ module Pod
         lint_argv = ["lint"]
         lint_argv << "--only-errors" if @allow_warnings
         lint_argv << "--silent" if config.silent
-        all_valid = true
+        # all_valid = true
         podspec_files.each do |podspec|
           Spec.new(ARGV.new(lint_argv + [podspec.to_s])).run
         end

data/lib/cocoapods/command/repo.rb

@@ -153,6 +153,8 @@ module Pod
         is_compatilbe(versions)
       end
 
+      #--------------------------------------#
+
       private
 
       def versions(dir)

data/lib/cocoapods/command/spec.rb

@@ -230,7 +230,7 @@ Pod::Spec.new do |s|
   s.homepage     = "#{data[:homepage]}"
 
   # Specify the license type. CocoaPods detects automatically the license file if it is named
-  # `LICENSE*.*', however if the name is different, specify it.
+  # `LICEN{C,S}E*.*', however if the name is different, specify it.
   s.license      = 'MIT (example)'
   # s.license      = { :type => 'MIT (example)', :file => 'FILE_LICENSE' }
   #

data/lib/cocoapods/command/update.rb

@@ -9,10 +9,6 @@ module Pod
       Updates all dependencies.}
       end
 
-      def self.options
-        [["--no-update", "Skip running `pod repo update` before install"]].concat(super)
-      end
-
       def initialize(argv)
         config.skip_repo_update = argv.option('--no-update')
         super unless argv.empty?

data/lib/cocoapods/dependency.rb

@@ -136,6 +136,8 @@ module Pod
         return unless name && params
         if params.key?(:git)
           GitSource.new(name, params)
+        elsif params.key?(:svn)
+          SvnSource.new(name, params)
         elsif params.key?(:podspec)
           PodspecSource.new(name, params)
         elsif params.key?(:local)
@@ -214,6 +216,29 @@ module Pod
         end
       end
 
+      class SvnSource < AbstractExternalSource
+        def copy_external_source_into_sandbox(sandbox, platform)
+          UI.info("->".green + " Pre-downloading: '#{name}'") do
+            target = sandbox.root + name
+            target.rmtree if target.exist?
+            downloader = Downloader.for_target(sandbox.root + name, @params)
+            downloader.download
+            store_podspec(sandbox, target + "#{name}.podspec")
+            if local_pod = sandbox.installed_pod_named(name, platform)
+                local_pod.downloaded = true
+            end
+          end
+        end
+
+        def description
+          "from `#{@params[:svn]}'".tap do |description|
+            description << ", folder `#{@params[:folder]}'" if @params[:folder]
+            description << ", tag `#{@params[:tag]}'" if @params[:tag]
+            description << ", revision `#{@params[:revision]}'" if @params[:revision]
+          end
+        end
+      end
+
       # can be http, file, etc
       class PodspecSource < AbstractExternalSource
         def copy_external_source_into_sandbox(sandbox, _)

data/lib/cocoapods/downloader/http.rb

@@ -73,6 +73,14 @@ module Pod
         else
           raise UnsupportedFileTypeError.new "Unsupported file type: #{type}"
         end
+
+        # If the archive only contained a folder, move its contents to the target (#727)
+        contents = target_path.children
+        contents.delete(full_filename)
+        entry = contents.first
+        if contents.count == 1 && entry.directory?
+          FileUtils.move(entry.children, target_path)
+        end
       end
 
     end

data/lib/cocoapods/downloader/subversion.rb

@@ -9,16 +9,20 @@ module Pod
 
       def download
         UI.section(' > Exporting subversion repo', '', 3) do
-          svn! %|export "#{reference_url}" "#{target_path}"|
+          svn! %|#{export_subcommand} "#{reference_url}" "#{target_path}"|
         end
       end
 
       def download_head
         UI.section(' > Exporting subversion repo', '', 3) do
-          svn! %|export "#{trunk_url}" "#{target_path}"|
+          svn! %|#{export_subcommand} "#{trunk_url}" "#{target_path}"|
         end
       end
 
+      def export_subcommand
+        result = 'export --non-interactive --trust-server-cert'
+      end
+
       def reference_url
         result = url.dup
         result << '/'       << options[:folder] if options[:folder]

data/lib/cocoapods/specification.rb

@@ -18,8 +18,8 @@ module Pod
     ### Initalization
 
     # The file is expected to define and return a Pods::Specification.
-    # If name is equals to nil it returns the top level Specification,
-    # otherwise it returned the specification with the name that matches
+    # If name is equal to nil it returns the top level Specification,
+    # otherwise it returns the specification with matching name
     def self.from_file(path, subspec_name = nil)
       unless path.exist?
         raise Informative, "No podspec exists at path `#{path}'."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -254,9 +254,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3740855769431273730
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -265,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: An Objective-C library package manager.