bkblz 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e32fc4c015090ea1808daf2fa0bf5d6f69ee6362
-  data.tar.gz: 39ab9e46da28e38ac44080d6b11b480d1d940ef5
+  metadata.gz: 5997f9298f8ca9a76ccab7d97a32056c39715284
+  data.tar.gz: 5705d4a980f24bc1129ea632e1d43c91a4141ebb
 SHA512:
-  metadata.gz: e6454e5cc445133352b0b8c9b30e77b39aeffac724db4c49fe21fc7c9e45fbc6893b65b607ab2686cfbd36ce1b014da943fff0c289986b2ad3c0797c644fbe4c
-  data.tar.gz: 2ed424c4099bc450e7adc719e1aa3ce26cbc8d7929cc6618e83719a73dd17d8f10140cbcd8185785f28e004e71430cf5649084d4ef56fcf0ee5777edaa2310c6
+  metadata.gz: ceb34167c6cac650642da332387d44dd413d5d16f96aaaa940b007ce412cf586640ce7e5770827c4d43e37a9f6e1013e79a499075c8ed47785de0ee1c2a1b5af
+  data.tar.gz: 756b93c8aafa321d6301e7bc5a1146dcbd64be52581de83c8ca16f41aea79ea6804d97bf6c4d2da35d53f0472611ad6453c5904b989382f658cd9778cb2ad3ca

data/bin/bkblz

@@ -109,18 +109,26 @@ module Bkblz
   class File < Thor
     include Helper
 
-    desc "upload <bucket_name> <local_file_path>", "upload a local file to B2"
+    desc "upload <bucket_name> <local_file_path>", "upload a local file to B2" +
+      " if <local_file_path> is \"-\" (0x2d), then upload will read from STDIN."
     option :file_name, :desc => "remote file name, if not given the basename" +
-      "of the local file is used"
+      " of the local file is used"
     def upload(bucket_name, local_file_path)
       parse_opts
 
+      params = {
+        :bucket_name => bucket_name,
+        :file_name => options[:file_name]
+      }
+
+      if local_file_path == "-"
+        params[:file_body] = STDIN.read
+      else
+        params[:file_path] = local_file_path
+      end
+
       file_info = run_task do
-        Bkblz::Task::UploadFile.run Bkblz.config, {
-          :bucket_name => bucket_name,
-          :file_path => local_file_path,
-          :file_name => options[:file_name]
-        }
+        Bkblz::Task::UploadFile.run Bkblz.config, params
       end
 
       print_header "File Info"

data/lib/bkblz/task/upload_file.rb

@@ -3,25 +3,41 @@ module Bkblz
     class UploadFile < BaseTask
 
       task_param :bucket_name, :required => true
-      task_param :file_path, :required => true
+      task_param :file_body # Either file_body or file_path is required
+      task_param :file_path
       task_param :file_name # Overrides local file_path if given
 
-      # TODO(erick): Change file_path to a byte string, let the task be agnostic
-      # to where the data comes from. (Probably v0.2).
       def run_internal(session, params)
-        f = ::File.new(params[:file_path], "r")
+        file_body = if params[:file_path]
+                      f = ::File.new(params[:file_path], "r")
+                      f.read
+                    elsif params[:file_body]
+                      params[:file_body]
+                    else
+                      raise 'missing either :file_body or :file_path param'
+                    end
+
+        file_name = if params[:file_name]
+                      params[:file_name]
+                    elsif params[:file_path]
+                      ::File.basename(params[:file_path])
+                    else
+                      raise 'missing either :file_name or :file_path param'
+                    end
+
+        file_mtime = if params[:file_path]
+                       ::File.mtime(params[:file_path])
+                     else
+                       Time.now
+                     end.to_i * 1000
 
         bucket = find_bucket_by_name session, params[:bucket_name]
         upload_auth = session.send(
           Bkblz::V1::GetUploadUrlRequest.new bucket.bucket_id).to_model
 
-        file_name = params[:file_name] || ::File.basename(f.path)
-        file_body = f.read
-        mtime_millis = f.mtime.to_i * 1000
-
         upload_file_info = session.send(
-          Bkblz::V1::UploadFileRequest.new upload_auth, file_body, file_name,
-                                           nil, mtime_millis).to_model
+          Bkblz::V1::UploadFileRequest.new(
+            upload_auth, file_body, file_name, nil, file_mtime)).to_model
       end
     end
   end

data/lib/bkblz/version.rb

@@ -1,3 +1,3 @@
 module Bkblz
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bkblz
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Erick Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor