filezor 1.3.2 → 1.3.3

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.3.3

data/filezor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{filezor}
-  s.version = "1.3.2"
+  s.version = "1.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
-  s.date = %q{2010-09-06}
+  s.date = %q{2010-09-07}
   s.default_executable = %q{filezor}
   s.description = %q{pure ruby file sync}
   s.email = %q{kyle@kylemaxwell.com}

data/lib/filezor/client.rb

@@ -11,9 +11,17 @@ class Filezor::Client
   
   attr_reader :options
   
+  def self.last_exception
+    @e
+  end
+  
+  def self.last_exception=(e)
+    @e = e
+  end
+  
   def initialize(host, port, password, options = {})
     @root = "http://admin:#{password}@#{host}:#{port}"
-    @options ||= options
+    @options ||= stringify_keys(options)
     @options.update JSON.parse(post("info", options.to_json, "/"))
   end
   
@@ -89,11 +97,17 @@ private
   def _get(*args)
     puts args.inspect if ENV["FILEZOR_DEBUG"] 
     RestClient.get(*args)
+  rescue => e
+    self.class.last_exception = e
+    raise
   end
   
   def _post(*args)
     puts args.inspect if ENV["FILEZOR_DEBUG"] 
     RestClient.post(*args)
+  rescue => e
+    self.class.last_exception = e
+    raise
   end
 
   def test(*files)
@@ -103,4 +117,8 @@ private
       end
     end
   end
+  
+  def stringify_keys(hash)
+    hash.inject({}) {|memo, (k, v)| memo.update k.to_s => v }
+  end
 end

data/lib/filezor/server.rb

@@ -3,6 +3,7 @@ require "cgi"
 require "fileutils"
 require "json"
 require "filezor/util"
+require "logger"
 class Filezor::Server < Sinatra::Base
   class BadRequest < RuntimeError; end
   include FileUtils
@@ -19,6 +20,8 @@ class Filezor::Server < Sinatra::Base
     authenticate(username, password)
   end
   
+  logger = Logger.new(STDERR)
+  
   use Rack::CommonLogger
   
   get INFO do
@@ -37,6 +40,7 @@ class Filezor::Server < Sinatra::Base
     if File.file?(path)
       File.read(path)
     else
+      logger.info "Not found: #{path}"
       404
     end
   end
@@ -89,7 +93,9 @@ class Filezor::Server < Sinatra::Base
         end
       end
       "ok"
-    rescue BadRequest
+    rescue BadRequest => e
+      logger.error e.message
+      logger.error e.backtrace.join("\n")
       400
     end
   end

data/spec/filezor/client_spec.rb

@@ -41,8 +41,8 @@ describe Filezor::Client do
       it "should send the md5, not the file" do
         @file = Filezor::File.new(fixture_file("a.txt"), "b.txt")
         @client.should_receive(:cached).and_return(["11e561e2cfcd0ac2b4bb0089a665b031"])
-        @client.should_receive(:post).with("", {"--delete" => "x", "x/b.txt" => "11e561e2cfcd0ac2b4bb0089a665b031" })
-        @client.sync("x", @file)
+        @client.should_receive(:post).with("", {"--root" => "x", "b.txt" => "11e561e2cfcd0ac2b4bb0089a665b031" })
+        @client.sync(@file, :root => "x")
       end
     end
   end
@@ -76,7 +76,7 @@ describe Filezor::Client do
           @unwanted = "#{@root}/a/b/gone.txt"
           File.open(@unwanted, "w"){|f| f.puts "hi" }
           file = Filezor::File.new(fixture_file("a.txt"), "c.txt")
-          @client.sync("a/b", file)
+          @client.sync(file, :root => "a/b", :delete => "*")
         end
     
         it "should upload the files" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 -07:00
+date: 2010-09-07 00:00:00 -07:00
 default_executable: filezor
 dependencies: 
 - !ruby/object:Gem::Dependency