dotenv-android 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf9107a7eac6ffceeeaf4712d9e70915ad47c9d5577eb76be97360b97b85addd
-  data.tar.gz: 5dfbc805c2c8331ad16a9d421767ab94401970629dbc768627f5634901365cd0
+  metadata.gz: 6368d3b979a5214b8ea3b57658927c3de927061f008362dc5c3c972a5c78cdd3
+  data.tar.gz: 7ad4465fe1cc946e764de3767732be14bb0c1b752262ce53f63f0bf977e0a733
 SHA512:
-  metadata.gz: 20651196c68f0a337f54d62f4a694f8d6eb76db602073ed9b251eddc93b1dd556f4b2639b298cf0f10c869eef8d053eb388b7f4d20666dc10845fcf9d55054ae
-  data.tar.gz: a360617fcb5d34ad1bb244a293b006bfe86dce259b8657cb20a872ee8451d78af1dcb6d8cc48d9690913a70ab62c0a977b1fb0200e88a1e43f524775d5b5c77a
+  metadata.gz: 913c186c562788989d83f35e3b82a5e8f37281fb39e52ee82b1fd126dcd095fb01484d838f20f0e170bae7fade39a2fe93a3f21aeda1253806f03031220bf6f1
+  data.tar.gz: dd9c513aa1a680b32b23eba862620f8d69d06382e255be13f6e024f9e0075c10f0812940e85c433c59beb0a8cc79337be27b28b2ad15ff813802d19f7bec798a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# [0.1.2] - 2020-03-25
+
+## Fixed 
+- Special characters at end of var ignored 
+
 # [0.1.1] - 2019-11-30
 
 ## Fixed 

data/README.md

@@ -29,6 +29,14 @@ At first, Android Studio will complain that `Env.apiHost` cannot be found. Don't
 ```
 #!/bin/bash
 
+# You may need to edit the PATH environment variable in order for dotenv-android to execute. It may not be found at first. 
+# After you run `gem install dotenv-android`, run `which dotenv-android` to find out where it is located. 
+# You may need to add the path to that executable to your script. Android Studio launches with it's own PATH
+# that may differ from your system's PATH.
+# To see what the PATH variable contains in Android Studio, uncomment the line below and perform a build to run this script:
+# /usr/bin/env
+export PATH="$PATH:~/.rbenv/shims/"
+
 dotenv-android --source app/src/main/java/com/example/myapplication/ --package PACKAGE_NAME
 ```
 

data/lib/dotenv-android/cli.rb

@@ -29,6 +29,7 @@ module DotEnvAndroid
       options.verbose = false
       options.debug = false
 
+      # rubocop:disable Metrics/BlockLength
       opt_parser = OptionParser.new do |opts|
         opts.banner = 'Usage: dotenv-android [options]'
 
@@ -47,7 +48,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|
+        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
           options.package_name = package_name
         end
         opts.on('-o', '--out FILE', 'Output file (example: Path/Env.kt)') do |out|
@@ -58,6 +59,7 @@ module DotEnvAndroid
           exit
         end
       end
+      # rubocop:enable Metrics/BlockLength
 
       help = opt_parser.help
       abort(help) if ARGV.empty?

data/lib/dotenv-android/generator.rb

@@ -46,9 +46,12 @@ module DotEnvAndroid
       requests = []
 
       File.readlines(file).each do |line|
-        line.split(' ').each do |word|
-          # https://regexr.com/4pmp0
-          next unless /Env\.[a-z]\w*/.match? word
+        # Regex matcher: https://regexr.com/4rf2s
+        matches = line.match(/Env\.[a-z]\w*/)
+        next if matches.nil?
+
+        matches.to_a.each do |word|
+          word = word.gsub('_', '') # \w in regex pattern above allows underscores. We want to remove those.
 
           requested_variable = word.split('.')[1]
           requested_variable = DotEnvAndroid::Util.to_snakecase(requested_variable).upcase
@@ -60,7 +63,7 @@ module DotEnvAndroid
       requests
     end
 
-    def get_values(requests)      
+    def get_values(requests)
       values = {}
 
       requests.each do |request|
@@ -73,25 +76,25 @@ module DotEnvAndroid
       values
     end
 
-    def get_package_header
+    def package_header
       package_name_header = "package #{@options.package_name}"
 
-      if !@options.package_name.include? "."
+      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 
+      end
 
       @ui.debug("Package name header: #{package_name_header}")
 
-      return package_name_header
-    end 
+      package_name_header
+    end
 
     def generate_output(env_variables)
       @ui.verbose("Outputting environment variables to #{@options.out}")
 
-      package_name_header = get_package_header
-      file_contents = "#{package_name_header}\n\n"      
+      package_name_header = package_header
+      file_contents = "#{package_name_header}\n\n"
       file_contents += "object Env {\n\n"
       env_variables.each do |key, value|
         file_contents += "  val #{DotEnvAndroid::Util.snake_to_camel(key)} = \"#{value}\"\n"

data/lib/dotenv-android/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotenv-android
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Levi Bostian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-30 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -94,22 +94,22 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -169,8 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Access environment variables at runtime of Android app