gitpic 0.0.1 → 0.0.2

data/lib/gitpic/uploader.rb

@@ -18,7 +18,8 @@ class Gitpic::Uploader
       if File.directory?(path)
         upload!(path)
       else
-        checksum = Digest::MD5.file(path).hexdigest
+        next unless photo_extension? file_name
+        checksum = Digest::SHA1.file(path).hexdigest
         if check_file(checksum)
           puts "Uploading #{path}"
           post_file(path)
@@ -35,17 +36,39 @@ class Gitpic::Uploader
   end
 
   def post_file(path)
-    file = File.new(path, 'rb')
-    RestClient.post( "#{Gitpic::HOST}/api/file_blobs?auth_token=#{token}", :file_blob => {
-      :data => file,
-      :path => path,
-      :filesystem_created_at => file.ctime,
-      :filesystem_modified_at => file.mtime
-    })
+    tries = 0
+    begin
+      file = File.new(path, 'rb')
+      RestClient.post( "#{Gitpic::HOST}/api/file_blobs?auth_token=#{token}", :file_blob => {
+        :data => file,
+        :path => path,
+        :filesystem_created_at => file.ctime,
+        :filesystem_modified_at => file.mtime
+      })
+    rescue RestClient::PreconditionFailed => e
+      puts "Failed to upload #{path}; #{e.response}"
+    rescue RestClient::RequestTimeout, RestClient::ServiceUnavailable => e
+      if tries < 10
+        tries += 1
+        puts "Server temporarily unavailable, trying again (#{tries} time)"
+        sleep 30
+        retry
+      else
+        puts "Server is fully non-responsive, try re-running the uploader later"
+        raise "Stop flogging the server, it's already dead!!!"
+      end
+    rescue Errno::EPIPE
+      puts "Failed to upload #{path}; [\"File is too large\"]"
+    end
+  end
+
+  def photo_extension?(file_name)
+    photo_extensions = %w(jpg jpeg png gif)
+    photo_extensions.include? file_name.split('.').last
   end
 
   def black_list
-    [".", "..", ".DS_Store"]
+    [".", "..", ".DS_Store", "Thumbs.db"]
   end
 
 end

data/lib/gitpic.rb

@@ -1,5 +1,5 @@
 module Gitpic
-  HOST = "http://gitpic.com"
+  HOST = ENV['GITPIC_HOST'] || "http://gitpic.com"
 end
 
 require 'gitpic/uploader'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitpic
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2156246360 !ruby/object:Gem::Requirement
+  requirement: &2164703760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2156246360
+  version_requirements: *2164703760
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2156245820 !ruby/object:Gem::Requirement
+  requirement: &2164703200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *2156245820
+  version_requirements: *2164703200
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2156245320 !ruby/object:Gem::Requirement
+  requirement: &2164702740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2156245320
+  version_requirements: *2164702740
 description: A ruby command line interface for uploading to GitPic
 email: rosshale@gmail.com
 executables: