Brandon Keepers 
							
						 
					 
					
						
						
							
						
						245a1a92cf 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into test-helper  
						
						 
						
						... 
						
						
						
						* origin/master:
  Add Gemfile.lock sample
  Remove deprecated method
  #all_extensions already includes primary extension
  typo
  remove unused assertion
  Symlink ant.xml to build.xml
  Avoid shadowing variable name
  Update comment
  Make missing sample failure message similar
  Remove blank extensions property
  Fix sample tests
  Add Forth extensions .f and .for; add heuristics for Forth and FORTRAN.
  Add FORTRAN and Forth samples.
  Extensions aren't actually required
  Fix errors from pedantic test
  Make pedantic test actually pedantic
  Removing extensions when they should be filenames
  Adding sample pom.xml files
  Link to contributing docs
  require samples if filename matches multiple languages
Conflicts:
	test/test_pedantic.rb 
						
						
					 
					
						2014-11-18 16:48:26 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brandon Keepers 
							
						 
					 
					
						
						
							
						
						aa7ab2065b 
					 
					
						
						
							
							Add test helper to make test env consistent  
						
						 
						
						
						
						
					 
					
						2014-11-18 16:46:09 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brandon Keepers 
							
						 
					 
					
						
						
							
						
						850ab6dedb 
					 
					
						
						
							
							#all_extensions already includes primary extension  
						
						 
						
						
						
						
					 
					
						2014-11-18 15:10:07 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brandon Keepers 
							
						 
					 
					
						
						
							
						
						b20fa497b9 
					 
					
						
						
							
							typo  
						
						 
						
						
						
						
					 
					
						2014-11-18 15:07:36 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brandon Keepers 
							
						 
					 
					
						
						
							
						
						1abc7ee2ef 
					 
					
						
						
							
							remove unused assertion  
						
						 
						
						
						
						
					 
					
						2014-11-18 15:04:12 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brandon Keepers 
							
						 
					 
					
						
						
							
						
						587c764950 
					 
					
						
						
							
							Avoid shadowing variable name  
						
						 
						
						
						
						
					 
					
						2014-11-18 14:57:39 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brandon Keepers 
							
						 
					 
					
						
						
							
						
						1abbcb6435 
					 
					
						
						
							
							Update comment  
						
						 
						
						
						
						
					 
					
						2014-11-18 14:57:32 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brandon Keepers 
							
						 
					 
					
						
						
							
						
						17f3d7005a 
					 
					
						
						
							
							Make missing sample failure message similar  
						
						 
						
						
						
						
					 
					
						2014-11-18 14:55:15 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brandon Keepers 
							
						 
					 
					
						
						
							
						
						ba8b55391d 
					 
					
						
						
							
							Fix sample tests  
						
						 
						
						
						
						
					 
					
						2014-11-18 14:48:21 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brandon Keepers 
							
						 
					 
					
						
						
							
						
						07a6411a75 
					 
					
						
						
							
							Link to contributing docs  
						
						 
						
						
						
						
					 
					
						2014-11-17 16:30:39 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brandon Keepers 
							
						 
					 
					
						
						
							
						
						b32bc5ef47 
					 
					
						
						
							
							require samples if filename matches multiple languages  
						
						 
						
						
						
						
					 
					
						2014-11-17 16:18:56 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brandon Keepers 
							
						 
					 
					
						
						
							
						
						cd743332f4 
					 
					
						
						
							
							Use yajl since it is already a dependency  
						
						 
						
						... 
						
						
						
						Both JSON and Yajl were listed as dependencies. Pygments.rb already requires yajl, so let's just use that instead of using both. 
						
						
					 
					
						2014-10-17 14:45:28 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brandon Keepers 
							
						 
					 
					
						
						
							
						
						015af19eaf 
					 
					
						
						
							
							Move Samples::DATA constant to Samples.cache method  
						
						 
						
						
						
						
					 
					
						2014-09-16 10:25:30 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						43923976c2 
					 
					
						
						
							
							Adding test to check that languages.yml includes all extensions represented in samples folder  
						
						 
						
						
						
						
					 
					
						2014-08-11 14:16:25 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						cec5942d6b 
					 
					
						
						
							
							Removing extra .  
						
						 
						
						
						
						
					 
					
						2014-04-22 22:09:30 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						152e3ace99 
					 
					
						
						
							
							Adding all_extensions method to Language  
						
						 
						
						
						
						
					 
					
						2014-04-22 16:56:27 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						64b6f18e66 
					 
					
						
						
							
							Adding debugging for failed assertions  
						
						 
						
						
						
						
					 
					
						2014-04-22 16:53:42 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						be1003648a 
					 
					
						
						
							
							Removing pry  
						
						 
						
						
						
						
					 
					
						2014-04-22 15:48:57 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						536800f9f5 
					 
					
						
						
							
							Towards testing for presence of sample files  
						
						 
						
						
						
						
					 
					
						2014-04-22 15:47:49 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								richo 
							
						 
					 
					
						
						
							
						
						2d7dea2d97 
					 
					
						
						
							
							Don't emit the diff if samples db is out of date  
						
						 
						
						... 
						
						
						
						There's a warning message emitted with instructions, a 2000 line diff
does nothing to help the user track down the issue. 
						
						
					 
					
						2013-03-13 17:29:05 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Joshua Peek 
							
						 
					 
					
						
						
							
						
						10e875e899 
					 
					
						
						
							
							Print out samples db diffs  
						
						 
						
						
						
						
					 
					
						2012-09-24 10:07:08 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Joshua Peek 
							
						 
					 
					
						
						
							
						
						5cda67530d 
					 
					
						
						
							
							Seperate test file for samples  
						
						 
						
						
						
						
					 
					
						2012-07-23 13:55:30 -05:00