trackler 2.0.0.4 → 2.0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 930373b0c5670419a14e779c478608d57004bd93
-  data.tar.gz: 0f5bd0b92f26975bfa7a090b7b4b16bb4824f52f
+  metadata.gz: 0ad43d193656b92d10fd9344553cf30d66baae72
+  data.tar.gz: fa8601209c89c67e01b4e8d3b797a3fc98271692
 SHA512:
-  metadata.gz: 626a0ea3510ad74ff08a010e9f3539fb8b9e128a1921953994ffa9755051712c23e123f808300c75d4c1d9e2d7e835d3580e13e23697183ac792c163624e9854
-  data.tar.gz: 961075ac95564c32b9ac6eaf618c2f9765961c06c13caa9d12bbbd6b9458be177fe0105d644e61efab7bc964002358d3f56a85caafbdd9585de19df7c9888c53
+  metadata.gz: ad7e2dba3130960687bf8c0dc7b4e0184e4d2951d10090d740af794de761d986e3c88aab193c5678627f9ed9908fe3bfea57c936c694f97c299896bbab2afcda
+  data.tar.gz: b7b933be55c8174b41730383df120ddf5aabd607cf9ef38054ee222df76058d73b8a012249ec1915ce3d529a1d6131469ab7ec684f4c5c0b25fabdc57040babc

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.0.0.4"
+  VERSION = "2.0.0.5"
 end

data/tracks/clojure/exercises/binary-search/test/binary_search_test.clj

@@ -4,8 +4,6 @@
 
 (def short-vector [1, 3, 4, 6, 8, 9, 11])
 
-(def unsorted-vector [2, 1, 4, 3, 6])
-
 (def large-vector [1, 3, 5, 8, 13, 21, 34, 55, 89])
 
 (def even-length-vector [1, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377])

data/tracks/haskell/config.json

@@ -382,6 +382,12 @@
       "topics": [
       ]
     },
+    {
+      "slug": "dominoes",
+      "difficulty": 8,
+      "topics": [
+      ]
+    },
     {
       "slug": "sgf-parsing",
       "difficulty": 9,

data/tracks/haskell/exercises/dominoes/examples/success-standard/package.yaml

@@ -0,0 +1,16 @@
+name: dominoes
+
+dependencies:
+  - base
+
+library:
+  exposed-modules: Dominoes
+  source-dirs: src
+
+tests:
+  test:
+    main: Tests.hs
+    source-dirs: test
+    dependencies:
+      - dominoes
+      - hspec

data/tracks/haskell/exercises/dominoes/examples/success-standard/src/Dominoes.hs

@@ -0,0 +1,15 @@
+module Dominoes (chain) where
+
+import Data.List  (delete)
+import Data.Maybe (listToMaybe, mapMaybe)
+
+chain :: [(Int, Int)] -> Maybe [(Int, Int)]
+chain [] = Just []
+chain (x@(left, right):xs) = fmap (x:) (subchain xs left right)
+
+subchain :: [(Int, Int)] -> Int -> Int -> Maybe [(Int, Int)]
+subchain [] chainLeft chainRight = if chainLeft == chainRight then Just [] else Nothing
+subchain l  chainLeft chainRight = listToMaybe (mapMaybe subchain' l)
+  where subchain' (a, b) | a == chainRight = fmap ((a, b):) (subchain (delete (a, b) l) chainLeft b)
+        subchain' (a, b) | b == chainRight = fmap ((b, a):) (subchain (delete (a, b) l) chainLeft a)
+        subchain' _                        = Nothing

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

@@ -0,0 +1,19 @@
+name: dominoes
+
+dependencies:
+  - base
+
+library:
+  exposed-modules: Dominoes
+  source-dirs: src
+  dependencies:
+  # - foo       # List here the packages you
+  # - bar       # want to use in your solution.
+
+tests:
+  test:
+    main: Tests.hs
+    source-dirs: test
+    dependencies:
+      - dominoes
+      - hspec

data/tracks/haskell/exercises/dominoes/src/Dominoes.hs

@@ -0,0 +1,4 @@
+module Dominoes (chain) where
+
+chain :: [(Int, Int)] -> Maybe [(Int, Int)]
+chain dominoes = undefined

data/tracks/haskell/exercises/dominoes/stack.yaml

@@ -0,0 +1 @@
+resolver: nightly-2016-07-17

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

@@ -0,0 +1,108 @@
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE RecordWildCards #-}
+
+import Control.Monad     (forM_, unless)
+import Data.Foldable     (for_)
+import Data.Function     (on)
+import Test.Hspec        (Spec, describe, expectationFailure, it, shouldBe, shouldMatchList)
+import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Text.Printf       (printf)
+
+import Dominoes (chain)
+
+main :: IO ()
+main = hspecWith defaultConfig {configFastFail = True} specs
+
+specs :: Spec
+specs = describe "dominoes" $
+          describe "chain" $ for_ cases test
+  where
+
+    test Case{..} = it description assertion
+      where
+        assertion = if expected
+                      then shouldBeChain $ chain input
+                      else chain input `shouldBe` Nothing
+
+        shouldBeChain Nothing = expectationFailure "should have had a chain, but didn't"
+        shouldBeChain (Just output) = do
+          output `shouldMatchDominoesOf` input
+          consecutivesShouldMatch output
+          endsShouldMatch output
+
+        shouldMatchDominoesOf = shouldMatchList `on` map sortDomino
+
+        consecutivesShouldMatch l = forM_ (indexedPairs l) $ \(d1, d2, i) ->
+          shouldBeConsecutive l ("domino " ++ show i, d1) ("domino " ++ show (i + 1), d2)
+
+        endsShouldMatch [] = return ()
+        endsShouldMatch l@(d1:_) =
+          shouldBeConsecutive l (" last domino", last l) ("first domino", d1)
+
+        indexedPairs :: [a] -> [(a, a, Int)]
+        indexedPairs l = zip3 l (drop 1 l) [1..]
+
+        sortDomino (a, b) = if a > b then (b, a) else (a, b)
+
+        shouldBeConsecutive l (name1, d1@(_, d1r)) (name2, d2@(d2l, _)) =
+          unless (d1r == d2l) $
+            expectationFailure $
+              printf "In chain %s:\n\t   right end of %s (%s)\n\tand left end of %s (%s)\n\tdidn't match!" (show l) name1 (show d1) name2 (show d2)
+
+-- Test cases adapted from `exercism/x-common/dominoes` on 2016-11-11.
+
+data Case = Case { description :: String
+                 , input       :: [(Int, Int)]
+                 , expected    :: Bool
+                 }
+
+cases :: [Case]
+cases = [ Case { description = "empty input = empty output"
+               , input       = []
+               , expected    = True
+               }
+        , Case { description = "singleton input = singleton output"
+               , input       = [(1, 1)]
+               , expected    = True
+               }
+        , Case { description = "singleton that can't be chained"
+               , input       = [(1, 2)]
+               , expected    = False
+               }
+        , Case { description = "three elements"
+               , input       = [(1, 2), (3, 1), (2, 3)]
+               , expected    = True
+               }
+        , Case { description = "can reverse dominoes"
+               , input       = [(1, 2), (1, 3), (2, 3)]
+               , expected    = True
+               }
+        , Case { description = "can't be chained"
+               , input       = [(1, 2), (4, 1), (2, 3)]
+               , expected    = False
+               }
+        , Case { description = "disconnected - simple"
+               , input       = [(1, 1), (2, 2)]
+               , expected    = False
+               }
+        , Case { description = "disconnected - double loop"
+               , input       = [(1, 2), (2, 1), (3, 4), (4, 3)]
+               , expected    = False
+               }
+        , Case { description = "disconnected - single isolated"
+               , input       = [(1, 2), (2, 3), (3, 1), (4, 4)]
+               , expected    = False
+               }
+        , Case { description = "need backtrack"
+               , input       = [(1, 2), (2, 3), (3, 1), (2, 4), (2, 4)]
+               , expected    = True
+               }
+        , Case { description = "separate loops"
+               , input       = [(1, 2), (2, 3), (3, 1), (1, 1), (2, 2), (3, 3)]
+               , expected    = True
+               }
+        , Case { description = "ten elements"
+               , input       = [(1, 2), (5, 3), (3, 1), (1, 2), (2, 4), (1, 6), (2, 3), (3, 4), (5, 6)]
+               , expected    = True
+               }
+        ]

data/tracks/objective-c/Dangerfile

@@ -5,7 +5,13 @@ if git.commits.any? { |c| c.message =~ /^Merge branch '#{github.branch_for_base}
   fail('Please rebase to get rid of the merge commits in this PR')
 end
 can_merge = github.pr_json["mergeable"]
-warn("This PR cannot be merged yet.", sticky: false) unless can_merge
+is_merged = github.pr_json["merged"]
+
+if is_merged
+  warn("This PR was merged before CI was done.", sticky: false)
+else
+  warn("This PR cannot be merged yet.", sticky: false) unless can_merge
+end
 
 # Make it more obvious that a PR is a work in progress and shouldn't be merged yet
 warn("PR is classed as Work in Progress") if github.pr_title.include? "[WIP]"

data/tracks/swift/Dangerfile

@@ -5,7 +5,13 @@ if git.commits.any? { |c| c.message =~ /^Merge branch '#{github.branch_for_base}
   fail('Please rebase to get rid of the merge commits in this PR')
 end
 can_merge = github.pr_json["mergeable"]
-warn("This PR cannot be merged yet.", sticky: false) unless can_merge
+is_merged = github.pr_json["merged"]
+
+if is_merged
+  warn("This PR was merged before CI was done.", sticky: false)
+else
+  warn("This PR cannot be merged yet.", sticky: false) unless can_merge
+end
 
 # Make it more obvious that a PR is a work in progress and shouldn't be merged yet
 warn("PR is classed as Work in Progress") if github.pr_title.include? "[WIP]"
@@ -20,9 +26,9 @@ warn("Please provide a summary in the Pull Request description") if github.pr_bo
 jsonpath = "lintreport.json"
 contents = File.read jsonpath
 require "json"
-if contents.to_s == '' 
+if contents.to_s == ''
 	contents = "[]"
-end 
+end
 json = JSON.parse contents
 json.each do |object|
    shortFile =  object["file"]
@@ -30,7 +36,7 @@ json.each do |object|
    shortFile = shortFile.to_s || ''
    msg = object["reason"].to_s || ''
    line = object["line"] || 1
-   #only warn for files that were edited in this PR. 
+   #only warn for files that were edited in this PR.
    if git.modified_files.include? shortFile
    	shortFile.prepend("/")  # get away from doing inline comments since they are buggy as of Sep-2016
    	warn(msg, file: shortFile, line: line)
@@ -45,6 +51,3 @@ contents2 = File.read jsonpath2
 json2 = JSON.parse contents2
 firstStrinInArray = json2["tests_summary_messages"][0]
 message(firstStrinInArray)
-
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.0.0.4
+  version: 2.0.0.5
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -2907,6 +2907,12 @@ files:
 - tracks/haskell/exercises/difference-of-squares/src/Squares.hs
 - tracks/haskell/exercises/difference-of-squares/stack.yaml
 - tracks/haskell/exercises/difference-of-squares/test/Tests.hs
+- tracks/haskell/exercises/dominoes/examples/success-standard/package.yaml
+- tracks/haskell/exercises/dominoes/examples/success-standard/src/Dominoes.hs
+- tracks/haskell/exercises/dominoes/package.yaml
+- tracks/haskell/exercises/dominoes/src/Dominoes.hs
+- tracks/haskell/exercises/dominoes/stack.yaml
+- tracks/haskell/exercises/dominoes/test/Tests.hs
 - tracks/haskell/exercises/etl/examples/success-standard/package.yaml
 - tracks/haskell/exercises/etl/examples/success-standard/src/ETL.hs
 - tracks/haskell/exercises/etl/package.yaml