Merge pull request exercism#102 from ZacharyRSmith/filenames

kytrinyx · kytrinyx · commit ebbc1c998c2f · 2015-08-21T20:19:45.000-06:00
Standardize filenames re: #30.
diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ OUTDIR := $(shell mktemp -d "$(TMPDIR)/$(ASSIGNMENT).XXXXXXXXXX")
 # language specific config (tweakable per language)
 FILEEXT := "js"
 EXAMPLE := "example.$(FILEEXT)"
-TSTFILE := "$(ASSIGNMENT)_test.spec.$(FILEEXT)"
+TSTFILE := "$(subst -,_,$(ASSIGNMENT))_test.spec.$(FILEEXT)"
 
 # development dependencies
 node_modules: package.json
@@ -19,9 +19,9 @@ node_modules: package.json
 
 test-assignment: node_modules
 	@echo "running tests for: $(ASSIGNMENT)"
-	@cp big-integer.$(FILEEXT) $(OUTDIR)
+	@cp big_integer.$(FILEEXT) $(OUTDIR)
 	@cp $(ASSIGNMENT)/$(TSTFILE) $(OUTDIR)
-	@cp $(ASSIGNMENT)/$(EXAMPLE) $(OUTDIR)/$(ASSIGNMENT).$(FILEEXT)
+	@cp $(ASSIGNMENT)/$(EXAMPLE) $(OUTDIR)/$(subst -,_,$(ASSIGNMENT)).$(FILEEXT)
 	@sed -i.original 's/\bxit\b/it/g' $(OUTDIR)/*spec.$(FILEEXT)
 	@./node_modules/.bin/jasmine-node --captureExceptions $(OUTDIR)/$(TSTFILE)
 
diff --git a/atbash-cipher/atbash_cipher_test.spec.js b/atbash-cipher/atbash_cipher_test.spec.js
@@ -1,4 +1,4 @@
-var atbash = require('./atbash-cipher');
+var atbash = require('./atbash_cipher');
 
 describe("encode", function() {
 
diff --git a/beer-song/beer_song_test.spec.js b/beer-song/beer_song_test.spec.js
@@ -1,4 +1,4 @@
-var Beer = require('./beer-song');
+var Beer = require('./beer_song');
 
 describe('Beer', function() {
 
diff --git a/big_integer.js b/big_integer.js
diff --git a/binary-search-tree/binary_search_tree_test.spec.js b/binary-search-tree/binary_search_tree_test.spec.js
@@ -1,4 +1,4 @@
-var Bst = require('./binary-search-tree');
+var Bst = require('./binary_search_tree');
 
 function recordAllData(bst) {
   var out = [];
diff --git a/binary-search/binary_search_test.spec.js b/binary-search/binary_search_test.spec.js
@@ -1,4 +1,4 @@
-var BinarySearch = require('./binary-search');
+var BinarySearch = require('./binary_search');
 
 describe('BinarySearch', function() {
 
diff --git a/bracket-push/bracket_push_test.spec.js b/bracket-push/bracket_push_test.spec.js
@@ -1,4 +1,4 @@
-var bracket = require('./bracket-push');
+var bracket = require('./bracket_push');
 
 describe("bracket push", function() {
   it("checks for appropriate bracketing in a set of brackets", function() {
diff --git a/circular-buffer/circular_buffer_test.spec.js b/circular-buffer/circular_buffer_test.spec.js
@@ -1,6 +1,6 @@
-var circularBuffer = require('./circular-buffer').circularBuffer;
-var bufferEmptyException = require('./circular-buffer').bufferEmptyException;
-var bufferFullException = require('./circular-buffer').bufferFullException;
+var circularBuffer = require('./circular_buffer').circularBuffer;
+var bufferEmptyException = require('./circular_buffer').bufferEmptyException;
+var bufferFullException = require('./circular_buffer').bufferFullException;
 
 describe("CircularBuffer", function() {
 
diff --git a/crypto-square/crypto_square_test.spec.js b/crypto-square/crypto_square_test.spec.js
@@ -1,4 +1,4 @@
-var Crypto = require('./crypto-square');
+var Crypto = require('./crypto_square');
 
 describe("Crypto",function() {
   it("normalize strange characters",function() {
diff --git a/custom-set/custom_set_test.spec.js b/custom-set/custom_set_test.spec.js
@@ -1,4 +1,4 @@
-var CustomSet = require('./custom-set');
+var CustomSet = require('./custom_set');
 
 describe('CustomSet', function() {
 
diff --git a/difference-of-squares/difference_of_squares_test.spec.js b/difference-of-squares/difference_of_squares_test.spec.js
@@ -1,4 +1,4 @@
-var Squares = require('./difference-of-squares');
+var Squares = require('./difference_of_squares');
 
 describe('Squares', function () {
 
diff --git a/food-chain/food_chain_test.spec.js b/food-chain/food_chain_test.spec.js
@@ -1,4 +1,4 @@
-var song = require('./food-chain');
+var song = require('./food_chain');
 
 describe('Food Chain', function () {
 
diff --git a/grade-school/grade_school_test.spec.js b/grade-school/grade_school_test.spec.js
@@ -1,4 +1,4 @@
-var School = require('./grade-school');
+var School = require('./grade_school');
 
 describe("School", function() {
   var school;
diff --git a/grains/big_integer.js b/grains/big_integer.js
diff --git a/grains/big_integer_test.spec.js b/grains/big_integer_test.spec.js
@@ -1,4 +1,4 @@
-var BigInt = require('./big-integer');
+var BigInt = require('./big_integer');
 
 
 describe("The big-integer module's returned object", function () {
diff --git a/grains/example.js b/grains/example.js
@@ -1,4 +1,4 @@
-var BigInt = require('./big-integer');
+var BigInt = require('./big_integer');
 
 /**
  * @author github.com/nonsensery
diff --git a/grains/grains_test.spec.js b/grains/grains_test.spec.js
@@ -27,7 +27,7 @@
  * See its tests in this folder for a quick primer on how to use it! ( :
  */
 
-var BigInt = require('./big-integer');
+var BigInt = require('./big_integer');
 var Grains = require('./grains');
 
 describe("Grains", function () {
diff --git a/hello-world/hello_world.js b/hello-world/hello_world.js
diff --git a/hello-world/hello_world_test.spec.js b/hello-world/hello_world_test.spec.js
@@ -1,4 +1,4 @@
-var HelloWorld = require('./hello-world');
+var HelloWorld = require('./hello_world');
 
 describe('Hello World', function() {
   var helloWorld = new HelloWorld();
diff --git a/kindergarten-garden/kindergarten_garden_test.spec.js b/kindergarten-garden/kindergarten_garden_test.spec.js
@@ -1,4 +1,4 @@
-var Garden = require('./kindergarten-garden');
+var Garden = require('./kindergarten_garden');
 
 describe('Garden', function () {
 
diff --git a/largest-series-product/largest_series_product_test.spec.js b/largest-series-product/largest_series_product_test.spec.js
@@ -1,4 +1,4 @@
-var Series = require('./largest-series-product');
+var Series = require('./largest_series_product');
 
 describe('Series', function () {
 
diff --git a/linked-list/linked_list_test.spec.js b/linked-list/linked_list_test.spec.js
@@ -1,4 +1,4 @@
-var LinkedList = require('./linked-list');
+var LinkedList = require('./linked_list');
 
 describe('LinkedList', function () {
   it('push/pop', function () {
diff --git a/nth-prime/nth_prime_test.spec.js b/nth-prime/nth_prime_test.spec.js
@@ -1,4 +1,4 @@
-var prime = require ('./nth-prime');
+var prime = require ('./nth_prime');
 
 describe('Prime',function() {
 
diff --git a/nucleotide-count/nucleotide_count_test.spec.js b/nucleotide-count/nucleotide_count_test.spec.js
@@ -1,4 +1,4 @@
-var dna = require('./nucleotide-count');
+var dna = require('./nucleotide_count');
 
 describe('DNA', function() {
 
diff --git a/ocr-numbers/ocr_numbers_test.spec.js b/ocr-numbers/ocr_numbers_test.spec.js
@@ -1,4 +1,4 @@
-var ocr = require('./ocr-numbers');
+var ocr = require('./ocr_numbers');
 
 describe('ocr', function () {
 
diff --git a/palindrome-products/palindrome_products_test.spec.js b/palindrome-products/palindrome_products_test.spec.js
@@ -1,5 +1,5 @@
 'use strict';
-var Palindromes = require('./palindrome-products');
+var Palindromes = require('./palindrome_products');
 
 describe("Palindrome", function() {
 
diff --git a/pascals-triangle/pascals_triangle_test.spec.js b/pascals-triangle/pascals_triangle_test.spec.js
@@ -1,4 +1,4 @@
-var Triangle = require('./pascals-triangle');
+var Triangle = require('./pascals_triangle');
 
 describe('Triangle', function () {
 
diff --git a/phone-number/phone_number_test.spec.js b/phone-number/phone_number_test.spec.js
@@ -1,4 +1,4 @@
-var PhoneNumber = require('./phone-number');
+var PhoneNumber = require('./phone_number');
 
 describe("PhoneNumber()", function() {
   it("cleans the number (123) 456-7890", function() {
diff --git a/pig-latin/pig_latin_test.spec.js b/pig-latin/pig_latin_test.spec.js
@@ -1,4 +1,4 @@
-var pigLatin = require('./pig-latin');
+var pigLatin = require('./pig_latin');
 
 describe('pigLatin', function () {
 
diff --git a/point-mutations/point_mutations_test.spec.js b/point-mutations/point_mutations_test.spec.js
@@ -1,4 +1,4 @@
-var DNA = require('./point-mutations');
+var DNA = require('./point_mutations');
 
 describe("DNA", function() {
 
diff --git a/prime-factors/prime_factors_test.spec.js b/prime-factors/prime_factors_test.spec.js
@@ -1,4 +1,4 @@
-var primeFactors = require('./prime-factors');
+var primeFactors = require('./prime_factors');
 
 describe('primeFactors', function() {
 
diff --git a/pythagorean-triplet/pythagorean_triplet_test.spec.js b/pythagorean-triplet/pythagorean_triplet_test.spec.js
@@ -1,4 +1,4 @@
-var Triplet = require('./pythagorean-triplet');
+var Triplet = require('./pythagorean_triplet');
 
 describe('Triplet', function () {
 
diff --git a/queen-attack/queen_attack_test.spec.js b/queen-attack/queen_attack_test.spec.js
@@ -1,4 +1,4 @@
-var Queens = require('./queen-attack');
+var Queens = require('./queen_attack');
 
 describe("Queens", function() {
   it("has the correct default positions", function() {
diff --git a/rna-transcription/rna_transcription_test.spec.js b/rna-transcription/rna_transcription_test.spec.js
@@ -1,4 +1,4 @@
-var toRna = require('./rna-transcription');
+var toRna = require('./rna_transcription');
 
 describe("toRna()", function() {
   it("transcribes cytosine to guanine", function() {
diff --git a/robot-name/robot_name_test.spec.js b/robot-name/robot_name_test.spec.js
@@ -1,4 +1,4 @@
-var Robot = require('./robot-name');
+var Robot = require('./robot_name');
 
 describe("Robot", function() {
   // NOTE: The 'beforeEach()' and 'afterEach()' act as setup/teardown for this
diff --git a/robot-simulator/robot_simulator_test.spec.js b/robot-simulator/robot_simulator_test.spec.js
@@ -1,4 +1,4 @@
-var Robot = require('./robot-simulator');
+var Robot = require('./robot_simulator');
 
 describe("Robot", function() {
   var robot = new Robot();
diff --git a/roman-numerals/roman_numerals_test.spec.js b/roman-numerals/roman_numerals_test.spec.js
@@ -1,4 +1,4 @@
-var toRoman = require('./roman-numerals');
+var toRoman = require('./roman_numerals');
 
 describe("toRoman()", function() {
   it("converts 1", function() {
diff --git a/saddle-points/saddle_points_test.spec.js b/saddle-points/saddle_points_test.spec.js
@@ -1,4 +1,4 @@
-var Matrix = require("./saddle-points");
+var Matrix = require("./saddle_points");
 
 describe("Matrix", function() {
   it("extracts a row", function() {
diff --git a/scrabble-score/scrabble_score_test.spec.js b/scrabble-score/scrabble_score_test.spec.js
@@ -1,4 +1,4 @@
-var score = require('./scrabble-score');
+var score = require('./scrabble_score');
 
 describe('Scrabble', function() {
   it("scores an empty word as zero",function() {
diff --git a/secret-handshake/secret_handshake_test.spec.js b/secret-handshake/secret_handshake_test.spec.js
@@ -1,4 +1,4 @@
-var SecretHandshake = require('./secret-handshake');
+var SecretHandshake = require('./secret_handshake');
 
 describe("Secret Handshake", function() {
   it("1 is a wink", function() {
diff --git a/simple-cipher/simple_cipher_test.spec.js b/simple-cipher/simple_cipher_test.spec.js
@@ -1,4 +1,4 @@
-var Cipher = require('./simple-cipher');
+var Cipher = require('./simple_cipher');
 
 describe('Random key cipher', function () {
   var cipher = new Cipher();
diff --git a/space-age/space_age_test.spec.js b/space-age/space_age_test.spec.js
@@ -1,4 +1,4 @@
-var SpaceAge = require('./space-age');
+var SpaceAge = require('./space_age');
 
 describe("Space Age", function() {
   it("age in seconds", function() {
diff --git a/sum-of-multiples/sum_of_multiples_test.spec.js b/sum-of-multiples/sum_of_multiples_test.spec.js
@@ -1,4 +1,4 @@
-var SumOfMultiples = require('./sum-of-multiples');
+var SumOfMultiples = require('./sum_of_multiples');
 
 describe('SumOfMultiples', function () {
   it('to 1', function () {
diff --git a/two-bucket/example_2.js b/two-bucket/example_2.js
diff --git a/two-bucket/two_bucket_test.spec.js b/two-bucket/two_bucket_test.spec.js
@@ -1,4 +1,4 @@
-var TwoBucket = require('./two-bucket');
+var TwoBucket = require('./two_bucket');
 
 describe('TwoBucket', function(){
 	describe('works for input of 3,5,1', function(){
diff --git a/word-count/word_count_test.spec.js b/word-count/word_count_test.spec.js
@@ -1,4 +1,4 @@
-var words = require('./word-count');
+var words = require('./word_count');
 
 describe("words()", function() {
   it("counts one word", function() {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var atbash = require('./atbash-cipher');`
	`1`	`+var atbash = require('./atbash_cipher');`
`2`	`2`
`3`	`3`	`describe("encode", function() {`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var Beer = require('./beer-song');`
	`1`	`+var Beer = require('./beer_song');`
`2`	`2`
`3`	`3`	`describe('Beer', function() {`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var Bst = require('./binary-search-tree');`
	`1`	`+var Bst = require('./binary_search_tree');`
`2`	`2`
`3`	`3`	`function recordAllData(bst) {`
`4`	`4`	`var out = [];`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var BinarySearch = require('./binary-search');`
	`1`	`+var BinarySearch = require('./binary_search');`
`2`	`2`
`3`	`3`	`describe('BinarySearch', function() {`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var bracket = require('./bracket-push');`
	`1`	`+var bracket = require('./bracket_push');`
`2`	`2`
`3`	`3`	`describe("bracket push", function() {`
`4`	`4`	`it("checks for appropriate bracketing in a set of brackets", function() {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var Crypto = require('./crypto-square');`
	`1`	`+var Crypto = require('./crypto_square');`
`2`	`2`
`3`	`3`	`describe("Crypto",function() {`
`4`	`4`	`it("normalize strange characters",function() {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var CustomSet = require('./custom-set');`
	`1`	`+var CustomSet = require('./custom_set');`
`2`	`2`
`3`	`3`	`describe('CustomSet', function() {`
`4`	`4`