slapshot 0.0.8 → 0.0.9

data/bin/slapshot

@@ -50,15 +50,6 @@ command :search do |c|
   end
 end
 
-desc 'Describe upload here'
-arg_name 'Describe arguments to upload here'
-command :upload do |c|
-  c.action do |global_options,options,args|
-    puts "upload command ran"
-    @sc.upload args[0]
-  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'
 
@@ -77,8 +68,13 @@ command :login do |c|
       password = STDIN.noecho(&:gets)
       puts
 
-      token = create_token(url, username, password)
-      puts "Generated token: #{token} and stored it in #{get_token_file}"
+      token = create_token(url, username.strip, password.strip)
+      
+      if token
+        puts "Generated token: #{token} and stored it in #{get_token_file}"
+      else
+        puts "Could not authenticate the given username and password"
+      end
       
     else
       puts "Found existing file at #{get_token_file}"

data/lib/slapshot/main.rb

@@ -10,7 +10,12 @@ def get_token_file
 end
 
 def create_token(url, username, password)
-  token = RestClient.get url + '/login', :params => { :u => username, :p => password }
+
+  begin
+    token = RestClient.get url + '/login', :params => { :u => username, :p => password }
+  rescue RestClient::BadRequest => e
+    return nil
+  end
 
   File.open(get_token_file, 'w') {|f| 
     f.write(token)
@@ -63,39 +68,6 @@ class Appshot
     
     json_response['docs']
   end
-  
-  def upload(file)
-    @api["v1/upload"].put FileStreamer.new(file)
-  end
-
-  class FileStreamer
-    
-    def initialize(file)
-      @file = File.open(file)
-      @done = 0
-    end
-    
-    def read(n)
-      puts caller
-      @done += n
-      puts done
-      puts @file.size
-      Formatador.redisplay_progressbar(@done, @file.size)
-    end
-    
-    def size
-      @file.size
-    end
-    
-    def closed?
-      @file.closed?
-    end
-    
-    def close
-      @file.close
-    end
-    
-  end
 
   def to_table(result)
       Formatador.display_table(result)

data/lib/slapshot/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slapshot
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2012-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake