mirror of
				https://github.com/KevinMidboe/linguist.git
				synced 2025-10-29 17:50:22 +00:00 
			
		
		
		
	Add Cocoapods to generated list so it doesn't show in PR diffs (#3865)
* Add Cocoapods to generated list so it doesn't show in PR diffs * Removed Cocoapods from vendor.yml * Enhance regex to match only Cocoapod's Pods folder * Adds additional test cases for generated Pods folder
This commit is contained in:
		
				
					committed by
					
						 Colin Seymour
						Colin Seymour
					
				
			
			
				
	
			
			
			
						parent
						
							c5d1bb5370
						
					
				
				
					commit
					ded0dc74e0
				
			| @@ -52,6 +52,7 @@ module Linguist | |||||||
|     # Return true or false |     # Return true or false | ||||||
|     def generated? |     def generated? | ||||||
|       xcode_file? || |       xcode_file? || | ||||||
|  |       cocoapods? || | ||||||
|       generated_net_designer_file? || |       generated_net_designer_file? || | ||||||
|       generated_net_specflow_feature_file? || |       generated_net_specflow_feature_file? || | ||||||
|       composer_lock? || |       composer_lock? || | ||||||
| @@ -95,6 +96,13 @@ module Linguist | |||||||
|       ['.nib', '.xcworkspacedata', '.xcuserstate'].include?(extname) |       ['.nib', '.xcworkspacedata', '.xcuserstate'].include?(extname) | ||||||
|     end |     end | ||||||
|  |  | ||||||
|  |     # Internal: Is the blob part of Pods/, which contains dependencies not meant for humans in pull requests. | ||||||
|  |     # | ||||||
|  |     # Returns true or false. | ||||||
|  |     def cocoapods? | ||||||
|  |       !!name.match(/(^Pods|\/Pods)\//) | ||||||
|  |     end | ||||||
|  |  | ||||||
|     # Internal: Is the blob minified files? |     # Internal: Is the blob minified files? | ||||||
|     # |     # | ||||||
|     # Consider a file minified if the average line length is |     # Consider a file minified if the average line length is | ||||||
|   | |||||||
| @@ -242,9 +242,6 @@ | |||||||
| # Carthage | # Carthage | ||||||
| - ^Carthage/ | - ^Carthage/ | ||||||
|  |  | ||||||
| # Cocoapods |  | ||||||
| - ^Pods/ |  | ||||||
|  |  | ||||||
| # Sparkle | # Sparkle | ||||||
| - (^|/)Sparkle/ | - (^|/)Sparkle/ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -188,6 +188,10 @@ class TestFileBlob < Minitest::Test | |||||||
|     assert fixture_blob("Binary/MainMenu.nib").generated? |     assert fixture_blob("Binary/MainMenu.nib").generated? | ||||||
|     assert !sample_blob("XML/project.pbxproj").generated? |     assert !sample_blob("XML/project.pbxproj").generated? | ||||||
|  |  | ||||||
|  |     # Cocoapods | ||||||
|  |     assert sample_blob('Pods/blah').generated? | ||||||
|  |     assert !sample_blob('My-Pods/blah').generated? | ||||||
|  |  | ||||||
|     # Gemfile.lock is NOT generated |     # Gemfile.lock is NOT generated | ||||||
|     assert !sample_blob("Gemfile.lock").generated? |     assert !sample_blob("Gemfile.lock").generated? | ||||||
|  |  | ||||||
| @@ -489,9 +493,6 @@ class TestFileBlob < Minitest::Test | |||||||
|     # Carthage |     # Carthage | ||||||
|     assert sample_blob('Carthage/blah').vendored? |     assert sample_blob('Carthage/blah').vendored? | ||||||
|  |  | ||||||
|     # Cocoapods |  | ||||||
|     assert sample_blob('Pods/blah').vendored? |  | ||||||
|  |  | ||||||
|     # Html5shiv |     # Html5shiv | ||||||
|     assert sample_blob("Scripts/html5shiv.js").vendored? |     assert sample_blob("Scripts/html5shiv.js").vendored? | ||||||
|     assert sample_blob("Scripts/html5shiv.min.js").vendored? |     assert sample_blob("Scripts/html5shiv.min.js").vendored? | ||||||
|   | |||||||
| @@ -42,6 +42,16 @@ class TestGenerated < Minitest::Test | |||||||
|     generated_sample_without_loading_data("Dummy/foo.xcworkspacedata") |     generated_sample_without_loading_data("Dummy/foo.xcworkspacedata") | ||||||
|     generated_sample_without_loading_data("Dummy/foo.xcuserstate") |     generated_sample_without_loading_data("Dummy/foo.xcuserstate") | ||||||
|  |  | ||||||
|  |     # Cocoapods | ||||||
|  |     generated_sample_without_loading_data("Pods/Pods.xcodeproj") | ||||||
|  |     generated_sample_without_loading_data("Pods/SwiftDependency/foo.swift") | ||||||
|  |     generated_sample_without_loading_data("Pods/ObjCDependency/foo.h") | ||||||
|  |     generated_sample_without_loading_data("Pods/ObjCDependency/foo.m") | ||||||
|  |     generated_sample_without_loading_data("Dummy/Pods/Pods.xcodeproj") | ||||||
|  |     generated_sample_without_loading_data("Dummy/Pods/SwiftDependency/foo.swift") | ||||||
|  |     generated_sample_without_loading_data("Dummy/Pods/ObjCDependency/foo.h") | ||||||
|  |     generated_sample_without_loading_data("Dummy/Pods/ObjCDependency/foo.m") | ||||||
|  |  | ||||||
|     # Go-specific vendored paths |     # Go-specific vendored paths | ||||||
|     generated_sample_without_loading_data("go/vendor/github.com/foo.go") |     generated_sample_without_loading_data("go/vendor/github.com/foo.go") | ||||||
|     generated_sample_without_loading_data("go/vendor/golang.org/src/foo.c") |     generated_sample_without_loading_data("go/vendor/golang.org/src/foo.c") | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user