swa 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e104c27cd170b45f520bf23f8ea1c1b3f2c08dfb5b4fbce5c81778d8dac8812
-  data.tar.gz: 25be55194508205f3d044a22734e144a777972c8b091f99e7658742d3214175f
+  metadata.gz: 1db2fa774c68dc5fc72812a3c9962eac1b532bbea246f163fdb705e301d80343
+  data.tar.gz: 3752e1fbb76dcd2fc3eeb84fe7b703420f5d87ad36559b05c178d3bdbe043508
 SHA512:
-  metadata.gz: e5e1856a85450d6b8194a253cbb7773dd81a8cfa2206ff24853ce1da0e55268b4c4ccf2448a91adc2c934da5ec6d43135b4d0c4d1ac7cb4d05cd97d044d49fc9
-  data.tar.gz: 700faafa6b9e53f0dd926b7fd63768c0cc9dedae487fb28e74a7bb5a63c9a5ab79015028f5e285666606fb0e3eb732ff0f4f500ea1242cc52e30c1721b15cc93
+  metadata.gz: 82fe2ee12f547a35efa664798fd5d52d6313ad60957c6045e13956de5f31662f728636d541a2661031d1068c4a5d110ad255a56c81b9d3ae280270f224f8be62
+  data.tar.gz: ffdf5f146091814f926b1af310a44c198dba8b64573d1f3e75f92b50fc50979698f433d9611bb3c0097ffa70f987ecf1fb290591ab0dfa562bb5922fbdbcebc5

data/lib/swa/cli/athena_command.rb

@@ -118,6 +118,8 @@ module Swa
 
         def wait_for_query(query_execution_id)
           QueryCompletionWaiter.new(client: athena_client).wait(query_execution_id: query_execution_id)
+        rescue Aws::Waiters::Errors::FailureStateError => error
+          signal_error error.response.query_execution.status.state_change_reason
         end
 
       end

data/lib/swa/cli/glue_command.rb

@@ -66,6 +66,14 @@ module Swa
           Swa::Glue::Database.new(glue_client.get_database(:name => name).database)
         end
 
+        subcommand ["delete"], "Delete database" do
+
+          def execute
+            glue_client.delete_database(:name => name)
+          end
+
+        end
+
         subcommand ["table"], "Show table" do
 
           parameter "NAME", "table name", attribute_name: :table_name
@@ -84,6 +92,14 @@ module Swa
 
           end
 
+          subcommand ["delete"], "Delete table" do
+
+            def execute
+              glue_client.delete_table(:database_name => name, :name => table_name)
+            end
+
+          end
+
           private
 
           def item

data/lib/swa/cli/s3_command.rb

@@ -120,13 +120,16 @@ module Swa
 
           option "--prefix", "PREFIX", "object prefix"
 
-          self.default_subcommand = "list"
+          self.default_subcommand = "prefixes"
 
           subcommand ["list", "ls"], "One-line summary" do
 
+            option %w(-R --recursive), :flag, "list recursively"
+
             def execute
-              objects.each do |i|
-                puts i.summary
+              delimiter = "/" unless recursive?
+              bucket.object_list_entries(prefix: prefix, delimiter: delimiter).each do |e|
+                puts e.summary
               end
             end
 
@@ -156,7 +159,7 @@ module Swa
           protected
 
           def objects
-            bucket.objects(:prefix => prefix)
+            bucket.objects(prefix: prefix)
           end
 
         end

data/lib/swa/s3/bucket.rb

@@ -1,6 +1,7 @@
 require "multi_json"
 require "swa/resource"
 require "swa/s3/object"
+require "swa/s3/object_list_entry"
 require "swa/s3/object_version"
 
 module Swa
@@ -38,6 +39,21 @@ module Swa
         Swa::S3::ObjectVersion.list(aws_resource.object_versions(options))
       end
 
+      def object_list_entries(options = {})
+        options = options.merge(bucket: bucket.name)
+        resp = bucket.client.list_objects_v2(options)
+        ::Enumerator.new do |y|
+          resp.each_page do |page|
+            page.data.common_prefixes.each do |prefix_data|
+              y << Swa::S3::ObjectPrefix.new(bucket.name, prefix_data)
+            end
+            page.data.contents.each do |object_data|
+              y << Swa::S3::ObjectSummary.new(bucket.name, object_data)
+            end
+          end
+        end
+      end
+
       def delete
         bucket.delete
       end

data/lib/swa/s3/object_list_entry.rb

@@ -0,0 +1,66 @@
+require "swa/record"
+
+module Swa
+  module S3
+
+    class ObjectListEntry < Record
+
+      def initialize(bucket_name, aws_record)
+        @bucket_name = bucket_name
+        super(aws_record)
+      end
+
+      attr_reader :bucket_name
+
+      def to_s
+        uri
+      end
+
+      def summary
+        [
+          pad(column1, 20),
+          rpad(column2, 10),
+          uri
+        ].join("  ")
+      end
+
+    end
+
+    class ObjectPrefix < ObjectListEntry
+
+      delegate :prefix
+
+      def column1
+        ""
+      end
+
+      def column2
+        ""
+      end
+
+      def uri
+        "s3://#{bucket_name}/#{prefix}"
+      end
+
+    end
+
+    class ObjectSummary < ObjectListEntry
+
+      delegate :key, :size, :last_modified
+
+      def column1
+        last_modified.iso8601
+      end
+
+      def column2
+        size
+      end
+
+      def uri
+        "s3://#{bucket_name}/#{key}"
+      end
+
+    end
+
+  end
+end

data/lib/swa/version.rb

@@ -1,3 +1,3 @@
 module Swa
-  VERSION = "0.7.3"
+  VERSION = "0.7.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swa
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Mike Williams
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2024-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -320,6 +320,7 @@ files:
 - lib/swa/resource.rb
 - lib/swa/s3/bucket.rb
 - lib/swa/s3/object.rb
+- lib/swa/s3/object_list_entry.rb
 - lib/swa/s3/object_version.rb
 - lib/swa/version.rb
 - swa.gemspec