ugc 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7d0b81779198129a1eb060f788f766c37a6f52a
-  data.tar.gz: 92c62c7644e1f427d1e33789e5c1b4d6ad37c0ce
+  metadata.gz: c9a75ddbf60a89991dce453c03827a89cc8c916d
+  data.tar.gz: 37a1d8f2d3d85b3adf06137d8e9de2b560f91b35
 SHA512:
-  metadata.gz: e94bba3fa4df8886e7cb95e1a85c8a0d9fc578c325aa757021596abe29b25f1105866c17a0ec07fe5efbbbb7edfee73f2f5ef6c6453e533c1621d8447e727e4d
-  data.tar.gz: 73dc8ec5e52bc0ca51ef5182c7a7d514f2b7a6b4d5da473de36d69a5498ed6f4490f260f0550aff8e23f1dac167c8d155072482908372d40cbad1470d3ebb7b1
+  metadata.gz: b352d3105048c654a02254b1e4d2ebfc50efba79622e5d5851856f5a0fb382015b175d768625f4d7724bfc89729c3521c66c1533b49722b972b7053b3dbce742
+  data.tar.gz: f8c377a1ccfa73459a9b3c7a1e24f9b463e32a1f15e8754cbc3b1baaee07d7264dde727ee6a8d2a67d49a80751a354e350a9ab823b55c2494d88e18edad82fa0

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    ugc (0.9.7)
+    ugc (0.9.8)
       command_line_reporter
-      gli
+      gli (>= 2.6)
       highline
       usergrid_iron (>= 0.9.1)
 
@@ -20,28 +20,30 @@ GEM
     colored (1.2)
     command_line_reporter (3.2.1)
       colored (>= 1.2)
-    cucumber (1.3.2)
+    cucumber (1.3.8)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12.0)
-      multi_json (~> 1.3)
+      gherkin (~> 2.12.1)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.0.2)
     diff-lcs (1.2.4)
-    ffi (1.8.1)
-    gherkin (2.12.0)
+    ffi (1.9.0)
+    gherkin (2.12.1)
       multi_json (~> 1.3)
-    gli (2.5.6)
+    gli (2.8.0)
     highline (1.6.19)
     json (1.8.0)
-    mime-types (1.23)
-    multi_json (1.7.6)
-    rake (10.0.4)
+    mime-types (1.25)
+    multi_json (1.8.0)
+    multi_test (0.0.2)
+    rake (10.1.0)
     rdoc (4.0.1)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec-expectations (2.13.0)
+    rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
-    usergrid_iron (0.9.1)
+    usergrid_iron (0.9.2)
       multi_json
       rest-client
 

data/README.md

@@ -21,7 +21,7 @@ ugc enables convenient terminal access to Apigee's App Services (aka Usergrid).
 
     $ gem install ugc
     
-Note: Requires Ruby 1.9.3+ or Ruby 2.0. 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
 	
@@ -178,6 +178,14 @@ If you specify column names in your query, you will be unable to reference the r
 
 ## Release notes
 
+### 0.9.8
+* New features
+  1. logout (remove access_token)
+  2. no longer force log in - as it's not always necessary
+  3. get (ls) command now defaults to list collections when no arguments
+* Bug fixes
+  1. updated to work with latest gli (> 2.6)
+
 ### 0.9.7
 * Bug Fixes
   1. allow headers to vary during paging

data/bin/ugc

@@ -34,8 +34,6 @@ flag [:s,:settings]
 commands_from '../lib/ugc/helpers'
 commands_from '../lib/ugc/commands'
 
-pre_login = [:info, :target, :profile]
-
 pre do |global_options,command,options,args|
   if global_options[:verbose]
     RestClient.log=Logger.new(STDOUT)
@@ -44,24 +42,15 @@ pre do |global_options,command,options,args|
   end
 
   $settings = Ugc::Settings.new global_options
-  if pre_login.include? command.name
-    true
-  elsif command.name == :login && $settings.configured?
+  if not $settings.configured?
+    raise "not configured"
+  elsif command.name == :login
     true
   else
-    if $settings.configured? && $settings.logged_in?
-      $application = Ugc::Application.new
-      $management = Ugc::Management.new
-      $context = global_options[:management] ? $management : $application
-      true
-    else
-      if $settings.configured?
-        puts "not logged in"
-      else
-        puts "not configured"
-      end
-      false
-    end
+    $application = Ugc::Application.new
+    $management = Ugc::Management.new
+    $context = global_options[:management] ? $management : $application
+    true
   end
 end
 
@@ -73,7 +62,10 @@ on_error do |e|
   # return false to skip default error handling
   if e.is_a? RestClient::Exception
     begin
-      puts e.response.data['error_description']
+      puts "#{e.http_code} error: #{e.response.data['error_description']}"
+      if e.http_code == 401 and not $settings.logged_in?
+        puts "(Hint: You may need to log in.)"
+      end
     rescue MultiJson::DecodeError
       puts e.response
     end

data/lib/ugc/application.rb

@@ -30,5 +30,23 @@ module Ugc
       end
     end
 
+    def list_collections
+      app = $application.entity
+      collections = app['metadata']['collections']
+      table border: $settings.table_border? do
+        row header: true do
+          collections.first[1].each_key do |k|
+            column k
+          end
+        end
+        collections.each_value do |coll|
+          row do
+            coll.each_value do |v|
+              column v
+            end
+          end
+        end
+      end
+    end
   end
 end

data/lib/ugc/commands/get.rb

@@ -2,44 +2,24 @@ desc 'retrieve and display a collection or entity'
 
 command :get,:show,:ls,:list do |c|
 
-  c.desc 'url'
-  c.command [:url] do |c2|
+  c.desc '[path]'
+  c.command [:path] do |c2|
 
     c2.action do |global_options,options,args|
-      help_now! unless args[0]
 
-      resource = $context[args[0]]
-      if $settings.show_curl?
-        puts_curl(:get, resource)
-      else
-        format_response resource.get
-      end
-    end
-  end
-
-  c.desc 'collections'
-  c.command [:collections] do |c2|
-
-    c2.action do |global_options,options,args|
-      app = $application.entity
-      collections = app['metadata']['collections']
-      table border: $settings.table_border? do
-        row header: true do
-          collections.first[1].each_key do |k|
-            column k
-          end
-        end
-        collections.each_value do |coll|
-          row do
-            coll.each_value do |v|
-              column v
-            end
-          end
+      if args[0] && args[0] != 'collections' && args[0] != '/'
+        resource = $context[args[0]]
+        if $settings.show_curl?
+          puts_curl(:get, resource)
+        else
+          format_response resource.get
         end
+      else
+        $application.list_collections
       end
     end
   end
 
-  c.default_command :url
+  c.default_command :path
 
 end

data/lib/ugc/commands/logout.rb

@@ -0,0 +1,11 @@
+desc 'Performs a logout on the current profile'
+
+command :logout do |c|
+
+  c.action do |global_options,options,args|
+
+    $settings.access_token = nil
+    puts "logged out of #{$settings.organization}/#{$settings.application}"
+
+  end
+end

data/lib/ugc/commands/post.rb

@@ -1,5 +1,5 @@
 desc 'non-idempotent create or update (post is usually create)'
-arg_name 'url [data]'
+arg_name '[path] [data]'
 
 command :post,:create do |c|
   c.flag [:d,:data], :desc => 'does nothing: for ease of conversion from curl'

data/lib/ugc/commands/put.rb

@@ -1,5 +1,5 @@
 desc 'idempotent create or update (put is usually an update)'
-arg_name 'url [data]'
+arg_name '[path] [data]'
 
 command :put,:update do |c|
   c.flag [:d,:data], :desc => 'does nothing: for ease of conversion from curl'

data/lib/ugc/settings.rb

@@ -99,7 +99,11 @@ module Ugc
     private
 
     def set_profile(prop, value)
-      profile[prop] = value
+      if value
+        profile[prop] = value
+      else
+        profile.delete prop
+      end
       save_profile
     end
 

data/lib/ugc/version.rb

@@ -1,3 +1,3 @@
 module Ugc
-  VERSION = '0.9.7'
+  VERSION = '0.9.8'
 end

data/ugc.gemspec

@@ -18,7 +18,7 @@ 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')
+  s.add_runtime_dependency('gli', '>= 2.6')
   s.add_runtime_dependency('usergrid_iron','>= 0.9.1')
   s.add_runtime_dependency('highline')
   s.add_runtime_dependency('command_line_reporter')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ugc
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Scott Ganyo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: usergrid_iron
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +133,7 @@ files:
 - lib/ugc/commands/delete.rb
 - lib/ugc/commands/get.rb
 - lib/ugc/commands/login.rb
+- lib/ugc/commands/logout.rb
 - lib/ugc/commands/post.rb
 - lib/ugc/commands/profile.rb
 - lib/ugc/commands/put.rb