unlicense, coc, stack

valpackett · Aug 21, 2015 · 69a6851 · 69a6851
1 parent 7434ca4
commit 69a6851
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 83 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ cabal.sandbox.config
 dist/
 tmp/
 *.tix
+.stack-work/
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,22 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing others' private information, such as physical or electronic addresses, without explicit permission
+* Other unethical or unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)
diff --git a/COPYING b/COPYING
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# gitson [![Hackage](https://img.shields.io/hackage/v/gitson.svg?style=flat)](https://hackage.haskell.org/package/gitson) [![Build Status](https://img.shields.io/travis/myfreeweb/gitson.svg?style=flat)](https://travis-ci.org/myfreeweb/gitson) [![Coverage Status](https://img.shields.io/coveralls/myfreeweb/gitson.svg?style=flat)](https://coveralls.io/r/myfreeweb/gitson) [![ISC License](https://img.shields.io/badge/license-ISC-red.svg?style=flat)](https://tldrlegal.com/license/-isc-license)
+# gitson [![Hackage](https://img.shields.io/hackage/v/gitson.svg?style=flat)](https://hackage.haskell.org/package/gitson) [![Build Status](https://img.shields.io/travis/myfreeweb/gitson.svg?style=flat)](https://travis-ci.org/myfreeweb/gitson) [![unlicense](https://img.shields.io/badge/un-license-green.svg?style=flat)](http://unlicense.org)
 
 A simple document store library for Git + JSON, based on [Aeson].
 Uses command line git, at least for now.
@@ -78,31 +78,29 @@ main = do
 
 ## Development
 
-```bash
-# Update to latest version of Cabal.
-cabal update
-cabal install cabal-install
+Use [stack] to build.  
+Use ghci to run tests quickly with `:test` (see the `.ghci` file).
 
-# Initialize a sandbox and install the package's dependencies.
-make install
+``bash
+$ stack build
 
-# Configure & build the package.
-make configure build
+$ stack test && rm tests.tix
 
-# Test package.
-make test
+$ stack bench
 
-# Benchmark package.
-make bench
+$ stack ghci --ghc-options="-fno-hpc"
+``
 
-# Start a REPL.
-make repl
+[stack]: https://github.com/commercialhaskell/stack
 
-# Generate documentation.
-make haddock
-```
+## Contributing
+
+Please feel free to submit pull requests!
+Bugfixes and simple non-breaking improvements will be accepted without any questions :-)
+
+By participating in this project you agree to follow the [Contributor Code of Conduct](http://contributor-covenant.org/version/1/2/0/).
 
 ## License
 
-Copyright 2014-2015 Greg V <greg@unrelenting.technology>
-Available under the ISC license, see the `COPYING` file
+This is free and unencumbered software released into the public domain.  
+For more information, please refer to the `UNLICENSE` file or [unlicense.org](http://unlicense.org).
diff --git a/Setup.hs b/Setup.hs
diff --git a/UNLICENSE b/UNLICENSE
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org/>
diff --git a/gitson.cabal b/gitson.cabal
@@ -7,14 +7,14 @@ homepage:        https://github.com/myfreeweb/gitson
 author:          Greg V
 copyright:       2014-2015 Greg V <greg@unrelenting.technology>
 maintainer:      greg@unrelenting.technology
-license:         OtherLicense
-license-file:    COPYING
+license:         PublicDomain
+license-file:    UNLICENSE
 build-type:      Simple
 cabal-version:   >= 1.18
 extra-source-files:
     README.md
 tested-with:
-    GHC == 7.8.2
+    GHC == 7.10.2
 
 source-repository head
     type: git
@@ -45,8 +45,8 @@ library
 test-suite examples
     build-depends:
         base >= 4.0.0.0 && < 5
-      , Glob == 0.*
-      , doctest >= 0.8
+      , Glob
+      , doctest
     default-language: Haskell2010
     ghc-options: -threaded -Wall -Werror
     hs-source-dirs: test-suite
@@ -61,7 +61,7 @@ test-suite tests
       , process
       , directory
       , aeson
-      , hspec == 2.1.*
+      , hspec
     default-language: Haskell2010
     ghc-options: -threaded -Wall -Werror -fhpc
     hs-source-dirs: test-suite
@@ -78,7 +78,7 @@ benchmark benchmarks
       , random
       , gitson
       , aeson
-      , criterion == 1.0.*
+      , criterion
     default-language: Haskell2010
     hs-source-dirs: benchmark
     main-is: Bench.hs

diff --git a/stack.yaml b/stack.yaml
@@ -0,0 +1,4 @@
+flags: {}
+packages:
+  - '.'
+resolver: nightly-2015-08-19