slapshot 0.0.9 → 0.0.10

data/bin/slapshot

@@ -19,8 +19,13 @@ desc 'Search your instance of Appshot'
 arg_name 'Pass in the query'
 command :search do |c|
 
-  c.desc 'Limit the search to this application or group'
-  c.flag [:a, :app]
+  c.desc 'Get all results'
+  c.default_value false
+  c.switch [:a, :all]
+
+  c.desc 'Return all fields of the results, including code snippets'
+  c.default_value false
+  c.switch [:f, :full]
 
   c.desc 'Export the results to an Excel file with the given name'
   c.flag [:x, :xls]
@@ -31,20 +36,22 @@ command :search do |c|
 
   c.action do |global_options,options,args|
 
-     if options[:a]
-       @sc.set_app options[:a]
-     end
-
      if args.length != 1
-       raise 'The search command takes exactly one argument: the query'
+       raise "The search command takes exactly one argument: the query"
+     end
+     
+     count = options[:c]
+     if options[:a]
+       count = 5000
      end
      
-     r = @sc.search args[0], options[:c]
+     r = @sc.search args[0], count, options[:f]
      
      if options[:x]
        @sc.to_xls r, options[:x]
        puts "Exported search results to #{options[:x]}"
      else
+       puts
        puts @sc.to_table r
      end
   end

data/lib/slapshot/main.rb

@@ -48,25 +48,23 @@ end
 class Appshot
   
   def initialize(url, token, instance)
-    @app = "Portfolio"
     @instance = instance
-    
     @api = RestClient::Resource.new url, :timeout => -1, :headers => {'Appshot-AuthToken' => token, 'Appshot-Instance' => instance}
   end
   
-  def set_app(app)
-    @app = app
-  end
-
-  def search(query, count)
+  def search(query, count, full)
     
-    response = @api["v1/search"].get :params => { :i => @instance, :app => @app, :q => query, :c => count }, :content_type => :json, :accept => :json
+    response = @api["v1/search"].get :params => { :i => @instance, :q => query, :c => count, :f => full }, :content_type => :json, :accept => :json
     
     json_response = JSON.parse(response.body)
     
-    puts "Found #{json_response['count']} total results, retrieving #{count} results in #{json_response['search_time']} ms."
+    if (Integer(json_response['count']) < Integer(count))
+      count = json_response['count']
+    end
     
+    puts "Found #{json_response['count']} total results, retrieving #{count} results in #{json_response['search_time']} ms."
     json_response['docs']
+    
   end
 
   def to_table(result)

data/lib/slapshot/version.rb

@@ -1,3 +1,3 @@
 module Slapshot
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slapshot
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors: