From 059cafcd01bdc5e9491877c19943eb744e363243 Mon Sep 17 00:00:00 2001 From: Phil Smith Date: Tue, 6 Dec 2016 15:15:24 -0800 Subject: [PATCH] Infrastructure 2.1.0. closes #11 --- .editorconfig | 3 +-- .gitignore | 45 +++++++++++++++++++++++++++++++++---------- Makefile | 1 + README.md | 4 ++++ Vagrantfile | 1 + provisioning/common | 1 + provisioning/travis | 1 + provisioning/vagrant | 1 + src/book.tex | 2 ++ vendor/infrastructure | 2 +- 10 files changed, 48 insertions(+), 13 deletions(-) diff --git a/.editorconfig b/.editorconfig index 79ac465..9df3360 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,5 +1,3 @@ -# This file is managed by chef, changes will be overwritten - root = true [*] @@ -8,6 +6,7 @@ end_of_line = lf indent_size = 2 indent_style = space insert_final_newline = true +max_line_length = 90 trim_trailing_whitespace = true [Makefile] diff --git a/.gitignore b/.gitignore index 5328507..21e0cca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,40 @@ -.vagrant - # Build intermediates build -# Bundler -.bundle/* -bin/* -Gemfile.lock +# From infrastructure +bin + +# Vagrant +.vagrant/ -# Berks -Berksfile.lock +# Vim +*~ +.netrwhist +Session.vim +[._]*.s[a-w][a-z] +[._]s[a-w][a-z] +tags -# Sublime Text -*.sublime-workspace +# Emacs +*.elc +*.rel +*_archive +*_flymake.* +*~ +.\#* +.cask/ +.dir-locals.el +.org-id-locations +.projectile +/.emacs.desktop +/.emacs.desktop.lock +/auto/ +/elpa/ +/eshell/history +/eshell/lastdir +/server/ +\#*\# +auto-save-list +dist/ +flycheck_*.el +tramp diff --git a/Makefile b/Makefile index 5b5f1f5..d0eed28 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +# vim: filetype=make # Copyright (C) 2016-2016 Philip H. Smith # This program is free software: you can redistribute it and/or modify diff --git a/README.md b/README.md index 2799667..09bae32 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ + + [![Build Status][build-status-badge]][build-status-link] [![Ready Stories][tickets-badge]][tickets-link] [build-status-badge]: https://travis-ci.org/waylang/book.svg?branch=master diff --git a/Vagrantfile b/Vagrantfile index 72febf3..115a86a 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,3 +1,4 @@ +# vim: filetype=ruby # Copyright (C) 2016-2016 Philip H. Smith # This program is free software: you can redistribute it and/or modify diff --git a/provisioning/common b/provisioning/common index 7c63888..6344a5d 100644 --- a/provisioning/common +++ b/provisioning/common @@ -1,4 +1,5 @@ #! /bin/bash +# vim: filetype=sh # Copyright (C) 2016-2016 Philip H. Smith diff --git a/provisioning/travis b/provisioning/travis index 9a1fbef..2e8d976 100644 --- a/provisioning/travis +++ b/provisioning/travis @@ -1,4 +1,5 @@ #! /bin/bash +# vim: filetype=sh # Copyright (C) 2016-2016 Philip H. Smith diff --git a/provisioning/vagrant b/provisioning/vagrant index d865a9b..f8066fb 100644 --- a/provisioning/vagrant +++ b/provisioning/vagrant @@ -1,4 +1,5 @@ #! /bin/bash +# vim: filetype=sh # Copyright (C) 2016-2016 Philip H. Smith diff --git a/src/book.tex b/src/book.tex index d846712..a163e1b 100644 --- a/src/book.tex +++ b/src/book.tex @@ -1,4 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% vim: filetype=tex +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Copyright (C) 2016-2016 Philip H. Smith % % % % This program is free software: you can redistribute it and/or modify % diff --git a/vendor/infrastructure b/vendor/infrastructure index f89c2a8..0124e14 160000 --- a/vendor/infrastructure +++ b/vendor/infrastructure @@ -1 +1 @@ -Subproject commit f89c2a83f1d0f06836daafdd95fa1b7d77ea3275 +Subproject commit 0124e1479167d227a5537c56766daf9c47c5a9b7