swa 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83e548dcd3489014b39e2abeaa629f2d992abb3a
-  data.tar.gz: 8631da8f320f0c4f836679cbb8051271a39e423b
+  metadata.gz: 6c2bdd3ea0c87066638304663413a8ce0edeeeb8
+  data.tar.gz: 987819dd756f3c9aa3827adb450b8c78c7f9a705
 SHA512:
-  metadata.gz: 05538c822b54162fa9e46ea392dc78d35d23b1f52f0113bc42191888dfef9bdedd6a3a78613ee5f6c86e9efb7a86281d7c983436829dedeb1b5906cc70859d35
-  data.tar.gz: f6bf15581d16ec77d4133a3a22401e0218b6ce10e0fa384f5fb15e45f325370da59cd97026762706b370682855ae478d081feed465dc1b6541c69bb5fec06d45
+  metadata.gz: 56f553cdb20ae6bf1ae7600563694c49635eb52295ef45de523530cb99048177e30296848a52f7d21f5a51d802145342a3ba0f5ceb06c5546ae10b326882f2e9
+  data.tar.gz: 0a1bb1ad8016f0ef4574672d3f2b0b03fc20e5958ed4781fadb92a80d64cad559da2b7b41cb5ae5815062d5b945fb0e347ae71882b83545bbb0ada56572f4ded

data/lib/swa/cli/collection_behaviour.rb

@@ -10,11 +10,13 @@ module Swa
         target.default_subcommand = "summary"
 
         target.subcommand ["summary", "s"], "One-line summary" do
+
           def execute
             collection.each do |i|
               puts i.summary
             end
           end
+
         end
 
         target.subcommand ["data", "d"], "Full details" do

data/lib/swa/cli/main_command.rb

@@ -28,12 +28,23 @@ module Swa
         end
       end
 
-      def parse(arguments)
-        if arguments.first =~ /^(\w+)-/
+      def parse_parameters
+        case remaining_arguments.first
+        when /^(\w+)-/
           subcommand = subcommand_for_prefix($1)
-          arguments = [subcommand] + arguments if subcommand
+          if subcommand
+            remaining_arguments[0,1] = [subcommand] + arguments
+          end
+        when %r{^s3://([^/]+)/(.+/)?$}
+          remaining_arguments[0, 1] = ["s3", "bucket", $1, "objects", "--prefix", $2]
+        when %r{^s3://([^/]+)/(.+)\*$}
+          remaining_arguments[0, 1] = ["s3", "bucket", $1, "objects", "--prefix", $2]
+        when %r{^s3://([^/]+)/(.+)$}
+          remaining_arguments[0, 1] = ["s3", "bucket", $1, "object", $2]
+        when %r{^s3://([^/]+)$}
+          remaining_arguments[0, 1] = ["s3", "bucket", $1]
         end
-        super(arguments)
+        super
       end
 
     end

data/lib/swa/cli/s3_command.rb

@@ -4,37 +4,160 @@ require "swa/cli/collection_behaviour"
 require "swa/cli/item_behaviour"
 require "swa/cli/tag_filter_options"
 require "swa/s3/bucket"
+require "swa/s3/object"
 
 module Swa
   module CLI
 
     class S3Command < BaseCommand
 
-      subcommand ["bucket"], "Show bucket" do
+      subcommand "bucket", "Show bucket" do
 
-        parameter "NAME", "bucket name"
+        parameter "NAME", "bucket name", :attribute_name => :bucket_name
 
         include ItemBehaviour
 
-        private
+        protected
+
+        def aws_bucket
+          s3.bucket(bucket_name)
+        end
+
+        def bucket
+          Swa::S3::Bucket.new(aws_bucket)
+        end
+
+        def bucket_name=(arg)
+          @bucket_name = arg.sub(%r{^s3://}, "")
+        end
+
+        alias_method :item, :bucket
+
+        subcommand "object", "Show object" do
+
+          parameter "KEY", "object key", :attribute_name => :object_key
+
+          include ItemBehaviour
+
+          subcommand "get", "GET object" do
+
+            def execute
+              IO.copy_stream(object.get_body, $stdout)
+            end
+
+          end
+
+          subcommand "put", "PUT object" do
+
+            parameter "[PAYLOAD]", "data", :default => "STDIN"
+
+            def execute
+              object.put(payload)
+            end
+
+            private
+
+            def default_payload
+              $stdin.read
+            end
+
+          end
+
+          subcommand "upload", "Upload file" do
+
+            parameter "FILE", "file name", :attribute_name => :file_name
+
+            def execute
+              object.upload(file_name)
+            end
+
+          end
+
+          subcommand "delete", "Delete object" do
+
+            def execute
+              logger.info "Deleting #{object.uri}"
+              object.delete
+            end
+
+          end
+
+          protected
+
+          def object
+            Swa::S3::Object.new(aws_bucket.object(object_key))
+          end
+
+          alias_method :item, :object
+
+        end
+
+        subcommand "objects", "List objects" do
+
+          option "--prefix", "PREFIX", "object prefix"
+
+          self.default_subcommand = "list"
+
+          subcommand ["list", "ls"], "One-line summary" do
+
+            def execute
+              objects.each do |i|
+                puts i.summary
+              end
+            end
+
+          end
+
+          subcommand ["data", "d"], "Full details" do
+
+            parameter "[QUERY]", "JMESPath expression"
+
+            def execute
+              display_data(objects.map(&:data).to_a, query)
+            end
+
+          end
+
+          subcommand "delete-all", "Delete objects" do
+
+            def execute
+              objects.each do |o|
+                logger.info "Deleting #{o.uri}"
+                o.delete
+              end
+            end
+
+          end
+
+          protected
+
+          def objects
+            bucket.objects(:prefix => prefix)
+          end
 
-        def item
-          Swa::S3::Bucket.new(s3.bucket(name))
         end
 
         subcommand "policy", "print bucket policy" do
 
           def execute
-            puts item.policy
+            display_data(bucket.policy_data)
+          end
+
+        end
+
+        subcommand "delete", "Delete bucket" do
+
+          def execute
+            logger.info "Deleting #{bucket.uri}"
+            bucket.delete
           end
 
         end
 
       end
 
-      subcommand ["buckets"], "List buckets" do
+      subcommand "buckets", "List buckets" do
 
-        include TagFilterOptions
         include CollectionBehaviour
 
         private
@@ -53,7 +176,7 @@ module Swa
 
       def query_for(query_method, resource_model)
         aws_resources = s3.public_send(query_method)
-        wrapped_resources = resource_model.list(aws_resources)
+        resource_model.list(aws_resources)
       end
 
     end

data/lib/swa/s3/bucket.rb

@@ -1,4 +1,4 @@
-require "base64"
+require "multi_json"
 require "swa/resource"
 
 module Swa
@@ -10,10 +10,26 @@ module Swa
         bucket.name
       end
 
-      def policy
+      def uri
+        "s3://#{bucket.name}"
+      end
+
+      def policy_json
         bucket.policy.policy.read
       end
 
+      def policy_data
+        MultiJson.load(policy_json)
+      end
+
+      def objects(options = {})
+        Swa::S3::Object.list(aws_resource.objects(options))
+      end
+
+      def delete
+        bucket.delete
+      end
+
       private
 
       alias_method :bucket, :aws_resource

data/lib/swa/s3/object.rb

@@ -0,0 +1,51 @@
+require "swa/resource"
+
+module Swa
+  module S3
+
+    class Object < Resource
+
+      def summary
+        [
+          object.last_modified.strftime("%Y-%m-%d %H:%M:%S"),
+          rpad(object.size, 10),
+          uri
+        ].join("  ")
+      end
+
+      def key
+        object.key
+      end
+
+      def uri
+        "s3://#{object.bucket.name}/#{object.key}"
+      end
+
+      def to_s
+        uri
+      end
+
+      def get_body
+        object.get.body
+      end
+
+      def put(io, options = {})
+        object.put(options.merge(:body => io))
+      end
+
+      def upload(file_name)
+        object.upload_file(file_name)
+      end
+
+      def delete
+        object.delete
+      end
+
+      private
+
+      alias_method :object, :aws_resource
+
+    end
+
+  end
+end

data/lib/swa/version.rb

@@ -1,3 +1,3 @@
 module Swa
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

data/swa.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "aws-sdk-resources"
   spec.add_runtime_dependency "chronic"
-  spec.add_runtime_dependency "clamp"
+  spec.add_runtime_dependency "clamp", ">= 1.1.0"
   spec.add_runtime_dependency "console_logger"
   spec.add_runtime_dependency "multi_json"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swa
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-09 00:00:00.000000000 Z
+date: 2016-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: console_logger
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,7 @@ files:
 - lib/swa/record.rb
 - lib/swa/resource.rb
 - lib/swa/s3/bucket.rb
+- lib/swa/s3/object.rb
 - lib/swa/version.rb
 - swa.gemspec
 homepage: https://github.com/mdub/swa
@@ -196,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: AWS, backwards