sambal 0.0.8 → 0.0.9

data/README.md

@@ -18,6 +18,21 @@ Or install it yourself as:
 
     $ gem install sambal
 
+## Requirements
+
+A working installation of samba, specifically the "smbclient" command line utility. See http://www.samba.org for more information.
+On a mac this can be installed through homebrew https://github.com/mxcl/homebrew, like this:
+    
+    brew install samba
+
+On the Mac it can probably also be installed both through Fink and MacPorts.
+
+On Linux (Ubuntu) it's as easy as:
+    
+    apt-get install smbclient
+
+It should be available in a similar way on all major Linux distributions.
+
 ## Usage
 
     client = Sambal::Client.new(domain: 'WORKGROUP', host: '127.0.0.1', share: '', user: 'guest', password: '--no-pass', port: 445)

data/lib/sambal/version.rb

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

data/lib/sambal.rb

@@ -48,8 +48,11 @@ module Sambal
         @o, @i, @pid = PTY.spawn("smbclient //#{options[:host]}/#{options[:share]} #{options[:password]} -W #{options[:domain]} -U #{options[:user]} -p #{options[:port]}")
         #@o.set_encoding('UTF-8:UTF-8') ## don't know didn't work, we only have this problem when the files are named using non-english characters
         #@i.set_encoding('UTF-8:UTF-8')
-        res = @o.expect(/^smb:.*\\>/, 10)[0]
+        res = @o.expect(/^smb:.*\\>/, 10)[0] rescue nil
         @connected = case res
+        when nil
+          $stderr.puts "Failed to connect"
+          false
         when /^put/
           res['putting'].nil? ? false : true
         else
@@ -66,8 +69,8 @@ module Sambal
           close if @pid
           exit(1)
         end
-      rescue
-        raise RuntimeError.exception("Unknown Process Failed!! (#{$!.to_s})")
+      rescue Exception => e
+        raise RuntimeError.exception("Unknown Process Failed!! (#{$!.to_s}): #{e.message.inspect}\n"+e.backtrace.join("\n"))
       end
     end
 
@@ -89,8 +92,8 @@ module Sambal
       end
     end
     
-    def ls(wildcard = '')
-      parse_files(ask("ls #{wildcard}"))
+    def ls(qualifier = '*')
+      parse_files(ask_wrapped('ls', qualifier))
     end
   
     def cd(dir)
@@ -104,7 +107,7 @@ module Sambal
     def get(file, output)
       begin
         file_context(file) do |file|
-          response = ask "get #{file} #{output}"
+          response = ask_wrapped 'get', [file, output]
           if response =~ /^getting\sfile.*$/
             Response.new(response, true)
           else
@@ -117,7 +120,7 @@ module Sambal
     end
   
     def put(file, destination)
-      response = ask "put #{file} #{destination}"
+      response = ask_wrapped 'put', [file, destination]
       if response =~ /^putting\sfile.*$/
         Response.new(response, true)
       else
@@ -132,7 +135,7 @@ module Sambal
       File.open(t.path, 'w') do |f|
         f << content
       end
-      response = ask "put #{t.path} #{destination}"
+      response = ask_wrapped 'put', [t.path, destination]
       if response =~ /^putting\sfile.*$/
         Response.new(response, true)
       else
@@ -147,7 +150,7 @@ module Sambal
     def del(file)
       begin
         file_context(file) do |file|
-          response = ask "del #{file}"
+          response = ask_wrapped 'del', file
           next_line = response.split("\n")[1]
           if next_line =~ /^smb:.*\\>/
           Response.new(response, true)
@@ -204,6 +207,16 @@ module Sambal
       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|

data/spec/sambal/client_spec.rb

@@ -161,5 +161,13 @@ 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
 
 end

metadata

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