dotenv-android 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6368d3b979a5214b8ea3b57658927c3de927061f008362dc5c3c972a5c78cdd3
-  data.tar.gz: 7ad4465fe1cc946e764de3767732be14bb0c1b752262ce53f63f0bf977e0a733
+  metadata.gz: 9d22e91e44e04625949928ec8e9a0c55612faeca178a4d9cd5461b7fbc7ff0db
+  data.tar.gz: 7a73cba66ce0b45c73b400e9d382fb908893c2abff44ca1bd74840b53e18aae3
 SHA512:
-  metadata.gz: 913c186c562788989d83f35e3b82a5e8f37281fb39e52ee82b1fd126dcd095fb01484d838f20f0e170bae7fade39a2fe93a3f21aeda1253806f03031220bf6f1
-  data.tar.gz: dd9c513aa1a680b32b23eba862620f8d69d06382e255be13f6e024f9e0075c10f0812940e85c433c59beb0a8cc79337be27b28b2ad15ff813802d19f7bec798a
+  metadata.gz: 205123bb2fe02d01e6de518d64200a3c8478f92039d3086368ac4f5666c7b16e1980b61ff4b2bcaeb082a2a185928432628c4f230f93a4e3979788c54624f815
+  data.tar.gz: 58ec434f9e4069be26933fb7a7f5d9ecf2fe15a46c1366b3ab01324e792c70ad4400992ef81df1e0a652e08940561822a55fd8d77be10c90fe99880fba622978

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [0.2.0] - 2020-03-26
+
+## Changed
+- Allow package name to exist in the .env file instead of CLI param
+- Show warning message instead of abort when a value is not found in .env file. 
+
 # [0.1.2] - 2020-03-25
 
 ## Fixed 

data/README.md

@@ -40,6 +40,8 @@ export PATH="$PATH:~/.rbenv/shims/"
 dotenv-android --source app/src/main/java/com/example/myapplication/ --package PACKAGE_NAME
 ```
 
+> Tip: You can put the package name in your `.env` file with key `PACKAGE_NAME` as well instead of as a CLI option. 
+
 In your `app/build.gradle` file, add the following to the bottom of the file:
 ```
 task generateEnv(type:Exec) {

data/lib/dotenv-android/cli.rb

@@ -25,6 +25,8 @@ module DotEnvAndroid
     end
 
     def parse_options
+      Dotenv.load('.env')
+
       options = Options.new
       options.verbose = false
       options.debug = false
@@ -48,7 +50,7 @@ module DotEnvAndroid
           options.verbose = true
           options.debug = true
         end
-        opts.on('--package PACKAGE_NAME', 'Package name to add to the top of the generated Env.kt file (example: com.yourdomain.app, or PACKAGE_NAME environment variable found in .env)') do |package_name| # rubocop:disable Metrics/LineLength
+        opts.on('--package', 'Package name to add to the top of the generated Env.kt file (example: com.yourdomain.app, or PACKAGE_NAME environment variable found in .env)') do |package_name| # rubocop:disable Metrics/LineLength
           options.package_name = package_name
         end
         opts.on('-o', '--out FILE', 'Output file (example: Path/Env.kt)') do |out|
@@ -66,13 +68,18 @@ module DotEnvAndroid
 
       opt_parser.parse!(ARGV)
 
+      if options.package_name.nil? 
+        options.package_name = ENV["PACKAGE_NAME"]
+
+        @ui.fail("Cannot find package name in .env file with key, PACKAGE_NAME, or as a CLI argument") if options.package_name.nil?
+      end 
+
       options
     end
 
     def assert_options
       prefix = '[ERROR]'
       @ui.fail("#{prefix} --source required") unless @options.source
-      @ui.fail("#{prefix} --package required") unless @options.package_name
     end
   end
 end

data/lib/dotenv-android/generator.rb

@@ -15,7 +15,7 @@ module DotEnvAndroid
 
       @ui = DotEnvAndroid::UI.new(@options.verbose, @options.debug)
 
-      @all_env_vars = Dotenv.parse('.env')
+      Dotenv.load('.env')
     end
 
     def start
@@ -67,9 +67,9 @@ module DotEnvAndroid
       values = {}
 
       requests.each do |request|
-        @ui.fail("Environment variable #{request} not found in .env") unless @all_env_vars[request]
+        @ui.warning("Environment variable #{request} not found in .env") unless ENV[request]
 
-        values[request] = @all_env_vars[request]
+        values[request] = ENV[request]
       end
 
       @ui.debug("Values: #{values}")
@@ -77,17 +77,7 @@ module DotEnvAndroid
     end
 
     def package_header
-      package_name_header = "package #{@options.package_name}"
-
-      unless @options.package_name.include? '.'
-        package_name = @all_env_vars[@options.package_name]
-        @ui.fail("Cannot find package name in .env file with key, #{@options.package_name}") if package_name.nil?
-        package_name_header = "package #{package_name}"
-      end
-
-      @ui.debug("Package name header: #{package_name_header}")
-
-      package_name_header
+      return "package #{@options.package_name}"
     end
 
     def generate_output(env_variables)

data/lib/dotenv-android/version.rb

@@ -3,7 +3,7 @@
 module DotEnvAndroid
   class Version
     def self.get
-      '0.1.2'
+      '0.2.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotenv-android
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Levi Bostian