collins_shell 0.2.18 → 0.2.19

data/VERSION

@@ -1 +1 @@
-0.2.18
+0.2.19

data/collins_shell.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "collins_shell"
-  s.version = "0.2.18"
+  s.version = "0.2.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Matheny"]
-  s.date = "2013-03-19"
+  s.date = "2013-04-15"
   s.description = "Provides basic CLI for interacting with Collins API"
   s.email = "bmatheny@tumblr.com"
   s.executables = ["collins-shell"]

data/lib/collins_shell/console.rb

@@ -8,7 +8,10 @@ class Pry
   # We kill the built in completion so we can tell users what things are available
   module InputCompleter
     class << self
-      def build_completion_proc(target, commands=[""])
+      def build_completion_proc(target, commands=[""], cmplns = nil)
+        if cmplns.is_a?(Array) then # Work around for breakage between pry 0.9.9.6 and 0.9.12
+          commands = cmplns
+        end
         proc do |input|
           commands.map do |cmd|
             cmd_s = cmd.to_s

data/lib/collins_shell/console/commands/iterators.rb

@@ -75,7 +75,10 @@ module CollinsShell; module Console; module Commands
         end
         # Should we just display commands?
         if display_commands then
-          output.puts("Available commands:")
+          output.puts("Available formats (see ls --help):")
+          r = fs_node.asset_methods(true)
+          process_values r.map{|m| "{{#{m}}}"}, 8
+          output.puts("\nAvailable commands:")
           process_values fs_node.available_commands, 8
           output.puts()
         # If we have nothing, grab all tags

data/lib/collins_shell/console/filesystem.rb

@@ -45,12 +45,38 @@ module CollinsShell; module Console
       CollinsShell::Console::Filesystem.new(opts)
     end
 
+    def exclude_methods
+      ['respond_to?','to_s','cput', 'id'].map{|s|s.to_sym}
+    end
+
+    def asset_methods exclude_non_scalar = false
+      non_scalar = [:addresses, :backend_address, :backend_addresses, :backend_ip_addresses,
+        :backend_netmasks, :cpus, :disks, :extras, :get_attribute, :mac_addresses, :memory, :nics,
+        :power, :public_address, :public_addresses, :public_ip_addresses]
+      asset_objects = {:ipmi => Collins::Ipmi, :state => Collins::AssetState}
+      ex_methods = exclude_methods
+      ex_methods += non_scalar if exclude_non_scalar
+      Collins::Asset.public_instance_methods(false).map(&:to_sym).reject do |meth|
+        ex_methods.include?(meth)
+      end.map do |meth|
+        if asset_objects.key?(meth) then
+          asset_objects[meth].public_instance_methods(false).map(&:to_sym).reject do |meh|
+            ex_methods.include?(meh) || meh.to_s =~ /=$/
+          end.map do |meh|
+            "#{meth}.#{meh}"
+          end
+        else
+          [meth.to_s]
+        end
+      end.flatten.sort
+    end
+
     def available_commands
       includes = ['clear_cache'] + pry_commands
       if asset? then
-        excludes = ['respond_to?','to_s','cput'].map{|s|s.to_sym}
+        excludes = exclude_methods
         cmds1 = CollinsShell::Console::Asset.public_instance_methods(false).reject{|i| excludes.include?(i.to_sym)}
-        cmds2 = Collins::Asset.public_instance_methods(false).reject{|i| excludes.include?(i.to_sym)}.map{|s| "asset.#{s}"}
+        cmds2 = asset_methods.map{|m| "asset.#{m}"}.sort
         cmds1 + cmds2 + includes
       else
         includes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collins_shell
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: collins_client
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4494318623502944839
+      hash: -2173725503607646113
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: