sambal 0.0.9 → 0.1.0

data/lib/sambal/test_server.rb

@@ -38,6 +38,8 @@ module Sambal
       @share_path = "#{root_path}/share"
       @share_name = share_name
       @config_path = "#{root_path}/smb.conf"
+      @lock_path = "#{root_path}"
+      @pid_dir = "#{root_path}"
       @port = Random.new(Time.now.to_i).rand(2345..5678).to_i
       @run_as = run_as
       FileUtils.mkdir_p @share_path
@@ -57,7 +59,7 @@ module Sambal
 
     def start
       @smb_server_pid = fork do
-        `smbd -S -F -s #{@config_path} -p #{@port}`
+        `smbd -S -F -s #{@config_path} -p #{@port} --lockdir=#{@lock_path} --piddir=#{@pid_dir}`
       end
       sleep 2 ## takes a short time to start up
     end

data/lib/sambal/version.rb

@@ -1,5 +1,5 @@
 # coding: UTF-8
 
 module Sambal
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/lib/sambal.rb

@@ -74,6 +74,14 @@ module Sambal
       end
     end
 
+    def logger
+      @logger ||= Logger.new(STDOUT)
+    end
+
+    def logger=(l)
+      @logger = l
+    end
+
     def file_context(path)
       if (path_parts = path.split('/')).length>1
         file = path_parts.pop
@@ -146,6 +154,30 @@ module Sambal
     ensure
       t.close
     end
+
+    def rmdir(dir)
+      cd dir
+      begin
+        ls.each do |name, meta|
+          if meta[:type]==:file
+            response = del name
+          elsif meta[:type]==:directory && !(name =~ /^\.+$/)
+            response = rmdir(name)
+          end
+          raise InternalError.new response.message if response && response.failure?
+        end
+        cd '..'
+        response = ask_wrapped 'rmdir', dir
+        next_line = response.split("\n")[1]
+        if next_line =~ /^smb:.*\\>/
+          Response.new(response, true)
+        else
+          Response.new(response, false)
+        end
+      rescue InternalError => e
+        Response.new(e.message, false)
+      end
+    end
   
     def del(file)
       begin

data/spec/sambal/client_spec.rb

@@ -157,6 +157,21 @@ describe Sambal::Client do
     @sambal_client.ls.should have_key("#{testfile}")
   end
 
+  it "should recursively delete a directory" do
+    @sambal_client.cd('/')
+    @sambal_client.cd(test_directory)
+    @sambal_client.put_content("some content", "file_to_delete").should be_successful
+    @sambal_client.cd('/')
+    @sambal_client.rmdir("#{test_directory}").should be_successful
+    @sambal_client.cd('/')
+    @sambal_client.ls.should_not have_key("#{test_directory}")
+  end
+
+  it "should not be successful when recursively deleting a nonexistant directory" do
+    @sambal_client.cd('/')
+    @sambal_client.rmdir("this_doesnt_exist").should_not be_successful
+  end
+
   it "should not be successful when command fails" do
     result = @sambal_client.put("jhfahsf iasifasifh", "jsfijsf ijidjag")
     result.should_not be_successful

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sambal
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec