Skip to content

Commit f5eed69

Browse files
Bump version to 0.2.0
1 parent 4842603 commit f5eed69

File tree

4 files changed

+22
-41
lines changed

4 files changed

+22
-41
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### 0.2.0 - 05.08.2019
2+
* Update to .Net Core
3+
* Distribute as .Net Core global tool
4+
15
### 0.1.0 - 04.06.2017
26
* Defining templates in F# DSL
37
* Creating pages using templates from `.md` files with `layout` entry

README.md

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![Logo](https://gitlab.com/Krzysztof-Cieslak/Fornax/raw/master/logo/Fornax.png)
1+
![Logo](https://gitlab.com/LambdaFactory/Fornax/raw/master/logo/Fornax.png)
22

33
Fornax is a static site generator using type safe F# DSL to define page templates.
44

@@ -18,38 +18,15 @@ Fornax is a static site generator using type safe F# DSL to define page template
1818

1919
## Installation.
2020

21-
#### Via Scoop.sh (Windows)
22-
23-
You can install Fornax via the [Scoop](http://scoop.sh/) package manager on Windows
24-
25-
scoop bucket add fsharp-extras https://github.com/Krzysztof-Cieslak/scoop-fsharp-extras.git
26-
scoop install fornax
27-
28-
#### Via Homebrew (OSX)
29-
30-
You can install Fornax via the [Homebrew](http://brew.sh) package manager on OS X
31-
32-
brew tap Krzysztof-Cieslak/fornax && brew install fornax
33-
34-
#### Via Linuxbrew (Linux)
35-
36-
You can install Fornax via the [Linuxbrew](http://linuxbrew.sh/) package manager on Linux
37-
38-
brew tap Krzysztof-Cieslak/fornax && brew install fornax
39-
40-
#### Other
41-
42-
You can download one of the releases found at https://gitlab.com/Krzysztof-Cieslak/Fornax/tags
43-
44-
Alternately you can clone the repo, build the source, and then move the files in your bin folder to a location of your choosing.
21+
Fornax is released as a global .Net Core tool. You can install it with `dotnet tool install fornax -g`
4522

4623
## CLI Application
4724

4825
The main functionality of Fornax comes from CLI applications that lets user scaffold, and generate webpages.
4926

5027
* `fornax new` - scaffolds new blog in current working directory using really simple template
5128
* `fornax build` - builds webpage, puts output to `_public` folder
52-
* `fornax watch` - starts small webserver that host your blog post, and background process that recompiles blog whenver any changes are detected. That's suggested way of working with Fornax
29+
* `fornax watch` - starts small webserver that host your blog post, and background process that recompiles blog whenever any changes are detected. That's suggested way of working with Fornax
5330
* `fornax clean` - removes output directory and any temp files.
5431
* `fornax version` - prints out version of Fornax
5532
* `fornax help` - prints out help
@@ -79,7 +56,7 @@ SomeGlobalValue: "Test global value"
7956

8057
### Templates
8158

82-
Templates are F# script files representing different templates that can be used in the website. They need to `#load` `siteModel.fsx` file, and `#r` `Fornax.Core.dll`. They need to define F# record called `Model` which defines additional settings passed to this particular template, and `generate` function of following signature: `SiteModel -> Model -> Post list -> string -> HtmlElement`. `SiteModel` is type representing global settings of webpage, `Model` is type representing settings for this template, `Post list` contains simplifed information about all avaliable posts in the blog (usefull for navigation, creating tag cloud etc.) `string` is main content of post (already compiled to `html`).
59+
Templates are F# script files representing different templates that can be used in the website. They need to `#load` `siteModel.fsx` file, and `#r` `Fornax.Core.dll`. They need to define F# record called `Model` which defines additional settings passed to this particular template, and `generate` function of following signature: `SiteModel -> Model -> Post list -> string -> HtmlElement`. `SiteModel` is type representing global settings of webpage, `Model` is type representing settings for this template, `Post list` contains simplified information about all available posts in the blog (useful for navigation, creating tag cloud etc.) `string` is main content of post (already compiled to `html`).
8360

8461
Templates are defined using DSL defined in `Html` module of `Fornax.Core`.
8562

@@ -110,7 +87,7 @@ let generate (siteModel : SiteModel) (mdl : Model) (posts: Post list) (content :
11087

11188
### Page content
11289

113-
Content files are `.md` files containg page contnt, and header with settings (defined using yaml). Header part is parsed, and passed to template `generate` function as `Model`. Content part is compiled to html and also passed to `generate` function. Header part needs to have `layout` entry which defines which template will be used for the page.
90+
Content files are `.md` files containing page content, and header with settings (defined using yaml). Header part is parsed, and passed to template `generate` function as `Model`. Content part is compiled to html and also passed to `generate` function. Header part needs to have `layout` entry which defines which template will be used for the page.
11491

11592
Sample page:
11693

@@ -145,7 +122,7 @@ It's filled based on respective entries in `layout` part of the post content fil
145122

146123
1. Hmmm... it looks similar to Jekyll, doesn't it?
147124

148-
* Yes, indeed. But the main advantage over Jekyll is type safe DSL for defining templates, and fact it's using normal prorgramming language - no additional syntax to things like loops or conditional statements, it's also very easy to compose templates - you just `#load` other template and execute as normal F# function
125+
* Yes, indeed. But the main advantage over Jekyll is type safe DSL for defining templates, and fact it's using normal programming language - no additional syntax to things like loops or conditional statements, it's also very easy to compose templates - you just `#load` other template and execute as normal F# function
149126

150127
2. What about F# Formatting?
151128

@@ -159,7 +136,7 @@ There might be a little voice inside that tells you you're not ready; that you n
159136

160137
I assure you, that's not the case.
161138

162-
This project has some clear Contribution Guidelines and expectations that you can [read here](https://github.com/Krzysztof-Cieslak/Saturn/blob/master/CONTRIBUTING.md).
139+
This project has some clear Contribution Guidelines and expectations that you can [read here](https://github.com/LambdaFactory/Saturn/blob/master/CONTRIBUTING.md).
163140

164141
The contribution guidelines outline the process that you'll need to follow to get a patch merged. By making expectations and process explicit, I hope it will make it easier for you to contribute.
165142

@@ -169,7 +146,7 @@ Thank you for contributing!
169146

170147
## Contributing and copyright
171148

172-
The project is hosted on [GitHub](https://github.com/Krzysztof-Cieslak/Fornax) where you can [report issues](https://github.com/Krzysztof-Cieslak/Fornax/issues), fork
173-
the project and submit pull requests. Please read [Contribution Guide](https://github.com/Krzysztof-Cieslak/Fornax/blob/master/CONTRIBUTING.md)
149+
The project is hosted on [GitHub](https://github.com/LambdaFactory/Fornax) where you can [report issues](https://github.com/LambdaFactory/Fornax/issues), fork
150+
the project and submit pull requests. Please read [Contribution Guide](https://github.com/LambdaFactory/Fornax/blob/master/CONTRIBUTING.md)
174151

175-
The library is available under [MIT license](https://github.com/Krzysztof-Cieslak/Fornax/blob/master/LICENSE.md), which allows modification and redistribution for both commercial and non-commercial purposes.
152+
The library is available under [MIT license](https://github.com/LambdaFactory/Fornax/blob/master/LICENSE.md), which allows modification and redistribution for both commercial and non-commercial purposes.

src/Fornax.Core/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("Fornax.Core")>]
66
[<assembly: AssemblyProductAttribute("Fornax")>]
77
[<assembly: AssemblyDescriptionAttribute("Fornax is a static site generator using type safe F# DSL to define page templates")>]
8-
[<assembly: AssemblyVersionAttribute("0.1.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("0.1.0")>]
8+
[<assembly: AssemblyVersionAttribute("0.2.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("0.2.0")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "Fornax.Core"
1414
let [<Literal>] AssemblyProduct = "Fornax"
1515
let [<Literal>] AssemblyDescription = "Fornax is a static site generator using type safe F# DSL to define page templates"
16-
let [<Literal>] AssemblyVersion = "0.1.0"
17-
let [<Literal>] AssemblyFileVersion = "0.1.0"
16+
let [<Literal>] AssemblyVersion = "0.2.0"
17+
let [<Literal>] AssemblyFileVersion = "0.2.0"

src/Fornax/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("Fornax")>]
66
[<assembly: AssemblyProductAttribute("Fornax")>]
77
[<assembly: AssemblyDescriptionAttribute("Fornax is a static site generator using type safe F# DSL to define page templates")>]
8-
[<assembly: AssemblyVersionAttribute("0.1.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("0.1.0")>]
8+
[<assembly: AssemblyVersionAttribute("0.2.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("0.2.0")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "Fornax"
1414
let [<Literal>] AssemblyProduct = "Fornax"
1515
let [<Literal>] AssemblyDescription = "Fornax is a static site generator using type safe F# DSL to define page templates"
16-
let [<Literal>] AssemblyVersion = "0.1.0"
17-
let [<Literal>] AssemblyFileVersion = "0.1.0"
16+
let [<Literal>] AssemblyVersion = "0.2.0"
17+
let [<Literal>] AssemblyFileVersion = "0.2.0"

0 commit comments

Comments
 (0)