ugc 0.0.2 → 0.0.3

data/README.md

@@ -2,9 +2,26 @@
 
 ugc enables convenient terminal access to Apigee's App Services (aka Usergrid).
 
+## Features
+
+* Multiple connection/login profiles
+* Simple syntax
+* Use relative (or absolute) URLs
+* Easy-to-read tabular output
+* Optionally also emits raw output (--verbose switch)
+
 ## Installation
 
     $ gem install ugc
+    
+Note: Requires Ruby 1.9.x. If you have issues, check your version:
+
+	$ ruby -v
+	
+If necessary, install a new version of Ruby. [RVM](Ruby 1.9.x
+) is recommended:
+
+	$ \curl -L https://get.rvm.io | bash -s stable --ruby
 
 ## Usage
 
@@ -21,7 +38,7 @@ Connect to an Apigee administrator account:
 	organization = scottganyo
 	$ ugc target app messagee
 	application = messagee
-	$ ugc login -a scott@ganyo.com
+	$ ugc login --admin scott@ganyo.com
 	password: **********
 	logged in user: scott@ganyo.com
 	
@@ -29,3 +46,25 @@ Connect to an Apigee administrator account:
 ### Examples
 
 ![image](https://github.com/scottganyo/ugc/raw/master/examples.jpeg)
+
+## Release notes
+
+### 0.0.3
+* New features
+  1. support for query result paging
+
+
+## Copyright
+Copyright (c) 2013 Scott Ganyo
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use the included files except in compliance with the License.
+
+You may obtain a copy of the License at
+
+  <http://www.apache.org/licenses/LICENSE-2.0>
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+either express or implied. See the License for the specific language governing permissions and
+limitations under the License.

data/lib/ugc/commands/delete.rb

@@ -4,6 +4,8 @@ arg_name 'url'
 command :delete do |c|
 
   c.action do |global_options,options,args|
+    help_now! unless args[0]
+
     format_result resource(args[0]).delete
   end
 

data/lib/ugc/commands/get.rb

@@ -4,6 +4,8 @@ arg_name 'url'
 command :get do |c|
 
   c.action do |global_options,options,args|
+    help_now! unless args[0]
+
     format_result resource(args[0]).get
   end
 

data/lib/ugc/commands/list.rb

@@ -37,6 +37,8 @@ command :ls,:list do |c|
   c.desc 'whatevers'
   c.command [:whatevers] do |c2|
     c2.action do |global_options,options,args|
+      help_now! unless args[0]
+
       whatevers = $application[args[0]].collection
       format_collection(whatevers)
     end

data/lib/ugc/commands/login.rb

@@ -8,21 +8,19 @@ command :login do |c|
   c.switch [:a,:admin]
   c.action do |global_options,options,args|
 
-    if args[0]
-      password = ask('password: ') { |q| q.echo = '*' }
+    help_now! unless args[0]
 
-      if password
-        if options[:admin]
-          management = Ugc::Management.new
-          management.login args[0], password
-        else
-          application = Ugc::Application.new
-          application.login args[0], password
-        end
+    password = ask('password: ') { |q| q.echo = '*' }
+
+    if password
+      if options[:admin]
+        management = Ugc::Management.new
+        management.login args[0], password
+      else
+        application = Ugc::Application.new
+        application.login args[0], password
       end
-      puts "logged in user: #{args[0]}"
-    else
-      raise 'username required'
     end
+    puts "logged in user: #{args[0]}"
   end
 end

data/lib/ugc/commands/post.rb

@@ -5,6 +5,8 @@ command :post do |c|
   c.flag [:d,:data]
 
   c.action do |global_options,options,args|
+    help_now! unless args[0]
+
     format_result resource(args[0]).post (options[:data] || args[1])
   end
 

data/lib/ugc/commands/put.rb

@@ -5,6 +5,8 @@ command :put do |c|
   c.flag [:d,:data]
 
   c.action do |global_options,options,args|
+    help_now! unless args[0]
+
     format_result resource(args[0]).put (options[:data] || args[1])
   end
 

data/lib/ugc/commands/query.rb

@@ -22,33 +22,9 @@ command :query do |c|
       query.gsub! /from\s+#{type}/i, ''
     end
 
-    result = $application[type].query query
+    response = $application[type].query query
 
-    collection = result.collection
-    format_collection collection, parsed_query['select']
+    format_collection response.collection, parsed_query['select']
   end
 
 end
-
-def parse_sql(query)
-  result = {}
-  keywords = %w(select from where)
-  current = nil
-  query.downcase.split(/[\s,*]/).each do |ea|
-    next if ea == ''
-    if keywords.include? ea
-      current = ea
-    elsif current
-      if result[current]
-        if result[current].is_a? Array
-          result[current] << ea
-        else
-          result[current] = [result[current]] << ea
-        end
-      else
-        result[current] = ea
-      end
-    end
-  end
-  result
-end

data/lib/ugc/commands/target.rb

@@ -13,6 +13,8 @@ command :target do |c|
   c.desc 'set organization'
   c.command [:org,:organization] do |ep|
     ep.action do |global_options,options,args|
+      help_now! unless args[0]
+
       $settings.organization = args[0]
       puts "organization = #{$settings.organization}"
     end
@@ -21,6 +23,8 @@ command :target do |c|
   c.desc 'set application'
   c.command [:app,:application] do |ep|
     ep.action do |global_options,options,args|
+      help_now! unless args[0]
+
       $settings.application = args[0]
       puts "application = #{$settings.application}"
     end

data/lib/ugc/helpers/formatters.rb

@@ -1,10 +1,10 @@
 SKIP_ATTRS = %w(metadata uri type)
 
-def format_result(result)
-  if result.multiple_entities? && result.collection.size > 1
-    format_collection(result.collection)
+def format_result(response)
+  if response.multiple_entities? && response.collection.size > 1
+    format_collection(response.collection)
   else
-    format_entity(result.entity)
+    format_entity(response.entity)
   end
 end
 
@@ -23,7 +23,7 @@ def format_collection(collection, headers=nil)
       end
       collection.each_with_index do |entity, index|
         row do
-          column index
+          column index+1
           if entity.is_a? Array
             entity.each do |v|
               column v
@@ -36,6 +36,9 @@ def format_collection(collection, headers=nil)
         end
       end
     end
+    if collection.cursor && agree('Next Page? (Y/N)') {|q| q.default = 'Y'}
+      format_collection(collection.next_page, headers)
+    end
   else
     puts "0 results"
   end
@@ -65,27 +68,5 @@ def equal_column_size(num_cols)
 end
 
 def terminal_columns
-  size = detect_terminal_size
-  size ? size[0] : 80
-end
-
-# Returns [width, height] of terminal when detected, nil if not detected.
-# Think of this as a simpler version of Highline's Highline::SystemExtensions.terminal_size()
-def detect_terminal_size
-  if (ENV['COLUMNS'] =~ /^\d+$/) && (ENV['LINES'] =~ /^\d+$/)
-    [ENV['COLUMNS'].to_i, ENV['LINES'].to_i]
-  elsif (RUBY_PLATFORM =~ /java/ || (!STDIN.tty? && ENV['TERM'])) && command_exists?('tput')
-    [`tput cols`.to_i, `tput lines`.to_i]
-  elsif STDIN.tty? && command_exists?('stty')
-    `stty size`.scan(/\d+/).map { |s| s.to_i }.reverse
-  else
-    nil
-  end
-rescue
-  nil
-end
-
-# Determines if a shell command exists by searching for it in ENV['PATH'].
-def command_exists?(command)
-  ENV['PATH'].split(File::PATH_SEPARATOR).any? {|d| File.exists? File.join(d, command) }
-end
+  HighLine.new.output_cols
+end

data/lib/ugc/helpers/sql.rb

@@ -0,0 +1,22 @@
+def parse_sql(query)
+  result = {}
+  keywords = %w(select from where)
+  current = nil
+  query.downcase.split(/[\s,*]/).each do |ea|
+    next if ea == ''
+    if keywords.include? ea
+      current = ea
+    elsif current
+      if result[current]
+        if result[current].is_a? Array
+          result[current] << ea
+        else
+          result[current] = [result[current]] << ea
+        end
+      else
+        result[current] = ea
+      end
+    end
+  end
+  result
+end

data/lib/ugc/version.rb

@@ -1,3 +1,3 @@
 module Ugc
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ugc
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-01 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -155,6 +155,7 @@ files:
 - lib/ugc/commands/query.rb
 - lib/ugc/commands/target.rb
 - lib/ugc/helpers/formatters.rb
+- lib/ugc/helpers/sql.rb
 - lib/ugc/helpers/uri.rb
 - lib/ugc/management.rb
 - lib/ugc/settings.rb
@@ -183,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2123078772774079119
+      hash: -3089552561571580179
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -192,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2123078772774079119
+      hash: -3089552561571580179
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24