trackler 2.2.1.85 → 2.2.1.86

data/tracks/bash/CONTRIBUTING.md

@@ -63,11 +63,11 @@ Currently, you're interested in all of the `"cases"`.  Each of these is a test c
 Implement each of the test cases (along with any comments or explanations you think are necessary for people who aren't sure of themselves).  When in doubt, check out the other, already implemented exercises for an example.  Here's an example of implementing the test case shown above.
 
 ```bash
-#!/bin/bash
+#!/usr/bin/env bats
 
 @test 'Say Hi!' {
   run bash hello_world.sh
-  
+
   [ "$status" -eq 0 ]
   [ "$output" = "Hello, World" ]
 }
@@ -77,6 +77,8 @@ Implement each of the test cases (along with any comments or explanations you th
 
 For each test you create, you should use the `description` value for the test case description.  The `property` value is generally used by other languages to specify what the function to be run is called.  Use your best judgement and check out how other exercises handle this.  If there's just one property, you can just test the script as a whole.  If there's multiple properties, consider testing those as either subcommands or flags (e.g. an exercise with an encode and a decode property could be handled by `run bash cyper.sh encode <argument>` or by `run bash cypher.sh -e <argument>`).  You're the one writing the tests, so you decide.  You'll get feedback when you open your pull request anyways, so don't stress too much about it.
 
+For test cases that are expected to return `true` or `false` make sure you are expecting an output value. It is better to return `"true"` or `true`, to the console instead of just relying on the exit status in bash (0 for success, 1-255 for error). This will be consistent with the existing exercises and prevent possible issues in the future.
+
 You can check to see if your example script works by running `bats`.
 
 ```bash
@@ -85,7 +87,7 @@ $ bats hello_world_test.sh
 
 ### Implementing an Example Solution
 
-If you've been following along so far, your tests should fail.  Go ahead and implement your solution in the `<your-exercise>.sh` file.  Make sure your file has `#!/bin/bash` at the top.
+If you've been following along so far, your tests should fail.  Go ahead and implement your solution in the `<your-exercise>.sh` file.  Make sure your file has `#!/usr/bin/env bash` ([shebang][shebang]) at the top.
 
 Keep running your test file against it until your tests all pass.  This process should help ensure that both your tests *and* your example are ship shape!
 
@@ -178,10 +180,10 @@ It's possible to submit an incomplete solution so you can see how others have co
 
 ### Cleaning Up
 
-20. If you've been practicing good version control throughout this process, you may have several commits.  At this point, you're almost ready to submit your pull request, but you should rebase against the most recent upstream master branch.
+If you've been practicing good version control throughout this process, you may have several commits.  At this point, you're almost ready to submit your pull request, but you should rebase against the most recent upstream master branch.
 
 ```bash
-# Assuming you've alread 'git added' and 'git commited'
+# Assuming you've already 'git added' and 'git commited'
 # If you don't already have the exercism/bash as your upstream remote:
 $ git remote add upstream https://github.com/exercism/bash.git
 # To get the most recent upstream version
@@ -190,7 +192,7 @@ $ git fetch upstream
 $ git rebase upstream/master
 ```
 
-21. Now you're ready to sync up with Github and open your pull request!
+Now you're ready to sync up with Github and open your pull request!
 
 ```bash
 $ git push --force-with-lease origin <your-branch-name>
@@ -199,3 +201,5 @@ $ git push --force-with-lease origin <your-branch-name>
 ![Create pull request](img/create-pr.png)
 
 Good luck, happy scripting, and thanks for your help!
+
+[shebang]: https://en.wikipedia.org/wiki/Shebang_(Unix)

data/tracks/bash/README.md

@@ -1,5 +1,6 @@
 # Exercism Bash Track
 
+[![Build Status](https://travis-ci.org/exercism/bash.svg?branch=master)](https://travis-ci.org/exercism/bash)
 [![Gitter](https://badges.gitter.im/exercism/bash.svg)](https://gitter.im/exercism/bash?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 Exercism Exercises in Bash

data/tracks/bash/exercises/acronym/README.md

@@ -8,7 +8,7 @@ Help generate some jargon by writing a program that converts a long name like Po
 
 Run the tests with:
 
-    bats whatever_test.sh
+    bats acronym_tests.sh
 
 ## Submitting Exercises
 

data/tracks/bash/exercises/anagram/README.md

@@ -8,7 +8,7 @@ Given `"listen"` and a list of candidates like `"enlists" "google"
 
 Run the tests with:
 
-    bats whatever_test.sh
+    bats anagram_test.sh
 
 ## Source
 

data/tracks/bash/exercises/armstrong-numbers/armstrong_numbers_test.sh

@@ -1,58 +1,66 @@
 #!/usr/bin/env bats
 
-@test 'Single digits are armstrong numbers' {
-  #skip
-  run ./armstrong_numbers.sh isarmstrong 5
+@test 'Single digits are Armstrong numbers' {
+  # skip
+  run ./armstrong_numbers.sh is_armstrong 5
 
   [ "$status" -eq 0 ]
+  [ "$output" = "true" ]
 }
 
-@test 'There are no two digit armstrong numbers' {
+@test 'There are no two digit Armstrong numbers' {
   skip
-  run ./armstrong_numbers.sh isarmstrong 10
+  run ./armstrong_numbers.sh is_armstrong 10
 
   [ "$status" -eq 1 ]
+  [ "$output" = "false" ]
 }
 
-@test 'A three digit number that is an armstrong number' {
+@test 'A three digit number that is an Armstrong number' {
   skip
-  run ./armstrong_numbers.sh isarmstrong 153
+  run ./armstrong_numbers.sh is_armstrong 153
 
   [ "$status" -eq 0 ]
+  [ "$output" = "true" ]
 }
 
-@test 'A three digit number that is not an armstrong number' {
+@test 'A three digit number that is not an Armstrong number' {
   skip
-  run ./armstrong_numbers.sh isarmstrong 100 
+  run ./armstrong_numbers.sh is_armstrong 100
 
   [ "$status" -eq 1 ]
+  [ "$output" = "false" ]
 }
 
-@test 'A four digit number that is an armstrong number' {
+@test 'A four digit number that is an Armstrong number' {
   skip
-  run ./armstrong_numbers.sh isarmstrong 9475 
+  run ./armstrong_numbers.sh is_armstrong 9474
 
   [ "$status" -eq 0 ]
+  [ "$output" = "true" ]
 }
 
-@test 'A four digit number that is not an armstrong number' {
+@test 'A four digit number that is not an Armstrong number' {
   skip
-  run ./armstrong_numbers.sh isarmstrong 9475 
+  run ./armstrong_numbers.sh is_armstrong 9475
 
   [ "$status" -eq 1 ]
+  [ "$output" = "false" ]
 }
 
-@test 'A seven digit number that is an armstrong number' {
+@test 'A seven digit number that is an Armstrong number' {
   skip
-  run ./armstrong_numbers.sh isarmstrong 9926315 
+  run ./armstrong_numbers.sh is_armstrong 9926315
 
   [ "$status" -eq 0 ]
+  [ "$output" = "true" ]
 }
 
-@test 'A seven digit number that is not an armstrong number' {
+@test 'A seven digit number that is not an Armstrong number' {
   skip
-  run ./armstrong_numbers.sh isarmstrong 9926314 
+  run ./armstrong_numbers.sh is_armstrong 9926314
 
   [ "$status" -eq 1 ]
+  [ "$output" = "false" ]
 }
 

data/tracks/bash/exercises/armstrong-numbers/example.sh

@@ -1,19 +1,25 @@
 #!/usr/bin/env bash
 
-isarmstrong() {
+is_armstrong() {
   sum=0
-  item=$1
-  while [ $item -ne 0 ]
-  do
-    rem=`expr $item % 10`
-    cube=`expr $rem \* $rem \* $rem`
-    sum=`expr $sum + $cube`
-    item=`expr $item / 10`
+  number=$1
+  power=${#number}
+
+  index=1
+  while [ $index -le ${#number} ]; do
+      digit=$(echo ${number} | cut -c${index}-${index})
+      sum=$(expr $sum + $(($digit**$power)))
+
+      index=$(expr $index + 1)
   done
-  if [ $sum -eq $num ]
-  then
-    return 0
+
+  if [ $sum -eq $number ]; then
+    echo "true"
+    exit 0
   else
-    return 1
+    echo "false"
+    exit 1
   fi
 }
+
+"$@"

data/tracks/bash/exercises/atbash-cipher/README.md

@@ -31,7 +31,7 @@ things based on word boundaries.
 To run the tests:
 
 ```sh
-$ bats atbash_cipher_tests.sh
+$ bats atbash_cipher_test.sh
 ```
 
 For more detailed info about the Bash track see the [help page](http://exercism.io/languages/bash).

data/tracks/bash/exercises/difference-of-squares/README.md

@@ -14,7 +14,7 @@ natural numbers is 3025 - 385 = 2640.
 
 Run the tests with:
 
-    bats whatever_test.sh
+    bats difference_of_squares_test.sh
 
 ## Source
 

data/tracks/bash/exercises/gigasecond/README.md

@@ -6,7 +6,7 @@ A gigasecond is 10^9 (1,000,000,000) seconds.
 
 Run the tests with:
 
-    bats whatever_test.sh
+    bats gigasecond_test.sh
 
 ## Source
 

data/tracks/bash/exercises/hamming/README.md

@@ -37,7 +37,7 @@ of equal length differently.
 
 Run the tests with:
 
-    bats whatever_test.sh
+    bats hamming_test.sh
 
 ## Source
 

data/tracks/bash/exercises/hello-world/README.md

@@ -56,7 +56,7 @@ seconds
 
 Run the tests with:
 
-    bats whatever_test.sh
+    bats hello_world_test.sh
 
 ## Source
 

data/tracks/bash/exercises/leap/README.md

@@ -28,7 +28,7 @@ phenomenon, go watch [this youtube video][video].
 
 Run the tests with:
 
-    bats whatever_test.sh
+    bats leap_test.sh
 
 ## Source
 

data/tracks/bash/exercises/luhn/README.md

@@ -66,7 +66,7 @@ Sum the digits
 
 Run the tests with:
 
-    bats whatever_test.sh
+    bats luhn_test.sh
 
 ## Source
 

data/tracks/bash/exercises/nucleotide-count/README.md

@@ -28,7 +28,7 @@ about that for now.
 
 Run the tests with:
 
-    bats whatever_test.sh
+    bats nucleotide_count_test.sh
 
 ## Source
 

data/tracks/bash/exercises/pangram/README.md

@@ -10,7 +10,7 @@ insensitive. Input will not contain non-ASCII symbols.
 
 Run the tests with:
 
-    bats whatever_test.sh
+    bats pangram_test.sh
 
 ## Source
 

data/tracks/bash/exercises/phone-number/README.md

@@ -29,7 +29,7 @@ should all produce the output
 
 Run the tests with:
 
-    bats whatever_test.sh
+    bats phone_number_test.sh
 
 ## Source
 

data/tracks/bash/exercises/raindrops/README.md

@@ -19,7 +19,7 @@ Convert a number to a string, the contents of which depend on the number's facto
 
 Run the tests with:
 
-    bats whatever_test.sh
+    bats raindrop_test.sh
 
 ## Source
 

data/tracks/bash/exercises/rna-transcription/README.md

@@ -20,7 +20,7 @@ each nucleotide with its complement:
 
 Run the tests with:
 
-    bats whatever_test.sh
+    bats rna_transcription_test.sh
 
 ## Source
 

data/tracks/bash/exercises/triangle/example.sh

@@ -21,31 +21,50 @@ assert() {
   [[ $( echo $1 | bc -l ) -eq 1 ]]
 }
 
+output() {
+  exit_code=$1
+
+  if [ $exit_code -eq 0 ]; then
+    echo "true"
+  else
+    echo "false"
+  fi
+
+  exit $exit_code
+}
+
 valid_triangle() {
   # Takes three sides lengths (numeric) $1, $2, $3
   # If any side is zero, returns false
   assert "$1 == 0" || assert "$2 == 0" || assert "$3 == 0" && return 1
   # If triangle doesn't meet inequality requirement, returns false
   assert "$1 + $2 <= $3" || assert "$1 + $3 <= $2" || assert "$2 + $3 <= $1" && return 1
+
   return 0
 }
 
 if ! valid_triangle $s1 $s2 $s3; then
-  echo "Sides do not meet triangle inequality requirement."
-  echo "Given a <= b <= c and a, b, c != 0, a + b >= c"
-  exit 1
+  # Sides do not meet triangle inequality requirement
+  # Given a <= b <= c and a, b, c != 0, a + b >= c
+  output 1
 fi
 
 equilateral() {
   assert "$1 == $2" && assert "$1 == $3"
+
+  output $?
 }
 
 isosceles() {
   assert "$1 == $2" || assert "$1 == $3" || assert "$2 == $3"
+
+  output $?
 }
-  
+
 scalene() {
   assert "$1 != $2" && assert "$1 != $3" && assert "$2 != $3"
+
+  output $?
 }
 
 # Bash Ternary Operator:

data/tracks/bash/exercises/triangle/triangle_test.sh

@@ -6,6 +6,7 @@
   run bash triangle.sh equilateral 2 2 2
 
   [ "$status" -eq 0 ]
+  [ "$output" = "true" ]
 }
 
 @test "false if any side is unequal" {
@@ -13,6 +14,7 @@
   run bash triangle.sh equilateral 2 3 2
 
   [ "$status" -eq 1 ]
+  [ "$output" = "false" ]
 }
 
 @test "false if no side is equal" {
@@ -20,6 +22,7 @@
   run bash triangle.sh equilateral 5 4 6
 
   [ "$status" -eq 1 ]
+  [ "$output" = "false" ]
 }
 
 @test "all zero sides illegal, so the triangle is not equilateral" {
@@ -27,6 +30,7 @@
   run bash triangle.sh equilateral 0 0 0
 
   [ "$status" -eq 1 ]
+  [ "$output" = "false" ]
 }
 
 # BONUS: Deal with floating point numbers
@@ -35,6 +39,7 @@
   run bash triangle.sh equilateral 0.5 0.5 0.5
 
   [ "$status" -eq 0 ]
+  [ "$output" = "true" ]
 }
 
 # Test Isosceles
@@ -43,6 +48,7 @@
   run bash triangle.sh isosceles 3 4 4
 
   [ "$status" -eq 0 ]
+  [ "$output" = "true" ]
 }
 
 @test "true if first two sides are equal" {
@@ -50,6 +56,7 @@
   run bash triangle.sh isosceles 4 4 3
 
   [ "$status" -eq 0 ]
+  [ "$output" = "true" ]
 }
 
 @test "true if first and last sides are equal" {
@@ -57,6 +64,7 @@
   run bash triangle.sh isosceles 4 3 4
 
   [ "$status" -eq 0 ]
+  [ "$output" = "true" ]
 }
 
 @test "equilateral triangles are also isosceles" {
@@ -64,6 +72,7 @@
   run bash triangle.sh isosceles 4 4 4
 
   [ "$status" -eq 0 ]
+  [ "$output" = "true" ]
 }
 
 @test "false if no sides are equal" {
@@ -71,6 +80,7 @@
   run bash triangle.sh isosceles 2 3 4
 
   [ "$status" -eq 1 ]
+  [ "$output" = "false" ]
 }
 
 @test "sides that violate triangle inequality are not isosceles, even if two are equal" {
@@ -78,6 +88,7 @@
   run bash triangle.sh isosceles 1 1 3
 
   [ "$status" -eq 1 ]
+  [ "$output" = "false" ]
 }
 
 # BONUS: Deal with floating point numbers
@@ -86,6 +97,7 @@
   run bash triangle.sh isosceles 0.5 0.4 0.5
 
   [ "$status" -eq 0 ]
+  [ "$output" = "true" ]
 }
 
 # Test Scalene
@@ -94,6 +106,7 @@
   run bash triangle.sh scalene 5 4 6
 
   [ "$status" -eq 0 ]
+  [ "$output" = "true" ]
 }
 
 @test "false if all sides are equal" {
@@ -101,6 +114,7 @@
   run bash triangle.sh scalene 4 4 4
 
   [ "$status" -eq 1 ]
+  [ "$output" = "false" ]
 }
 
 @test "false if two sides are equal" {
@@ -108,6 +122,7 @@
   run bash triangle.sh scalene 4 4 3
 
   [ "$status" -eq 1 ]
+  [ "$output" = "false" ]
 }
 
 @test "sides that violate triangle inequality are not scalene even if they are all different" {
@@ -115,6 +130,7 @@
   run bash triangle.sh scalene 7 3 2
 
   [ "$status" -eq 1 ]
+  [ "$output" = "false" ]
 }
 
 # BONUS: Deal with floating point numbers
@@ -123,4 +139,5 @@
   run bash triangle.sh scalene 0.5 0.4 0.6
 
   [ "$status" -eq 0 ]
+  [ "$output" = "true" ]
 }