slapshot 0.0.5 → 0.0.6

data/bin/slapshot

@@ -8,18 +8,12 @@ program_desc 'A command line interface to the Appshot API'
 
 #version Slapshot::VERSION
 
-desc 'Your Appshot  url'
+desc 'Your Appshot url'
 flag [:url]
 
 desc 'Your Appshot instance'
 flag [:i,:instance]
 
-desc 'Your Appshot username'
-flag [:u,:username]
-
-desc 'Your Appshot password'
-flag [:p,:password]
-
 desc 'Search your instance of Appshot'
 arg_name 'Pass in the query'
 command :search do |c|
@@ -63,19 +57,70 @@ command :upload do |c|
   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'
+
+command :login do |c|
+
+  c.desc 'Username (required)'
+  c.flag :u
+
+  c.desc 'Password (required)'
+  c.flag :p
+  
+  c.action do |global_options,options,args|
+
+    url = global_options[:url] || ENV['APPSHOT_URL'] || "https://api.appshot.com"    
+    
+    if !options[:u] or !options[:p]
+      raise "When logging in you need to pass in both a username and a password"
+    end
+
+    if !File.exists? get_token_file
+
+      token = create_token(url, options[:u], options [:p])
+      puts "Generated token: #{token} and stored it in #{get_token_file}"
+      
+    else
+      puts "Found existing file at #{get_token_file}"
+    end
+    
+  end
+  
+end
+
+desc 'Logout to the API, disactivate and remove the token'
+command :logout do |c|
+
+  c.action do |global_options,options,args|
+
+    url = global_options[:url] || ENV['APPSHOT_URL'] || "https://api.appshot.com"    
+    
+    if File.exists? get_token_file
+
+      token = remove_token(url)
+      puts "Disactivated token: #{token} and removed #{get_token_file}"
+      
+    else
+      puts "You are not logged in."
+    end
+
+  end
+  
+end
+
+
 pre do |global,command,options,args|
-  # Pre logic here
-  # Return true to proceed; false to abort and not call the
-  # chosen command
-  # Use skips_pre before a command to skip this block
-  # on that command only
-
-  url = global[:url] || ENV['APPSHOT_URL'] || "https://api.appshot.com"
-  instance = global[:i] || ENV['APPSHOT_INSTANCE']  
-  username = global[:u] || ENV['APPSHOT_USERNAME']
-  password = global[:p] || ENV['APPSHOT_PASSWORD']
-
-  @sc = SlapshotConnection.new url, instance, username, password
+    
+  url = global[:url] || ENV['APPSHOT_URL'] || "https://api.appshot.com"    
+
+  if command.names != 'login' and command.names != 'logout'
+
+    instance = global[:i] || ENV['APPSHOT_INSTANCE']  
+
+    @sc = Appshot.new url, get_token, instance
+    
+  end
   
   true
 end
@@ -89,6 +134,9 @@ end
 on_error do |exception|
   # Error logic here
   # return false to skip default error handling
+
+  #puts "exception #{exception.http_body}"
+  
   true
 end
 

data/lib/slapshot/main.rb

@@ -3,12 +3,50 @@ require 'json'
 require 'formatador'
 require 'spreadsheet'
 
-class SlapshotConnection
+def get_token_file
+  homes = ["HOME", "HOMEPATH"]
+  realHome = homes.detect {|h| ENV[h] != nil}
+  ENV[realHome] + '/.slapshot_token' unless !realHome
+end
+
+def create_token(url, username, password)
+  token = RestClient.get url + '/login', :params => { :u => username, :p => password }
+
+  File.open(get_token_file, 'w') {|f| 
+    f.write(token)
+  }
   
-  def initialize(url, instance, username, password)
+  token
+end
+
+def remove_token(url)
+
+  token = get_token
+
+  RestClient.get url + '/logout', :params => { :t => token }
+
+  File.delete(get_token_file)
+  
+  token
+  
+end
+
+def get_token
+
+  if not File.exists? get_token_file
+    raise "Could not find a token file to read from"
+  end
+  
+  File.open(get_token_file, 'r').read
+end
+
+class Appshot
+  
+  def initialize(url, token, instance)
     @app = "Portfolio"
     @instance = instance
-    @api = RestClient::Resource.new url, :user => username, :password => password, :timeout => -1
+    
+    @api = RestClient::Resource.new url, :timeout => -1, :headers => {'Appshot-AuthToken' => token, 'Appshot-Instance' => instance}
   end
   
   def set_app(app)
@@ -17,9 +55,10 @@ class SlapshotConnection
 
   def search(query, count)
     
-    response = @api["search"].get :params => { :i => @instance, :app => @app, :q => query, :c => count }, :content_type => :json, :accept => :json
+    response = @api["v1/search"].get :params => { :i => @instance, :app => @app, :q => query, :c => count }, :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."
     
     json_response['docs']
@@ -34,7 +73,7 @@ class SlapshotConnection
     book = Spreadsheet::Workbook.new
     sheet1 = book.create_worksheet :name => 'Search Results'
 
-    columns = ['name', 'entity_type', 'highlight']
+    columns = ['name', 'entity_type']
 
       rownum = 0
       for column in columns
@@ -47,7 +86,6 @@ class SlapshotConnection
         end
       end
       book.write(out)    
-    
   end
   
 end

data/lib/slapshot/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slapshot
 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: 2012-10-24 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake