cocoapods 1.1.0.beta.2 → 1.1.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 418a08b4640dea3a24c182ef13b27429b38cb4ff
-  data.tar.gz: e741431690118b0f7cb25eec97cc4e2fe21f466b
+  metadata.gz: f4ff9dbac2efdec1817b8a8fb06c7aed5f2c1558
+  data.tar.gz: d05adef502d5c11d80f44819de3c317ce71c7561
 SHA512:
-  metadata.gz: 671ae461b6646fbd4e683c93515f7a4b362502910f375bb41979ab3772c9f4ec07e27f3b1fab4004365eb7e3e33b94feb741ed24473afe143b49c72d602c5e84
-  data.tar.gz: 8ad878152d902904f0da3817dc4d0353194c6d68fbd279b8d86fed4f9276cd2d72d15e56b90ff5114cc05d6ddb3539b4e8da1f895e40e1c9b0ef39823c8635ab
+  metadata.gz: 819b0c19eb7ed8ad2be3a8dc44eb9c4ea499e5bf93a75dfd16ef50c911eca9fbeb6b944f123a237605f3e855a7a24f84ca72e7d6f201bf40a25f0811e3b8e588
+  data.tar.gz: defab2d9d9364630d198e0b0334ef840f80175f696cb00def25bfbccc6a70458a2a0c3f3f9ca92649cac66e9aee1c110089680bb813fafc64e5dfe3a1014cb9f

data/CHANGELOG.md

@@ -4,6 +4,34 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## Master
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* None.  
+
+
+## 1.1.0.rc.1 (2016-09-10)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Prevent crash when generating acknowledgements when license type is not specified.  
+  [Marcelo Fabri](https://github.com/marcelofabri)
+  [#5826](https://github.com/CocoaPods/CocoaPods/issues/5826)
+
+* Pass full path to App.xcworkspace for spec validation, and use `git -C` for `pod repo push` git ops.  
+  [Ben Asher](https://github.com/benasher44)
+  [#5805](https://github.com/CocoaPods/CocoaPods/issues/5805)
+
+
 ## 1.1.0.beta.2 (2016-09-03)
 
 ##### Enhancements
@@ -33,6 +61,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [benasher44](https://github.com/benasher44)
   [#5747](https://github.com/CocoaPods/CocoaPods/pull/5747)
 
+* Pass the version of CocoaPods to `pod lib create`'s configure script.  
+  [orta](https://github.com/orta)
+  [#5787](https://github.com/CocoaPods/CocoaPods/pull/5787)
+
 ##### Bug Fixes
 
 * Hash scope suffixes if they are over 50 characters to prevent file paths from being too long. 

data/lib/cocoapods/command/lib/create.rb

@@ -75,7 +75,7 @@ module Pod
           UI.section("Configuring #{@name} template.") do
             Dir.chdir(@name) do
               if File.exist?('configure')
-                system('./configure', @name, *@additional_args)
+                system({ 'COCOAPODS_VERSION' => Pod::Version }, './configure', @name, *@additional_args)
               else
                 UI.warn 'Template does not have a configure file.'
               end

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

@@ -96,7 +96,7 @@ module Pod
         # specs to the master repo.
         #
         def check_if_master_repo
-          remotes = Dir.chdir(repo_dir) { `git remote -v 2>&1` }
+          remotes = `git -C "#{repo_dir}" remote -v 2>&1`
           master_repo_urls = [
             'git@github.com:CocoaPods/Specs.git',
             'https://github.com/CocoaPods/Specs.git',
@@ -145,7 +145,7 @@ module Pod
         # @return [void]
         #
         def check_repo_status
-          clean = Dir.chdir(repo_dir) { `git status --porcelain  2>&1` } == ''
+          clean = `git -C "#{repo_dir}" status --porcelain  2>&1` == ''
           raise Informative, "The repo `#{@repo}` at #{UI.path repo_dir} is not clean" unless clean
         end
 
@@ -155,7 +155,7 @@ module Pod
         #
         def update_repo
           UI.puts "Updating the `#{@repo}' repo\n".yellow
-          Dir.chdir(repo_dir) { UI.puts `git pull 2>&1` }
+          UI.puts `git -C "#{repo_dir}" pull 2>&1`
         end
 
         # Commits the podspecs to the source, which should be a git repo.
@@ -189,15 +189,13 @@ module Pod
               FileUtils.cp(spec_file, output_path)
             end
 
-            Dir.chdir(repo_dir) do
-              # only commit if modified
-              if git!('status', '--porcelain').include?(spec.name)
-                UI.puts " - #{message}"
-                git!('add', spec.name)
-                git!('commit', '--no-verify', '-m', message)
-              else
-                UI.puts " - [No change] #{spec}"
-              end
+            # only commit if modified
+            if repo_git('status', '--porcelain').include?(spec.name)
+              UI.puts " - #{message}"
+              repo_git('add', spec.name)
+              repo_git('commit', '--no-verify', '-m', message)
+            else
+              UI.puts " - [No change] #{spec}"
             end
           end
         end
@@ -208,7 +206,7 @@ module Pod
         #
         def push_repo
           UI.puts "\nPushing the `#{@repo}' repo\n".yellow
-          Dir.chdir(repo_dir) { UI.puts `git push origin master 2>&1` }
+          UI.puts `git -C "#{repo_dir}" push origin master 2>&1`
         end
 
         #---------------------------------------------------------------------#
@@ -217,6 +215,12 @@ module Pod
 
         # @!group Private helpers
 
+        # @return result of calling the git! with args in repo_dir
+        #
+        def repo_git(*args)
+          git!(['-C', repo_dir] + args)
+        end
+
         # @return [Pathname] The directory of the repository.
         #
         def repo_dir

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/acknowledgements/plist.rb

@@ -33,12 +33,14 @@ module Pod
 
       def hash_for_spec(spec)
         if (license = license_text(spec))
-          {
+          hash =  {
             :Type => 'PSGroupSpecifier',
             :Title => sanitize_encoding(spec.name),
             :FooterText => sanitize_encoding(license),
-            :License => sanitize_encoding(spec.license[:type]),
           }
+          hash[:License] = sanitize_encoding(spec.license[:type]) if spec.license[:type]
+
+          hash
         end
       end
 

data/lib/cocoapods/sources_manager.rb

@@ -103,9 +103,8 @@ module Pod
     end
 
     def update_git_repo(show_output = false)
-      ensure_in_repo!
       Config.instance.with_changes(:verbose => show_output) do
-        git!(%w(pull --ff-only))
+        git!(['-C', repo, 'pull', '--ff-only'])
       end
     rescue
       UI.warn 'CocoaPods was not able to update the ' \
@@ -117,10 +116,9 @@ module Pod
 
   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))
+          git!(['-C', repo, 'fetch', '--unshallow'])
         end
       end
       super

data/lib/cocoapods/validator.rb

@@ -718,7 +718,7 @@ module Pod
     #
     def xcodebuild
       require 'fourflusher'
-      command = %w(clean build -workspace App.xcworkspace -scheme App -configuration Release)
+      command = ['clean', 'build', '-workspace', File.join(validation_dir, 'App.xcworkspace'), '-scheme', 'App', '-configuration', 'Release']
       case consumer.platform_name
       when :ios
         command += %w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
@@ -731,7 +731,7 @@ module Pod
         command += Fourflusher::SimControl.new.destination(:oldest, 'tvOS', deployment_target)
       end
 
-      output, status = Dir.chdir(validation_dir) { _xcodebuild(command) }
+      output, status = _xcodebuild(command)
 
       unless status.success?
         message = 'Returned an unsuccessful exit code.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta.2
+  version: 1.1.0.rc.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-03 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta.2
+        version: 1.1.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta.2
+        version: 1.1.0.rc.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +207,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -217,7 +217,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'