diff --git a/angular_scaffold/management/commands/createdebugger.py b/angular_scaffold/management/commands/createdebugger.py index 93bd17b..38b8b00 100644 --- a/angular_scaffold/management/commands/createdebugger.py +++ b/angular_scaffold/management/commands/createdebugger.py @@ -1,7 +1,9 @@ from django.core.management.base import BaseCommand from django.conf import settings -from angular_scaffold.management.commands.helpers._generate_debugger import generate_debugger +from angular_scaffold.management.commands.helpers._generate_debugger import \ + generate_debugger +import sys class Command(BaseCommand): @@ -15,8 +17,11 @@ def handle(self, *args, **options): else: path = '.' if not args: - password = raw_input("Password: ") + if (sys.version_info > (3, 0)): + password = input("Password: ") + else: + password = raw_input("Password: ") generate_debugger(path, password) else: for password in args: - generate_debugger(path, password) \ No newline at end of file + generate_debugger(path, password) diff --git a/angular_scaffold/management/commands/helpers/_add_route.py b/angular_scaffold/management/commands/helpers/_add_route.py index 5147d8f..01236c2 100644 --- a/angular_scaffold/management/commands/helpers/_add_route.py +++ b/angular_scaffold/management/commands/helpers/_add_route.py @@ -1,9 +1,10 @@ import os import re +import sys from string import Template -from _generate_view import generate_view -from _generate_controller import generate_controller +from ._generate_view import generate_view +from ._generate_controller import generate_controller _route = Template(""".when('${when}', @@ -24,17 +25,26 @@ def add_route(directory, when=None, controller=None, template=None, resolves=None): - if not when: - when = raw_input("When: ") - if not controller: - controller = raw_input("Controller: ") + if (sys.version_info > (3, 0)): + if not when: + when = input("When: ") + if not controller: + controller = input("Controller: ") + else: + if not when: + when = raw_input("When: ") + if not controller: + controller = raw_input("Controller: ") if not os.path.exists(os.path.join(directory, 'assets', 'controllers', controller + "Controller.js")): generate_controller(directory, controller) controller = controller.title() + "Controller" else: - print "Using Controller: %s" % os.path.join(directory, 'assets', 'controllers', controller + "Controller.js") + print("Using Controller: %s" % os.path.join(directory, 'assets', 'controllers', controller + "Controller.js")) if not template: - template = raw_input("Template (relative to views folder): ") + if (sys.version_info > (3, 0)): + template = input("Template (relative to views folder): ") + else: + template = raw_input("Template (relative to views folder): ") template_name = template if not template_name.endswith('.html'): template_html = template_name + '.html' @@ -44,12 +54,15 @@ def add_route(directory, when=None, controller=None, template=None, resolves=Non if not os.path.exists(os.path.join(directory, 'assets', 'app', 'views', template_html)): generate_view(directory, template_name) else: - print "Using Template: %s" % os.path.join(directory, 'assets', 'app', 'views', template_html) + print("Using Template: %s" % os.path.join(directory, 'assets', 'app', 'views', template_html)) if resolves is None: resolve_input = True resolves = [] while resolve_input: - resolve_input = raw_input("Resolve: ") + if (sys.version_info > (3, 0)): + resolve_input = input("Resolve: ") + else: + resolve_input = raw_input("Resolve: ") if resolve_input: resolves.append(resolve_input) if resolves: @@ -72,4 +85,4 @@ def add_route(directory, when=None, controller=None, template=None, resolves=Non organized_routes = routes # TODO: organize routes by route complexity and group them with open(os.path.join(directory, 'assets', 'app', 'config', 'routes.js'), 'w') as route_file: - route_file.write(_header + ''.join(organized_routes) + _footer) \ No newline at end of file + route_file.write(_header + ''.join(organized_routes) + _footer) diff --git a/angular_scaffold/management/commands/helpers/_generate_assets.py b/angular_scaffold/management/commands/helpers/_generate_assets.py index 06153f8..62f68bc 100644 --- a/angular_scaffold/management/commands/helpers/_generate_assets.py +++ b/angular_scaffold/management/commands/helpers/_generate_assets.py @@ -1,4 +1,5 @@ import os +import sys _assets = { @@ -68,7 +69,10 @@ def generate_assets(directory, app_name=None): _build(_assets, os.path.join(directory, 'assets')) # setup angular application if not app_name: - app_name = raw_input("Angular Application Name: ") + if (sys.version_info > (3, 0)): + app_name = input("Angular Application Name: ") + else: + app_name = raw_input("Angular Application Name: ") with open(os.path.join(directory, 'assets', 'app', 'app.js'), 'w') as app: app.write('var app = angular.module("%s", []);' % app_name) # setup styles @@ -80,4 +84,4 @@ def generate_assets(directory, app_name=None): '//vendor\n' '\n' '//site\n' - '@import "site/global";\n') \ No newline at end of file + '@import "site/global";\n') diff --git a/angular_scaffold/management/commands/helpers/_generate_controller.py b/angular_scaffold/management/commands/helpers/_generate_controller.py index fc759ae..7bacf7c 100644 --- a/angular_scaffold/management/commands/helpers/_generate_controller.py +++ b/angular_scaffold/management/commands/helpers/_generate_controller.py @@ -18,4 +18,4 @@ def generate_controller(directory, name): with open(os.path.join(directory, 'assets', controller), 'w') as f: f.write(_template.substitute(name=title)) else: - print "Controller Already Exists: %s" % controller \ No newline at end of file + print("Controller Already Exists: %s" % controller) diff --git a/angular_scaffold/management/commands/helpers/_generate_csrf.py b/angular_scaffold/management/commands/helpers/_generate_csrf.py index cf2216b..1c18bf9 100644 --- a/angular_scaffold/management/commands/helpers/_generate_csrf.py +++ b/angular_scaffold/management/commands/helpers/_generate_csrf.py @@ -11,8 +11,8 @@ def generate_csrf(directory): filename = os.path.join(directory, 'assets', 'app', 'config', 'csrf.js') - print "Creating: " + filename + print("Creating: " + filename) with open(filename, 'w') as f: f.write(_csrf) - print "Injecting cookie dependency" - update_dependencies(directory, 'ngCookies') \ No newline at end of file + print("Injecting cookie dependency") + update_dependencies(directory, 'ngCookies') diff --git a/angular_scaffold/management/commands/helpers/_generate_debugger.py b/angular_scaffold/management/commands/helpers/_generate_debugger.py index 51fbf7f..16f20fe 100644 --- a/angular_scaffold/management/commands/helpers/_generate_debugger.py +++ b/angular_scaffold/management/commands/helpers/_generate_debugger.py @@ -1,12 +1,17 @@ import os +import sys import hashlib + def generate_debugger(directory, password): m = hashlib.md5() - m.update(password) + if (sys.version_info > (3, 0)): + m.update(password.encode('utf-8')) + else: + m.update(password) password_hash = m.hexdigest() logger_file = os.path.join(directory, 'assets', 'app', 'config', 'logger.js') - print "Creating: " + logger_file + print("Creating: " + logger_file) with open(logger_file, 'w') as f: f.write("""app.config(["$logProvider", function ($logProvider) { "use strict"; @@ -49,4 +54,4 @@ def generate_debugger(directory, password): if not os.path.exists(os.path.join(directory, 'docs')): os.makedirs(os.path.join(directory, 'docs')) with open(os.path.join(directory, 'docs', 'logging.md'), 'w') as f: - f.write(_debugger_docs) \ No newline at end of file + f.write(_debugger_docs) diff --git a/angular_scaffold/management/commands/helpers/_generate_limiter.py b/angular_scaffold/management/commands/helpers/_generate_limiter.py index 7a30dee..4e5ad30 100644 --- a/angular_scaffold/management/commands/helpers/_generate_limiter.py +++ b/angular_scaffold/management/commands/helpers/_generate_limiter.py @@ -34,7 +34,7 @@ def generate_limiter(directory): filename = os.path.join(directory, 'assets', 'app', 'config', 'limiter.js') - print "Creating: " + filename + print("Creating: " + filename) with open(filename, 'w') as f: f.write(_limiter) if not os.path.exists(os.path.join(directory, 'docs')): diff --git a/angular_scaffold/management/commands/helpers/_generate_routes.py b/angular_scaffold/management/commands/helpers/_generate_routes.py index 606028d..54c6176 100644 --- a/angular_scaffold/management/commands/helpers/_generate_routes.py +++ b/angular_scaffold/management/commands/helpers/_generate_routes.py @@ -17,8 +17,8 @@ def generate_routes(directory): filename = os.path.join(directory, 'assets', 'app', 'config', 'routes.js') - print "Creating: " + filename + print("Creating: " + filename) with open(filename, 'w') as f: f.write(_routes) - print "Injecting route dependency" - update_dependencies(directory, 'ngRoute') \ No newline at end of file + print("Injecting route dependency") + update_dependencies(directory, 'ngRoute') diff --git a/angular_scaffold/management/commands/helpers/_generate_service.py b/angular_scaffold/management/commands/helpers/_generate_service.py index cd8d41c..a7e2825 100644 --- a/angular_scaffold/management/commands/helpers/_generate_service.py +++ b/angular_scaffold/management/commands/helpers/_generate_service.py @@ -1,4 +1,7 @@ import os +import sys + + from string import Template _template = Template(""" ${name}${title}: function (${args}) { @@ -59,12 +62,20 @@ def generate_service(directory, name=None, url=None, plural=None): - if not name: - name = raw_input("Service Name: ") - if not url: - url = raw_input("Endpoint URL: ") - if not plural: - plural = raw_input("Plural Form: ") + if (sys.version_info > (3, 0)): + if not name: + name = input("Service Name: ") + if not url: + url = input("Endpoint URL: ") + if not plural: + plural = input("Plural Form: ") + else: + if not name: + name = raw_input("Service Name: ") + if not url: + url = raw_input("Endpoint URL: ") + if not plural: + plural = raw_input("Plural Form: ") endpoints = [] service = os.path.join("app", "services", name.lower() + "Service.js") with open(os.path.join(directory, 'assets', service), 'w') as f: @@ -101,4 +112,4 @@ def generate_service(directory, name=None, url=None, plural=None): f.write(',\n'.join(endpoints)) f.write("""\n }; -}]);""") \ No newline at end of file +}]);""") diff --git a/angular_scaffold/management/commands/helpers/_generate_view.py b/angular_scaffold/management/commands/helpers/_generate_view.py index b858ad0..443295b 100644 --- a/angular_scaffold/management/commands/helpers/_generate_view.py +++ b/angular_scaffold/management/commands/helpers/_generate_view.py @@ -1,4 +1,5 @@ import os +import sys def _touch(fname): @@ -25,7 +26,10 @@ def _build(path, pwd=None): def generate_view(directory, name=None): if not name: - name = raw_input('View Name: ') + if (sys.version_info > (3, 0)): + name = raw_input('View Name: ') + else: + name = raw_input('View Name: ') view = os.path.join("assets", "app", "views", name + ".html") split = name.split(os.sep) namespace = '-'.join(split) @@ -39,7 +43,7 @@ def generate_view(directory, name=None): with open(os.path.join(directory, view), 'w') as f: f.write("
\n\n
" % namespace) else: - print "View Template Already Exists: %s" % namespace + print("View Template Already Exists: %s" % namespace) # styles file if not os.path.exists(os.path.join(directory, style)): @@ -47,8 +51,9 @@ def generate_view(directory, name=None): with open(os.path.join(directory, style), 'w') as f: f.write(".page.%s{\n\n}" % namespace) else: - print "View Styles Already Exists: %s" % style + print("View Styles Already Exists: %s" % style) # import styles styles - with open(os.path.join(directory, 'assets', 'lib', 'styles', 'styles.scss'), 'a') as styles: - styles.write('\n@import "site/%s";' % name) \ No newline at end of file + with open(os.path.join(directory, 'assets', 'lib', 'styles', 'styles.scss'), + 'a') as styles: + styles.write('\n@import "site/%s";' % name) diff --git a/angular_scaffold/management/commands/startcontroller.py b/angular_scaffold/management/commands/startcontroller.py index 93be8eb..a126b8b 100644 --- a/angular_scaffold/management/commands/startcontroller.py +++ b/angular_scaffold/management/commands/startcontroller.py @@ -2,6 +2,7 @@ from django.conf import settings from angular_scaffold.management.commands.helpers._generate_controller import generate_controller +import sys class Command(BaseCommand): @@ -14,7 +15,10 @@ def handle(self, *args, **options): else: directory = '.' if not args: - controller_name = raw_input("Name of the controller: ") + if (sys.version_info > (3, 0)): + controller_name = input("Name of the controller: ") + else: + controller_name = raw_input("Name of the controller: ") generate_controller(directory, controller_name) self.stdout.write('Successfully initialized controller "%s"' % controller_name) else: diff --git a/angular_scaffold/management/commands/startservice.py b/angular_scaffold/management/commands/startservice.py index 829b301..b1dcc68 100644 --- a/angular_scaffold/management/commands/startservice.py +++ b/angular_scaffold/management/commands/startservice.py @@ -1,12 +1,14 @@ from django.core.management.base import BaseCommand from django.conf import settings -from angular_scaffold.management.commands.helpers._generate_service import generate_service +from angular_scaffold.management.commands.helpers._generate_service import \ + generate_service class Command(BaseCommand): args = '' - help = 'Creates a new service, adds endpoints for list, get, post, put, and delete' + help = 'Creates a new service, adds endpoints for list, get, post, ' + \ + 'put, and delete' def handle(self, *args, **options): if hasattr(settings, 'BASE_DIR'): @@ -15,8 +17,8 @@ def handle(self, *args, **options): directory = '.' if not args: generate_service(directory) - print 'Successfully initialized service' + print('Successfully initialized service') else: for service_name in args: generate_service(directory, service_name) - print 'Successfully initialized service "%s"' % service_name + print('Successfully initialized service "%s"' % service_name) diff --git a/angular_scaffold/management/commands/startview.py b/angular_scaffold/management/commands/startview.py index 29be260..9062872 100644 --- a/angular_scaffold/management/commands/startview.py +++ b/angular_scaffold/management/commands/startview.py @@ -1,7 +1,9 @@ from django.core.management.base import BaseCommand from django.conf import settings -from angular_scaffold.management.commands.helpers._generate_view import generate_view +from angular_scaffold.management.commands.helpers._generate_view import \ + generate_view +import sys class Command(BaseCommand): @@ -14,10 +16,14 @@ def handle(self, *args, **options): else: directory = '.' if not args: - view_name = raw_input("View Name: ") + if (sys.version_info > (3, 0)): + view_name = input("View Name: ") + else: + view_name = raw_input("View Name: ") generate_view(directory, view_name) self.stdout.write('Successfully initialized view "%s"' % view_name) else: for view_name in args: generate_view(directory, view_name) - self.stdout.write('Successfully initialized view "%s"' % view_name) + self.stdout.write('Successfully initialized view "%s"' % + view_name) diff --git a/angular_scaffold/tests/addroute_test.py b/angular_scaffold/tests/addroute_test.py index 424cb85..7841393 100644 --- a/angular_scaffold/tests/addroute_test.py +++ b/angular_scaffold/tests/addroute_test.py @@ -21,7 +21,7 @@ def test_view(self): os.path.exists(os.path.join(self.BASE_DIR, 'assets', 'app', 'config', 'routes.js'))) with open(os.path.join(self.BASE_DIR, 'assets', 'app', 'config', 'routes.js'), 'r') as js: routes = js.read() - print routes + print(routes) self.assertTrue('app.config(function ($routeProvider) {' in routes) self.assertTrue("controller: 'HomeController'," in routes) self.assertTrue("templateUrl: '/static/app/views/home.html'" in routes) @@ -32,10 +32,10 @@ def test_multiple_view(self): os.path.exists(os.path.join(self.BASE_DIR, 'assets', 'app', 'config', 'routes.js'))) with open(os.path.join(self.BASE_DIR, 'assets', 'app', 'config', 'routes.js'), 'r') as js: routes = js.read() - print routes + print(routes) self.assertTrue('app.config(function ($routeProvider) {' in routes) self.assertTrue("controller: 'ProjectController'," in routes) self.assertTrue("templateUrl: '/static/app/views/project/home.html'" in routes) def tearDown(self): - shutil.rmtree(os.path.join(self.BASE_DIR, 'assets')) \ No newline at end of file + shutil.rmtree(os.path.join(self.BASE_DIR, 'assets'))