collins-cli 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d8cb9285558a8adc49d7da521c0241e1331eb08
-  data.tar.gz: 27559afb065f378b3e60aa010eb3271e40e53222
+  metadata.gz: 068a6b925cfcf4b7d3a3d9b637e731186733e88a
+  data.tar.gz: 66ab664be91281098cb1c2aba20d249f2a349aa6
 SHA512:
-  metadata.gz: b96eda4857aaed7c4a92a704306ff7158f322f3708e24cb66fd15a9665977827d6620fec9244fff7496bf8217445144695d1058e935522504de95fc00f8d50f1
-  data.tar.gz: 050ca2a0dfddb04dd02c798bcd58fad07078e5445e37f0fb8337360928fb95ea2c7f3518fd293acbeec5da10011296b119b1b4516992adad21f8ec0e8e5b5b1a
+  metadata.gz: af1c57c8a001d86e1cb0d2fa0eaf304579785ee29b8f85f46e502b68be644f67bd95cc07b31870ab96339abe2e77bac56d2f248cd97d36ad5f593f13c18d6253
+  data.tar.gz: 1b9b927522b57f77650805a549cc01fa3ed99dfac9f71a79ec2b848645cf951798134dafffca42bf6541ec5b411faaa61814a8ca68fc7a0d2a2eb0e4aef3154a

data/lib/collins/cli/find.rb

@@ -11,7 +11,7 @@ module Collins::CLI
     PROG_NAME = 'collins find'
     QUERY_DEFAULTS = {
       :operation => 'AND',
-      :size => 9999,
+      :size => 100,
     }
     OPTION_DEFAULTS = {
       :format          => :table,           # how to display the results
@@ -43,7 +43,7 @@ module Collins::CLI
         opts.on('-T','--type TYPE',String, "Only show assets with type TYPE") {|v| search_attrs[:type] = v}
         opts.on('-n','--nodeclass NODECLASS[,...]',Array, "Assets in nodeclass NODECLASS") {|v| search_attrs[:nodeclass] = v}
         opts.on('-p','--pool POOL[,...]',Array, "Assets in pool POOL") {|v| search_attrs[:pool] = v}
-        opts.on('-s','--size SIZE',Integer, "Number of assets to return (Default: #{query_opts[:size]})") {|v| query_opts[:size] = v}
+        opts.on('-s','--size SIZE',Integer, "Number of assets to return per page (Default: #{query_opts[:size]})") {|v| query_opts[:size] = v}
         opts.on('-r','--role ROLE[,...]',Array,"Assets in primary role ROLE") {|v| search_attrs[:primary_role] = v}
         opts.on('-R','--secondary-role ROLE[,...]',Array,"Assets in secondary role ROLE") {|v| search_attrs[:secondary_role] = v}
         opts.on('-i','--ip-address IP[,...]',Array,"Assets with IP address[es]") {|v| search_attrs[:ip_address] = v}
@@ -90,7 +90,7 @@ module Collins::CLI
 
         opts.separator ""
         opts.separator "Extra options:"
-        opts.on('--expire SECONDS',Integer,"Timeout in seconds (0 == forever)") {|v| options[:timeout] = v}
+        opts.on('--timeout SECONDS',Integer,"Timeout in seconds (0 == forever)") {|v| options[:timeout] = v}
         opts.on('-C','--config CONFIG',String,'Use specific Collins config yaml for Collins::Client') {|v| options[:config] = v}
         opts.on('-h','--help',"Help") {options[:mode] = :help}
 
@@ -145,8 +145,15 @@ _EXAMPLES_
       if options[:mode] == :help
         puts parser
       else
+        page = 0
+        assets, res = [], []
         begin
-          assets = collins.find(query_opts)
+          loop do
+            res = collins.find(query_opts.merge({:page => page}))
+            break if res.empty?
+            assets = assets.concat res
+            page += 1
+          end
         rescue => e
           raise "Error querying collins: #{e.message}"
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: collins-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Gabe Conradi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-29 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize