Merge pull request #2 from agoravoting/copyright

edulix · web-flow · commit f51d4e6d4dca · 2016-06-22T11:58:51.000+02:00
Release 3.2.0
diff --git a/AUTHORS b/AUTHORS
@@ -1 +1,3 @@
-Eduardo Robles Elvira <edulix AT wadobo DOT com>
+Eduardo Robles Elvira <edulix AT agoravoting DOT com>
+David Ruescas <david AT agoravoting DOT com>
+Daniel García Moreno <danigm AT wadobo DOT com>
diff --git a/examples/errorhandling/server.py b/examples/errorhandling/server.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of frestq.
-# Copyright (C) 2013  Eduardo Robles Elvira <edulix AT wadobo DOT com>
+# Copyright (C) 2013-2016  Agora Voting SL <agora@agoravoting.com>
 
 # frestq is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
diff --git a/examples/external/server_a.py b/examples/external/server_a.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of frestq.
-# Copyright (C) 2013  Eduardo Robles Elvira <edulix AT wadobo DOT com>
+# Copyright (C) 2013-2016  Agora Voting SL <agora@agoravoting.com>
 
 # frestq is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
diff --git a/examples/external/server_b.py b/examples/external/server_b.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of frestq.
-# Copyright (C) 2013  Eduardo Robles Elvira <edulix AT wadobo DOT com>
+# Copyright (C) 2013-2016  Agora Voting SL <agora@agoravoting.com>
 
 # frestq is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
diff --git a/examples/hellossl/server_a.py b/examples/hellossl/server_a.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of frestq.
-# Copyright (C) 2013  Eduardo Robles Elvira <edulix AT wadobo DOT com>
+# Copyright (C) 2013-2016  Agora Voting SL <agora@agoravoting.com>
 
 # frestq is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
diff --git a/examples/hellossl/server_b.py b/examples/hellossl/server_b.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of frestq.
-# Copyright (C) 2013  Eduardo Robles Elvira <edulix AT wadobo DOT com>
+# Copyright (C) 2013-2016  Agora Voting SL <agora@agoravoting.com>
 
 # frestq is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
diff --git a/examples/helloworld/server_a.py b/examples/helloworld/server_a.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of frestq.
-# Copyright (C) 2013  Eduardo Robles Elvira <edulix AT wadobo DOT com>
+# Copyright (C) 2013-2016  Agora Voting SL <agora@agoravoting.com>
 
 # frestq is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
diff --git a/examples/helloworld/server_b.py b/examples/helloworld/server_b.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of frestq.
-# Copyright (C) 2013  Eduardo Robles Elvira <edulix AT wadobo DOT com>
+# Copyright (C) 2013-2016  Agora Voting SL <agora@agoravoting.com>
 
 # frestq is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
diff --git a/examples/synchronized/common.py b/examples/synchronized/common.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of frestq.
-# Copyright (C) 2013  Eduardo Robles Elvira <edulix AT wadobo DOT com>
+# Copyright (C) 2013-2016  Agora Voting SL <agora@agoravoting.com>
 
 # frestq is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -15,7 +15,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with frestq.  If not, see <http://www.gnu.org/licenses/>.
 
-
 from frestq import decorators
 from frestq.app import app
 from frestq.action_handlers import SynchronizedSubtaskHandler
diff --git a/examples/synchronized/server_a.py b/examples/synchronized/server_a.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of frestq.
-# Copyright (C) 2013  Eduardo Robles Elvira <edulix AT wadobo DOT com>
+# Copyright (C) 2013-2016  Agora Voting SL <agora@agoravoting.com>
 
 # frestq is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
diff --git a/examples/synchronized/server_b.py b/examples/synchronized/server_b.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of frestq.
-# Copyright (C) 2013  Eduardo Robles Elvira <edulix AT wadobo DOT com>
+# Copyright (C) 2013-2016  Agora Voting SL <agora@agoravoting.com>
 
 # frestq is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
diff --git a/examples/tasktree/common.py b/examples/tasktree/common.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of frestq.
-# Copyright (C) 2013  Eduardo Robles Elvira <edulix AT wadobo DOT com>
+# Copyright (C) 2013-2016  Agora Voting SL <agora@agoravoting.com>
 
 # frestq is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -15,7 +15,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with frestq.  If not, see <http://www.gnu.org/licenses/>.
 
-
 from frestq import decorators
 
 @decorators.task(action="testing.goodbye_cruel_world", queue="hello_world")
diff --git a/examples/tasktree/server_a.py b/examples/tasktree/server_a.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of frestq.
-# Copyright (C) 2013  Eduardo Robles Elvira <edulix AT wadobo DOT com>
+# Copyright (C) 2013-2016  Agora Voting SL <agora@agoravoting.com>
 
 # frestq is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
diff --git a/examples/tasktree/server_b.py b/examples/tasktree/server_b.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of frestq.
-# Copyright (C) 2013  Eduardo Robles Elvira <edulix AT wadobo DOT com>
+# Copyright (C) 2013-2016  Agora Voting SL <agora@agoravoting.com>
 
 # frestq is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
diff --git a/frestq/action_handlers.py b/frestq/action_handlers.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of frestq.
-# Copyright (C) 2013  Eduardo Robles Elvira <edulix AT wadobo DOT com>
+# Copyright (C) 2013-2016  Agora Voting SL <agora@agoravoting.com>
 
 # frestq is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
diff --git a/frestq/api.py b/frestq/api.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of frestq.
-# Copyright (C) 2013  Eduardo Robles Elvira <edulix AT wadobo DOT com>
+# Copyright (C) 2013-2016  Agora Voting SL <agora@agoravoting.com>
 
 # frestq is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
diff --git a/frestq/app.py b/frestq/app.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of frestq.
-# Copyright (C) 2013, 2014 Eduardo Robles Elvira <edulix AT agoravoting DOT com>
+# Copyright (C) 2013-2016  Agora Voting SL <agora@agoravoting.com>
 
 # frestq is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -28,196 +28,7 @@
 from flask.wrappers import Request, _missing, _get_data
 
 from .utils import loads
-
-logging.basicConfig(level=logging.DEBUG)
-
-class FrestqRequest(Request):
-    '''
-    We have to customize request so that by default it can overload the json
-    object_hook for json.loads() so that it auto-parses datetimes
-    '''
-
-    def get_json(self, force=False, silent=False, cache=True):
-        """Parses the incoming JSON request data and returns it.  If
-        parsing fails the :meth:`on_json_loading_failed` method on the
-        request object will be invoked.  By default this function will
-        only load the json data if the mimetype is ``application/json``
-        but this can be overriden by the `force` parameter.
-
-        :param force: if set to `True` the mimetype is ignored.
-        :param silent: if set to `False` this method will fail silently
-                       and return `False`.
-        :param cache: if set to `True` the parsed JSON data is remembered
-                      on the request.
-        """
-        rv = getattr(self, '_cached_json', _missing)
-        if rv is not _missing:
-            return rv
-
-        if self.mimetype != 'application/json' and not force:
-            return None
-
-        # We accept a request charset against the specification as
-        # certain clients have been using this in the past.  This
-        # fits our general approach of being nice in what we accept
-        # and strict in what we send out.
-        request_charset = self.mimetype_params.get('charset')
-        try:
-            data = _get_data(self, cache)
-            if request_charset is not None:
-                rv = loads(data, encoding=request_charset)
-            else:
-                rv = loads(data)
-        except ValueError as e:
-            if silent:
-                rv = None
-            else:
-                rv = self.on_json_loading_failed(e)
-        if cache:
-            self._cached_json = rv
-        return rv
-
-class FrestqApp(Flask):
-    def __init__(self, *args, **kwargs):
-        if 'parse_args' in kwargs:
-            del kwargs['parse_args']
-            self.parse_args()
-        super(FrestqApp, self).__init__(*args, **kwargs)
-
-    request_class = FrestqRequest
-
-    pargs = None
-
-    def configure_app(self, config_object=None):
-        '''
-        Configures the application. It's intended to do everything to be able to
-        run the application except calling app.run, so that it can be reused when
-        using gunicorn or similar.
-        '''
-        self.config.from_object(__name__)
-        if config_object:
-            self.config.from_object(config_object)
-
-        frestq_settings = os.environ.get('FRESTQ_SETTINGS', None)
-        if frestq_settings is not None:
-            if not os.path.isabs(frestq_settings):
-                os.environ['FRESTQ_SETTINGS'] = os.path.abspath(frestq_settings)
-            logging.debug("FRESTQ_SETTINGS = %s" % os.environ['FRESTQ_SETTINGS'])
-            self.config.from_envvar('FRESTQ_SETTINGS', silent=False)
-        else:
-            logging.warning("FRESTQ_SETTINGS not set")
-
-        # store cert in
-        if self.config.get('SSL_CERT_PATH', None) and\
-            self.config.get('SSL_KEY_PATH', None):
-
-            with open(self.config.get('SSL_CERT_PATH', ''), 'r') as f:
-                self.config['SSL_CERT_STRING'] = f.read()
-        else:
-            self.config['SSL_CERT_STRING'] = ''
-            logging.warning("You are NOT using SSL in this instance")
-
-        if self.pargs.createdb or self.pargs.messages or self.pargs.tasks or\
-                self.pargs.tree or self.pargs.show_task or\
-                self.pargs.show_message or self.pargs.show_external or\
-                self.pargs.finish or self.pargs.show_activity:
-            return
-
-        logging.info("Launching with ROOT_URL = %s", self.config['ROOT_URL'])
-        FScheduler.start_all_schedulers()
-
-    def parse_args(self):
-        parser = argparse.ArgumentParser()
-        parser.add_argument("--createdb", help="create the database",
-                            action="store_true")
-        parser.add_argument("--messages", help="list last messages",
-                            action="store_true")
-        parser.add_argument("--tasks", help="list last tasks",
-                            action="store_true")
-        parser.add_argument("--filters", nargs='+',
-            help="filter items, with \"key=value\" ", default=[])
-        parser.add_argument("--tree",
-                            help="prints the tree of related tasks")
-        parser.add_argument("--show-task", help="prints a task in detail")
-        parser.add_argument("--console", help="frestq command line",
-                            action="store_true")
-        parser.add_argument("--show-message", help="prints a task in detail")
-        parser.add_argument("--show-external", help="prints an external task details")
-        parser.add_argument("--show-activity", help="prints activity",
-                            action="store_true")
-        parser.add_argument("--finish", help="finish an external task",
-                            nargs=2, default=None)
-        parser.add_argument("--with-parents",
-                            help="show in the tree parent tasks too",
-                            action="store_true")
-        parser.add_argument("-n", "--limit", help="limit number of results",
-                            type=int, default=20)
-        parser.add_argument("-ll", "--log-level", default=None,
-                            help="show verbose output. set to ERROR by default",
-                            choices=["debug","info", "error"])
-        self.pargs = parser.parse_args()
-
-        if self.pargs.limit < 1:
-            print "limit must be >= 1"
-            return
-
-        if self.pargs.log_level != None:
-            if self.pargs.log_level == "debug":
-                logging.getLogger().setLevel(logging.DEBUG)
-            elif self.pargs.log_level == "info":
-                logging.getLogger().setLevel(logging.INFO)
-            elif self.pargs.log_level == "error":
-                logging.getLogger().setLevel(logging.ERROR)
-
-    def run(self, *args, **kwargs):
-        '''
-        Reimplemented the run function.
-        '''
-        if self.pargs is not None:
-            if self.pargs.createdb:
-                print "creating the database: ", self.config.get('SQLALCHEMY_DATABASE_URI', '')
-                db.create_all()
-                return
-            elif self.pargs.messages:
-                list_messages(self.pargs)
-                return
-            elif self.pargs.tasks:
-                list_tasks(self.pargs)
-                return
-            elif self.pargs.tree:
-                task_tree(self.pargs)
-                return
-            elif self.pargs.show_task:
-                show_task(self.pargs)
-                return
-            elif self.pargs.show_message:
-                show_message(self.pargs)
-                return
-            elif self.pargs.show_external:
-                show_external_task(self.pargs)
-            elif self.pargs.finish:
-                finish_task(self.pargs)
-                return
-            elif self.pargs.show_activity:
-                show_activity(self.pargs)
-                return
-            elif self.pargs.console:
-                import ipdb; ipdb.set_trace()
-                return
-
-        # ignore these threaded or use_reloader, we force those two
-        if 'threaded' in kwargs:
-            print "threaded provided but ignored (always set to True): ", kwargs['threaded']
-            del kwargs['threaded']
-        if 'use_reloader' in kwargs:
-            print "use_reloader provided but ignored (always set to True): ", kwargs['use_reloader']
-            del kwargs['use_reloader']
-
-        if 'port' not in kwargs:
-            kwargs['port'] = app.config.get('SERVER_PORT', None)
-
-        return super(FrestqApp, self).run(threaded=True, use_reloader=False,
-                                          *args, **kwargs)
+from .frestq_app import FrestqApp, FrestqRequest
 
 app = FrestqApp(__name__, parse_args=True)
 
diff --git a/frestq/decorators.py b/frestq/decorators.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of frestq.
-# Copyright (C) 2013  Eduardo Robles Elvira <edulix AT wadobo DOT com>
+# Copyright (C) 2013-2016  Agora Voting SL <agora@agoravoting.com>
 
 # frestq is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
diff --git a/frestq/frestq_app.py b/frestq/frestq_app.py
diff --git a/frestq/fscheduler.py b/frestq/fscheduler.py
diff --git a/frestq/models.py b/frestq/models.py
diff --git a/frestq/protocol.py b/frestq/protocol.py
diff --git a/frestq/tasks.py b/frestq/tasks.py
diff --git a/frestq/utils.py b/frestq/utils.py
diff --git a/setup.py b/setup.py
