awscli 0.1.4 → 0.1.5

data/README.md

@@ -3,6 +3,8 @@ awscli
 
 Amazon Web Service(s) Command Line Interface
 
+[![Gem Version](https://badge.fury.io/rb/awscli.png)](http://badge.fury.io/rb/awscli) [![Dependency Status](https://gemnasium.com/ashrithr/awscli.png)](https://gemnasium.com/ashrithr/awscli)  [![Code Climate](https://codeclimate.com/github/ashrithr/awscli.png)](https://codeclimate.com/github/ashrithr/awscli)
+
 Provides the following interface:
 
 - Elastic Cloud Compute (EC2)

data/lib/awscli/cli/UsageExamples/dynamo

@@ -0,0 +1,33 @@
+#Sample awscli dynamo usage examples:
+
+# => Create tables
+awscli dynamo table create -n ProductCatalog -k Id -t N -r 5 -w 5
+awscli dynamo table create -n Forum -k Name -t S -r 5 -w 5
+awscli dynamo table create -n Thread -k ForumName -t S --rk-name Subject --rk-type S -r 5 -w 5
+awscli dynamo table create -n Reply -k Id -t S --rk-name ReplyDateTime --rk-type S -r 5 -w 5
+
+#Individual Puts
+awscli dynamo item put -t ProductCatalog -i Id:N:101 Title:S:'Book 101 Title' ISBN:S:'111-1111111111' Authors:SS:'Author1,Author2' Price:N:2 Dimensions:S:'8.5 x 11.0 x 0.5' PageCount:N:500 InPublication:N:1 ProductCategory:S:Book
+awscli dynamo item put -t ProductCatalog -i Id:N:102 Title:S:'Book 102 Title' ISBN:S:'222-2222222222' Authors:SS:'Author2' Price:N:20 Dimensions:S:'8.5 x 11.0 x 0.8' PageCount:N:600 InPublication:N:1 ProductCategory:S:Book
+awscli dynamo item put -t ProductCatalog -i Id:N:103 Title:S:'Book 103 Title' ISBN:S:'333-3333333333' Authors:SS:'Author1,Author2' Price:N:2000 Dimensions:S:'8.5 x 11.0 x 1.5' PageCount:N:600 InPublication:N:0 ProductCategory:S:Book
+awscli dynamo item put -t ProductCatalog -i Id:N:201 Title:S:'18-Bike-201' Description:S:'201 Description' BicycleType:S:Road Brand:S:'Mountain A' Price:N:100 Gender:S:M Color:SS:'Green,Red' ProductCategory:S:Bicycle
+awscli dynamo item put -t ProductCatalog -i Id:N:202 Title:S:'21-Bike-202' Description:S:'202 Description' BicycleType:S:Road Brand:S:'Brand-Company A' Price:N:200 Gender:S:M Color:SS:'Green,Black' ProductCategory:S:Bicycle
+awscli dynamo item put -t ProductCatalog -i Id:N:203 Title:S:'19-Bike-203' Description:S:'203 Description' BicycleType:S:Road Brand:S:'Brand-Company B' Price:N:300 Gender:S:W Color:SS:'Red,Green,Black' ProductCategory:S:Bicycle
+awscli dynamo item put -t ProductCatalog -i Id:N:204 Title:S:'18-Bike-204' Description:S:'204 Description' BicycleType:S:Mountain Brand:S:'Brand-Company B' Price:N:400 Gender:S:W Color:SS:'Red' ProductCategory:S:Bicycle
+awscli dynamo item put -t ProductCatalog -i Id:N:205 Title:S:'20-Bike-205' Description:S:'205 Description' BicycleType:S:Hybrid Brand:S:'Brand-Company C' Price:N:500 Gender:S:B Color:SS:'Red,Black' ProductCategory:S:Bicycle
+
+#Batch Writes
+awscli dynamo item batch_write --put-requests Forum,Name:S:'Amazon DynamoDB',Category:S:'AWS',Threads:N:2,Messages:N:4,Views:N:1000 Forum,Name:S:'Amazon S3',Category:S:'AWS',Threads:N:0 Thread,ForumName:S:'Amazon DynamoDB',Subject:S:'DynamoDB Thread 1',Message:S:'DynamoDB thread 1 message',LastPostedBy:S:'User A',LastPostedDateTime:S:'2013-04-02 13:49:13 -0700',Views:N:0,Reply:N:0,Answered:N:0,Tags:SS:'index;primarykey;table' Thread,ForumName:S:'Amazon DynamoDB',Subject:S:'DynamoDB Thread 2',Message:S:'DynamoDB thread 2 message',LastPostedBy:S:'User A',LastPostedDateTime:S:'2013-03-19 13:56:48 -0700',Views:N:0,Reply:N:0,Answered:N:0,Tags:SS:'index;primarykey;rangekey' Thread,ForumName:S:'Amazon S3',Subject:S:'S3 Thread 1',Message:S:'S3 thread 1 message',LastPostedBy:S:'User A',LastPostedDateTime:S:'2013-03-19 13:56:48 -0700',Views:N:0,Reply:N:0,Answered:N:0,Tags:SS:'largeobjects;multipart upload'
+awscli dynamo item batch_write --put-requests Reply,Id:S:'Amazon DynamoDB#DynamoDB Thread 1',ReplyDateTime:S:'2013-04-02 13:49:13 -0700',Message:S:'DynamoDB Thread 1 Reply 1 text',PostedBy:S:'User A' Reply,Id:S:'Amazon DynamoDB#DynamoDB Thread 1',ReplyDateTime:S:'2013-04-09 15:00:54 -0700',Message:S:'DynamoDB Thread 1 Reply 2 text',PostedBy:S:'User B' Reply,Id:S:'Amazon DynamoDB#DynamoDB Thread 2',ReplyDateTime:S:'2013-04-09 12:30:12 -0700',Message:S:'DynamoDB Thread 2 Reply 1 text',PostedBy:S:'User A' Reply,Id:S:'Amazon DynamoDB#DynamoDB Thread 2',ReplyDateTime:S:'2013-04-12 04:12:30 -0700',Message:S:'DynamoDB Thread 2 Reply 2 text',PostedBy:S:'User A'
+
+#Sample Queries
+#Get an item from the ProductCatalog table whose Id is 101 and get attributes Id,ISBN,Title,Authors
+awscli dynamo item get -t ProductCatalog -k N:101 -g Id ISBN Title Authors
+#Query the Reply table to find replies posted in the last 15 days
+awscli dynamo item query -t Reply -v S,"Amazon DynamoDB#DynamoDB Thread 1" -f LT,S,"2013-04-09 12:30:12 -0700"
+
+#Delete tables
+awscli dynamo table delete -n ProductCatalog
+awscli dynamo table delete -n Forum
+awscli dynamo table delete -n Thread
+awscli dynamo table delete -n Reply

data/lib/awscli/cli/dynamo/item.rb

@@ -38,6 +38,10 @@ module AwsCli
 
           `awscli dynamo item put -t test_table -i Id:N:1 UserName:S:test_user`
 
+          Put a Multi-Valued(NS|SS|BS) attribute into a table:
+
+          `awscli dynamo item put -t ProductCatalog -i Id:N:101 Authors:SS:'Author1;Author2'`
+
            #{conditional_item}
 
           `awscli dynamo item put -t test -i Id:N:1 UserName:S:test_user -a UserName:S:test -e true -r ALL_OLD`
@@ -121,6 +125,13 @@ module AwsCli
         end
 
         desc 'query [OPTIONS]', 'returns one or more items and their attributes by primary key (only available for hash-and-range primary key tables)'
+        long_desc <<-DESC
+        Usage Example:
+
+        Query the 'Reply' table to get last 15 days replies from thread 1:
+
+        `awscli dynamo item query -t Reply -v S,"Amazon DynamoDB#DynamoDB Thread 1" -f LT,S,"2013-04-09 12:30:12 -0700"`
+        DESC
         method_option :table_name, :aliases => '-t', :desc => 'name of the table containing the requested items'
         method_option :attrs_to_get, :aliases => '-g', :type => :array, :desc => 'array of attribute names, if attribute names are not specified then all attributes will be returned'
         method_option :limit, :aliases => '-l', :type => :numeric, :desc => 'limit of total items to return'
@@ -222,7 +233,7 @@ module AwsCli
 
         The following batch_write operation will put an item into User, Item tables and deletes item from User, Thread tables
 
-        `bundle exec bin/awscli dynamo item batch_write --put-requests User,Id:S:003,UserName:S:user123,Password:S:secret123 Item,Id:S:'Amazon Dynamo DB#Thread 5',ReplyDateTime:S:'2012-04-03T11:04:47.034Z' --delete-requests User,S=003 Thread,S='Amazon DynamoDB#Thread 4':S='oops - accidental row'`
+        `bundle exec bin/awscli dynamo item batch_write --put-requests User,Id:S:003,UserName:S:user123,Password:S:secret123 Item,Id:S:'Amazon Dynamo DB#Thread 5',ReplyDateTime:S:'2012-04-03T11:04:47.034Z',Comments:SS:'Test;Another' --delete-requests User,S=003 Thread,S='Amazon DynamoDB#Thread 4':S='oops - accidental row'`
         DESC
         method_option :put_requests, :aliases => '-p', :type => :array, :desc => 'Format=> table_name,col_name1:col_type1:col_value1,col_name2:col_type2:col_value2 ..'
         method_option :delete_requests, :aliases => '-d', :type => :array, :desc => 'Format=> table_name,hash_key_type*=hash_key_value*:range_key_type=range_key_value ..'

data/lib/awscli/cli/dynamo/table.rb

@@ -20,6 +20,18 @@ module AwsCli
         end
 
         desc 'create', 'create a new table'
+        long_desc <<-DESC
+          Usage Examples:
+
+          Create table named 'ProductCatalog' with primary hash key 'Id' of type 'Number' and provisioned Throughput read
+          capacity & write capacity of 5:
+
+          `awscli dynamo table create -n ProductCatalog -k Id -t N -r 5 -w 5`
+
+          Create table named 'Thread' with primary hash key 'ForumName' of type String and primary range key 'Subject' of type String:
+
+          `awscli dynamo table create -n Thread -k ForumName -t S --rk-name Subject --rk-type S -r 5 -w 5`
+        DESC
         method_option :name, :aliases => '-n', :required => true, :desc => 'name of the table to create, name should be unique among your account'
         method_option :pk_name, :aliases => '-k', :required => true, :desc => 'primary key hash attribute name for the table'
         method_option :pk_type, :aliases => '-t', :required => true, :desc => 'type of the hash attribute, valid values in [N, NS, S, SS]. N-Number, NS-NumberSet, S-String, SS-StringSet'

data/lib/awscli/dynamo.rb

@@ -174,8 +174,17 @@ module Awscli
         opts = {}
         options[:item].each do |item|
           abort "invalid item format: #{item}" unless item =~ /(.*):(N|S|NS|SS|B|BS):(.*)/
-          attr_name, attr_type, attr_value = item.split(':')
-          items[attr_name] = { attr_type => attr_value }
+          attr_name, attr_type, attr_value = item.split(':', 3)
+          case attr_type
+            when 'N', 'S', 'B'
+              items[attr_name] = { attr_type => attr_value }
+            when 'NS', 'SS', 'BS'
+              attr_value_arry = attr_value.split(';')
+              abort 'Invalid attribute value format, attributes should be comma separated values' if attr_value_arry.empty?
+              items[attr_name] = { attr_type => attr_value_arry }
+            else
+              abort 'Invalid attribute type'
+          end
         end
         if options[:expected_attr] #-a
           expected_attr_name, expected_attr_type, expected_attr_value = options[:expected_attr].split(':')
@@ -272,14 +281,23 @@ module Awscli
         #request_items['RequestItems'] = {}
         options[:put_requests] and options[:put_requests].each do |request|
           #table_name,col_name1:col_type1:col_value1,col_name2:col_type2:col_value2 ..
-          table_name, *cols = request.split(',')
+          table_name, *cols = request.split(/,(?=(?:[^']|'[^']*')*$)/)
           request_items[table_name] ||= []
           put_request = {}
           put_request['PutRequest'] = {}
           put_request['PutRequest']['Item'] = {}
           cols.each do |col|
-            col_name, col_type, col_value = col.split(':')
-            put_request['PutRequest']['Item'][col_name] = { col_type => col_value }
+            col_name, col_type, col_value = col.split(':', 3)
+            case col_type
+              when 'N', 'S', 'B'
+                put_request['PutRequest']['Item'][col_name] = { col_type => col_value }
+              when 'NS', 'SS', 'BS'
+                col_value_arry = col_value.split(';')
+                abort 'Invalid attribute value format, attributes should be comma separated values' if col_value_arry.empty?
+                put_request['PutRequest']['Item'][col_name] = { col_type => col_value_arry }
+              else
+                abort "Invalid attribute type: #{col_type}"
+            end
           end
           request_items[table_name] << put_request
         end

data/lib/awscli/version.rb

@@ -1,3 +1,3 @@
 module Awscli
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awscli
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -160,6 +160,7 @@ files:
 - lib/awscli/cli/s3/directories.rb
 - lib/awscli/cli/s3/files.rb
 - lib/awscli/cli/s3.rb
+- lib/awscli/cli/UsageExamples/dynamo
 - lib/awscli/cli/UsageExamples/emr
 - lib/awscli/cli.rb
 - lib/awscli/connection.rb
@@ -202,3 +203,4 @@ specification_version: 3
 summary: Command Line Interface for Amazon Web Services built in Ruby, using Fog and
   Thor
 test_files: []
+has_rdoc: