ugc 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ugc (0.0.4)
+    ugc (0.0.5)
       command_line_reporter
       gli (= 2.5.0)
       highline

data/README.md

@@ -14,7 +14,7 @@ ugc enables convenient terminal access to Apigee's App Services (aka Usergrid).
 
     $ gem install ugc
     
-Note: Requires Ruby 1.9.x. If you have issues, check your version:
+Note: Requires Ruby 1.9.3+. If you have issues, check your version:
 
 	$ ruby -v
 	
@@ -49,6 +49,14 @@ Connect to an Apigee administrator account:
 
 ## Release notes
 
+### 0.0.5
+* New features
+  1. smart column widths
+  1. add "limit" keyword to sql syntax
+* Bug fixes
+  1. fixed issue with selecting a single column
+  1. fixed formatting of entities with heterogeneous attributes
+
 ### 0.0.4
 * Bug fixes
   1. include Gemfile.lock to ensure correct version of usergrid_iron is used

data/lib/ugc/commands/query.rb

@@ -22,7 +22,14 @@ command :query do |c|
       query.gsub! /from\s+#{type}/i, ''
     end
 
-    response = $application[type].query query
+    params = {}
+    if parsed_query['limit']
+      limit = parsed_query['limit']
+      query.gsub! /limit\s+#{limit}/i, ''
+      params[:limit] = limit
+    end
+
+    response = $application[type].query query, params
 
     format_collection response.collection, parsed_query['select']
   end

data/lib/ugc/helpers/formatters.rb

@@ -13,25 +13,20 @@ COL_OVERHEAD = 3
 
 def format_collection(collection, headers=nil)
   if collection && collection.size > 0
+    metadata = collection_metadata collection, headers
     table border: true do
       row header: true do
-        headers ||= collection.first.keys.reject{|e| SKIP_ATTRS.include? e}
+        headers ||= metadata.keys
         column '#', width: INDEX_COL_WIDTH
-        headers.each do |r|
-          column r, width: equal_column_size(headers.size)
-        end
+        headers.each {|header| column header, width: metadata[header][:size] }
       end
       collection.each_with_index do |entity, index|
         row do
           column index+1
           if entity.is_a? Array
-            entity.each do |v|
-              column v
-            end
+            entity.each {|v| column v }
           else
-            entity.reject{|k,v| SKIP_ATTRS.include? k}.each_value do |v|
-              column v
-            end
+            headers.each {|header| column entity[header]}
           end
         end
       end
@@ -63,10 +58,35 @@ def format_entity(entity)
   end
 end
 
-def equal_column_size(num_cols)
-  ((terminal_columns - COL_OVERHEAD - (INDEX_COL_WIDTH + COL_OVERHEAD)) / num_cols).to_i - COL_OVERHEAD
+# return hash { column_name: { max_size: 12, size: 12 }  }
+def collection_metadata(collection, headers=nil)
+  result = {}
+  collection.each do |entity|
+    if entity.is_a? Array
+      headers.each_with_index do |header, index|
+        col = result[header] ||= {}
+        size = entity[index].to_s.size
+        col[:max_size] = col[:max_size] ? [col[:max_size], size].max : size
+      end
+    else
+      entity.reject{|k,v| headers ? !headers.include?(k) : SKIP_ATTRS.include?(k)}.each do |k,v|
+        col = result[k] ||= {}
+        size = v.to_s.size
+        col[:max_size] = col[:max_size] ? [col[:max_size], size].max : size
+      end
+    end
+  end
+  total_size = result.inject(0) do |total, (col,meta)|
+    meta[:max_size] = [col.size, meta[:max_size]].max
+    total + meta[:max_size]
+  end
+  terminal_columns = HighLine.new.output_cols
+  overhead = (result.keys.size + 2) * COL_OVERHEAD + INDEX_COL_WIDTH
+  if total_size + overhead < terminal_columns
+    result.each {|col,meta| meta[:size] = meta[:max_size]}
+  else
+    col_size = (terminal_columns - overhead) / result.keys.size
+    result.each {|col,meta| meta[:size] = col_size}
+  end
+  result
 end
-
-def terminal_columns
-  HighLine.new.output_cols
-end

data/lib/ugc/helpers/sql.rb

@@ -1,6 +1,6 @@
 def parse_sql(query)
   result = {}
-  keywords = %w(select from where)
+  keywords = %w(select from where limit)
   current = nil
   query.downcase.split(/[\s,*]/).each do |ea|
     next if ea == ''
@@ -14,7 +14,7 @@ def parse_sql(query)
           result[current] = [result[current]] << ea
         end
       else
-        result[current] = ea
+        result[current] = (current == 'select') ? [ea] : ea
       end
     end
   end

data/lib/ugc/version.rb

@@ -1,3 +1,3 @@
 module Ugc
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ugc
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2840457187789729927
+      hash: -192062484210983223
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2840457187789729927
+      hash: -192062484210983223
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24