ugc 0.0.5 → 0.0.6

data/Gemfile.lock

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

data/README.md

@@ -49,13 +49,22 @@ Connect to an Apigee administrator account:
 
 ## Release notes
 
+### 0.0.6
+* New features
+  1. Ruby eval of data in put and post commands
+     * eg. may now use "key: 'value'" for json instead of '{"key": "value"}'
+  2. Added alias: 'show' for 'get'
+  3. Made 'list' an alias of 'get' and updated get to include 'list' functionality
+  4. smart column width for entities
+  5. Added aliases 'create' and 'update' for 'post' and 'put' (yes, I am aware this isn't technically correct)
+
 ### 0.0.5
 * New features
-  1. smart column widths
-  1. add "limit" keyword to sql syntax
+  1. smart column widths for collections
+  2. add "limit" keyword to sql syntax
 * Bug fixes
   1. fixed issue with selecting a single column
-  1. fixed formatting of entities with heterogeneous attributes
+  2. fixed formatting of entities with heterogeneous attributes
 
 ### 0.0.4
 * Bug fixes

data/lib/ugc/commands/delete.rb

@@ -1,4 +1,4 @@
-desc 'http delete'
+desc 'delete an entity'
 arg_name 'url'
 
 command :delete do |c|

data/lib/ugc/commands/get.rb

@@ -1,12 +1,50 @@
-desc 'http get'
-arg_name 'url'
+desc 'retrieve a collection or entity'
 
-command :get do |c|
+command :get,:show,:ls,:list do |c|
 
-  c.action do |global_options,options,args|
-    help_now! unless args[0]
+  c.desc 'url'
+  c.command [:url] do |c2|
 
-    format_result resource(args[0]).get
+    c2.action do |global_options,options,args|
+      help_now! unless args[0]
+
+      format_result $application[args[0]].get
+    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: true 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
 
+  default_names = %w(assets users events roles folders activities devices groups)
+  default_names.each do |e|
+    c.desc e
+    c.command [e.to_sym] do |c2|
+      c2.action do |global_options,options,args|
+        format_collection($application[e].collection)
+      end
+    end
+  end
+
+  c.default_command :url
+
 end

data/lib/ugc/commands/post.rb

@@ -1,13 +1,13 @@
-desc 'http post'
+desc 'non-idempotent create or update (usually create)'
 arg_name 'url [data]'
 
-command :post do |c|
+command :post,:create 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])
+    format_result resource(args[0]).post parse_data(options[:data] || args[1])
   end
 
 end

data/lib/ugc/commands/put.rb

@@ -1,13 +1,13 @@
-desc 'http put'
+desc 'idempotent create or update (usually an update)'
 arg_name 'url [data]'
 
-command :put do |c|
+command :put,:update 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])
+    format_result resource(args[0]).put parse_data(options[:data] || args[1])
   end
 
 end

data/lib/ugc/helpers/{formatters.rb → format.rb}

@@ -41,10 +41,15 @@ end
 
 def format_entity(entity)
   if entity
+    name_cols = value_cols = 0
+    entity.data.reject{|k,v| SKIP_ATTRS.include? k}.each do |k,v|
+      name_cols = [name_cols, k.size].max
+      value_cols = [value_cols, v.to_s.size].max
+    end
     table border: true do
       row header: true do
-        column 'name', width: 20
-        column 'value', width: (terminal_columns - 28)
+        column 'name', width: [name_cols, 20].min
+        column 'value', width: [value_cols, HighLine.new.output_cols - 28].min
       end
       entity.data.reject{|k,v| SKIP_ATTRS.include? k}.each do |k,v|
         row do

data/lib/ugc/helpers/{sql.rb → parse.rb}

@@ -1,3 +1,5 @@
+require 'json'
+
 def parse_sql(query)
   result = {}
   keywords = %w(select from where limit)
@@ -20,3 +22,15 @@ def parse_sql(query)
   end
   result
 end
+
+# returns a json string
+def parse_data(input)
+  # must be wrapped in {}
+  input = "{#{input}}" unless input.start_with? '{'
+  # must be a json string or 1.9 hash format
+  begin
+    MultiJson.dump(eval(input))
+  rescue SyntaxError
+    input
+  end
+end

data/lib/ugc/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ugc
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -148,15 +148,14 @@ files:
 - lib/ugc/application.rb
 - lib/ugc/commands/delete.rb
 - lib/ugc/commands/get.rb
-- lib/ugc/commands/list.rb
 - lib/ugc/commands/login.rb
 - lib/ugc/commands/post.rb
 - lib/ugc/commands/profile.rb
 - lib/ugc/commands/put.rb
 - lib/ugc/commands/query.rb
 - lib/ugc/commands/target.rb
-- lib/ugc/helpers/formatters.rb
-- lib/ugc/helpers/sql.rb
+- lib/ugc/helpers/format.rb
+- lib/ugc/helpers/parse.rb
 - lib/ugc/helpers/uri.rb
 - lib/ugc/management.rb
 - lib/ugc/settings.rb
@@ -185,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -192062484210983223
+      hash: -2161769601695807419
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -194,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -192062484210983223
+      hash: -2161769601695807419
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/ugc/commands/list.rb

@@ -1,49 +0,0 @@
-desc 'list'
-command :ls,:list do |c|
-
-  c.desc 'collections'
-  c.command [:collections] do |c2|
-
-    c2.action do |global_options,options,args|
-      app = $application.entity
-      collections = app['metadata']['collections']
-      table border: true 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
-
-  default_names = %w(assets users events roles folders activities devices groups)
-  default_names.each do |e|
-    c.desc e
-    c.command [e.to_sym] do |c2|
-      c2.action do |global_options,options,args|
-        format_collection($application[e].collection)
-      end
-    end
-  end
-
-  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
-  end
-
-  c.default_command :whatevers
-
-end