Better environment variables loading

elegos · Feb 21, 2018 · 9b51ebf · 9b51ebf
1 parent 240f259
commit 9b51ebf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/lib/load-dotenv-variables.js b/lib/load-dotenv-variables.js
@@ -4,7 +4,7 @@ import { CompositeDisposable } from 'atom'
 import env from 'node-env-file'
 import fs from 'fs'
 
-const loadEnvFile = (filePath) => {
+const loadEnvFile = (filePath, notify) => {
   try {
     var file = fs.openSync(filePath, 'r')
     var stats = fs.fstatSync(file)
@@ -21,7 +21,9 @@ const loadEnvFile = (filePath) => {
   }
 
   env(filePath)
-  atom.notifications.addSuccess('Load .env Variables: file correctly loaded', { detail: filePath })
+  if (notify) {
+    atom.notifications.addSuccess('Load .env Variables: file correctly loaded', { detail: filePath })
+  }
 
   return true
 }
@@ -44,16 +46,18 @@ export default {
       'load-dotenv-variables:reload': () => this.reload()
     }));
 
-    this.subscriptions.add(atom.project.onDidChangePaths(this.reload))
+    this.subscriptions.add(atom.whenShellEnvironmentLoaded(() => this.reload(false)))
+    this.subscriptions.add(atom.workspace.onDidOpen(() => this.reload(false)))
+    this.subscriptions.add(atom.project.onDidChangePaths(() => this.reload(false)))
 
-    this.reload()
+    this.reload(false)
   },
 
   deactivate() {
     this.subscriptions.dispose();
   },
 
-  reload() {
+  reload(notify) {
     const dotEnvFileName = atom.config.get('load-dotenv-variables.envFile')
 
     const dotEnvFiles = atom.project.getDirectories().map(dir => {
@@ -62,10 +66,10 @@ export default {
 
     let loaded = false
     dotEnvFiles.forEach(file => {
-      loaded = loaded || loadEnvFile(file)
+      loaded = loaded || loadEnvFile(file, notify)
     })
 
-    if (!loaded) {
+    if (!loaded && notify) {
       atom.notifications.addWarning('Load .env Variables: no dotenv file was loaded', { detail: `Searching for: ${dotEnvFileName}` })
     }
   }

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "load-dotenv-variables",
   "main": "./lib/load-dotenv-variables",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Load dotenv variables from the project's root .env file",
   "keywords": [],
   "activationCommands": {},