ugc 0.9.2 → 0.9.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 72d7b2c5c9b42a1e198c8bd6828a1c86822f8dbc
+  data.tar.gz: f866ba7a2730d4bc129b0e8490075ac90e80cdfa
+SHA512:
+  metadata.gz: c7492d652e1d709685c282a087b6b950a6c21b1e670db2f70145b5fb04a4e281bf6d4d843e4e13dc2436a7a5396dd438420b68e1eb9eaf6bd69abaab3390375f
+  data.tar.gz: 38e564db8b05ac4a97dbafc4d376393626b01d3663ca02e7cda8b5db5049dd81ae51e4455720415df50933e7ab53d5390ebb890a7162e495602304d895e2291b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ugc (0.9.2)
+    ugc (0.9.3)
       command_line_reporter
       gli (= 2.5.0)
       highline
@@ -30,10 +30,10 @@ GEM
     gherkin (2.11.5)
       json (>= 1.4.6)
     gli (2.5.0)
-    highline (1.6.15)
+    highline (1.6.16)
     json (1.7.6)
-    mime-types (1.19)
-    multi_json (1.5.0)
+    mime-types (1.21)
+    multi_json (1.7.2)
     rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
@@ -41,7 +41,7 @@ GEM
       mime-types (>= 1.16)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    usergrid_iron (0.0.9)
+    usergrid_iron (0.9.0)
       multi_json
       rest-client
 

data/README.md

@@ -14,6 +14,7 @@ ugc enables convenient terminal access to Apigee's App Services (aka Usergrid).
 * Ruby evaluation within data elements
 * Can optionally emits raw output (--verbose switch)
 * Extended SQL syntax (adds 'from' and 'limit' clauses to standard Usergrid syntax)
+* File upload (-f or --file option) on PUT and POST
 
 ## Installation
 
@@ -152,6 +153,10 @@ Note synonym commands:
     created  1357344269759
     modified 1357344537483
     breed    Mixed
+    
+If you have more than ten dogs, it might be easier to target your specific dog when you update it:
+
+```ugc update dogs/79dfb563-56cb-11e2-a6b8-14109fd49581 '{ "breed" : "Mixed" }'```
 
 #### show off our latest dogs
 
@@ -172,6 +177,11 @@ If you specify column names in your query, you will be unable to reference the r
 
 ## Release notes
 
+### 0.9.3
+* New features
+  1. file upload function with -f (--file) switch
+    * eg. `$ ugc post something "property1Name: 'property1Value'" --file property2Name=/path/to/myfile`
+
 ### 0.9.2
 * New features
   1. access management functions with -m (--management) global switch

data/bin/ugc

@@ -69,7 +69,11 @@ end
 on_error do |e|
   # return false to skip default error handling
   if e.is_a? RestClient::Exception
-    puts e.response.data['error_description']
+    begin
+      puts e.response.data['error_description']
+    rescue MultiJson::DecodeError
+      puts e.response
+    end
     false
   else
     true

data/lib/ugc/commands/post.rb

@@ -2,12 +2,19 @@ desc 'non-idempotent create or update (usually create)'
 arg_name 'url [data]'
 
 command :post,:create do |c|
-  c.flag [:d,:data]
+  c.flag [:d,:data], :desc => 'does nothing: for ease of conversion from curl'
+  c.flag [:f,:file], :must_match => /.*=.*/, :arg_name => 'field_name=file_name', :desc => 'will force multipart upload'
 
   c.action do |global_options,options,args|
     help_now! unless args[0]
 
-    format_response $context[args[0]].post parse_data(options[:data] || args[1])
+    resource = $context[args[0]]
+    payload = parse_data(options[:data] || args[1])
+    if options[:file]
+      format_response multipart_upload resource, payload, options[:file]
+    else
+      format_response resource.post payload
+    end
   end
 
 end

data/lib/ugc/commands/put.rb

@@ -2,12 +2,19 @@ desc 'idempotent create or update (usually an update)'
 arg_name 'url [data]'
 
 command :put,:update do |c|
-  c.flag [:d,:data]
+  c.flag [:d,:data], :desc => 'does nothing: for ease of conversion from curl'
+  c.flag [:f,:file], :must_match => /=/, :arg_name => 'field_name=file_name', :desc => 'will force multipart upload'
 
   c.action do |global_options,options,args|
     help_now! unless args[0]
 
-    format_response $context[args[0]].put parse_data(options[:data] || args[1])
+    resource = $context[args[0]]
+    payload = parse_data(options[:data] || args[1])
+    if options[:file]
+      format_response multipart_upload resource, payload, options[:file], :put
+    else
+      format_response resource.put payload
+    end
   end
 
 end

data/lib/ugc/helpers/rest.rb

@@ -0,0 +1,17 @@
+def multipart_upload(resource, payload, file, method=:post, additional_headers = {})
+  payload = payload.is_a?(Hash) ? payload : MultiJson.load(payload)
+  filename = 'file'
+  filename, file = file.split '=' if file.is_a?(String)
+  file = file[1..-1] if file.start_with? '@' # be kind to curl users
+  payload[filename] = file.is_a?(File) ? file : File.new(file, 'rb')
+  payload[:multipart] = true
+  headers = (resource.options[:headers] || {}).merge(additional_headers)
+  response = RestClient::Request.execute(resource.options.merge(
+                                             :method => method,
+                                             :url => resource.url,
+                                             :payload => payload,
+                                             :headers => headers))
+  resource.instance_variable_set :@response, response
+  response.resource = resource
+  response
+end

data/lib/ugc/version.rb

@@ -1,3 +1,3 @@
 module Ugc
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

metadata

@@ -1,68 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: ugc
 version: !ruby/object:Gem::Version
-  version: 0.9.2
-  prerelease: 
+  version: 0.9.3
 platform: ruby
 authors:
 - Scott Ganyo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -78,49 +69,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: usergrid_iron
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: command_line_reporter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -156,6 +141,7 @@ files:
 - lib/ugc/helpers/format.rb
 - lib/ugc/helpers/history.rb
 - lib/ugc/helpers/parse.rb
+- lib/ugc/helpers/rest.rb
 - lib/ugc/management.rb
 - lib/ugc/settings.rb
 - lib/ugc/version.rb
@@ -165,6 +151,7 @@ files:
 - ugc.rdoc
 homepage: http://ganyo.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -176,27 +163,19 @@ require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2746687193506333932
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2746687193506333932
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Usergrid Command Line
 test_files: []