slapshot 0.0.12 → 0.0.13

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6b25d113ae7b0db720fc5052ad3b4e99df9bce14
+  data.tar.gz: 42df251af565c0a802326819b336474b0aba6286
+SHA512:
+  metadata.gz: eec0f68106e4805c6d7d3b1d80a853f55d33d2a58919e08439126e9feb91f9eccf087b516febae39007acec255b33b435f0cdf3c67b70f0a1e3220b923ac540a
+  data.tar.gz: 8ba924b8fb78047dc31c5a387b6105dba538e111798ee9a44c57827ca747a7b515640d5bd0aa0dddb4b37363e0a4de2b6e0f034583774b88943c2d62c4fd90c3

data/bin/slapshot

@@ -26,6 +26,14 @@ command :search do |c|
   c.desc 'Return all fields of the results, including code snippets'
   c.default_value false
   c.switch [:f, :full]
+  
+  c.desc 'Return results in GraphML'
+  c.default_value false
+  c.switch [:g, :graph]
+  
+  c.desc 'Return results in JSON'
+  c.default_value false
+  c.switch [:j, :json]
 
   c.desc 'Export the results to an Excel file with the given name'
   c.flag [:x, :xls]
@@ -45,9 +53,15 @@ command :search do |c|
        count = 5000
      end
      
-     r = @sc.search args[0], count, options[:f]
+     r = @sc.search args[0], count, options[:f], options[:g]
      
-     if options[:x]
+     if options[:g]
+       puts
+       puts r
+     elsif options[:j]
+       puts
+       puts "#{r}"
+     elsif options[:x]
        @sc.to_xls r, options[:x]
        puts "Exported search results to #{options[:x]}"
      else
@@ -57,6 +71,33 @@ command :search do |c|
   end
 end
 
+desc 'Try out a custom parser'
+arg_name 'pass in a solrQuery and a custom parser file'
+command :try do |c|
+
+  c.desc 'Return results in HTML'
+  c.default_value false
+  c.switch [:h, :html]
+  
+  c.desc 'The maximum number of results the search should return'
+  c.default_value 20
+  c.flag [:c, :count]
+
+  c.action do |global_options,options,args|
+
+     if args.length != 2
+       raise 'The search command takes exactly 2 arguments: a solr query and a parser file'
+     end
+     
+     file = File.new(args[1], 'r');
+     
+     r = @sc.try args[0], file, options[:c], options[:h]
+     
+     puts
+     puts "#{r}"
+  end
+end
+
 desc 'Login to the API and generate a token'
 arg_name 'Pass in the username and password to login and generate a token'
 
@@ -138,8 +179,7 @@ post do |global,command,options,args|
 end
 
 on_error do |exception|
-  # Error logic here
-  # return false to skip default error handling
+  #puts exception.http_body
   true
 end
 

data/lib/slapshot/main.rb

@@ -49,13 +49,14 @@ end
 class Appshot
   
   def initialize(url, token, instance)
-    @instance = instance
-    @api = RestClient::Resource.new url, :timeout => -1, :headers => {'Appshot-AuthToken' => token, 'Appshot-Instance' => instance}
+    @headers = {'Appshot-AuthToken' => token, 'Appshot-Instance' => instance};
+    @url = url
+    @api = RestClient::Resource.new url, :timeout => -1, :headers => @headers
   end
   
-  def search(query, count, full)
+  def search(query, count, full, graph)
     
-    response = @api["service/api/search"].get :params => { :i => @instance, :q => query, :c => count, :f => full }, :content_type => :json, :accept => :json
+    response = @api["service/api/search"].get :params => { :i => @instance, :q => query, :c => count, :f => full ,:g => graph}, :content_type => :json, :accept => :json
     
     json_response = JSON.parse(response.body)
     
@@ -64,11 +65,55 @@ class Appshot
     end
     
     puts "Found #{json_response['count']} total results, retrieving #{count} results in #{json_response['search_time']} ms."
-    json_response['docs']
+    
+    if graph
+      json_response['graph'] 
+    else 
+      json_response['docs']
+    end
+    
+  end
+  
+  def try(solrQuery, parserFile, count, html)
+
+=begin
+    response = RestClient.post "#{@url}/service/customParser/test", {:solrQuery => solrQuery, :parserFile => parserFile, :c => count, :h => html }, @headers
+
+    JSON.parse(response.body)
+
+    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."
+
+    if html
+      json_response['html']
+    else
+      json_response['docs']
+    end
+=end
+
+    if html
+      response = RestClient.post "#{@url}/service/customParser/testHtml", {:solrQuery => solrQuery, :parserFile => parserFile}, @headers
+    else
+      response = RestClient.post "#{@url}/service/customParser/test", {:solrQuery => solrQuery, :parserFile => parserFile}, @headers
+      JSON.parse(response.body)
+    end
     
   end
 
   def to_table(result)
+    
+      #remove all of the newlines
+      result.each do |r|
+        r.each_pair do |k,v|
+          if v.instance_of?(String)
+            r[k] = v.gsub("\n",' ')
+          end
+        end
+      end
+    
       Formatador.display_table(result)
   end
 
@@ -76,20 +121,30 @@ class Appshot
     
     book = Spreadsheet::Workbook.new
     sheet1 = book.create_worksheet :name => 'Search Results'
+    sheet1.row(0).default_format = Spreadsheet::Format.new :weight => :bold, :align => :center
 
-    columns = ['name', 'entity_type']
+    columns = ['name']
+    for obj in result
+      for key in obj.keys
+        columns << key
+      end
+    end
+    
+    columns.uniq!
 
-      rownum = 0
+    rownum = 0
+    for column in columns
+        sheet1.row(rownum).push column
+    end
+    
+    for row in result
+      rownum += 1
       for column in columns
-          sheet1.row(rownum).push column
-      end
-      for row in result
-        rownum += 1
-        for column in columns
-          sheet1.row(rownum).push row[column].nil? ? 'N/A' : row[column]
-        end
+        sheet1.row(rownum).push row[column].nil? ? 'N/A' : row[column]
       end
-      book.write(out)    
+    end
+    
+    book.write(out)  
+      
   end
-  
 end

data/lib/slapshot/version.rb

@@ -1,3 +1,3 @@
 module Slapshot
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

metadata

@@ -1,68 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: slapshot
 version: !ruby/object:Gem::Version
-  version: 0.0.12
-  prerelease: 
+  version: 0.0.13
 platform: ruby
 authors:
 - Mik Lernout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: formatador
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -134,15 +118,12 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.4
-description: ! 'This is a command line interface to the Appshot API. I allows you
-  to search your Appshot instance, upload code and import/export informations.
-
-'
+description: |
+  This is a command line interface to the Appshot API. I allows you to search your Appshot instance, upload code and import/export informations.
 email: Mik_Lernout@Dell.com
 executables:
 - slapshot
@@ -159,6 +140,7 @@ files:
 - slapshot.rdoc
 homepage: http://appshot.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -170,21 +152,19 @@ require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A command line interface to the Appshot API
 test_files: []