Merge pull request #7393 from paulb777/nowhere

nowhere is one word

Gemfile

@@ -47,7 +47,7 @@ group :development do
 
   # Integration tests
   gem 'diffy'
-  gem 'clintegracon', :git => 'https://github.com/segiddins/CLIntegracon.git', :branch => 'segiddins/replacement-pattern-overlapping-replacements'
+  gem 'clintegracon'
 
   # Code Quality
   gem 'inch_by_inch'

Gemfile.lock

@@ -93,15 +93,6 @@ GIT
   specs:
     cocoapods-try (1.1.0)
 
-GIT
-  remote: https://github.com/segiddins/CLIntegracon.git
-  revision: 8bb9aa1fecd1731df996bda5cabc53fd746d2577
-  branch: segiddins/replacement-pattern-overlapping-replacements
-  specs:
-    clintegracon (0.8.1)
-      colored2 (~> 3.1)
-      diffy
-
 GIT
   remote: https://github.com/segiddins/json.git
   revision: a9588bc4334c2f5bf985f255b61c05eafdcd8907
@@ -151,11 +142,15 @@ GEM
       cork
       nap
       open4 (~> 1.3)
+    clintegracon (0.8.1)
+      colored (~> 1.2)
+      diffy
     cocoapods-dependencies (1.0.0.beta.1)
       ruby-graphviz (~> 1.2)
     cocoapods_debug (0.1.0)
       pry (= 0.10.3)
     coderay (1.1.0)
+    colored (1.2)
     colored2 (3.1.2)
     concurrent-ruby (1.0.5)
     cork (0.3.0)
@@ -182,7 +177,7 @@ GEM
     ffi (1.9.6)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.1.0)
+    gh_inspector (1.1.1)
     git (1.3.0)
     hashdiff (0.3.1)
     i18n (0.9.3)
@@ -272,7 +267,7 @@ DEPENDENCIES
   bacon
   bundler (~> 1.3)
   claide!
-  clintegracon!
+  clintegracon
   cocoapods!
   cocoapods-core!
   cocoapods-deintegrate!

lib/cocoapods/generator/copy_resources_script.rb

@@ -100,7 +100,7 @@ set -u
 set -o pipefail
 
 if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
-    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's no where for us to copy
+    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
     # resources to, so exit 0 (signalling the script phase was successful).
     exit 0
 fi

lib/cocoapods/generator/embed_frameworks_script.rb

@@ -41,7 +41,7 @@ module Pod
           set -o pipefail
 
           if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
-              # If FRAMEWORKS_FOLDER_PATH is not set, then there's no where for us to copy
+              # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
               # frameworks to, so exit 0 (signalling the script phase was successful).
               exit 0
           fi

lib/cocoapods/user_interface/inspector_reporter.rb

@@ -19,7 +19,7 @@ module Pod
         UI.puts "Looking for related issues on #{inspector.repo_owner}/#{inspector.repo_name}..."
       end
 
-      # Called once the inspector has recieved a report with more than one issue,
+      # Called once the inspector has received a report with more than one issue,
       # showing the top 3 issues, and offering a link to see more.
       #
       # @param [GhInspector::InspectionReport] report
@@ -30,7 +30,7 @@ module Pod
       #
       # @return [void]
       #
-      def inspector_successfully_recieved_report(report, _)
+      def inspector_successfully_received_report(report, _)
         report.issues[0..2].each { |issue| print_issue_full(issue) }
 
         if report.issues.count > 3
@@ -39,7 +39,7 @@ module Pod
         end
       end
 
-      # Called once the report has been recieved, but when there are no issues found.
+      # Called once the report has been received, but when there are no issues found.
       #
       # @param [GhInspector::InspectionReport] report
       #        An empty report
@@ -49,7 +49,7 @@ module Pod
       #
       # @return [void]
       #
-      def inspector_recieved_empty_report(_, inspector)
+      def inspector_received_empty_report(_, inspector)
         UI.puts 'Found no similar issues. To create a new issue, please visit:'
         UI.puts "https://github.com/#{inspector.repo_owner}/#{inspector.repo_name}/issues/new"
       end

cocoapods-integration-specs @ 426aa000

-Subproject commit f3299acb7729e33d7ac944dda6f45ed9c1d8ad20
+Subproject commit 426aa00031605afa62a8c6f171cd49ff2492bea1

spec/unit/user_interface/error_report_spec.rb

@@ -111,7 +111,7 @@ EOS
         message.should == '[!] at -'
       end
 
-      it 'handles inspector_successfully_recieved_report' do
+      it 'handles inspector_successfully_received_report' do
         time = Time.new(2016, 5, 13)
         Time.stubs(:now).returns(time)
 

spec/unit/user_interface/inspector_reporter_spec.rb

@@ -7,9 +7,9 @@ class SilentEvidence
 
   def inspector_is_still_investigating(query, inspector); end
 
-  def inspector_successfully_recieved_report(report, inspector); end
+  def inspector_successfully_received_report(report, inspector); end
 
-  def inspector_recieved_empty_report(report, inspector); end
+  def inspector_received_empty_report(report, inspector); end
 
   def inspector_could_not_create_report(error, query, inspector); end
 end
@@ -24,7 +24,7 @@ module Pod
       UI.output.should.match %r{Looking for related issues on cocoapods\/cocoapods}
     end
 
-    it 'handles inspector_successfully_recieved_report' do
+    it 'handles inspector_successfully_received_report' do
       url = 'https://api.github.com/search/issues?q=Testing+repo:cocoapods/cocoapods'
       fixture_json_text = File.read SpecHelper.fixture('github_search_response.json')
       GhInspector::Sidekick.any_instance.expects(:get_api_results).with(url).returns(JSON.parse(fixture_json_text))
@@ -33,7 +33,7 @@ module Pod
       report = inspector.search_query 'Testing', SilentEvidence.new
 
       reporter = UserInterface::InspectorReporter.new
-      reporter.inspector_successfully_recieved_report(report, inspector)
+      reporter.inspector_successfully_received_report(report, inspector)
 
       UI.output.should.match /Travis CI with Ruby 1.9.x fails for recent pull requests/
       UI.output.should.match %r{https:\/\/github.com\/CocoaPods\/CocoaPods\/issues\/646 \[closed\] \[8 comments\]}