Merge a359b0a into 5612552

.gitignore

@@ -1,5 +1 @@
-point-free/compiled/*
-point-free/*.bak
-point-free/*.html
-point-free/*.css
-point-free/*.js
+compiled/

.travis.yml

@@ -1,18 +1,33 @@
-langauge: c
-sudo: false
+language: c
+
 env:
   global:
     - RACKET_DIR=~/racket
   matrix:
-    - RACKET_VERSION=6.1.1
+    - RACKET_VERSION=6.0    RUN_COVER=false  RACO_TEST_OPTIONS=
+    - RACKET_VERSION=6.0.1  RUN_COVER=false  RACO_TEST_OPTIONS=-e
+    - RACKET_VERSION=6.1    RUN_COVER=false  RACO_TEST_OPTIONS=-e
+    - RACKET_VERSION=6.1.1  RUN_COVER=true   RACO_TEST_OPTIONS=-e
+    - RACKET_VERSION=6.2    RUN_COVER=true   RACO_TEST_OPTIONS=-e
+    - RACKET_VERSION=6.2.1  RUN_COVER=true   RACO_TEST_OPTIONS=-e
+    - RACKET_VERSION=6.3    RUN_COVER=true   RACO_TEST_OPTIONS=-e
+    - RACKET_VERSION=6.4    RUN_COVER=true   RACO_TEST_OPTIONS=-e
+    - RACKET_VERSION=6.5    RUN_COVER=true   RACO_TEST_OPTIONS=-e
+    - RACKET_VERSION=6.6    RUN_COVER=true   RACO_TEST_OPTIONS=-e
+    - RACKET_VERSION=6.7    RUN_COVER=true   RACO_TEST_OPTIONS=-e
 
 before_install:
   - git clone https://github.com/greghendershott/travis-racket.git ../travis-racket
   - cat ../travis-racket/install-racket.sh | bash
   - export PATH="${RACKET_DIR}/bin:${PATH}"
 
-install: raco pkg install --deps search-auto $TRAVIS_BUILD_DIR # install dependencies
+install:
+  - raco pkg install --installation --deps search-auto --link
+      $TRAVIS_BUILD_DIR/point-free-doc
+      $TRAVIS_BUILD_DIR/point-free-lib
+      $TRAVIS_BUILD_DIR/point-free-test
+  - if [ "$RUN_COVER" = true ]; then raco pkg install --installation --auto cover cover-coveralls; fi
 
 script:
- - raco test $TRAVIS_BUILD_DIR # run tests. you wrote tests, right?
- - raco cover -f coveralls -d $TRAVIS_BUILD_DIR/coverage . # generate coverage information for coveralls
+  - raco test $RACO_TEST_OPTIONS -p point-free-lib point-free-test
+  - if [ "$RUN_COVER" = true ]; then raco cover -bf coveralls -d $TRAVIS_BUILD_DIR/coverage -p point-free-lib point-free-test; fi

point-free-doc/info.rkt

@@ -0,0 +1,11 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps
+  '())
+(define build-deps
+  '("base"
+    "point-free-lib"
+    "racket-doc"
+    "scribble-lib"))

point-free-doc/scribblings/info.rkt

@@ -0,0 +1,4 @@
+#lang info
+
+(define scribblings
+  '(["point-free.scrbl" ()]))

point-free/point-free.scrbl → point-free-doc/scribblings/point-free.scrbl

@@ -10,7 +10,7 @@
 @title{point-free}
 
 @(define the-eval (make-base-eval))
-@(the-eval '(require "main.rkt"
+@(the-eval '(require point-free
                      racket/function
                      racket/list))
 
@@ -327,4 +327,3 @@ for example, are all nonnegative numbers. The absolute value of a nonnegative nu
     (define count-to-ten (until-fixpoint count-once-to-ten))
     (count-to-ten 5)
     ]}
-

point-free-lib/info.rkt

@@ -0,0 +1,8 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps
+  '("base"))
+(define build-deps
+  '("rackunit-lib"))

point-free/arg-count-syntax.rkt → point-free-lib/point-free/arg-count-syntax.rkt

@@ -1,4 +1,4 @@
-#lang racket
+#lang racket/base
 
 (provide define/compose
          arg-count
@@ -16,7 +16,8 @@
   (define id (arg-count n expr)))
 
 (module+ test
-  (require rackunit)
+  (require racket/function
+           rackunit)
   (define-binary-check (check-syntax-datum stx-actual stx-expected)
     (equal? (syntax->datum stx-actual)
             (syntax->datum stx-expected)))
@@ -28,4 +29,4 @@
     (arg-count n (const n)))
   (check-eqv? (num-args1 0 0) 2)
   (define/arg-count num-args2 n (const n))
-  (check-eqv? (num-args2 'foo 'bar 'baz) 3))
+  (check-eqv? (num-args2 'foo 'bar 'baz) 3))

point-free/definition-forms.rkt → point-free-lib/point-free/definition-forms.rkt

@@ -1,4 +1,4 @@
-#lang racket
+#lang racket/base
 
 (provide define/wind
          define/wind-pre

point-free/fixpoint.rkt → point-free-lib/point-free/fixpoint.rkt

@@ -1,10 +1,11 @@
-#lang racket
-
-(require rackunit)
+#lang racket/base
 
 (provide until-fixpoint
          fixpoint?)
 
+(module+ test
+  (require rackunit))
+
 (define (until-fixpoint f)
   (define (fixpoint-f v)
     (let ([fv (f v)])

point-free/main.rkt → point-free-lib/point-free/main.rkt

@@ -1,4 +1,4 @@
-#lang racket
+#lang racket/base
 
 (require "arg-count-syntax.rkt"
          "parallel-composition.rkt"

point-free/parallel-composition.rkt → point-free-lib/point-free/parallel-composition.rkt

@@ -1,6 +1,4 @@
-#lang racket
-
-(require rackunit)
+#lang racket/base
 
 (provide join
          join*
@@ -11,6 +9,10 @@
          wind-post*
          wind*)
 
+(module+ test
+  (require racket/math
+           rackunit))
+
 ;; Function form of flat application - (app + 2 3) is equivalent to (+ 2 3).
 ;; Used to simplify logic in joining functins
 

point-free/thrush.rkt → point-free-lib/point-free/thrush.rkt

@@ -1,6 +1,4 @@
-#lang racket
-
-(require rackunit)
+#lang racket/base
 
 (provide thrush
          thrush+
@@ -17,6 +15,9 @@
                      [thrush+-and and~>]
                      [thrush*-and and~>*]))
 
+(module+ test
+  (require rackunit))
+
 (define (thrush . fs)
   (apply compose (reverse fs)))
 

point-free-test/info.rkt

@@ -0,0 +1,10 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps
+  '())
+(define build-deps
+  '("base"
+    "doc-coverage"
+    "point-free-lib"))

point-free/info.rkt

@@ -1,4 +1,11 @@
 #lang info
 
-(define name "point-free")
-(define scribblings '(("point-free.scrbl" ())))
+(define collection 'multi)
+
+(define deps
+  '("point-free-doc"
+    "point-free-lib"))
+(define build-deps
+  '())
+
+(define implies deps)