s3reamer 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: feb3e76af1518b06696c2aef13cc7cd924b806dc
-  data.tar.gz: 92a13b8ce0a4768996065e50e2f495363bce480d
+  metadata.gz: 44cb148d5be1f3d30b47a839a447490c31f2f054
+  data.tar.gz: 81ac44c4a694bbedf5ba05fa520ec2457e1b8b38
 SHA512:
-  metadata.gz: 246dd684e12c523eb0d6123f9eecc9242e2aa964b1dd1ac5578fa15acb5ddc61cf118d5a5c9266dcd1148f58f829fa7afc6d2f80ded750ca69852851a6c7c89e
-  data.tar.gz: ef04e8f6859697a0bde25c7bfd5a9874d21c428449a6d24ba2a6e12fe3366f1ee84165f47f4355b3e30eb59801e0c5104ce090154a4597e632732b6397d250e8
+  metadata.gz: 574f10b3d0a0a955574ed45f78d32665e19e8d4f6ecca277409fa2fc4800df1b596fc06de36c58d8ebaa7b9715099b1ff9827dbbdd578fc534494fb665b5a60a
+  data.tar.gz: 1b36d85b66f01033f1b32f87a1da047408e720573947b1c0ed79fee4db7e4474369da8b3c113414b2e9470e715557334ede336398c8ac49b0e0200bd89ddcd7e

data/bin/s3reamer

@@ -6,26 +6,9 @@ require 'aws-sdk'
 require 's3reamer'
 
 banner = "Usage: s3reamer DIRECTORY BUCKET_NAME [options]"
-if ARGV.length < 2
-  $stderr.puts banner
-  exit 1
-end
-
-dir = ARGV.shift
-if !File.exists?(dir)
-  $stderr.puts "Directory does not exist: #{dir}"
-  exit 1
-elsif !File.directory?(dir)
-  $stderr.puts "Not a directory: #{dir}"
-  exit 1
-end
-
-bucket_name = ARGV.shift
 
 options = {
   region: 'us-east-1',
-  bucket_name: bucket_name,
-  directory: dir,
   reader_timeout: 30,
   reader_sleep_interval: 1,
   pool_size: 4,
@@ -34,7 +17,7 @@ options = {
   credentials_profile: 'default',
   prefix: ''
 }
-OptionParser.new do |opts|
+opts = OptionParser.new do |opts|
   opts.banner = banner
 
   opts.on("-r", "--region [AWS_REGION]") do |v|
@@ -75,7 +58,28 @@ OptionParser.new do |opts|
     v = "#{v}/" unless v.end_with?("/")
     options[:prefix] = v
   end
-end.parse!
+end
+
+if ARGV.length < 2
+  $stderr.puts opts
+  exit 1
+end
+
+dir = ARGV.shift
+if !File.exists?(dir)
+  $stderr.puts "Directory does not exist: #{dir}"
+  exit 1
+elsif !File.directory?(dir)
+  $stderr.puts "Not a directory: #{dir}"
+  exit 1
+end
+
+bucket_name = ARGV.shift
+options = options.merge({
+    bucket_name: bucket_name,
+    directory: dir
+})
+opts.parse!
 
 credentials = Aws::SharedCredentials.new(path: options[:credentials_file], profile_name: options[:credentials_profile])
 s3 = Aws::S3::Resource.new(region: options[:region], credentials: credentials)

data/lib/s3reamer/version.rb

@@ -1,3 +1,3 @@
 module S3reamer
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3reamer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Christopher Mullins