Merge pull request #7 from sneben/master

Little update

.gitignore

@@ -54,4 +54,5 @@ coverage.xml
 docs/_build/
 
 # PyBuilder
-target/
+target/
+venv/

README.rst

@@ -1,59 +1,72 @@
 ==========
 yamlreader
 ==========
-
-Merge YAML data from a directory, a list of files or a file glob. With a directory, the YAML files (`*.yaml`) are sorted alphabetically. The YAML files are expected to contain a complex key-value structure and merged with the following rules:
+Merge YAML data from a directory, a list of files or a file glob. With a
+directory, the YAML files (`*.yaml`) are sorted alphabetically. The YAML
+files are expected to contain a complex key-value structure and merged
+with the following rules:
 
 * lists get appended
 * hashes get merged by key
 * scalars (numbers, strings) are overwritten
 * everything else will fail
 
-The purpose is to allow several YAML files instead of a single YAML file. We use it to help our software read configuration data from an arbitrary amount of YAML files instead of a single YAML file.
+The purpose is to allow several YAML files instead of a single YAML file. We
+use it to help our software read configuration data from an arbitrary amount
+of YAML files instead of a single YAML file.
 
 Read the unit test to see some examples.
 
---------
-Building
---------
-
-#. Check out the source
-#. Build a package 
-
- #. RPM: Run `python setup.py clean bdist_rpm`, results will be in `dist/`
- #. DEB: Install `python-stdeb <https://pypi.python.org/pypi/stdeb>`_ and run `python setup.py --command-packages=stdeb.command clean bdist_deb`, results will be in `deb_dist`
-
--------
-Running
--------
+Building and Installation
+=========================
+Using pip
+---------
+**yamlreader** is available with ``pip``:
+::
 
-The package installs a command line script `yamlreader` that can be used to read one or many YAML files and dump the merge result as a YAML document.
+    pip install yamlreader
 
-------------
-Contributing
-------------
+Manual build and installation
+-----------------------------
+If you want to make changes or use e.g. ``fpm`` for packaging this, you need to
+prepare the development environment to make further steps.
 
-Create a new `virtual environment <https://pypi.python.org/pypi/virtualenv>`_::
+Prepare the source
+~~~~~~~~~~~~~~~~~~
+::
 
+    git clone https://github.com/ImmobilienScout24/yamlreader.git
+    cd yamlreader
     virtualenv venv
-
-Activate the virtual environment::
-
     source venv/bin/activate
+    pip install pybuilder
+    pyb install_dependencies
 
-Install requirements using pip::
+Running tests
+~~~~~~~~~~~~~
+::
 
-    pip install -r requirements.txt
+    pyb verify
 
-Now you are able to run the tests::
+Generating a setup.py
+~~~~~~~~~~~~~~~~~~~~~
+::
 
-    python setup.py test
+    pyb
+    cd target/dist/yamlreader-<VERSION>
+    ./setup.py <whatever you want>
 
------------------------
-Use it in your software
------------------------
+Running
+=======
+The package installs a command line script ``yamlreader`` that can be used to
+read one or many YAML files and dump the merge result as a YAML document.
 
-Wherever you had been using the `safe_load` function of `PyYAML <http://pyyaml.org/>`_ to read a single YAML file you can use the `yamlreader.yaml_load` function as a replacement to read all `*.yaml` files in a directory::
+Use it in your software
+=======================
+Wherever you had been using the ``safe_load`` function of
+`PyYAML <http://pyyaml.org/>`_ to read a single YAML file you can use
+the ``yamlreader.yaml_load`` function as a replacement to read all ``*.yaml``
+files in a directory::
 
     from yamlreader import *
 
@@ -64,24 +77,22 @@ Wherever you had been using the `safe_load` function of `PyYAML <http://pyyaml.o
 
     config = yaml_load("/etc/myapp", defaultconfig)
 
+yaml_load
 ---------
-load_yaml
----------
-
 ::
 
     def yaml_load(source,defaultdata=None):
         """merge YAML data from files found in source
-        
-        Always returns a dict. The YAML files are expected to contain some kind of 
+
+        Always returns a dict. The YAML files are expected to contain some kind of
         key:value structures, possibly deeply nested. When merging, lists are
         appended and dict keys are replaced. The YAML files are read with the
         yaml.safe_load function.
-         
-        source can be a file, a dir, a list/tuple of files or a string containing 
+
+        source can be a file, a dir, a list/tuple of files or a string containing
         a glob expression (with ?*[]).
-        
+
         For a dir all *.yaml files will be read in alphabetical order.
-           
+
         defaultdata can be used to initialize the data.
         """

build.py

@@ -1,4 +1,4 @@
-from pybuilder.core import use_plugin, init, Author
+from pybuilder.core import use_plugin, init, task, depends, Author
 
 use_plugin("python.core")
 use_plugin("python.unittest")
@@ -32,3 +32,9 @@ def set_properties(project):
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
     ])
+
+
+@task
+@depends('prepare')
+def build_directory(project):
+    print project.expand_path("$dir_dist")