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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68101ad3a4782fc7e4f443d0f6770056fcd5ce95
-  data.tar.gz: f6988ebcecede78fc19c151838496d053ab93579
+  metadata.gz: 8dd8493ba3541dfee0d29c01a6bc17e5631b1688
+  data.tar.gz: fc5724cf0f4a28abae4c6f8032fd62bf1d441d40
 SHA512:
-  metadata.gz: 439ec090f0e1e103578185ce13d4a80a70f3799b75317b664c88f183dd178eae4c4c328d5e46397d4d547754dd2d37768022952c5ff9082855183b0101236029
-  data.tar.gz: 1fe27f51aa33521f776ff2c384e7e81c38ef7b6418863441fdc2d4c7b2875c4bd83046b84a32de1e1f7f0c24ecf20f51f2bcec3800d163050946dfb98439d76b
+  metadata.gz: cf6d0562c39e02525338a4c3009156b5599bc1c9238612af5febef7b94fa3da0cb9ccd713a65a21a8948bb3a07a550aeda05102035d581fc7d8d7af7f74794b7
+  data.tar.gz: 120832f370c037c813d7860b6fd085b6634b774bae26d3b71a608614b4768c7be1cb017c6ec1a56bca12da88132345c20bf1bade3433b37129beb51c5e2ebd56

data/lib/cocoapods-core/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods-core.
   #
-  CORE_VERSION = '1.1.0.beta.2'.freeze unless defined? Pod::CORE_VERSION
+  CORE_VERSION = '1.1.0.rc.1'.freeze unless defined? Pod::CORE_VERSION
 end

data/lib/cocoapods-core/master_source.rb

@@ -28,7 +28,7 @@ module Pod
     # @return [Bool] Whether the given source should be updated.
     #
     def requires_update?
-      commit_hash = Dir.chdir(repo) { git_commit_hash }
+      commit_hash = git_commit_hash
       GitHub.modified_since_commit('CocoaPods/Specs', commit_hash)
     end
   end

data/lib/cocoapods-core/source.rb

@@ -41,14 +41,11 @@ module Pod
     #       option. See https://github.com/CocoaPods/CocoaPods/issues/2724.
     #
     def url
-      Dir.chdir(repo) do
-        remote = git(%w(config --get remote.origin.url))
-
-        if !remote.empty?
-          remote
-        elsif (repo + '.git').exist?
-          "file://#{repo}/.git"
-        end
+      remote = repo_git(%w(config --get remote.origin.url))
+      if !remote.empty?
+        remote
+      elsif (repo + '.git').exist?
+        "file://#{repo}/.git"
       end
     end
 
@@ -333,26 +330,20 @@ module Pod
     #          Returns the list of changed spec paths.
     #
     def update(show_output)
-      changed_spec_paths = []
-      Dir.chdir(repo) do
-        prev_commit_hash = git_commit_hash
-        update_git_repo(show_output)
-        refresh_metadata
-        if version = metadata.last_compatible_version(Version.new(CORE_VERSION))
-          tag = "v#{version}"
-          CoreUI.warn "Using the `#{tag}` tag of the `#{name}` source because " \
-            "it is the last version compatible with CocoaPods #{CORE_VERSION}."
-          git(['checkout', tag])
-        end
-        changed_spec_paths = diff_until_commit_hash(prev_commit_hash)
+      prev_commit_hash = git_commit_hash
+      update_git_repo(show_output)
+      refresh_metadata
+      if version = metadata.last_compatible_version(Version.new(CORE_VERSION))
+        tag = "v#{version}"
+        CoreUI.warn "Using the `#{tag}` tag of the `#{name}` source because " \
+          "it is the last version compatible with CocoaPods #{CORE_VERSION}."
+        repo_git(['checkout', tag])
       end
-      changed_spec_paths
+      diff_until_commit_hash(prev_commit_hash)
     end
 
     def git?
-      Dir.chdir(repo) do
-        !git(%w(rev-parse HEAD)).empty?
-      end
+      !repo_git(%w(rev-parse HEAD)).empty?
     end
 
     def verify_compatibility!
@@ -398,12 +389,6 @@ module Pod
     # @group Private Helpers
     #-------------------------------------------------------------------------#
 
-    def ensure_in_repo!
-      return if File.identical?(Pathname.pwd.realpath.to_s, repo.realpath.to_s)
-      raise StandardError, "Must be in the root of the repo (#{repo}), " \
-        "instead in #{Pathname.pwd}."
-    end
-
     # Loads the specification for the given Pod gracefully.
     #
     # @param  [String] name
@@ -428,14 +413,12 @@ module Pod
     end
 
     def git_commit_hash
-      ensure_in_repo!
-      git(%w(rev-parse HEAD))
+      repo_git(%w(rev-parse HEAD))
     end
 
     def update_git_repo(show_output = false)
-      ensure_in_repo!
-      git(['checkout', git_tracking_branch])
-      output = git(%w(pull --ff-only), :include_error => true)
+      repo_git(['checkout', git_tracking_branch])
+      output = repo_git(%w(pull --ff-only), :include_error => true)
       CoreUI.puts output if show_output
     end
 
@@ -445,12 +428,11 @@ module Pod
     end
 
     def diff_until_commit_hash(commit_hash)
-      ensure_in_repo!
-      git(%W(diff --name-only #{commit_hash}..HEAD)).split("\n")
+      repo_git(%W(diff --name-only #{commit_hash}..HEAD)).split("\n")
     end
 
-    def git(args, include_error: false)
-      command = 'git ' << args.join(' ')
+    def repo_git(args, include_error: false)
+      command = "git -C \"#{repo}\" " << args.join(' ')
       command << ' 2>&1' if include_error
       (`#{command}` || '').strip
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta.2
+  version: 1.1.0.rc.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport