Merge pull request #17 from uzzu/change-dotenv-file

Add changing dotenv file feature

.github/workflows/main.yml

@@ -7,28 +7,33 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Setup JDK
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'adopt'
-        java-version: 11
-    - name: Gradle clean
-      run: |
-        ./gradlew clean
-    - name: Gradle build
-      run: |
-        ./gradlew build
-    - name: Gradle publish to mavenLocal
-      run: |
-        ./gradlew publishToMavenLocal
-    - name: Run basic example
-      run: |
-        cd examples/basic
-        ./gradlew clean --refresh-dependencies
-    - name: Upload build report
-      uses: actions/[email protected]
-      with:
-        name: build_reports
-        path: plugin/build/reports
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup JDK
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: 11
+      - name: Gradle clean
+        run: |
+          ./gradlew clean
+      - name: Gradle build
+        run: |
+          ./gradlew build
+      - name: Gradle publish to mavenLocal
+        run: |
+          ./gradlew publishToMavenLocal
+      - name: Run basic example
+        run: |
+          cd examples/basic
+          ./gradlew clean --refresh-dependencies
+      - name: Run change file example
+        run: |
+          cd examples/change_file
+          ./gradlew clean --refresh-dependencies
+          ENV_FILE=.env.staging ./gradlew clean
+      - name: Upload build report
+        uses: actions/[email protected]
+        with:
+          name: build_reports
+          path: plugin/build/reports

.github/workflows/publish.yml

@@ -1,35 +1,39 @@
 name: Publish
-on: 
+on:
   workflow_dispatch:
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Setup JDK
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'adopt'
-        java-version: 11
-    - name: Set env
-      run: |
-        echo 'GRADLE_PUBLISH_KEY=${{ secrets.GRADLE_PUBLISH_KEY }}' >> $GITHUB_ENV
-        echo 'GRADLE_PUBLISH_SECRET=${{ secrets.GRADLE_PUBLISH_SECRET }}' >> $GITHUB_ENV
-    - name: Gradle clean
-      run: |
-        ./gradlew clean
-    - name: Gradle build
-      run: |
-        ./gradlew build
-    - name: Gradle publish to mavenLocal
-      run: |
-        ./gradlew publishToMavenLocal
-    - name: Run basic example
-      run: |
-        cd examples/basic
-        ./gradlew clean --refresh-dependencies
-        pushd
-    - name: publish
-      run: |
-        PUBLISH_PRODUCTION=1 ./gradlew publishPlugins
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup JDK
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: 11
+      - name: Set env
+        run: |
+          echo 'GRADLE_PUBLISH_KEY=${{ secrets.GRADLE_PUBLISH_KEY }}' >> $GITHUB_ENV
+          echo 'GRADLE_PUBLISH_SECRET=${{ secrets.GRADLE_PUBLISH_SECRET }}' >> $GITHUB_ENV
+      - name: Gradle clean
+        run: |
+          ./gradlew clean
+      - name: Gradle build
+        run: |
+          ./gradlew build
+      - name: Gradle publish to mavenLocal
+        run: |
+          ./gradlew publishToMavenLocal
+      - name: Run basic example
+        run: |
+          cd examples/basic
+          ./gradlew clean --refresh-dependencies
+      - name: Run change file example
+        run: |
+          cd examples/change_file
+          ./gradlew clean --refresh-dependencies
+          ENV_FILE=.env.staging ./gradlew clean
+      - name: publish
+        run: |
+          PUBLISH_PRODUCTION=1 ./gradlew publishPlugins

.github/workflows/pull-request.yml

@@ -1,6 +1,6 @@
 name: pull-request-build
 
-on: [pull_request]
+on: [ pull_request ]
 
 jobs:
   build:
@@ -36,6 +36,11 @@ jobs:
         run: |
           cd examples/basic
           ./gradlew clean --refresh-dependencies
+      - name: Run change file example
+        run: |
+          cd examples/change_file
+          ./gradlew clean --refresh-dependencies
+          ENV_FILE=.env.staging ./gradlew clean
       - name: Upload build report
         uses: actions/[email protected]
         with:

CHANGELOG.md

@@ -7,15 +7,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- Update Gradle to 6.9
+- Update Kotlin to 1.4.20
+- Add changing `.env` file feature
+  - If environment variable `ENV_FILE` is set, The plugin read a file specified `ENV_FILE` instead of `.env` file.
+
 ## Changed
+
 - Update Gradle to 6.6
 - Update Kotlin to 1.3.72
 
 ## [1.1.0] - 2020-04-21
 
 ### Added
 
-- `(Map<String, String>) env.allVariables` to get all environment variables includes variables specified in `.env` files. [#5](https://github.com/uzzu/dotenv-gradle/pull/5)
+- `(Map<String, String>) env.allVariables` to get all environment variables includes variables specified in `.env`
+  files. [#5](https://github.com/uzzu/dotenv-gradle/pull/5)
 
 ## [1.0.2] - 2020-02-12
 
@@ -26,9 +33,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.0.1] - 2020-02-12
 
 ### Fixed
+
 - Fix gradle plugin metadata.
 
 ## [1.0.0] - 2020-02-12
 
 ### Added
+
 - Initial release.

README.md

@@ -43,6 +43,12 @@ println(env.BAZ.orElse("default baz"))  // => baz
 
 If a `.env.template` file exists, this plugin refer it to create a environemnt variable properties in the `env` extension.
 
+### [Optional] Change a file to read instead of `.env` file.
+
+If environment variable `ENV_FILE` is set, The plugin read a file specified `ENV_FILE` instead of `.env` file.
+
+[See example](/examples/change_file)
+
 ### Others
 - All APIs of `env` extension consider `.env` file.
   - If the same variable name value is defined in both the `.env` file and the system environment variable, the system environment variable takes precedence.

examples/change_file/.env

@@ -0,0 +1 @@
+FOO=default

examples/change_file/.env.staging

@@ -0,0 +1 @@
+FOO=staging

examples/change_file/.env.template

@@ -0,0 +1 @@
+FOO=

examples/change_file/.gitattributes

@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+

examples/change_file/.gitignore

@@ -0,0 +1,5 @@
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build

examples/change_file/README.md

@@ -0,0 +1,6 @@
+## Change file example
+
+Run the following command to confirm that the DotEnv file to be loaded has changed.
+
+- `./gradlew clean`
+- `ENV_FILE=.env.staging ./gradlew clean`

examples/change_file/build.gradle.kts

@@ -0,0 +1,6 @@
+plugins {
+    base
+    id("co.uzzu.dotenv.gradle") version "1.1.0"
+}
+
+println(env.FOO.value)

examples/change_file/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists