Merge pull request #38 from pavloo/develop

pavloo · web-flow · commit b656f4bb4660 · 2018-04-04T20:02:31.000+03:00
Release 0.1.1
diff --git a/config_py/fixtures/__init__.py b/config_py/fixtures/__init__.py
@@ -1,4 +1,4 @@
 from config_py.lib import import_config
 
 
-import_config(globals(){arguments_str})
+import_config(globals(){arguments_str})
diff --git a/config_py/lib/__init__.py b/config_py/lib/__init__.py
@@ -34,17 +34,15 @@ def import_config(glob, **kwargs):
     env_var_name = kwargs.get('env_var', 'WSGI_ENV')
     env = get_environment(env_var_name)
 
-    conf_module = '.config_{}'.format(env)
-    conf_package = '{}config'.format(package)
+    conf_module = '{}config.config_{}'.format(package, env)
     try:
         my_module = importlib.import_module(
-            conf_module,
-            conf_package
+            conf_module
         )
-    except ModuleNotFoundError:
+    except ImportError:
         logging.warning('There is no configuration module for environment "{}"'.format(env))
         logging.warning(
-            'Expected module to be present "{}{}"'.format(conf_package, conf_module)
+            'Expected module to be present "{}"'.format(conf_module)
         )
         return
 
diff --git a/test/bin/config_py_test.py b/test/bin/config_py_test.py
@@ -36,14 +36,14 @@ def test_create_config_root(self, mock_get_cwd):
 
         self.assertTrue(
             filecmp.cmp(
-                os.path.join(SCRIPT_DIR, 'fixtures', 'root', '__init__.py_'),
+                os.path.join(SCRIPT_DIR, 'fixtures', 'root', '__init__.py'),
                 os.path.join(SCRIPT_DIR, CONF_DIR_NAME, '__init__.py')
             )
         )
 
         self.assertTrue(
             filecmp.cmp(
-                os.path.join(SCRIPT_DIR, 'fixtures', 'root', DEV_FILE + '_'),
+                os.path.join(SCRIPT_DIR, 'fixtures', 'root', DEV_FILE),
                 os.path.join(SCRIPT_DIR, CONF_DIR_NAME, DEV_FILE)
             )
         )
@@ -58,14 +58,14 @@ def test_create_config_with_env_root(self, mock_get_cwd):
 
         self.assertTrue(
             filecmp.cmp(
-                os.path.join(SCRIPT_DIR, 'fixtures', 'root', 'env', '__init__.py_'),
+                os.path.join(SCRIPT_DIR, 'fixtures', 'root', 'env', '__init__.py'),
                 os.path.join(SCRIPT_DIR, CONF_DIR_NAME, '__init__.py')
             )
         )
 
         self.assertTrue(
             filecmp.cmp(
-                os.path.join(SCRIPT_DIR, 'fixtures', 'root', DEV_FILE + '_'),
+                os.path.join(SCRIPT_DIR, 'fixtures', 'root', DEV_FILE),
                 os.path.join(SCRIPT_DIR, CONF_DIR_NAME, DEV_FILE)
             )
         )
@@ -94,7 +94,7 @@ def test_create_config_package(self, mock_get_cwd):
 
         self.assertTrue(
             filecmp.cmp(
-                os.path.join(SCRIPT_DIR, 'fixtures', 'package', '__init__.py_'),
+                os.path.join(SCRIPT_DIR, 'fixtures', 'package', '__init__.py'),
                 os.path.join(
                     SCRIPT_DIR,
                     CUST_MODULE_DIST,
@@ -106,7 +106,7 @@ def test_create_config_package(self, mock_get_cwd):
 
         self.assertTrue(
             filecmp.cmp(
-                os.path.join(SCRIPT_DIR, 'fixtures', 'package', DEV_FILE + '_'),
+                os.path.join(SCRIPT_DIR, 'fixtures', 'package', DEV_FILE),
                 os.path.join(
                     SCRIPT_DIR,
                     CUST_MODULE_DIST,
diff --git a/test/bin/fixtures/package/__init__.py b/test/bin/fixtures/package/__init__.py
@@ -1,4 +1,4 @@
 from config_py.lib import import_config
 
 
-import_config(globals(), package='my_module.', env_var='WSGI_ENV')
+import_config(globals(), package='my_module.', env_var='WSGI_ENV')
diff --git a/test/bin/fixtures/package/config_dev.py b/test/bin/fixtures/package/config_dev.py
diff --git a/test/bin/fixtures/root/__init__.py b/test/bin/fixtures/root/__init__.py
@@ -0,0 +1,4 @@
+from config_py.lib import import_config
+
+
+import_config(globals(), env_var='WSGI_ENV')
diff --git a/test/bin/fixtures/root/__init__.py_ b/test/bin/fixtures/root/__init__.py_
diff --git a/test/bin/fixtures/root/config_dev.py b/test/bin/fixtures/root/config_dev.py
diff --git a/test/bin/fixtures/root/env/__init__.py b/test/bin/fixtures/root/env/__init__.py
@@ -0,0 +1,4 @@
+from config_py.lib import import_config
+
+
+import_config(globals(), env_var='MY_ENV')
diff --git a/test/bin/fixtures/root/env/__init__.py_ b/test/bin/fixtures/root/env/__init__.py_
diff --git a/test/lib/lib_tests.py b/test/lib/lib_tests.py
@@ -33,8 +33,7 @@ def test_import_config_with_package(self, mock_importmodule, mock_getenv):
         import_config(global_mock, package='my.package.')
 
         mock_importmodule.assert_called_with(
-            '.config_production',
-            'my.package.config'
+            'my.package.config.config_production'
         )
         to_be_exported['env'] = ANY
         global_mock.update.assert_called_with(to_be_exported)
diff --git a/version/__init__.py b/version/__init__.py
@@ -1 +1 @@
-__version__ = "0.1.0"
+__version__ = "0.1.1"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`from config_py.lib import import_config`
`2`	`2`
`3`	`3`
`4`		`-import_config(globals(){arguments_str})`
	`4`	`+import_config(globals(){arguments_str})`
Original file line number	Diff line number	Diff line change
`@@ -36,14 +36,14 @@ def test_create_config_root(self, mock_get_cwd):`
`36`	`36`
`37`	`37`	`self.assertTrue(`
`38`	`38`	`filecmp.cmp(`
`39`		`- os.path.join(SCRIPT_DIR, 'fixtures', 'root', '__init__.py_'),`
	`39`	`+ os.path.join(SCRIPT_DIR, 'fixtures', 'root', '__init__.py'),`
`40`	`40`	`os.path.join(SCRIPT_DIR, CONF_DIR_NAME, '__init__.py')`
`41`	`41`	`)`
`42`	`42`	`)`
`43`	`43`
`44`	`44`	`self.assertTrue(`
`45`	`45`	`filecmp.cmp(`
`46`		`- os.path.join(SCRIPT_DIR, 'fixtures', 'root', DEV_FILE + '_'),`
	`46`	`+ os.path.join(SCRIPT_DIR, 'fixtures', 'root', DEV_FILE),`
`47`	`47`	`os.path.join(SCRIPT_DIR, CONF_DIR_NAME, DEV_FILE)`
`48`	`48`	`)`
`49`	`49`	`)`
`@@ -58,14 +58,14 @@ def test_create_config_with_env_root(self, mock_get_cwd):`
`58`	`58`
`59`	`59`	`self.assertTrue(`
`60`	`60`	`filecmp.cmp(`
`61`		`- os.path.join(SCRIPT_DIR, 'fixtures', 'root', 'env', '__init__.py_'),`
	`61`	`+ os.path.join(SCRIPT_DIR, 'fixtures', 'root', 'env', '__init__.py'),`
`62`	`62`	`os.path.join(SCRIPT_DIR, CONF_DIR_NAME, '__init__.py')`
`63`	`63`	`)`
`64`	`64`	`)`
`65`	`65`
`66`	`66`	`self.assertTrue(`
`67`	`67`	`filecmp.cmp(`
`68`		`- os.path.join(SCRIPT_DIR, 'fixtures', 'root', DEV_FILE + '_'),`
	`68`	`+ os.path.join(SCRIPT_DIR, 'fixtures', 'root', DEV_FILE),`
`69`	`69`	`os.path.join(SCRIPT_DIR, CONF_DIR_NAME, DEV_FILE)`
`70`	`70`	`)`
`71`	`71`	`)`
`@@ -94,7 +94,7 @@ def test_create_config_package(self, mock_get_cwd):`
`94`	`94`
`95`	`95`	`self.assertTrue(`
`96`	`96`	`filecmp.cmp(`
`97`		`- os.path.join(SCRIPT_DIR, 'fixtures', 'package', '__init__.py_'),`
	`97`	`+ os.path.join(SCRIPT_DIR, 'fixtures', 'package', '__init__.py'),`
`98`	`98`	`os.path.join(`
`99`	`99`	`SCRIPT_DIR,`
`100`	`100`	`CUST_MODULE_DIST,`
`@@ -106,7 +106,7 @@ def test_create_config_package(self, mock_get_cwd):`
`106`	`106`
`107`	`107`	`self.assertTrue(`
`108`	`108`	`filecmp.cmp(`
`109`		`- os.path.join(SCRIPT_DIR, 'fixtures', 'package', DEV_FILE + '_'),`
	`109`	`+ os.path.join(SCRIPT_DIR, 'fixtures', 'package', DEV_FILE),`
`110`	`110`	`os.path.join(`
`111`	`111`	`SCRIPT_DIR,`
`112`	`112`	`CUST_MODULE_DIST,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`from config_py.lib import import_config`
`2`	`2`
`3`	`3`
`4`		`-import_config(globals(), package='my_module.', env_var='WSGI_ENV')`
	`4`	`+import_config(globals(), package='my_module.', env_var='WSGI_ENV')`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +from config_py.lib import import_config
++
++
 +import_config(globals(), env_var='WSGI_ENV')