sambal 0.0.2 → 0.0.3

data/lib/sambal/version.rb

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

data/lib/sambal.rb

@@ -11,6 +11,33 @@ require 'tempfile'
 
 module Sambal
 
+  class InternalError < RuntimeError; end
+
+  class Response
+
+    attr_reader :message
+
+    def initialize(message, success)
+      msg = message.split("\n")
+      msg.each do |line|
+        if line =~ /^NT\_.*\s/
+          @message = line
+        end
+      end
+      @message ||= message
+      @success = success
+    end
+
+    def success?
+      @success
+    end
+
+    def failure?
+      !success?
+    end
+
+  end
+
   class Client
     
     attr_reader :connected
@@ -49,29 +76,33 @@ module Sambal
     end
   
     def cd(dir)
-      if ask "cd #{dir}"
-        return true
+      if response = ask("cd #{dir}")
+        Response.new(response, true)
       else
-        return false
+        Response.new(response, false)
       end
     end
   
     def get(file, output)
       response = ask "get #{file} #{output}"
       if response =~ /^getting\sfile.*$/
-        true
+        Response.new(response, true)
       else
-        false
+        Response.new(response, false)
       end
+    rescue InternalError => e
+      Response.new(e.message, false)
     end
   
     def put(file, destination)
       response = ask "put #{file} #{destination}"
       if response =~ /^putting\sfile.*$/
-        true
+        Response.new(response, true)
       else
-        false
+        Response.new(response, false)
       end
+    rescue InternalError => e
+      Response.new(e.message, false)
     end
   
     def put_content(content, destination)
@@ -81,10 +112,12 @@ module Sambal
       end
       response = ask "put #{t.path} #{destination}"
       if response =~ /^putting\sfile.*$/
-        true
+        Response.new(response, true)
       else
-        false
+        Response.new(response, false)
       end
+    rescue InternalError => e
+      Response.new(e.message, false)
     ensure
       t.close
     end
@@ -93,14 +126,16 @@ module Sambal
       response = ask "del #{file}"
       next_line = response.split("\n")[1]
       if next_line =~ /^smb:.*\\>/
-        true
-      elsif next_line =~ /^NT_STATUS_NO_SUCH_FILE.*$/
-        false
-      elsif next_line =~ /^NT_STATUS_ACCESS_DENIED.*$/
-        false
+        Response.new(response, true)
+      #elsif next_line =~ /^NT_STATUS_NO_SUCH_FILE.*$/
+      #  Response.new(response, false)
+      #elsif next_line =~ /^NT_STATUS_ACCESS_DENIED.*$/
+      #  Response.new(response, false)
       else
-        false
+        Response.new(response, false)
       end
+    rescue InternalError => e
+      Response.new(e.message, false)
     end
   
     def close
@@ -108,16 +143,14 @@ module Sambal
       @connected = false
     end
     
-    private
-    
     def ask(cmd)
       @i.printf("#{cmd}\n")
       response = @o.expect(/^smb:.*\\>/,10)[0] rescue nil
       if response.nil?
         $stderr.puts "Failed to do #{cmd}"
-        exit(1)
+        raise Exception.new, "Failed to do #{cmd}"
       else
-        return response
+        response
       end
     end
     

data/spec/sambal/client_spec.rb

@@ -64,48 +64,58 @@ describe Sambal::Client do
   end
 
   it "should get files from an smb server" do
-    @sambal_client.get(testfile, "/tmp/sambal_spec_testfile.txt").should == true
+    @sambal_client.get(testfile, "/tmp/sambal_spec_testfile.txt").should be_successful
     File.exists?("/tmp/sambal_spec_testfile.txt").should == true
     File.size("/tmp/sambal_spec_testfile.txt").should == @sambal_client.ls[testfile][:size].to_i
   end
 
-  it "should return false when getting a file from an smb server fails" do
-    @sambal_client.get("non_existant_file.txt", "/tmp/sambal_spec_non_existant_file.txt").should == false
+  it "should not be successful when getting a file from an smb server fails" do
+    result = @sambal_client.get("non_existant_file.txt", "/tmp/sambal_spec_non_existant_file.txt")
+    result.should_not be_successful
+    result.message.should match /^NT_.*$/
+    result.message.split("\n").should have(1).line
     File.exists?("/tmp/sambal_spec_non_existant_file.txt").should == false
   end
 
   it "should upload files to an smb server" do
     @sambal_client.ls.should_not have_key("uploaded_file.txt")
-    @sambal_client.put(file_to_upload.path, 'uploaded_file.txt')
+    @sambal_client.put(file_to_upload.path, 'uploaded_file.txt').should be_successful
     @sambal_client.ls.should have_key("uploaded_file.txt")
   end
 
   it "should upload content to an smb server" do
     @sambal_client.ls.should_not have_key("content_uploaded_file.txt")
-    @sambal_client.put_content("Content upload", 'content_uploaded_file.txt')
+    @sambal_client.put_content("Content upload", 'content_uploaded_file.txt').should be_successful
     @sambal_client.ls.should have_key("content_uploaded_file.txt")
   end
 
   it "should delete files on an smb server" do
-    @sambal_client.del(testfile).should == true
+    @sambal_client.del(testfile).should be_successful
     @sambal_client.ls.should_not have_key(testfile)
   end
 
-  it "should return false when deleting a file from an smb server fails" do
-    @sambal_client.del("non_existant_file.txt").should == false
+  it "should not be successful when deleting a file from an smb server fails" do
+    result = @sambal_client.del("non_existant_file.txt")
+    result.should_not be_successful
+    result.message.should match /^NT_.*$/
+    result.message.split("\n").should have(1).line
   end
 
   it "should switch directory on an smb server" do
-    @sambal_client.put_content("testing directories", 'dirtest.txt') ## a bit stupid, but now we can check that this isn't listed when we switch dirs
+    @sambal_client.put_content("testing directories", 'dirtest.txt').should be_successful ## a bit stupid, but now we can check that this isn't listed when we switch dirs
     @sambal_client.ls.should have_key('dirtest.txt')
-    @sambal_client.cd(test_directory)
+    @sambal_client.cd(test_directory).should be_successful
     @sambal_client.ls.should_not have_key('dirtest.txt')
-    @sambal_client.put_content("in #{test_directory}", 'intestdir.txt')
+    @sambal_client.put_content("in #{test_directory}", 'intestdir.txt').should be_successful
     @sambal_client.ls.should have_key('intestdir.txt')
-    @sambal_client.cd('..')
+    @sambal_client.cd('..').should be_successful
     @sambal_client.ls.should_not have_key('intestdir.txt')
     @sambal_client.ls.should have_key('dirtest.txt')
   end
 
+  it "should not be successful when command fails" do
+    result = @sambal_client.put("jhfahsf iasifasifh", "jsfijsf ijidjag")
+    result.should_not be_successful
+  end
 
 end

data/spec/spec_helper.rb

@@ -44,6 +44,12 @@ File.open(SAMBA_CONF, 'w') do |f|
   f << Document.new(IO.binread("#{spec_path}/smb.conf.erb")).interpolate(samba_share: SAMBA_SHARE, local_user: ENV['USER'])
 end
 
+RSpec::Matchers.define :be_successful do
+  match do |actual|
+    actual.success?.should be_true
+  end
+end
+
 #
 #
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sambal
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70272128682480 !ruby/object:Gem::Requirement
+  requirement: &70152943099320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70272128682480
+  version_requirements: *70152943099320
 description: Ruby Samba Client using the cmdline smbclient
 email:
 - john@insane.se