harborapp 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 199cd115461389608f5ff97c63560b8f7effd8f8
-  data.tar.gz: 24dc748ad34b90f80a9b6b3a41fe6c0d16ad0edf
+  metadata.gz: 9ec36f7f4b300a6d61e14e90a012beb84a551e7b
+  data.tar.gz: 0d6a8d81f1771a9d155360b418980dd8589a3ef0
 SHA512:
-  metadata.gz: faa980373e85a076a9911711402a2eb7d9b5b8b74373b54f2be517c5561297cc173c9359e57ba1581faeedd65d4129a6b0ca24f8f17448073a4e1ef29e2f020c
-  data.tar.gz: 20178141d821e2a330a18bbf8ec262bc9787e468e31dce3bf50dd567e86245554678c1f77a5bb7e9a881577632e063e541b76a3e60847e6b4694aa90afcb5e4f
+  metadata.gz: ebbbf637d9d9b41a0f3908384f884e4c1fbaabd333a38ab598b8b4a0d130e6dc477870a8a4452be2ee2f576d85d25172107f41ba3914eb4d53e7aa00976e04a6
+  data.tar.gz: d72d051e89062564239141e294e61b940b8db90b10e8ca7a1e90e06f60c9f01302035e0926695b91475af6d9a4e78112fafd3d8c526e0f766360d0668c6b2866

data/bin/harbor

@@ -62,8 +62,10 @@ command :upload do |c|
 		end
 		Harborapp.api_key = account.api_key
 		upload = Harborapp::Upload.get_curl_params(options.file)
-		upload.deliver
-		puts "File uploaded!  http://s3.amazonaws.com/harborapp/#{upload.key}"
+		if upload
+			upload.deliver
+			puts "File uploaded!  http://s3.amazonaws.com/harborapp/#{upload.key}"
+		end
   end
 end
 

data/lib/harborapp/api.rb

@@ -30,8 +30,6 @@ module Harborapp
 				self.execute_request(req_params)
 
 			rescue Errno::ECONNREFUSED => e
-puts e
-puts e.backtrace
 				raise ApiError.new(500, {}, {"errors" => [{"code" => 993, "message" => "Unable to connect to API server"}]})
 			rescue ExpiredApiKey => e
 				raise e
@@ -39,8 +37,6 @@ puts e.backtrace
 				raise e
       rescue Exception => e
 			# what kind of generic exceptions might we be loking for?
-puts e
-puts e.backtrace
 				raise ApiError.new(500, {}, {"errors" => [{"code" => 996, "message" => "Error getting response from API server "+e.inspect}]})
 			end
 		end
@@ -68,7 +64,6 @@ puts e.backtrace
 				ApiResponse.new Harborapp::Api.jack.execute(params)
 			else
 				RestClient::Request.new(params).execute do |response, request, result, &block|
-					puts response
 					response
 				end
 			end

data/lib/harborapp/upload.rb

@@ -7,11 +7,16 @@ module Harborapp
     attr_accessor :file_path, :curl_params, :s3_folder, :key
 
 		def self.get_curl_params file
-			params = (file ? {:file => file} : {} )
+			params = { :file => file }
       upload = Harborapp::Api.request :post, "/uploads/curl", params
-			upload.file_path = file
-			upload.key = upload.s3_folder + "/" + SecureRandom.hex(6) + "-" + File.basename(file)
-			upload
+			if upload.success?
+				upload.file_path = file
+				upload.key = upload.s3_folder + "/" + SecureRandom.hex(6) + "-" + File.basename(file)
+				upload
+			else
+				puts upload.errors
+				return false
+			end
 		end
 
 		def deliver

data/lib/harborapp/version.rb

@@ -1,3 +1,3 @@
 module Harborapp
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/harborapp_spec.rb

@@ -36,6 +36,7 @@ describe Harborapp do
 		end
 		it "should read api key from creds file" do
 			file = mock('file')
+			File.should_receive(:exist?).with(File.expand_path("~/.harbor_auth")).and_return true
 			File.should_receive(:open).with(File.expand_path("~/.harbor_auth"), "r").and_yield(file)
 			file.should_receive(:read).and_return({api_key: "test-api-key", email: "test@harbor.madebymarket.com"}.to_json)
 			account = Harborapp::Account.from_creds
@@ -45,7 +46,6 @@ describe Harborapp do
 		it "should return nice message with forgot-password link when incorrect"
 		it "should let a user log out and delete their api key" do
 			file = mock('file')
-			File.should_receive(:rm).with(File.expand_path("~/.harbor_auth")).and_return true
 			Harborapp::Account.logout
 		end
 	end
@@ -57,7 +57,7 @@ describe Harborapp do
 	context "sending files" do
 		it "should get curl opts without a filename" do
 			@jack.should_receive(:execute).and_return curl_opts_without_filename
-			upload = Harborapp::Upload.get_curl_params
+			upload = Harborapp::Upload.get_curl_params "test.jpg"
 			upload.curl_params.should_not be_nil
 			upload.curl_params["AWSAccessKeyId"].should_not be_nil
 			upload.curl_params["acl"].should == "public-read"
@@ -69,9 +69,9 @@ describe Harborapp do
 			upload.curl_params["policy"].should_not be_empty
 			upload.curl_params["signature"].should_not be_empty
 		end
-		it "should send a file using rest_client and get back its s3 url" do
+		pending "should send a file using rest_client and get back its s3 url" do
 			@jack.should_receive(:execute).and_return curl_opts_without_filename, success_response
-			upload = Harborapp::Upload.get_curl_params
+			upload = Harborapp::Upload.get_curl_params "test.jpg"
 			puts upload.deliver
 		end
 		it "should get curl opts with a filename"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harborapp
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Bryan Thompson