Alias env vars. Pick them up for cucumber.properties.

Author: aslakhellesoy

History.md

@@ -1,4 +1,7 @@
 ## [1.1.8-SNAPSHOT (Git master)](https://github.com/cucumber/cucumber-jvm/compare/v1.1.7...master)
+
+* [Core] Environment variables/properties are aliased. Example: `HELLO_THERE` == `hello.there` (Aslak Hellesøy)
+* [Core] The `cucumber-jvm.properties` file is no longer picked up. Use `cucumber.properties` instead (Aslak Hellesøy)
 * [Core] Make standrd out non-buffered ([#721](https://github.com/cucumber/cucumber-jvm/pull/721) danielhodder)
 * [Core] Allow empty doc string and data table entries after token replacement from scenario outlines ([#712](https://github.com/cucumber/cucumber-jvm/issues/712), [#709](https://github.com/cucumber/cucumber-jvm/pull/709), [#713](https://github.com/cucumber/cucumber-jvm/pull/713) Leon Poon, Björn Rasmusson)
 * [Guice] New scenario scope for Guice. Non-backwards compatible ([#683](https://github.com/cucumber/cucumber-jvm/pull/683) jakecollins)

android/AndroidManifest.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.1.7-SNAPSHOT" package="cucumber.api.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.1.7" package="cucumber.api.android">
 </manifest>

core/src/main/java/cucumber/runtime/Env.java

@@ -34,7 +34,15 @@ public Env(String bundleName, Properties properties) {
     }
 
     public String get(String key) {
-        String value = System.getenv(asEnvKey(key));
+        String result = get0(asEnvKey(key));
+        if (result == null) {
+            result = get0(asPropertyKey(key));
+        }
+        return result;
+    }
+
+    private String get0(String key) {
+        String value = System.getenv(key);
         if (value == null) {
             value = properties.getProperty(key);
             if (value == null && bundleName != null) {
@@ -55,4 +63,8 @@ public String get(String key, String defaultValue) {
     private static String asEnvKey(String key) {
         return key.replace('.', '_').toUpperCase();
     }
+
+    private static String asPropertyKey(String key) {
+        return key.replace('_', '.').toLowerCase();
+    }
 }

core/src/main/java/cucumber/runtime/RuntimeOptions.java

@@ -67,7 +67,7 @@ public RuntimeOptions(Env env, List<String> argv) {
     }
 
     public RuntimeOptions(FormatterFactory formatterFactory, List<String> argv) {
-        this(new Env("cucumber-jvm"), formatterFactory, argv);
+        this(new Env("cucumber"), formatterFactory, argv);
     }
 
     public RuntimeOptions(Env env, FormatterFactory formatterFactory, List<String> argv) {

core/src/test/java/cucumber/runtime/EnvTest.java

@@ -23,15 +23,17 @@ public void returns_null_for_absent_key() {
     @Test
     public void looks_up_value_from_system_properties() {
         try {
-            System.setProperty("EnvTest", "from-props");
-            assertEquals("from-props", env.get("EnvTest"));
+            System.setProperty("env.test", "from-props");
+            assertEquals("from-props", env.get("env.test"));
+            assertEquals("from-props", env.get("ENV_TEST"));
         } finally {
-            System.getProperties().remove("EnvTest");
+            System.getProperties().remove("env.test");
         }
     }
 
     @Test
     public void looks_up_value_from_resource_bundle() {
-        assertEquals("from-bundle", env.get("EnvTest"));
+        assertEquals("from-bundle", env.get("env.test"));
+        assertEquals("from-bundle", env.get("ENV_TEST"));
     }
 }

core/src/test/resources/env-test.properties

@@ -1 +1 @@
-EnvTest=from-bundle
+env.test=from-bundle

jruby/README.md

@@ -16,9 +16,9 @@ These values can be defined in any of the three places:
 
 * In an Environment variable
 * In a System property (for example `-DRUBY_VERSION=1.9`
-* In a `cucumber-jvm.properties` properties file on your `CLASSPATH`.
+* In a `cucumber.properties` properties file on your `CLASSPATH`.
 
-Sample cucumber-jvm.properties file:
+Sample `cucumber.properties` file:
 
 ```
 GEM_PATH=${basedir}/src/test/gems

jruby/src/main/java/cucumber/runtime/jruby/JRubyBackend.java

@@ -33,7 +33,7 @@
 import java.util.Set;
 
 public class JRubyBackend implements Backend {
-    private static final Env env = new Env("cucumber-jvm");
+    private static final Env env = new Env("cucumber");
     private final SnippetGenerator snippetGenerator = new SnippetGenerator(new JRubySnippet());
     private final ScriptingContainer jruby = new ScriptingContainer();
     private final ResourceLoader resourceLoader;