sambal 0.1.0 → 0.1.1

data/lib/sambal.rb

@@ -39,9 +39,9 @@ module Sambal
   end
 
   class Client
-    
+
     attr_reader :connected
-    
+
     def initialize(options={})
       begin
         options = {domain: 'WORKGROUP', host: '127.0.0.1', share: '', user: 'guest', password: '--no-pass', port: 445}.merge(options)
@@ -64,7 +64,7 @@ module Sambal
             true
           end
         end
-        
+
         unless @connected
           close if @pid
           exit(1)
@@ -99,19 +99,20 @@ module Sambal
         end
       end
     end
-    
+
     def ls(qualifier = '*')
       parse_files(ask_wrapped('ls', qualifier))
     end
-  
+
     def cd(dir)
-      if response = ask("cd #{dir}")
-        Response.new(response, true)
-      else
+      response = ask("cd \"#{dir}\"")
+      if response.split("\r\n").join('') =~ /NT_STATUS_OBJECT_NAME_NOT_FOUND/
         Response.new(response, false)
+      else
+        Response.new(response, true)
       end
     end
-  
+
     def get(file, output)
       begin
         file_context(file) do |file|
@@ -126,7 +127,7 @@ module Sambal
         Response.new(e.message, false)
       end
     end
-  
+
     def put(file, destination)
       response = ask_wrapped 'put', [file, destination]
       if response =~ /^putting\sfile.*$/
@@ -137,7 +138,7 @@ module Sambal
     rescue InternalError => e
       Response.new(e.message, false)
     end
-  
+
     def put_content(content, destination)
       t = Tempfile.new("upload-smb-content-#{destination}")
       File.open(t.path, 'w') do |f|
@@ -156,7 +157,8 @@ module Sambal
     end
 
     def rmdir(dir)
-      cd dir
+      response = cd dir
+      return response if response.failure?
       begin
         ls.each do |name, meta|
           if meta[:type]==:file
@@ -178,7 +180,7 @@ module Sambal
         Response.new(e.message, false)
       end
     end
-  
+
     def del(file)
       begin
         file_context(file) do |file|
@@ -222,12 +224,12 @@ module Sambal
     #    subdirs.times { cd '..' }
     #  end
     end
-  
+
     def close
       @i.printf("quit\n")
       @connected = false
     end
-    
+
     def ask(cmd)
       @i.printf("#{cmd}\n")
       response = @o.expect(/^smb:.*\\>/,10)[0] rescue nil
@@ -238,22 +240,23 @@ module Sambal
         response
       end
     end
-    
+
     def ask_wrapped(cmd,filenames)
       ask wrap_filenames(cmd,filenames)
     end
-    
+
     def wrap_filenames(cmd,filenames)
       filenames = [filenames] unless filenames.kind_of?(Array)
       filenames.map!{ |filename| '"' + filename + '"' }
       [cmd,filenames].flatten.join(' ')
     end
-    
+
     def parse_files(str)
       files = {}
       str.each_line do |line|
         if line =~ /\s+([\w\.\d\-\_\?\!\s]+)\s+([DAH]?)\s+(\d+)\s+(.+)$/
-          lsplit = line.split(/\s+/)
+          lsplit = line.split(/\s{2,}/)
+          #$stderr.puts "lsplit: #{lsplit}"
           lsplit.shift ## remove first empty string
           name = lsplit.shift#$1
           if lsplit.first =~ /^[A-Za-z]+$/
@@ -273,6 +276,6 @@ module Sambal
       end
       files
     end
-    
+
   end
 end

data/lib/sambal/version.rb

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

data/spec/sambal/client_spec.rb

@@ -13,11 +13,16 @@ describe Sambal::Client do
     File.open("#{test_server.share_path}/#{testfile}", 'w') do |f|
       f << "Hello"
     end
+    FileUtils.mkdir_p "#{test_server.share_path}/#{test_directory_with_space_in_name}"
+    File.open("#{test_server.share_path}/#{test_directory_with_space_in_name}/#{test_file_in_directory_with_space_in_name}", 'w') do |f|
+      f << "Hello there"
+    end
     FileUtils.mkdir_p "#{test_server.share_path}/#{test_directory}"
     FileUtils.mkdir_p "#{test_server.share_path}/#{test_directory}/#{test_sub_directory}"
     File.open("#{test_server.share_path}/#{test_directory}/#{test_sub_directory}/#{testfile_sub}", 'w') do |f|
       f << "Hello"
     end
+    FileUtils.chmod 0775, "#{test_server.share_path}/#{test_directory_with_space_in_name}/#{test_file_in_directory_with_space_in_name}"
     FileUtils.chmod 0775, "#{test_server.share_path}/#{test_directory}/#{test_sub_directory}/#{testfile_sub}"
     FileUtils.chmod 0775, "#{test_server.share_path}/#{test_directory}/#{test_sub_directory}"
     FileUtils.chmod 0775, "#{test_server.share_path}/#{test_directory}"
@@ -37,6 +42,12 @@ describe Sambal::Client do
     t
   end
 
+  let(:test_directory_with_space_in_name) { 'my dir with spaces in name' }
+
+  let(:test_file_in_directory_with_space_in_name) { 'a_file_in_a_dir_with_spaces_in_name' }
+
+  let(:test_spaces_in_name_path) { "#{test_directory_with_space_in_name}/#{test_file_in_directory_with_space_in_name}" }
+
   let(:test_directory) do
     'testdir'
   end
@@ -74,7 +85,12 @@ describe Sambal::Client do
       FileUtils.cp "#{test_server.share_path}/#{testfile}", "#{test_server.share_path}/#{testfile2}"
       FileUtils.cp "#{test_server.share_path}/#{testfile}", "#{test_server.share_path}/#{testfile3}"
     end
- 
+
+    it "should list files with spaces in their names" do
+      result = @sambal_client.ls
+      result.should have_key(test_directory_with_space_in_name)
+    end
+
     it "should list files on an smb server" do
       result = @sambal_client.ls
       result.should have_key(testfile)
@@ -96,6 +112,13 @@ describe Sambal::Client do
     File.size("/tmp/sambal_spec_testfile.txt").should == @sambal_client.ls[testfile][:size].to_i
   end
 
+  it "should get files in a dir with spaces in it's name from an smb server" do
+    @sambal_client.get(test_spaces_in_name_path, "/tmp/sambal_this_file_was_in_dir_with_spaces.txt").should be_successful
+    File.exists?("/tmp/sambal_this_file_was_in_dir_with_spaces.txt").should == true
+    @sambal_client.cd(test_directory_with_space_in_name)
+    File.size("/tmp/sambal_this_file_was_in_dir_with_spaces.txt").should == @sambal_client.ls[test_file_in_directory_with_space_in_name][:size].to_i
+  end
+
   it "should get files in a subdirectory while in a higher level directory from an smb server" do
     @sambal_client.get(testfile_sub_path, "/tmp/sambal_spec_testfile_sub.txt").should be_successful
     File.exists?("/tmp/sambal_spec_testfile_sub.txt").should == true
@@ -176,11 +199,11 @@ describe Sambal::Client do
     result = @sambal_client.put("jhfahsf iasifasifh", "jsfijsf ijidjag")
     result.should_not be_successful
   end
-  
+
   it 'should create commands with one wrapped filename' do
     @sambal_client.wrap_filenames('cmd',['file1','file2']).should eq('cmd "file1" "file2"')
   end
-  
+
   it 'should create commands with more than one wrapped filename' do
     @sambal_client.wrap_filenames('cmd',['file1','file2']).should eq('cmd "file1" "file2"')
   end

metadata

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