dotenv 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fadc1aaf858a18707131513d5fa3dc015a6c6cd52f6402a92a873ea8b9bb1cda
-  data.tar.gz: c07851bf8fa4dcd429420a416f099a1202e2790937413d96d1861a7e1580056e
+  metadata.gz: '0992bc73a32f12b64e16572e15cbde78e9767730ed5aae4ea2e986e8ef98d81f'
+  data.tar.gz: 3c9209567d61c87b38a6077550a9c489f3b3b5d441c247ca6563a17ac91f3923
 SHA512:
-  metadata.gz: 3815788d3a7f2527dc89c57e15c67cf10bcdf7dd6d12ddb2f4c5eadc5be3c98ab55fd90077a2df829b431b4ce36c04e1e7a3f484f728f7fd498df85d41cc1c73
-  data.tar.gz: 15788c3ecc0ab48db28ff231d4a2bc4a79c8d52786dd0994b5c3839aa709bd58b541205f8683d0dd4ad7101f6d3ca604f590814979165d0adffcce7b8fd5be13
+  metadata.gz: c3109086cd8ad5b552bca4d4f219fe2a6e670eb66430c034010be2e8e60bda81c177e80f0a0c32be01c13c3509252d924e4aa40c4916039a9867c6801045eb64
+  data.tar.gz: 2b59d23bde10b3d1521b681aa04cad979d127c965610c1e9995f12b3e14fa4d0bbb6e56485fbe5ff2bf3cc3eb12fc8c16b156b59ea04c38b41f95ca73881c913

data/lib/dotenv/cli.rb

@@ -6,10 +6,12 @@ module Dotenv
   # The CLI is a class responsible of handling all the command line interface
   # logic.
   class CLI
-    attr_reader :argv
+    attr_reader :argv, :exec_args, :parser_args, :filenames
 
     def initialize(argv = [])
       @argv = argv.dup
+      @filenames = []
+      @flag_matchers = []
     end
 
     def run
@@ -20,48 +22,71 @@ module Dotenv
       rescue Errno::ENOENT => e
         abort e.message
       else
-        exec(*@argv) unless @argv.empty?
+        exec(*@exec_args) unless @exec_args.empty?
       end
     end
 
     private
 
     def parse_argv!(argv)
-      @filenames = []
-
-      OptionParser.new do |parser|
-        parser.banner = "Usage: dotenv [options]"
-        parser.separator ""
-        add_options(parser)
-      end.parse!(argv)
+      parser = create_option_parser
+      add_options(parser, @flag_matchers)
+      @parser_args, @exec_args = split_argv(argv.join(" "), @flag_matchers)
+      parser.parse! @parser_args
 
       @filenames
     end
 
-    def add_options(parser)
-      add_files_option(parser)
-      add_help_option(parser)
-      add_version_option(parser)
+    def add_options(parser, flag_matchers)
+      add_files_option(parser, flag_matchers)
+      add_help_option(parser, flag_matchers)
+      add_version_option(parser, flag_matchers)
     end
 
-    def add_files_option(parser)
+    def add_files_option(parser, flag_matchers)
+      flag_matchers.push("-f \\S+")
       parser.on("-f FILES", Array, "List of env files to parse") do |list|
         @filenames = list
       end
     end
 
-    def add_help_option(parser)
+    def add_help_option(parser, flag_matchers)
+      flag_matchers.push("-h", "--help")
       parser.on("-h", "--help", "Display help") do
         puts parser
         exit
       end
     end
 
-    def add_version_option(parser)
+    def add_version_option(parser, flag_matchers)
+      flag_matchers.push("-v", "--version")
       parser.on("-v", "--version", "Show version") do
         puts "dotenv #{Dotenv::VERSION}"
         exit
       end
     end
+
+    # Detect dotenv flags vs executable args so we can parse properly and still
+    # take advantage of OptionParser for dotenv flags
+    def split_argv(arg_string, matchers)
+      matcher     = /^((?:#{matchers.join("|")})\s?)?(.+)?$/
+      data        = matcher.match(arg_string)
+      dotenv_args = []
+      exec_args   = []
+
+      unless data.nil?
+        dotenv_args = (!data[1].nil? ? data[1].split(" ") : [])
+        exec_args   = (!data[2].nil? ? data[2].split(" ") : [])
+      end
+
+      [dotenv_args, exec_args]
+    end
+
+    def create_option_parser
+      OptionParser.new do |parser|
+        parser.banner = "Usage: dotenv [options]"
+        parser.separator ""
+      end
+    end
   end
 end

data/lib/dotenv/version.rb

@@ -1,3 +1,3 @@
 module Dotenv
-  VERSION = "2.7.0".freeze
+  VERSION = "2.7.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotenv
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Brandon Keepers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake