[+] Organize code in a better way

[+] Added setup directives
fmount · Dec 20, 2017 · be72e3c · be72e3c
1 parent 580d4ea
commit be72e3c
Show file tree

Hide file tree

Showing 22 changed files with 69 additions and 3 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -0,0 +1 @@
+fmount <[email protected]>
diff --git a/ChangeLog b/ChangeLog
@@ -0,0 +1,7 @@
+CHANGES
+=======
+
+* [+] Added support to crud for user objects [+] Added admin support both in conf and in the model [+] Added new user endpoint as resource
+* [+] Add expiring time support to be able to retrieve (or not) the link [+] Fix oslo config loading and nopaste.conf options [+] Add helper function to check expiring time [+] Make sqlite\_middleware more generic
+* [+] Added new options (expire) [+] More config parameters and Log parameter [+] Fix exception in sqlalchemy middleware
+* [+] First commit: Importing repo
diff --git a/README.md b/README.md
@@ -70,5 +70,5 @@ KNOWN ISSUES
 
 TODO
 ===
-* Make a file / link available for a predefined timeframe window, then it expires and it's not available anymore.
-* Show/Delete user(s)
+* Put db in /var/lib/nopaste by default
+
diff --git a/__init__.py → nopaste/__init__.py b/__init__.py → nopaste/__init__.py
diff --git a/basicpastev2.py → nopaste/basicpastev2.py b/basicpastev2.py → nopaste/basicpastev2.py
@@ -117,6 +117,9 @@ def show_me_thefile(url):
 api.add_resource(UserAPI, "/api/user/<int:uuid>", endpoint="user")
 
 
+def run():
+    app.run(host='127.0.0.1', debug=CONF.default.debug)
+
 
 if __name__ == '__main__':
-    app.run(debug=CONF.default.debug)
+    run()
diff --git a/config.py → nopaste/config.py b/config.py → nopaste/config.py
diff --git a/config/nopaste.conf → nopaste/config/nopaste.conf b/config/nopaste.conf → nopaste/config/nopaste.conf
diff --git a/lib/__init__.py → nopaste/lib/__init__.py b/lib/__init__.py → nopaste/lib/__init__.py
diff --git a/lib/resources/__init__.py → nopaste/lib/resources/__init__.py b/lib/resources/__init__.py → nopaste/lib/resources/__init__.py
diff --git a/lib/resources/linksapi.py → nopaste/lib/resources/linksapi.py b/lib/resources/linksapi.py → nopaste/lib/resources/linksapi.py
diff --git a/lib/resources/userapi.py → nopaste/lib/resources/userapi.py b/lib/resources/userapi.py → nopaste/lib/resources/userapi.py
diff --git a/model.py → nopaste/model.py b/model.py → nopaste/model.py
diff --git a/sqlite_middleware.py → nopaste/sqlite_middleware.py b/sqlite_middleware.py → nopaste/sqlite_middleware.py
diff --git a/templates/content.html → nopaste/templates/content.html b/templates/content.html → nopaste/templates/content.html
diff --git a/templates/home.html → nopaste/templates/home.html b/templates/home.html → nopaste/templates/home.html
diff --git a/templates/uploader_form.html → nopaste/templates/uploader_form.html b/templates/uploader_form.html → nopaste/templates/uploader_form.html
diff --git a/utils/__init__.py → nopaste/utils/__init__.py b/utils/__init__.py → nopaste/utils/__init__.py
diff --git a/utils/helper.py → nopaste/utils/helper.py b/utils/helper.py → nopaste/utils/helper.py
diff --git a/utils/short_url.py → nopaste/utils/short_url.py b/utils/short_url.py → nopaste/utils/short_url.py
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,28 @@
+[metadata]
+name = nopaste
+summary = A nopaste service 
+description-file = README.md
+license = MIT
+author = fmount
+author-email = [email protected]
+classifier =
+    Development Status :: 5 - Production/Stable
+    License :: OSI Approved :: Apache Software License
+    Operating System :: OS Independent
+    Programming Language :: Python :: 2.7
+keywords = nopaste
+
+[files]
+packages = nopaste
+extra-files = nopaste/config/nopaste.conf
+
+[entry_points]
+console_scripts =
+    nopaste = basicpastev2.run
+
+[pbr]
+autodoc_index_modules = True
+
+
+[wheel]
+universal = 1
diff --git a/setup.py b/setup.py
@@ -0,0 +1,13 @@
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
+import setuptools
+
+# In python < 2.7.4, a lazy loading of package `pbr` will break
+# setuptools if some other modules registered functions in `atexit`.
+# solution from: http://bugs.python.org/issue15881#msg170215
+try:
+	import multiprocessing	# noqa
+except ImportError:
+	pass
+
+setuptools.setup(
+	setup_requires=['pbr>=2.0.0'], pbr=True)
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,14 @@
+# content of: tox.ini , put in same dir as setup.py
+[tox]
+envlist = py27,py36
+skipsdist = true
+
+#[testenv]
+#deps=pytest
+#commands=pytest
+[testenv]
+deps =
+    nose
+    unittest2
+commands =
+    nosetests