slapshot 0.0.6 → 0.0.7

data/bin/slapshot

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require 'gli'
 require 'slapshot'
+require 'io/console'
 
 include GLI::App
 
@@ -54,6 +55,7 @@ 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
 
@@ -62,23 +64,20 @@ 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])
+      print "Username: "
+      username = gets
+      
+      print "Password: "
+      password = STDIN.noecho(&:gets)
+      puts
+
+      token = create_token(url, username, password)
       puts "Generated token: #{token} and stored it in #{get_token_file}"
       
     else
@@ -134,9 +133,6 @@ 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

@@ -63,6 +63,39 @@ 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.6'
+  VERSION = '0.0.7'
 end

metadata

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