Small changes on structure

iprofile/cli/clear.py

@@ -55,6 +55,6 @@ def clear_all(self):
         if cleared == 0:
             self.red(texts.ERROR_NO_PROFILES_TO_CLEAR)
         else:
-            click.echo(texts.LOG_QTD_CLEARED.format(
+            click.echo(texts.LOG_QTT_CLEARED.format(
                 cleared, 's' if cleared != 1 else ''))
         return names

iprofile/cli/delete.py

@@ -26,7 +26,7 @@ def run(self, **options):
             if deleted == 0:
                 self.red(texts.ERROR_NO_PROFILES_TO_DELETE)
             else:
-                click.echo(texts.LOG_QTD_DELETED.format(
+                click.echo(texts.LOG_QTT_DELETED.format(
                     deleted, 's' if deleted != 1 else ''))
         elif names:
             self.run_for_profile(Profile(names, self.global_config))

iprofile/cli/init.py

@@ -2,6 +2,7 @@
 
 from iprofile import texts
 from iprofile.core.decorators import icommand
+from iprofile.core.utils import GLOBAL_SETTINGS_FILE
 from iprofile.models import ICommand
 from slugify import slugify
 import click
@@ -36,7 +37,8 @@ def run(self, **options):
             self.global_config.save()
 
             self.green(texts.LOG_IPROFILE_INITIALIZED.format(abspath))
-            click.echo(texts.LOG_IPROFILE_YML.format(os.getcwd(), action))
+            click.echo(texts.LOG_IPROFILE_YML.format(
+                os.getcwd(), action, GLOBAL_SETTINGS_FILE))
 
         except OSError:
             self.red(texts.ERROR_INIT_PATH_EXISTS.format(abspath))

iprofile/cli/list.py

@@ -26,7 +26,7 @@ def run(self, **options):
 
         show_only = options.get('show_only', None)
         if not show_only:
-            self.green(texts.LOG_QTD_PROFILES.format(
+            self.green(texts.LOG_QTT_PROFILES.format(
                 qtd_profiles,
                 's' if qtd_profiles != 1 else '',
                 'were' if qtd_profiles != 1 else 'was'
@@ -35,7 +35,7 @@ def run(self, **options):
         for profile_name in profiles:
             profile = Profile(profile_name, self.global_config)
             if show_only == 'names':
-                click.echo(profile_name)
+                click.echo(profile.name)
             elif show_only == 'paths':
                 click.echo(profile.ipython_locate())
             else:

iprofile/core/utils.py

@@ -4,6 +4,9 @@
 import click
 import os
 
+PROFILE_SETTINGS_FILE = 'settings.yml'
+GLOBAL_SETTINGS_FILE = 'iprofile.yml'
+
 
 def get_ipython_name(profile_name, config):
     return '{0}_{1}'.format(
@@ -33,7 +36,8 @@ def list_profiles(project_path):
         return [
             x for x in os.listdir(project_path)
             if os.path.isdir('{0}/{1}'.format(project_path, x)) and
-            'settings.yml' in os.listdir('{0}/{1}'.format(project_path, x))
+            PROFILE_SETTINGS_FILE in os.listdir(
+                '{0}/{1}'.format(project_path, x))
         ]
     return []
 

iprofile/models/config.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+from iprofile.core.utils import PROFILE_SETTINGS_FILE
+from iprofile.core.utils import GLOBAL_SETTINGS_FILE
 import yaml
 import os
 import IPython
@@ -8,7 +10,7 @@
 class GlobalConfig(object):
 
     def __init__(self):
-        self.filepath = os.path.join(os.getcwd(), 'iprofile.yml')
+        self.filepath = os.path.join(os.getcwd(), GLOBAL_SETTINGS_FILE)
         self._config = {}
 
         if not os.path.isfile(self.filepath):
@@ -58,7 +60,7 @@ def save(self):
 class ProfileConfig(GlobalConfig):
 
     def __init__(self, path, profile):
-        self.filepath = os.path.join(path, profile, 'settings.yml')
+        self.filepath = os.path.join(path, profile, PROFILE_SETTINGS_FILE)
         self._config = {}
 
     def read(self):

iprofile/models/profiles.py

@@ -3,6 +3,7 @@
 from slugify import slugify
 from iprofile.core.utils import get_ipython_name
 from iprofile.core.utils import get_user_home
+from iprofile.core.utils import PROFILE_SETTINGS_FILE
 from iprofile.models import ProfileConfig
 import IPython
 import os
@@ -31,7 +32,7 @@ def __init__(self, name, config, **kwargs):
 
         self._path = {
             'profile': profile_path,
-            'settings': os.path.join(profile_path, 'settings.yml'),
+            'settings': os.path.join(profile_path, PROFILE_SETTINGS_FILE),
             'startup': os.path.join(profile_path, 'startup'),
             'config': os.path.join(profile_path, 'ipython_config.py'),
         }

iprofile/texts/logs.py

@@ -29,16 +29,16 @@
 LOG_ACTIVE_PROFILE = (
     "Active profile: "
 )
-LOG_QTD_DELETED = (
+LOG_QTT_DELETED = (
     "Successfully deleted {0} profile{1}."
 )
-LOG_QTD_CLEARED = (
+LOG_QTT_CLEARED = (
     "Successfully cleared {0} profile{1}."
 )
-LOG_QTD_PROFILES = (
+LOG_QTT_PROFILES = (
     "{0} profile{1} {2} found:"
 )
 LOG_IPROFILE_INITIALIZED = (
     "Successfully initialized IProfile at '{0}'."
 )
-LOG_IPROFILE_YML = "{1} config file at '{0}/iprofile.yml'."
+LOG_IPROFILE_YML = "{1} config file at '{0}/{2}'."

tests/test_cli/test_init.py

@@ -2,6 +2,7 @@
 
 from iprofile.cli import Init
 from iprofile.core.utils import makedirs
+from iprofile.core.utils import GLOBAL_SETTINGS_FILE
 import os
 import shutil
 
@@ -17,7 +18,7 @@ def test_run():
 
 def test_no_profile_yml():
     try:
-        os.remove(os.path.join(os.getcwd(), 'iprofile.yml'))
+        os.remove(os.path.join(os.getcwd(), GLOBAL_SETTINGS_FILE))
     except OSError:
         pass
     shutil.rmtree('iprofiles', ignore_errors=True)

tests/test_models.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from iprofile.core.utils import GLOBAL_SETTINGS_FILE
 from iprofile.models import ICommand
 from iprofile.models import GlobalConfig
-from iprofile.models import Profile
 import pytest
 import os
 
@@ -14,7 +14,7 @@ def test_run_not_implemented_error():
 
 def test_iprofiles_yml_does_not_exist():
     try:
-        os.remove('iprofile.yml')
+        os.remove(GLOBAL_SETTINGS_FILE)
     except OSError:
         pass
     GlobalConfig()