swa 0.8.4 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f97ea85d4f432b6ea61fb652ce14f5ea50f1827aa3056437869f9eb6fcd28f83
-  data.tar.gz: 00e6d4f165f754f6dc4d03d4c45c09075b7235961527d1792eec649f8475b67e
+  metadata.gz: 5c07723e018108852c4b08553e806bdd53e80e88988e2fa1dbdef99b8aebbab3
+  data.tar.gz: 2835192e6d525d1bdb79ae94b698f8435f3311bba1deb145d20a5ab9257e373e
 SHA512:
-  metadata.gz: da5a54d7e1ec1da3b3860cf27ae60e5548eb007679ff7158eb6c8e0ae7f82b49592c553b6920b230773302a7318d5f2d651ba2bfc1d5c7c37d9256bc51fc1aa6
-  data.tar.gz: 10134f56ec3a62439470d5f0148a8e3df4804338ff86a18c824da2795866fd1512cfab71c75f8bd9de45b1f3f5b1ab7b3c092825e4d88b6c89c47c3640bf084c
+  metadata.gz: 0cc932811e45b02d1d1b254ca52ba54e188281f59764e4b0efaae4164bdc2695f7c7cfcbab3f0ab92c6cbcfd417b3ef17e05e5a76ce2b29820c7c936cfb65a47
+  data.tar.gz: fc6105d43f360c2db2be74a594bd855a4567618143edbefb6343f46c5dd137af87971468a1d85c9cad5ef2a0b7d2c952f8b9b10c02b60f29f90c910f615e8587

data/lib/swa/cli/athena_command.rb

@@ -112,7 +112,11 @@ module Swa
           )
           wait_for_query(start_query_response.query_execution_id)
           query_results = athena_client.get_query_results(query_execution_id: start_query_response.query_execution_id)
-          output_results_as_csv(query_results.result_set)
+          if query =~ /\AEXPLAIN/
+            output_explain_result(query_results.result_set)
+          else
+            output_results_as_csv(query_results.result_set)
+          end
         end
 
         private
@@ -127,6 +131,12 @@ module Swa
           signal_error error.response.query_execution.status.state_change_reason
         end
 
+        def output_explain_result(result_set)
+          result_set.rows.drop(1).each do |row|
+            puts row.data.first.var_char_value
+          end
+        end
+
       end
 
       subcommand ["workgroups", "wgs"], "Show work-groups" do

data/lib/swa/cli/base_command.rb

@@ -27,6 +27,8 @@ module Swa
         super(arguments)
       rescue Aws::Errors::MissingCredentialsError
         signal_error "no credentials provided"
+      rescue Aws::Errors::MissingRegionError, Aws::Errors::InvalidRegionError => e
+        signal_error e.message
       rescue Aws::Errors::ServiceError => e
         signal_error e.message
       end

data/lib/swa/cli/s3_command.rb

@@ -68,7 +68,28 @@ module Swa
             parameter "FILE", "file name", :attribute_name => :file_name
 
             def execute
-              object.upload(file_name)
+              object.upload_from(file_name)
+            end
+
+          end
+
+          subcommand "download", "download object to local file" do
+
+            option %w(-T --to), "TARGET", "file or directory to download into", default: ".", attribute_name: :target
+
+            def execute
+              object.download_into(target_file_path, &method(:log_download_progress))
+              logger.info "Downloaded to #{target_file_path}"
+            end
+
+            private
+
+            def target_file_path
+              if File.directory?(target)
+                File.join(target, File.basename(object_key))
+              else
+                target
+              end
             end
 
           end
@@ -96,6 +117,27 @@ module Swa
 
             end
 
+            subcommand "download", "download version to local file" do
+
+              option %w(-T --to), "TARGET", "file or directory to download into", default: ".", attribute_name: :target
+
+              def execute
+                version.download_into(target_file_path)
+                logger.info "Downloaded to #{target_file_path}"
+              end
+
+              private
+
+              def target_file_path
+                if File.directory?(target)
+                  File.join(target, File.basename(object_key))
+                else
+                  target
+                end
+              end
+
+            end
+
             protected
 
             def version
@@ -263,6 +305,12 @@ module Swa
         resource_model.list(aws_resources)
       end
 
+      def log_download_progress(bytes, part_sizes, file_size)
+        # total_bytes = bytes.sum
+        # percent_done = "%.1f" % [100.0 * total_bytes / file_size]
+        # logger.debug "Downloaded #{total_bytes} of #{file_size}; #{percent_done}% done"
+      end
+
     end
 
   end

data/lib/swa/s3/object.rb

@@ -30,11 +30,15 @@ module Swa
         object.get.body
       end
 
+      def download_into(file_name, &progress_callback)
+        object.download_file(file_name, progress_callback: progress_callback)
+      end
+
       def put(io, options = {})
         object.put(options.merge(:body => io))
       end
 
-      def upload(file_name)
+      def upload_from(file_name)
         object.upload_file(file_name)
       end
 

data/lib/swa/s3/object_version.rb

@@ -34,6 +34,17 @@ module Swa
         version.get.body
       end
 
+      def download_into(file_name, &progress_callback)
+        downloader = Aws::S3::FileDownloader.new(client: aws_resource.client)
+        options = {
+          bucket: version.bucket_name,
+          key: version.object_key,
+          version_id: version.id,
+          progress_callback: progress_callback,
+        }
+        downloader.download(file_name, options)
+      end
+
       def delete
         version.delete
       end

data/lib/swa/version.rb

@@ -1,3 +1,3 @@
 module Swa
-  VERSION = "0.8.4"
+  VERSION = "0.8.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swa
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.6
 platform: ruby
 authors:
 - Mike Williams
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-09 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -360,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: AWS, backwards