Merge branch 'develop'

.gitignore

@@ -1,12 +1,3 @@
-.DS_Store
 *.py[co]
-.idea/*
-*.tmproj
-dist/*
-docs/_build/*
-env/*
-build/*
-*.egg-info
-testFiles/*
-*.db
-*.sqlite
+.spyderproject
+tmp

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Cecil Woebker and individual contributors.
+Copyright (c) 2012, Cecil Woebker and individual contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are
@@ -11,6 +11,10 @@ Redistributions in binary form must reproduce the above copyright notice, this l
 of conditions and the following disclaimer in the documentation and/or other
 materials provided with the distribution.
 
+Neither the name of the author nor the names of its contributors may be used
+to endorse or promote products derived from this software without specific prior written
+permission.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT

MANIFEST.in

@@ -1,9 +1,3 @@
-include README.rst
-include INSTALL
-include CHANGES
-include ROADMAP
-include LICENSE
-include MANIFEST.in
+include README.rst LICENSE
 recursive-include tests *
 recursive-include relo *
-include relo/doctype/*.relo

docs/changelog.rst

@@ -5,6 +5,20 @@
 Release Notes and Changelog
 ===========================
 
+Release 0.7 (2012 Jan 7)
+========================
+
+* **Better Printing**: improved way of posting information
+    * **Relo Colorful:** Colors for better information flow.
+    * **Progress Bar:** There is now a progressbar to display how much of the search is done. not part of the actual printing module
+
+* **Index Option** index files before search them, more efficient **DONE**
+
+* **Settings** config file plus a way to change settings, but not widely used yet, EXPERIMENTAL
+
+* Much of the Code has been rewritten too - still far from done
+
+
 Release 0.6 (2011 Sep 16)
 =========================
 

docs/conf.py

@@ -41,16 +41,16 @@
 
 # General information about the project.
 project = u'relo'
-copyright = u'2011, Cecil Woebker'
+copyright = u'2012, Cecil Woebker'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.5'
+version = '0.7'
 # The full version, including alpha/beta/rc tags.
-release = '0.5'
+release = '0.7 beta'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/contact.rst

@@ -4,16 +4,16 @@ Contact
 
 .. rubric:: About the author
 
-.. image:: _static/avatar.png
+.. image:: http://www.gravatar.com/avatar/08f391968a5dcd91795e388f76f867f4?s=256
     :alt: Photo
     :class: floatright
 
-Hello, my name is *Cecil Woebker* (aka *cwoebker*), author of `Relo <http://cwoebker.github.com/relo>`_.
+Hello, my name is *Cecil Woebker* (aka *cwoebker*), author of `Relo <http://cwoebker.com/relo>`_.
 I'm 16 years old and originally form Germany. But now I am visiting
 a high school in the United States. Python is my favorite language, but I
 also code in c++ and html/css. Watch me on `twitter <http://twitter.com/cwoebker>`_
 or visit my profile at `GitHub <http://github.com/cwoebker>`_ to get in contact just email
-me at cwoebker@gmail.com.
+me at me@cwoebker.com or visit my website @ `cwoebker.com <http://cwoebker.com>`_.
 
 .. rubric:: About Relo
 

docs/roadmap.rst

@@ -5,74 +5,40 @@
 Roadmap
 =======
 
-
-Release 0.7
-===========
-
-.. rubric:: New Features
-
-* **Logging:** A logging class to implement debugging mode and other features.
-* **DocType Managing:** Install, remove, update and find DocTypes.
-* **Missing DocType:** Notify user when a plugin is needed but available.
-* **Relo Updater:** You can update the relo library from within relopy itself.
-* **Relo Extensions:** add extensions - thrid party - with updater
-* **Symbolic Links:** Search through directories/files that are being linked symbolically. **IN PROGRESS (Python link support problem), postponed**
-
-.. rubric:: Improvements
-
-* **Progress Bar:** There is now a progressbar to display how much of the search is done.
-* **Relo Colorful:** (Maybe) Colors for better information flow:
-
-    * **Error:** Red
-    * **INFO:** White
-    * **DEBUG:** Yellow
-
-.. rubric:: DocType
-
-* **Microsoft Html Help (.chm):** Add support for Microsoft HTML Help files. **postponed**
-
-
 Release 0.8
 ===========
 
-.. rubric:: New Features
+* **Relo Updater:** updates relo
 
 * **Graphical User Interface (GUI):** A User interface in wxPython, PyQt4 or whatever fits best.
 
-    * **Settings and Defaults:** Settings and Defaults stored in ~/.relo(py) .
+    * **Settings and Defaults:** Settings
     * **Plugin Manager:** Control the Plugin Manager from the GUI.
-    * **MenuBar Icon:** Make relopy easily accessible through the menubar.
+    * **MenuBar Icon:** Make relopy easily accessible through the menu bar.
 
+* **Adapt new plugin system** custom plugin system instead of yapsy
 
-.. rubric:: Improvements
+* **New Argument System** for better integration with the gui
 
-* **Index DB:** relo created db files for faster searching, either when set or when already searched.
+* **Documentation Updated** hopefully this will help with usage problems
 
-.. rubric:: DocType
+* **Many new doctypes** you will see soon
 
 Release 0.9
 ===========
 
-.. rubric:: New Features
-
-.. rubric:: Improvements
-
-.. rubric:: DocType
+* **Total modularization** The relo library is going to be split up into its counterparts so it can be used more effectively
+* **maybe go away from yapsy** implement own plugin system
 
 Release 1.0
 ===========
 
-.. rubric:: New Features
+* **Cython** speed improvements
 
-.. rubric:: Improvements
+* **Code Check** Code is going to be checked completely. w/ pylint, pyflakes and pep8
 
-.. rubric:: DocType
+* **Tests** are going to be added
 
 Future
 ======
 
-Indexing of files for faster search
-index db generation one time, then changes
-performance needed code in C
-
-More DocTypes