trackler 2.1.0.11 → 2.1.0.12

data/tracks/haskell/exercises/parallel-letter-frequency/package.yaml

@@ -1,5 +1,5 @@
 name: parallel-letter-frequency
-version: 0.1.0.1
+version: 0.1.0.2
 
 dependencies:
   - base

data/tracks/haskell/exercises/parallel-letter-frequency/test/Tests.hs

@@ -12,7 +12,7 @@ main :: IO ()
 main = hspecWith defaultConfig {configFastFail = True} specs
 
 specs :: Spec
-specs = describe "parallel-letter-frequency" $ do
+specs = do
 
     let odeAnDieFreude = concat             -- Poem by Friedrich Schiller.
           [ "Freude schöner Götterfunken"   -- The corresponding music is

data/tracks/haskell/exercises/pascals-triangle/package.yaml

@@ -1,5 +1,5 @@
 name: pascals-triangle
-version: 1.0.0.2
+version: 1.0.0.3
 
 dependencies:
   - base

data/tracks/haskell/exercises/pascals-triangle/test/Tests.hs

@@ -10,8 +10,7 @@ main :: IO ()
 main = hspecWith defaultConfig {configFastFail = True} specs
 
 specs :: Spec
-specs = describe "pascals-triangle" $
-          describe "rows" $ for_ rowsCases rowsTest
+specs = describe "rows" $ for_ rowsCases rowsTest
   where
 
     rowsTest (description, n, expected) = it description assertion

data/tracks/haskell/exercises/phone-number/examples/success-standard/src/Phone.hs

@@ -1,9 +1,18 @@
 module Phone (number) where
-import Data.Char (isDigit, isLetter)
+import Data.Char (isDigit)
 
 number :: String -> Maybe String
-number input
-  | any isLetter input = Nothing
+number input = clean input >>= check
+
+check :: String -> Maybe String
+check ('0':_) = Nothing
+check ('1':_) = Nothing
+check (_:_:_:'0':_) = Nothing
+check (_:_:_:'1':_) = Nothing
+check s = Just s
+
+clean :: String -> Maybe String
+clean input
   | len == 10 = Just digits
   | len == 11 && head digits == '1' = Just $ tail digits
   | otherwise = Nothing

data/tracks/haskell/exercises/phone-number/package.yaml

@@ -1,5 +1,5 @@
 name: phone-number
-version: 1.0.0.2
+version: 1.2.0.4
 
 dependencies:
   - base

data/tracks/haskell/exercises/phone-number/test/Tests.hs

@@ -10,8 +10,7 @@ main :: IO ()
 main = hspecWith defaultConfig {configFastFail = True} specs
 
 specs :: Spec
-specs = describe "phone-number" $
-          describe "number" $ for_ cases test
+specs = describe "number" $ for_ cases test
   where
     test Case{..} = it description $ number input `shouldBe` expected
 
@@ -23,30 +22,34 @@ data Case = Case { description ::       String
 cases :: [Case]
 cases =
     [ Case { description = "cleans the number"
-           , input       = "(123) 456-7890"
-           , expected    = Just "1234567890"
+           , input       = "(223) 456-7890"
+           , expected    = Just "2234567890"
            }
-    , Case { description = "cleans number with dots"
-           , input       = "123.456.7890"
-           , expected    = Just "1234567890"
+    , Case { description = "cleans numbers with dots"
+           , input       = "223.456.7890"
+           , expected    = Just "2234567890"
            }
     , Case { description = "cleans numbers with multiple spaces"
-           , input       = "123 456   7890   "
-           , expected    = Just "1234567890"
+           , input       = "223 456   7890   "
+           , expected    = Just "2234567890"
            }
     , Case { description = "invalid when 9 digits"
            , input       = "123456789"
            , expected    = Nothing
            }
-    , Case { description = "invalid when 11 digits"
-           , input       = "21234567890"
+    , Case { description = "invalid when 11 digits does not start with a 1"
+           , input       = "22234567890"
            , expected    = Nothing
            }
-    , Case { description = "valid when 11 digits and first is 1"
-           , input       = "11234567890"
-           , expected    = Just "1234567890"
+    , Case { description = "valid when 11 digits and starting with 1"
+           , input       = "12234567890"
+           , expected    = Just "2234567890"
+           }
+    , Case { description = "valid when 11 digits and starting with 1 even with punctuation"
+           , input       = "+1 (223) 456-7890"
+           , expected    = Just "2234567890"
            }
-    , Case { description = "invalid when 12 digits"
+    , Case { description = "invalid when more than 11 digits"
            , input       = "321234567890"
            , expected    = Nothing
            }
@@ -58,8 +61,12 @@ cases =
            , input       = "123-@:!-7890"
            , expected    = Nothing
            }
-    , Case { description = "invalid with right number of digits but letters mixed in"
-           , input       = "1a2b3c4d5e6f7g8h9i0j"
+    , Case { description = "invalid if area code does not start with 2-9"
+           , input       = "(123) 456-7890"
+           , expected    = Nothing
+           }
+    , Case { description = "invalid if exchange code does not start with 2-9"
+           , input       = "(223) 056-7890"
            , expected    = Nothing
            }
     ]

data/tracks/haskell/exercises/pig-latin/package.yaml

@@ -1,5 +1,5 @@
 name: pig-latin
-version: 1.0.0.2
+version: 1.0.0.3
 
 dependencies:
   - base

data/tracks/haskell/exercises/pig-latin/test/Tests.hs

@@ -7,8 +7,7 @@ main :: IO ()
 main = hspecWith defaultConfig {configFastFail = True} specs
 
 specs :: Spec
-specs = describe "pig-latin" $
-          describe "translate" $ do
+specs = describe "translate" $ do
 
     describe "ay is added to words that start with vowels" $ do
         it "word beginning with a" $ translate "apple"  `shouldBe` "appleay"

data/tracks/haskell/exercises/pov/package.yaml

@@ -1,5 +1,5 @@
 name: pov
-version: 1.0.0.2
+version: 1.1.1.4
 
 dependencies:
   - base

data/tracks/haskell/exercises/pov/test/Tests.hs

@@ -13,7 +13,7 @@ main :: IO ()
 main = hspecWith defaultConfig {configFastFail = True} specs
 
 specs :: Spec
-specs = describe "pov" $ do
+specs = do
 
     describe "fromPOV" $ do
 
@@ -68,14 +68,11 @@ specs = describe "pov" $ do
                         , "uncle"
                         , "cousin-1"    ]
 
-      it "Can trace from a leaf to a leaf" $
-        tracePathBetween "kid-a" "cousin-0" cousins
-        `shouldBe` Just [ "kid-a"
-                        , "x"
-                        , "parent"
-                        , "grandparent"
-                        , "uncle"
-                        , "cousin-0"    ]
+      it "Can find path from nodes other than x" $
+        tracePathBetween "a" "c" flat
+        `shouldBe` Just [ "a"
+                        , "root"
+                        , "c"    ]
 
       it "Cannot trace if destination does not exist" $
         tracePathBetween "x" "NOT THERE" cousins

data/tracks/haskell/exercises/prime-factors/package.yaml

@@ -1,5 +1,5 @@
 name: prime-factors
-version: 1.0.0.2
+version: 1.0.0.3
 
 dependencies:
   - base

data/tracks/haskell/exercises/prime-factors/test/Tests.hs

@@ -10,8 +10,7 @@ main :: IO ()
 main = hspecWith defaultConfig {configFastFail = True} specs
 
 specs :: Spec
-specs = describe "prime-factors" $
-          describe "primeFactors" $ for_ cases test
+specs = describe "primeFactors" $ for_ cases test
   where
 
     test (description, n, expected) = it description assertion

data/tracks/haskell/exercises/pythagorean-triplet/package.yaml

@@ -1,5 +1,5 @@
 name: pythagorean-triplet
-version: 0.1.0.1
+version: 0.1.0.2
 
 dependencies:
   - base

data/tracks/haskell/exercises/pythagorean-triplet/test/Tests.hs

@@ -10,7 +10,7 @@ main :: IO ()
 main = hspecWith defaultConfig {configFastFail = True} specs
 
 specs :: Spec
-specs = describe "pythagorean-triplet" $ do
+specs = do
           describe "isPythagorean"       $ for_ isPythagoreanCases       isPythagoreanTest
           describe "pythagoreanTriplets" $ for_ pythagoreanTripletsCases pythagoreanTripletsTest
   where

data/tracks/haskell/exercises/queen-attack/package.yaml

@@ -1,5 +1,5 @@
 name: queen-attack
-version: 1.0.0.2
+version: 1.0.0.3
 
 dependencies:
   - base

data/tracks/haskell/exercises/queen-attack/test/Tests.hs

@@ -10,7 +10,7 @@ main :: IO ()
 main = hspecWith defaultConfig {configFastFail = True} specs
 
 specs :: Spec
-specs = describe "queen-attack" $ do
+specs = do
 
     -- Track-specific test cases.
 

data/tracks/haskell/exercises/raindrops/package.yaml

@@ -1,5 +1,5 @@
 name: raindrops
-version: 1.0.0.2
+version: 1.0.0.3
 
 dependencies:
   - base

data/tracks/haskell/exercises/raindrops/test/Tests.hs

@@ -10,8 +10,7 @@ main :: IO ()
 main = hspecWith defaultConfig {configFastFail = True} specs
 
 specs :: Spec
-specs = describe "raindrops" $
-          describe "convert" $ for_ cases test
+specs = describe "convert" $ for_ cases test
   where
 
     test (number, expected) = it description assertion

data/tracks/haskell/exercises/rna-transcription/package.yaml

@@ -1,5 +1,5 @@
 name: rna-transcription
-version: 1.0.0.2
+version: 1.0.0.3
 
 dependencies:
   - base

data/tracks/haskell/exercises/rna-transcription/test/Tests.hs

@@ -10,8 +10,7 @@ main :: IO ()
 main = hspecWith defaultConfig {configFastFail = True} specs
 
 specs :: Spec
-specs = describe "rna-transcription" $
-          describe "toRNA" $ for_ cases test
+specs = describe "toRNA" $ for_ cases test
   where
     test Case{..} = it description $ toRNA dna `shouldBe` expected
 

data/tracks/haskell/exercises/robot-name/package.yaml

@@ -1,5 +1,5 @@
 name: robot-name
-version: 0.1.0.1
+version: 0.1.0.2
 
 dependencies:
   - base

data/tracks/haskell/exercises/robot-name/test/Tests.hs

@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fno-warn-type-defaults #-}
 
 import Data.Ix           (inRange)
-import Test.Hspec        (Spec, describe, it, shouldBe, shouldNotBe, shouldSatisfy)
+import Test.Hspec        (Spec, it, shouldBe, shouldNotBe, shouldSatisfy)
 import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
 
 import Robot (mkRobot, resetName, robotName)
@@ -16,7 +16,7 @@ real "robot generator" would use a proper serial number system and
 would likely not be in the business of resetting the name.
 -}
 specs :: Spec
-specs = describe "robot-name" $ do
+specs = do
 
           let a = ('A', 'Z')
           let d = ('0', '9')

data/tracks/haskell/exercises/robot-simulator/package.yaml

@@ -1,5 +1,5 @@
 name: robot-simulator
-version: 1.0.0.2
+version: 1.0.0.3
 
 dependencies:
   - base

data/tracks/haskell/exercises/robot-simulator/test/Tests.hs

@@ -21,7 +21,7 @@ main :: IO ()
 main = hspecWith defaultConfig {configFastFail = True} specs
 
 specs :: Spec
-specs = describe "robot-simulator" $ do
+specs = do
 
     describe "mkRobot" $ do
 

data/tracks/haskell/exercises/roman-numerals/package.yaml

@@ -1,5 +1,5 @@
 name: roman-numerals
-version: 0.9.0.1 # 2016-07-26
+version: 1.0.0.3
 
 dependencies:
   - base

data/tracks/haskell/exercises/roman-numerals/test/Tests.hs

@@ -11,72 +11,90 @@ main :: IO ()
 main = hspecWith defaultConfig {configFastFail = True} specs
 
 specs :: Spec
-specs = describe "roman-numerals" $
-          describe "numerals" $ for_ cases test
+specs = describe "numerals" $ for_ cases test
   where
 
     test Case{..} = it explanation assertion
       where
-        explanation = show number
+        explanation = show number ++ ": " ++ description
         assertion   = numerals (fromIntegral number) `shouldBe` expected
 
-data Case = Case { number   :: Integer
-                 , expected :: Maybe String
+data Case = Case { description :: String
+                 , number      :: Integer
+                 , expected    :: Maybe String
                  }
 
 cases :: [Case]
-cases = [ Case { number   = 1
-               , expected = Just "I"
+cases = [ Case { description = "1 is a single I"
+               , number      = 1
+               , expected    = Just "I"
                }
-        , Case { number   = 2
-               , expected = Just "II"
+        , Case { description = "2 is two I's"
+               , number      = 2
+               , expected    = Just "II"
                }
-        , Case { number   = 3
-               , expected = Just "III"
+        , Case { description = "3 is three I's"
+               , number      = 3
+               , expected    = Just "III"
                }
-        , Case { number   = 4
-               , expected = Just "IV"
+        , Case { description = "4, being 5 - 1, is IV"
+               , number      = 4
+               , expected    = Just "IV"
                }
-        , Case { number   = 5
-               , expected = Just "V"
+        , Case { description = "5 is a single V"
+               , number      = 5
+               , expected    = Just "V"
                }
-        , Case { number   = 6
-               , expected = Just "VI"
+        , Case { description = "6, being 5 + 1, is VI"
+               , number      = 6
+               , expected    = Just "VI"
                }
-        , Case { number   = 9
-               , expected = Just "IX"
+        , Case { description = "9, being 10 - 1, is IX"
+               , number      = 9
+               , expected    = Just "IX"
                }
-        , Case { number   = 27
-               , expected = Just "XXVII"
+        , Case { description = "20 is two X's"
+               , number      = 27
+               , expected    = Just "XXVII"
                }
-        , Case { number   = 48
-               , expected = Just "XLVIII"
+        , Case { description = "48 is not 50 - 2 but rather 40 + 8"
+               , number      = 48
+               , expected    = Just "XLVIII"
                }
-        , Case { number   = 59
-               , expected = Just "LIX"
+        , Case { description = "50 is a single L"
+               , number      = 59
+               , expected    = Just "LIX"
                }
-        , Case { number   = 93
-               , expected = Just "XCIII"
+        , Case { description = "90, being 100 - 10, is XC"
+               , number      = 93
+               , expected    = Just "XCIII"
                }
-        , Case { number   = 141
-               , expected = Just "CXLI"
+        , Case { description = "100 is a single C"
+               , number      = 141
+               , expected    = Just "CXLI"
                }
-        , Case { number   = 163
-               , expected = Just "CLXIII"
+        , Case { description = "60, being 50 + 10, is LX"
+               , number      = 163
+               , expected    = Just "CLXIII"
                }
-        , Case { number   = 402
-               , expected = Just "CDII"
+        , Case { description = "400, being 500 - 100, is CD"
+               , number      = 402
+               , expected    = Just "CDII"
                }
-        , Case { number   = 575
-               , expected = Just "DLXXV"
+        , Case { description = "500 is a single D"
+               , number      = 575
+               , expected    = Just "DLXXV"
                }
-        , Case { number   = 911
-               , expected = Just "CMXI"
+        , Case { description = "900, being 1000 - 100, is CM"
+               , number      = 911
+               , expected    = Just "CMXI"
                }
-        , Case { number   = 1024
-               , expected = Just "MXXIV"
+        , Case { description = "1000 is a single M"
+               , number      = 1024
+               , expected    = Just "MXXIV"
                }
-        , Case { number   = 3000
-               , expected = Just "MMM"
+        , Case { description = "3000 is three M's"
+               , number      = 3000
+               , expected    = Just "MMM"
                }
         ]