Add stdlib

Makefile

@@ -1,8 +1,28 @@
+ifndef version
+version=$(shell git rev-list -1 HEAD)
+endif
+
+buildargs = -ldflags "-X main.VersionString=$(version)" -v
+
 all: build test install
 
 build:
-	cd cmd/nash && make -e build
-	cd cmd/nashfmt && make -e build
+	go build $(buildargs) -o ./cmd/nash/nash ./cmd/nash
+	go build $(buildargs) -o ./cmd/nashfmt/nashfmt ./cmd/nashfmt
+
+NASHPATH=$(HOME)/nash
+NASHROOT=$(HOME)/nashroot
+
+install: build
+	@echo
+	@echo "Installing nash at: "$(NASHROOT)
+	mkdir -p $(NASHROOT)/bin
+	rm -f $(NASHROOT)/bin/nash
+	rm -f $(NASHROOT)/bin/nashfmt
+	cp -p ./cmd/nash/nash $(NASHROOT)/bin
+	cp -p ./cmd/nashfmt/nashfmt $(NASHROOT)/bin
+	rm -rf $(NASHROOT)/stdlib
+	cp -pr ./stdlib $(NASHROOT)/stdlib
 
 deps:
 	go get -v -t golang.org/x/exp/ebnf
@@ -14,14 +34,10 @@ docs: docsdeps
 	mdtoc -w ./README.md
 	mdtoc -w ./docs/interactive.md
 	mdtoc -w ./docs/reference.md
+	mdtoc -w ./docs/stdlib/fmt.md
 
 test: deps build
-	GO15VENDOREXPERIMENT=1 ./hack/check.sh
-
-install:
-	cd cmd/nash && make -e install
-	cd cmd/nashfmt && make -e install
-	@echo "Nash installed on $(GOPATH)/bin/nash"
+	./hack/check.sh
 
 update-vendor:
 	cd cmd/nash && nash ./vendor.sh

README.md

@@ -1,11 +1,15 @@
 <!-- mdtocstart -->
+
 # Table of Contents
 
 - [nash](#nash)
 - [Show time!](#show-time)
     - [Useful stuff](#useful-stuff)
     - [Why nash scripts are reliable?](#why-nash-scripts-are-reliable)
     - [Installation](#installation)
+        - [Release](#release)
+            - [Linux](#linux)
+        - [Master](#master)
     - [Getting started](#getting-started)
 - [Accessing command line args](#accessing-command-line-args)
 - [Namespace features](#namespace-features)
@@ -16,7 +20,9 @@
 - [Security](#security)
 - [Concept](#concept)
 - [Motivation](#motivation)
+- [Releasing](#releasing)
 - [Want to contribute?](#want-to-contribute)
+
 <!-- mdtocend -->
 
 # nash
@@ -50,14 +56,44 @@ Nash is a system shell, inspired by plan9 `rc`, that makes it easy to create rel
 
 ## Installation
 
-If you have Go, go-get it:
+Before proceeding to any of the install procedures it is important that you
+set in your environment the **NASHPATH** and **NASHROOT** variables.
 
-```sh
-# Make sure GOPATH/bin is in your PATH
-go get github.com/NeowayLabs/nash/cmd/nash
-go get github.com/NeowayLabs/nash/cmd/nashfmt
+The **NASHROOT** variable is used to find the stdlib, while **NASHPATH**
+is used to find libraries in general. It is important to have two different
+paths since this will allow you to delete all libraries
+(cleaning up your installation) by removing your $NASHPATH directory
+without affecting your base nash installation and standard library.
+
+If no **NASHPATH** set a default of $HOME/nash will be assumed.
+If no **NASHROOT** set a default of $HOME/nashroot will be assumed.
+
+The libraries lookup dir will be $NASHPATH/lib.
+The standard library lookup dir will be $NASHROOT/stdlib.
+
+After installing the nash binary will be located at $NASHROOT/bin.
+
+### Release
+
+Installing is so stupid that we provide small scripts to do it.
+If your platform is not supported take a look at the existent ones
+and send a MR with the script for your platform.
+
+#### Linux
+
+Run:
+
+```
+./hack/install/linux.sh
+```
+
+### Master
+
+Run:
+
+```
+make install
 ```
-If not, [download the latest binary release](https://github.com/NeowayLabs/nash/releases) and copy to somewhere in your PATH.
 
 ## Getting started
 

cmd/nash/main.go

@@ -49,7 +49,7 @@ func main() {
 
 	if version {
 		fmt.Printf("build tag: %s\n", VersionString)
-		os.Exit(0)
+		return
 	}
 
 	if len(flag.Args()) > 0 {

cmd/nashfmt/main.go

@@ -12,10 +12,14 @@ import (
 
 var (
 	overwrite bool
+	version   bool
+	// version is set at build time
+	VersionString = "No version provided"
 )
 
 func init() {
 	flag.BoolVar(&overwrite, "w", false, "overwrite file")
+	flag.BoolVar(&version, "version", false, "Show version")
 }
 
 func main() {
@@ -26,6 +30,11 @@ func main() {
 
 	flag.Parse()
 
+	if version {
+		fmt.Printf("build tag: %s\n", VersionString)
+		return
+	}
+
 	if len(flag.Args()) <= 0 {
 		flag.PrintDefaults()
 		return

docs/interactive.md

@@ -1,10 +1,12 @@
 <!-- mdtocstart -->
+
 # Table of Contents
 
 - [Line mode](#line-mode)
 - [Autocomplete](#autocomplete)
 - [Hooks](#hooks)
 - [bindfn](#bindfn)
+
 <!-- mdtocend -->
 
 When used as an interactive shell, nash supports a few features to

docs/reference.md

@@ -1,17 +1,28 @@
 <!-- mdtocstart -->
+
 # Table of Contents
 
 - [Command line arguments](#command-line-arguments)
 - [Flow control](#flow-control)
+    - [Branching](#branching)
+    - [Looping](#looping)
+        - [Lists](#lists)
+        - [Forever](#forever)
 - [Functions](#functions)
 - [Operators](#operators)
-    - [+ (Concatenation)](#-concatenation)
+    - [+](#)
         - [string](#string)
+- [Packages](#packages)
 - [Iterating](#iterating)
 - [Built-in functions](#builtin-functions)
+    - [print](#print)
+    - [format](#format)
     - [len](#len)
     - [append](#append)
-- [Packages](#packages)
+    - [exit](#exit)
+    - [glob](#glob)
+- [Standard Library](#standard-library)
+
 <!-- mdtocend -->
 
 Here lies a comprehensive reference documentation of nash
@@ -171,10 +182,19 @@ echo $a+$b
 #Output:"12"
 ```
 
+# Packages
+
+TODO
+
 # Iterating
 
+TODO
+
 # Built-in functions
 
+Built-in functions are functions that are embedded on the
+language. You do not have to import any package to use them.
+
 ## print
 
 The function **print** is used to print simple
@@ -237,4 +257,20 @@ example_list <= append($example_list, "2")
 echo $example_list
 ```
 
-# Packages
+## exit
+
+TODO
+
+## glob
+
+TODO
+
+# Standard Library
+
+The standard library is a set of packages that comes with the
+nash install (although not obligatory).
+
+They must be imported explicitly (as any other package) to
+be used.
+
+* [fmt](docs/stdlib/fmt.md)

docs/stdlib/fmt.md

@@ -0,0 +1,21 @@
+<!-- mdtocstart -->
+
+# Table of Contents
+
+- [fmt](#fmt)
+    - [fmt_println](#fmtprintln)
+
+<!-- mdtocend -->
+
+# fmt
+
+## fmt_println
+
+Same behavior as print but adds a newline on the end.
+
+```nash
+import fmt
+
+fmt_println("hi")
+#Output:"hi\n"
+```

hack/check.sh

@@ -33,6 +33,10 @@ done
 
 $GO tool cover -func coverage.txt
 
+echo "running stdlib tests"
+export NASHPATH=`pwd`
+./cmd/nash/nash ./stdlib/fmt_test.sh
+
 # To submit the test coverage result to coveralls.io,
 # use goveralls (https://github.com/mattn/goveralls)
 # goveralls -coverprofile=profile.cov -service=travis-ci

hack/install/linux.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+
+VERSION="v0.5"
+echo "installing nash: "$VERSION" at NASHPATH: "$NASHPATH
+
+cd $NASHPATH
+tarfile="nash-$VERSION-linux-amd64.tar.gz"
+wget https://github.com/NeowayLabs/nash/releases/download/$VERSION/$tarfile
+tar xvfz $tarfile
+rm -f $tarfile

hack/releaser.sh

@@ -19,18 +19,21 @@ mkdir -p dist
 fn prepare_execs(distfiles, os) {
 	if $os == "windows" {
 		newfiles = ()
-		
+
 		for distfile in $distfiles {
-			file = $distfile+".exe"
-
-			newfiles <= append($newfiles, $file)
+			src = $distfile[0]
+			dst = $distfile[1]
+			newsrc = $src + ".exe"
+			newdst = $dst + ".exe"
+			newfiles <= append($newfiles, ($newsrc $newdst))
 		}
-		
+
 		return $newfiles
 	}
+
 	if $os == "linux" {
 		for distfile in $distfiles {
-			strip $distfile
+			strip $distfile[0]
 		}
 	}
 
@@ -45,13 +48,36 @@ for os in $supported_os {
 		echo "building OS: "+$GOOS+" ARCH : "+$GOARCH
 		make build "version="+$version
 
-		nash      = "cmd/nash/nash"
-		nashfmt   = "cmd/nashfmt/nashfmt"
-		execfiles = ($nash $nashfmt)
+		pkgdir    <= mktemp -d
+		bindir = $pkgdir + "/bin"
+		stdlibdir = $pkgdir + "/stdlib"
+		mkdir -p $bindir
+		mkdir -p $stdlibdir
+
+		nash_src = "./cmd/nash/nash"
+		nash_dst = $bindir + "/nash"
+		nashfmt_src = "./cmd/nashfmt/nashfmt"
+		nashfmt_dst = $bindir + "/nashfmt"
+
+		execfiles = ( ($nash_src $nash_dst) ($nashfmt_src $nashfmt_dst) )
+		execfiles <= prepare_execs($execfiles, $os)
+
+		# TODO: Improve with glob, right now have only one package =)
+		distfiles <= append($execfiles, ("./stdlib/fmt.sh" $stdlibdir))
+
+		for distfile in $distfiles {
+			src = $distfile[0]
+			dst = $distfile[1]
+			cp -pr $src $dst
+		}
 
-		distfiles <= prepare_execs($execfiles, $os)
-		distar    <= format("dist/nash-%s-%s-%s.tar.gz", $version, $os, $arch)
+		projectdir <= pwd
+		distar  <= format("%s/dist/nash-%s-%s-%s.tar.gz", $projectdir, $version, $os, $arch)
 
-		tar cvfz $distar $distfiles
+		chdir($pkgdir)
+		pkgraw <= ls
+		pkgfiles <= split($pkgraw, "\n")
+		tar cvfz $distar $pkgfiles
+		chdir($projectdir)
 	}
 }