Browse Source

Update remaining references to collage

Getty Ritter 6 years ago
parent
commit
671ba3ba58
5 changed files with 11 additions and 10 deletions
  1. 9 9
      README.md
  2. 0 0
      examples/basic-example/bricoleur
  3. 0 0
      examples/structural-types/bricoleur
  4. 1 0
      src/Bricoleur.hs
  5. 1 1
      src/Bricoleur/Opts.hs

+ 9 - 9
README.md

@@ -1,8 +1,8 @@
-The `collage` tool is a tool for writing documents that rely on code samples while keeping the code samples up-to-date.
+The `bricoleur` tool is a tool for writing documents that rely on code samples while keeping the code samples up-to-date.
 
 # Including an Entire Source File
 
-To create a `collage` project, create a directory that contains a file called `collage` as well as one or more subdirectories that contain the code that you want to expose, and a document in whatever plain text format you want. For example, say that we have a piece of Python source we'd like to write about: let's create a project directory as well as the subdirectory for the Python program, and initialize it with a trivial Python program:
+To create a `bricoleur` project, create a directory that contains a file called `bricoleur` as well as one or more subdirectories that contain the code that you want to expose, and a document in whatever plain text format you want. For example, say that we have a piece of Python source we'd like to write about: let's create a project directory as well as the subdirectory for the Python program, and initialize it with a trivial Python program:
 
 ```bash
 $ mkdir my-post
@@ -23,7 +23,7 @@ World' program in Python looks like this:
 Isn't that easy?
 ```
 
-Notice that the code block there contains a string in guillemets (`«hello»`) instead of the actual source code. Now, finally, we write a `collage` file that ties these together:
+Notice that the code block there contains a string in guillemets (`«hello»`) instead of the actual source code. Now, finally, we write a `bricoleur` file that ties these together:
 
 
 ```
@@ -46,20 +46,20 @@ Notice that the code block there contains a string in guillemets (`«hello»`) i
 )
 ```
 
-In our directory, we can now run `collage test` and we'll get output that looks like the following:
+In our directory, we can now run `bricoleur test` and we'll get output that looks like the following:
 
 ```bash
-$ collage test
+$ bricoleur test
 testing my-document.md
 - building source hello
   - running "python main.py" in my-post/python-example
 Hello, world
 ```
 
-we can also run `collage splice` to stitch the source code in question into our document:
+we can also run `bricoleur splice` to stitch the source code in question into our document:
 
 ```bash
-$ collage splice
+$ bricoleur splice
 Here is a document describing a snippet of Python source. A 'Hello
 World' program in Python looks like this:
 
@@ -72,7 +72,7 @@ Isn't that easy?
 
 # Including Multiple Source Files Per Project
 
-In addition to exposing a single source file, we can expose more than one. Replace the `(file "my-file")` expression with a map from names to files, and then use forward slashes to refer to names within this mapping. For example, if I added a `helper.py` file, and I wanted to use both, my Markdown file could reference `«hello/main»` and `«hello/helper»`, and my `collage` file could be updated to include
+In addition to exposing a single source file, we can expose more than one. Replace the `(file "my-file")` expression with a map from names to files, and then use forward slashes to refer to names within this mapping. For example, if I added a `helper.py` file, and I wanted to use both, my Markdown file could reference `«hello/main»` and `«hello/helper»`, and my `bricoleur` file could be updated to include
 
 ```
 # ...
@@ -99,7 +99,7 @@ if __name__ == '__main__':
     main()
 ```
 
-The two comment lines around the `main` function demarcate a _section_ of the file: `collage` will look for those substrings and then select only the lines of the file in between those two. We can refer to that section identifier just like we refer to multiple files above, as `«helper/main»`. We can then update our `collage` file to read:
+The two comment lines around the `main` function demarcate a _section_ of the file: `bricoleur` will look for those substrings and then select only the lines of the file in between those two. We can refer to that section identifier just like we refer to multiple files above, as `«helper/main»`. We can then update our `bricoleur` file to read:
 
 ```
 # ...

examples/basic-example/collage → examples/basic-example/bricoleur


examples/structural-types/collage → examples/structural-types/bricoleur


+ 1 - 0
src/Bricoleur.hs

@@ -13,7 +13,7 @@ import qualified Bricoleur.Opts as Opt
 import qualified Bricoleur.Commands.Splice as Cmd
 import qualified Bricoleur.Commands.Test as Cmd
 
+-- | Run the main @bricoleur@ function with the provided options.
 main :: Opt.Options -> IO ()
 main opts = do
   configMb <- Conf.getConfig (Opt.optFile opts)

+ 1 - 1
src/Bricoleur/Opts.hs

@@ -57,5 +57,5 @@ getOpts = do
   cwd <- Sys.getCurrentDirectory
   options <- Opt.execParser opts
   return $ if null (optFile options)
-              then options { optFile = cwd Sys.</> "collage" }
+              then options { optFile = cwd Sys.</> "bricoleur" }
               else options