ugc 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72d7b2c5c9b42a1e198c8bd6828a1c86822f8dbc
-  data.tar.gz: f866ba7a2730d4bc129b0e8490075ac90e80cdfa
+  metadata.gz: 62fd96ec45f90ca1750c59ee45fc0b74c7eaa2c0
+  data.tar.gz: 646f5efc53d15729d7d3eb69a7bae4d0d89a54a3
 SHA512:
-  metadata.gz: c7492d652e1d709685c282a087b6b950a6c21b1e670db2f70145b5fb04a4e281bf6d4d843e4e13dc2436a7a5396dd438420b68e1eb9eaf6bd69abaab3390375f
-  data.tar.gz: 38e564db8b05ac4a97dbafc4d376393626b01d3663ca02e7cda8b5db5049dd81ae51e4455720415df50933e7ab53d5390ebb890a7162e495602304d895e2291b
+  metadata.gz: 84decc28a7bbac07174f2fb0cec3ef8d59d511f9e81123a1a03054d58bd1e6b324b7e3b616483e607dea23cfe41a544203c5cc50025ea559946026137e22139a
+  data.tar.gz: 7d6ac3c0ecc81bd9080a60e7aa9c2d791eee2cdbb3c74d02689d5e5232da8014a717f3d01d64ce8f665c4d43870618b82275c7ec36240e1a5f7d3102d4650220

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/Gemfile.lock

@@ -1,47 +1,47 @@
 PATH
   remote: .
   specs:
-    ugc (0.9.3)
+    ugc (0.9.4)
       command_line_reporter
-      gli (= 2.5.0)
+      gli
       highline
-      usergrid_iron (>= 0.0.9)
+      usergrid_iron (>= 0.9.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    aruba (0.5.1)
-      childprocess (~> 0.3.6)
+    aruba (0.5.3)
+      childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    builder (3.1.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
+    builder (3.2.2)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
     colored (1.2)
     command_line_reporter (3.2.1)
       colored (>= 1.2)
-    cucumber (1.2.1)
+    cucumber (1.3.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    diff-lcs (1.1.3)
-    ffi (1.2.0)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
-    gli (2.5.0)
-    highline (1.6.16)
-    json (1.7.6)
-    mime-types (1.21)
-    multi_json (1.7.2)
-    rake (10.0.3)
-    rdoc (3.12)
+      gherkin (~> 2.12.0)
+      multi_json (~> 1.3)
+    diff-lcs (1.2.4)
+    ffi (1.8.1)
+    gherkin (2.12.0)
+      multi_json (~> 1.3)
+    gli (2.5.6)
+    highline (1.6.19)
+    json (1.8.0)
+    mime-types (1.23)
+    multi_json (1.7.5)
+    rake (10.0.4)
+    rdoc (4.0.1)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    usergrid_iron (0.9.0)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    usergrid_iron (0.9.1)
       multi_json
       rest-client
 

data/README.md

@@ -15,12 +15,13 @@ ugc enables convenient terminal access to Apigee's App Services (aka Usergrid).
 * 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
+* Emit curl equivalent for all REST commands
 
 ## Installation
 
     $ gem install ugc
     
-Note: Requires Ruby 1.9.3+. If you have issues, check your version:
+Note: Requires Ruby 1.9.3+ or Ruby 2.0. If you have issues, check your version:
 
 	$ ruby -v
 	
@@ -33,14 +34,14 @@ If necessary, install a new version of Ruby. [RVM](https://rvm.io) is recommende
 ### Commands
 
     delete              - delete an entity
-    get, show, ls, list - retrieve a collection or entity
+    get, show, ls, list - retrieve and display a collection or entity
     help                - Shows a list of commands or help for one command
-    login               - Describe login here
-    post, create        - non-idempotent create or update (usually create)
-    profile, profiles   - set the current profile
-    put, update         - idempotent create or update (usually an update)
-    query               - query
-    target              - set the base url, org, and app
+    login               - Performs a login to the current profile
+    post, create        - non-idempotent create or update (post is usually create)
+    profile, profiles   - set the current profile (creates if it doesn't exist)
+    put, update         - idempotent create or update (put is usually an update)
+    query               - query (uses sql-like syntax)
+    target              - set the base url, org, and app for the current profile
 
 ### Setup
 
@@ -177,6 +178,11 @@ If you specify column names in your query, you will be unable to reference the r
 
 ## Release notes
 
+### 0.9.4
+* New features
+  1. Emit curl equivalent commands with -c (--curl) switch
+    * eg. `$ ugc -c get something`
+
 ### 0.9.3
 * New features
   1. file upload function with -f (--file) switch

data/bin/ugc

@@ -18,9 +18,12 @@ switch [:v,:verbose], negatable: false
 desc 'management'
 switch [:m,:management], negatable: false
 
+desc 'show curl equivalent (does not execute)'
+switch [:c,:curl], negatable: false
+
 desc 'draw table border'
 default_value true
-switch [:b,:border]
+switch [:border]
 
 desc 'settings directory'
 arg_name 'settings directory'

data/lib/ugc/commands/delete.rb

@@ -6,7 +6,12 @@ command :rm,:del,:delete do |c|
   c.action do |global_options,options,args|
     help_now! unless args[0]
 
-    format_response $context[args[0]].delete
+    resource = $context[args[0]]
+    if $settings.show_curl?
+      puts_curl(:delete, resource)
+    else
+      format_response resource.delete
+    end
   end
 
 end

data/lib/ugc/commands/get.rb

@@ -1,4 +1,4 @@
-desc 'retrieve a collection or entity'
+desc 'retrieve and display a collection or entity'
 
 command :get,:show,:ls,:list do |c|
 
@@ -8,7 +8,12 @@ command :get,:show,:ls,:list do |c|
     c2.action do |global_options,options,args|
       help_now! unless args[0]
 
-      format_response $context[args[0]].get
+      resource = $context[args[0]]
+      if $settings.show_curl?
+        puts_curl(:get, resource)
+      else
+        format_response resource.get
+      end
     end
   end
 

data/lib/ugc/commands/login.rb

@@ -1,6 +1,6 @@
 require 'io/console'
 
-desc 'Describe login here'
+desc 'Performs a login to the current profile'
 arg_name 'username'
 
 command :login do |c|

data/lib/ugc/commands/post.rb

@@ -1,4 +1,4 @@
-desc 'non-idempotent create or update (usually create)'
+desc 'non-idempotent create or update (post is usually create)'
 arg_name 'url [data]'
 
 command :post,:create do |c|
@@ -10,10 +10,14 @@ command :post,:create do |c|
 
     resource = $context[args[0]]
     payload = parse_data(options[:data] || args[1])
-    if options[:file]
-      format_response multipart_upload resource, payload, options[:file]
+    if $settings.show_curl?
+      puts_curl(:post, resource, payload, options[:file])
     else
-      format_response resource.post payload
+      if options[:file]
+        format_response multipart_upload resource, payload, options[:file]
+      else
+        format_response resource.post payload
+      end
     end
   end
 

data/lib/ugc/commands/profile.rb

@@ -1,4 +1,4 @@
-desc 'set the current profile'
+desc "set the current profile (creates if it doesn't exist)"
 arg_name 'profile name'
 
 command :profile,:profiles do |c|

data/lib/ugc/commands/put.rb

@@ -1,4 +1,4 @@
-desc 'idempotent create or update (usually an update)'
+desc 'idempotent create or update (put is usually an update)'
 arg_name 'url [data]'
 
 command :put,:update do |c|
@@ -10,10 +10,14 @@ command :put,:update do |c|
 
     resource = $context[args[0]]
     payload = parse_data(options[:data] || args[1])
-    if options[:file]
-      format_response multipart_upload resource, payload, options[:file], :put
+    if $settings.show_curl?
+      puts_curl(:put, resource, payload, options[:file])
     else
-      format_response resource.put payload
+      if options[:file]
+        format_response multipart_upload resource, payload, options[:file], :put
+      else
+        format_response resource.put payload
+      end
     end
   end
 

data/lib/ugc/commands/query.rb

@@ -1,5 +1,5 @@
-desc 'query'
-long_desc 'note: query may contain a "from" clause instead of specifying collection_name'
+desc 'query (uses sql-like syntax)'
+long_desc 'query may contain "from" clause instead of specifying collection_name'
 arg_name '[collection_name] query'
 
 command :query do |c|
@@ -30,10 +30,15 @@ command :query do |c|
       params[:limit] = limit
     end
 
-    response = $application[type].query query, params
-
-    format_collection response.collection, parsed_query['select']
-    save_response response
+    resource = $application[type]
+    if $settings.show_curl?
+      options = options.merge({ql: query}) if query
+      puts_curl(:get, resource)
+    else
+      response = resource.query query, params
+      format_collection response.collection, parsed_query['select']
+      save_response response
+    end
   end
 
 end

data/lib/ugc/commands/target.rb

@@ -1,4 +1,4 @@
-desc 'set the base url, org, and app'
+desc 'set the base url, org, and app for the current profile'
 
 command :target do |c|
 

data/lib/ugc/helpers/curl.rb

@@ -0,0 +1,21 @@
+def puts_curl(command, resource, payload=nil, file=nil)
+  headers = resource.options[:headers] || {}
+  req = RestClient::Request.new(resource.options.merge(
+                      :method => :get,
+                      :url => resource.url,
+                      :headers => headers))
+  headers.delete(:content_type) if file
+  curl_headers = req.make_headers headers
+  curl_headers = curl_headers.map {|e| %Q[-H "#{e.join(': ')}"] }.join(' ')
+  curl = "curl -X #{command.upcase} -i #{curl_headers}"
+  if file
+    payload = multipart_payload payload || {}, file
+    payload = payload.map { |k,v|
+      File.file?(v) ? %Q[-F "#{k}=@#{File.absolute_path(v)}"] : %Q[-F "#{k}=#{v}"]
+    }.join ' '
+    curl = "#{curl} #{payload}"
+  else
+    curl = %Q[#{curl} -d '#{payload}'] if (payload)
+  end
+  puts "#{curl} #{resource.url}"
+end

data/lib/ugc/helpers/rest.rb

@@ -1,9 +1,14 @@
-def multipart_upload(resource, payload, file, method=:post, additional_headers = {})
+def multipart_payload(payload, file)
   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
+end
+
+def multipart_upload(resource, payload, file, method=:post, additional_headers = {})
+  payload = multipart_payload payload, file
   payload[:multipart] = true
   headers = (resource.options[:headers] || {}).merge(additional_headers)
   response = RestClient::Request.execute(resource.options.merge(

data/lib/ugc/settings.rb

@@ -5,6 +5,7 @@ module Ugc
 
     def initialize(global_options)
       @draw_table_border = global_options[:border]
+      @show_curl = global_options[:curl]
       @settings_file = File.join global_options[:settings], SETTINGS_FILE
       @settings = YAML.load_file(@settings_file) rescue default_settings
     end
@@ -76,6 +77,10 @@ module Ugc
       !!@draw_table_border
     end
 
+    def show_curl?
+      !!@show_curl
+    end
+
     def logged_in?
       !!access_token
     end

data/lib/ugc/version.rb

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

data/ugc.gemspec

@@ -18,8 +18,8 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('rake')
   s.add_development_dependency('rdoc')
   s.add_development_dependency('aruba')
-  s.add_runtime_dependency('gli','2.5.0')
-  s.add_runtime_dependency('usergrid_iron','>= 0.0.9')
+  s.add_runtime_dependency('gli')
+  s.add_runtime_dependency('usergrid_iron','>= 0.9.1')
   s.add_runtime_dependency('highline')
   s.add_runtime_dependency('command_line_reporter')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ugc
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Scott Ganyo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -56,30 +56,30 @@ dependencies:
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: usergrid_iron
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +138,7 @@ files:
 - lib/ugc/commands/put.rb
 - lib/ugc/commands/query.rb
 - lib/ugc/commands/target.rb
+- lib/ugc/helpers/curl.rb
 - lib/ugc/helpers/format.rb
 - lib/ugc/helpers/history.rb
 - lib/ugc/helpers/parse.rb