awful 0.0.130 → 0.0.131

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b56310b5eaa870bd8f51803d0cb4b09c2b012c28
-  data.tar.gz: 017a43ebb750daae18a48c473ac6eaca5a23efbb
+  metadata.gz: 9df02b3f1ece5cedce9a2932ee0f8904a1d0685c
+  data.tar.gz: ad7374123396d7155ec84d6cae57c07d09f98dab
 SHA512:
-  metadata.gz: bff613f4f426f39448821c6725848cd00ea6b9b1a0b96b8b59366b7e87d804170da93b12470f611a3984600131b2edcdebbb606f9564cb516acfd887c8a48278
-  data.tar.gz: 9620a45d8c8b8a03fe4843e4f83145526e1bd14f39e83a447f8d569347ad3ebe461abd8606854f659a075b828fac1f0dfdf8a405105bca250f33e4cf081c81cf
+  metadata.gz: 2cd8a580e571a794911aca602cde857f4d22e6efef782fb973930aa12da8c3c79e1ad4001e4cf2b331095b855ae798b7b1693b9e523dbbec7a082f73960a9dde
+  data.tar.gz: 17d36acb2c6df8fd77cfaf42112358f05a982c3112befd700ce1ee74ebe08934d2a65eb96b816c537668e24c5879c570fdfb2a01cb5b33262f934d3344ab050f

data/lib/awful/dynamodb.rb

@@ -45,18 +45,18 @@ module Awful
       if options[:long]
         tables.map do |table|
           dynamodb.describe_table(table_name: table).table
-        end.tap do |list|
+        end.output do |list|
           print_table list.map { |t| [ t.table_name, color(t.table_status), t.item_count, t.table_size_bytes, t.creation_date_time ] }
         end
       else
-        tables.tap { |t| puts t }
+        tables.output(&method(:puts))
       end
     end
 
     desc 'dump NAME', 'dump table with name'
     def dump(name)
       all_matching_tables(name).map do |table_name|
-        dynamodb.describe_table(table_name: table_name).table.to_hash.tap do |table|
+        dynamodb.describe_table(table_name: table_name).table.to_hash.output do |table|
           puts YAML.dump(stringify_keys(table))
         end
       end
@@ -64,15 +64,14 @@ module Awful
 
     desc 'status NAME', 'get status of NAMEd table'
     def status(name)
-      dynamodb.describe_table(table_name: name).table.table_status.tap(&method(:puts))
+      dynamodb.describe_table(table_name: name).table.table_status.output(&method(:puts))
     end
 
-    desc 'key NAME', 'get hash or range key of named table'
-    method_option :type, aliases: '-t', type: :string, default: :hash, desc: 'type of key to get: hash or range'
-    def key(name)
-      dynamodb.describe_table(table_name: name).table.key_schema.find do |schema|
-        schema.key_type == options[:type].to_s.upcase
-      end.attribute_name.output(&method(:puts))
+    desc 'keys NAME', 'get hash and range keys of named table'
+    def keys(name)
+      dynamodb.describe_table(table_name: name).table.key_schema.each_with_object({}) do |schema, h|
+        h[schema.key_type.downcase.to_sym] = schema.attribute_name
+      end.output(&method(:print_table))
     end
 
     desc 'create_table NAME', 'create table with NAME'
@@ -92,7 +91,7 @@ module Awful
       ## scrub unwanted keys from GSIs
       if opt.has_key?(:global_secondary_indexes)
         params[:global_secondary_indexes] = opt[:global_secondary_indexes].map do |gsi|
-          only_keys_matching(gsi, %i[index_name key_schema projection]).tap do |g|
+          only_keys_matching(gsi, %i[index_name key_schema projection]).output do |g|
             if gsi[:provisioned_throughput]
               g[:provisioned_throughput] = only_keys_matching(gsi[:provisioned_throughput], %i[read_capacity_units write_capacity_units])
             end
@@ -230,42 +229,63 @@ module Awful
     end
 
     desc 'scan NAME', 'scan table with NAME'
-    method_option :output, aliases: '-o', type: :string, default: nil, desc: 'Output filename (default: stdout)'
+    method_option :output, aliases: '-o', type: :string,  default: nil,   desc: 'Output filename (default: stdout)'
+    method_option :count,  aliases: '-c', type: :boolean, default: false, desc: 'Return count instead of items'
     def scan(name, exclusive_start_key = nil)
       fd = options[:output] ? File.open(options[:output], 'w') : $stdout.dup # open output file or stdout
       exclusive_start_key = nil
+      count = 0
       loop do
-        r = dynamodb_simple.scan('TableName' => name, 'ExclusiveStartKey' => exclusive_start_key)
-        r['Items'].each do |item|
+        r = dynamodb_simple.scan(
+          'TableName'         => name,
+          'Select'            => options[:count] ? 'COUNT' : 'ALL_ATTRIBUTES',
+          'ExclusiveStartKey' => exclusive_start_key
+        )
+        count += r.fetch('Count', 0)
+        r.fetch('Items', []).each do |item|
           fd.puts JSON.generate(item)
         end
         exclusive_start_key = r['LastEvaluatedKey']
         break unless exclusive_start_key
       end
       fd.close
+      puts count if options[:count]
     end
 
     desc 'query NAME', 'query table with NAME'
-    method_option :hash_key,       aliases: '-k', type: :string, default: nil, desc: 'Hash key'
-    method_option :hash_key_value, aliases: '-v', type: :string, default: nil, desc: 'Hash key value'
-    method_option :output,         aliases: '-o', type: :string, default: nil, desc: 'Output filename (default: stdout)'
+    method_option :hash_key,        aliases: '-k', type: :string,  default: nil,   desc: 'Hash key'
+    method_option :hash_key_value,  aliases: '-v', type: :string,  default: nil,   desc: 'Hash key value'
+    method_option :range_key,       aliases: '-K', type: :string,  default: nil,   desc: 'Range key'
+    method_option :range_key_value, aliases: '-V', type: :string,  default: nil,   desc: 'Range key value'
+    method_option :output,          aliases: '-o', type: :string,  default: nil,   desc: 'Output filename (default: stdout)'
+    method_option :count,           aliases: '-c', type: :boolean, default: false, desc: 'Return count instead of items'
     def query(name, exclusive_start_key = nil)
       fd = options[:output] ? File.open(options[:output], 'w') : $stdout.dup # open output file or stdout
       exclusive_start_key = nil
+      count = 0
+      condition = "#{options[:hash_key]} = :hash_key_value"
+      condition += " and #{options[:range_key]} = :range_key_value" if options[:range_key]
+      attributes = {
+        ':hash_key_value'  => { S: options[:hash_key_value] },
+        ':range_key_value' => { S: options[:range_key_value] },
+      }.reject { |_,v| v[:S].nil? }
       loop do
         r = dynamodb_simple.query(
           'TableName'                 => name,
           'ExclusiveStartKey'         => exclusive_start_key,
-          'KeyConditionExpression'    => "#{options[:hash_key]} = :hash_key_value",
-          'ExpressionAttributeValues' => { ":hash_key_value" => { S: options[:hash_key_value] } }
+          'Select'                    => options[:count] ? 'COUNT' : 'ALL_ATTRIBUTES',
+          'KeyConditionExpression'    => condition,
+          'ExpressionAttributeValues' => attributes,
         )
-        r['Items'].each do |item|
+        count += r.fetch('Count', 0)
+        r.fetch('Items', []).each do |item|
           fd.puts JSON.generate(item)
         end
         exclusive_start_key = r['LastEvaluatedKey']
         break unless exclusive_start_key
       end
       fd.close
+      puts count if options[:count]
     end
 
     desc 'put_items NAME', 'puts json items into the table with NAME'
@@ -294,7 +314,7 @@ module Awful
       end
 
       ## return counts
-      [put_count, skip_count].tap do |put, skip|
+      [put_count, skip_count].output do |put, skip|
         puts "put #{put} items, skipped #{skip} items"
       end
     end

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = '0.0.130'
+  VERSION = '0.0.131'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awful
 version: !ruby/object:Gem::Version
-  version: 0.0.130
+  version: 0.0.131
 platform: ruby
 authors:
 - Ric Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler