Add -e option func

Author: kozakana

README.md

@@ -33,7 +33,7 @@ bucketsync [--help | --env | --dry-run | --no-ignore | --ignore=VALUE] ACCESSKEY
 ## Options
 <pre>
   -h, --help     show this help message and exit
-  -e, --env      input access key and secret key from '.env' file
+  -e, --env      input access key, secret key, syncdir and bucket name from '.env' file
   --dry-run      Only show what should be uploaded or downloaded but
                  don't actually do it. May still perform S3 requests to
                  get bucket listings and other information though (only
@@ -50,11 +50,19 @@ put your working folder.
 S3_ACCESS_KEY = 'AK1234556'
 S3_SECRET_KEY = 'DFEWAefwj381012'
 </pre>
+OR
+<pre>
+S3_ACCESS_KEY = 'AK1234556'
+S3_SECRET_KEY = 'DFEWAefwj381012'
+DEPLOY_DIR = './public/'
+S3_BUCKET_NAME = 'bucket_name'
+</pre>
 
 ## Examples
 
 <pre>
   bucketsync AK1234556 DFEWAefwj381012 ./public/ sample-bucket
   bucketsync -e ./public/ sample-bucket
+  bucketsync -e
   bucketsync --dry-run AK1234556 DFEWAefwj381012 ./public/ sample-bucket
 </pre>

bucketsync

@@ -17,7 +17,7 @@ dry_run_help = [
 
 option={}
 OptionParser.new do |opt|
-  opt.on('-e', '--env', "input access key and secret key from '.env' file") {|v| option[:env] = v}
+  opt.on('-e', '--env', "input access key, secret key, syncdir and bucket name from '.env' file") {|v| option[:env] = v}
   opt.on('--dry-run', *dry_run_help) {|v| option[:dry_run] = v}
   opt.on('--no-ignore', 'all files are targeted for upload') {|v| option[:no_ignore] = v}
   opt.on('--ignore=VALUE', 'set your ignore file') {|v| option[:ignore] = v}
@@ -36,21 +36,15 @@ class Object
 end
 
 def read_env env_file
-  elements = {
-    'S3_ACCESS_KEY' => '',
-    'S3_SECRET_KEY' => ''
-  }
-
+  elements = {}
   begin
     File.open(env_file) do |file|
       file.each_line do |line|
         rows = line.split('=')
         elem = rows.first.try(:strip)
-        if elements[elem]
-          value = rows.last.try(:strip)
-          next unless value
-          elements[elem] = value.gsub('"', '').gsub('\'', '')
-        end
+        value = rows.last.try(:strip)
+        next unless value
+        elements[elem] = value.gsub('"', '').gsub('\'', '')
       end
     end
   rescue => e
@@ -69,8 +63,8 @@ if option[:env]
   env = read_env('.env')
   access_key  = env['S3_ACCESS_KEY']
   secret_key  = env['S3_SECRET_KEY']
-  upload_dir  = ARGV[0]
-  bucket_name = ARGV[1]
+  upload_dir  = env['DEPLOY_DIR'] || ARGV[0]
+  bucket_name = env['S3_BUCKET_NAME'] || ARGV[1]
 else
   if ARGV.length < 4
     puts "too few arguments."