bkblz 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bb020bd742d6466c5034266d7a7bb8226eb77e6
-  data.tar.gz: '02239fdea837af33a2c1b2c7d44e75a5c4b8baf5'
+  metadata.gz: a78f7af9b064373a818c24c9f74c5402a153317f
+  data.tar.gz: 76c95a222b762d6b741313849c92be7162546aa8
 SHA512:
-  metadata.gz: 4c9ea979f127b4460c079bb84e13381242ddc7c23bbaa6164a35d11b90eec93b1db2e3897689288ec3cc2a6c4417fa6356fc4203af3298dff7fbb5a15a92e4f7
-  data.tar.gz: 937b30c05b0e6156acf4380d76d7d8db3ee1d6446fdc0b7585fb99c0d67fa2d0b8206a034c512b67e43c0e6e716dec826ed63bcd4b2d9832fe965cce7f7b7d1b
+  metadata.gz: '028ede1e92325f7808d1dc3769f8c29b9ac4017bd50ff26205e90bcb6cb6ed288e3f13765f2f11262c5d7a58700b4782fef4f7a9ea0f4d37e56fb1941bf5c3ff'
+  data.tar.gz: 9ba3b10ead315fced6c2ab188fa75db3544bfe2da810f662955f0583c285cd33efa10d2138d8bb9cac5f6df07aee9414257fb8f3655dd8a5eac6a5faab4c56a5

data/bin/bkblz

@@ -110,14 +110,17 @@ module Bkblz
     include Helper
 
     desc "upload <bucket_name> <local_file_path>", "upload a local file to B2"
+    option :file_name, :desc => "remote file name, if not given the basename" +
+      "of the local file is used"
     def upload(bucket_name, local_file_path)
       parse_opts
 
       file_info = run_task do
         Bkblz::Task::UploadFile.run Bkblz.config, {
-                                                  :bucket_name => bucket_name,
-                                                  :file_path => local_file_path
-                                                }
+          :bucket_name => bucket_name,
+          :file_path => local_file_path,
+          :file_name => options[:file_name]
+        }
       end
 
       print_header "File Info"
@@ -148,6 +151,9 @@ module Bkblz
            }
     option :all, :desc => "lists all file versions, cannot be used with --start-at"
     option :with_id, :type => :boolean, :desc => "include file_id in results"
+    option :prefix, :desc => "limits results to those that match the prefix"
+    option :delimiter, :desc => "combine with prefix to search directories, " +
+      "see https://www.backblaze.com/b2/docs/b2_list_file_names.html for usage"
     def list(bucket_name)
       parse_opts
 
@@ -158,7 +164,9 @@ module Bkblz
           :start_at => options[:start_at],
           :limit => options[:limit],
           :all_versions => options[:all],
-          :bucket_name => bucket_name
+          :bucket_name => bucket_name,
+          :prefix => options[:prefix],
+          :delimiter => options[:delimiter]
         })
 
         file_printer = lambda do |file|

data/lib/bkblz/task/list_files.rb

@@ -6,6 +6,8 @@ module Bkblz
       task_param :limit, :default => 100
       task_param :all_versions
       task_param :bucket_name, :required => true
+      task_param :prefix
+      task_param :delimiter
 
       def run_internal(session, params)
         bucket = find_bucket_by_name session, params[:bucket_name]
@@ -14,7 +16,8 @@ module Bkblz
           session.send Bkblz::V1::ListFileVersionsRequest.new bucket, params[:limit]
         else
           session.send Bkblz::V1::ListFileNamesRequest.new(
-                         bucket, params[:limit], params[:start_at])
+            bucket, params[:limit], params[:start_at],
+            :prefix => params[:prefix], :delimiter => params[:delimiter])
         end
       end
     end

data/lib/bkblz/task/upload_file.rb

@@ -4,7 +4,10 @@ module Bkblz
 
       task_param :bucket_name, :required => true
       task_param :file_path, :required => true
+      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")
 
@@ -12,7 +15,7 @@ module Bkblz
         upload_auth = session.send(
           Bkblz::V1::GetUploadUrlRequest.new bucket.bucket_id).to_model
 
-        file_name = ::File.basename f.path
+        file_name = params[:file_name] || ::File.basename(f.path)
         file_body = f.read
         mtime_millis = f.mtime.to_i * 1000
 

data/lib/bkblz/v1/list_file_names.rb

@@ -12,6 +12,7 @@ module Bkblz
       end
     end
 
+    # https://www.backblaze.com/b2/docs/b2_list_file_names.html
     class ListFileNamesRequest < Request
 
       response_class ListFileNamesResponse
@@ -19,12 +20,16 @@ module Bkblz
 
       attr_reader :bucket
 
-      def initialize(bucket, max_file_count=1000, start_file_name=nil)
+      # TODO(erick): Switch start_file_name to a keyword arg
+      def initialize(bucket, max_file_count=1000, start_file_name=nil,
+          prefix: nil, delimiter: nil)
         @bucket = bucket
         @body = {}
         @body[:bucket_id] = bucket.bucket_id
         @body[:max_file_count] = max_file_count
         @body[:start_file_name] = start_file_name if start_file_name
+        @body[:prefix] = prefix if prefix
+        @body[:delimiter] = delimiter if delimiter
       end
 
       def build_request(session)

data/lib/bkblz/v1/response.rb

@@ -74,7 +74,8 @@ module Bkblz
         parsed_json = JSON.parse http_response.body, {
                                    :allow_nan => true,
                                    :symbolize_names => true,
-                                   :max_nesting => 4
+                                   # TODO(erick): Maybe make this configurable?
+                                   :max_nesting => 10
                                  }
         Bkblz::MapKeyFormatter.underscore_keys parsed_json
       end

data/lib/bkblz/version.rb

@@ -1,3 +1,3 @@
 module Bkblz
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bkblz
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Erick Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-02 00:00:00.000000000 Z
+date: 2017-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Bkblz GEM for the Backblaze B2 API. https://www.backblaze.com/b2/docs/