sambal 0.0.6 → 0.0.7

data/lib/sambal.rb

@@ -70,6 +70,24 @@ module Sambal
         raise RuntimeError.exception("Unknown Process Failed!! (#{$!.to_s})")
       end
     end
+
+    def file_context(path)
+      if (path_parts = path.split('/')).length>1
+        file = path_parts.pop
+        subdirs = path_parts.length
+        dir = path_parts.join('/')
+        cd dir
+      else
+        file = path
+      end
+      begin
+        yield(file)
+      ensure
+        unless subdirs.nil?
+          subdirs.times { cd '..' }
+        end
+      end
+    end
     
     def ls
       parse_files(ask("ls"))
@@ -84,14 +102,18 @@ module Sambal
     end
   
     def get(file, output)
-      response = ask "get #{file} #{output}"
-      if response =~ /^getting\sfile.*$/
-        Response.new(response, true)
-      else
-        Response.new(response, false)
+      begin
+        file_context(file) do |file|
+          response = ask "get #{file} #{output}"
+          if response =~ /^getting\sfile.*$/
+            Response.new(response, true)
+          else
+            Response.new(response, false)
+          end
+        end
+      rescue InternalError => e
+        Response.new(e.message, false)
       end
-    rescue InternalError => e
-      Response.new(e.message, false)
     end
   
     def put(file, destination)
@@ -123,29 +145,47 @@ module Sambal
     end
   
     def del(file)
-      if (path_parts = file.split('/')).length>1
-        file = path_parts.pop
-        subdirs = path_parts.length
-        dir = path_parts.join('/')
-        cd dir
-      end
-      response = ask "del #{file}"
-      next_line = response.split("\n")[1]
-      if next_line =~ /^smb:.*\\>/
-        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
-        Response.new(response, false)
-      end
-    rescue InternalError => e
-      Response.new(e.message, false)
-    ensure
-      unless subdirs.nil?
-        subdirs.times { cd '..' }
+      begin
+        file_context(file) do |file|
+          response = ask "del #{file}"
+          next_line = response.split("\n")[1]
+          if next_line =~ /^smb:.*\\>/
+          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
+            Response.new(response, false)
+          end
+        end
+      rescue InternalError => e
+        Response.new(e.message, false)
       end
+      #end
+      #if (path_parts = file.split('/')).length>1
+      #  file = path_parts.pop
+      #  subdirs = path_parts.length
+      #  dir = path_parts.join('/')
+      #  cd dir
+      #end
+    #  response = ask "del #{file}"
+    #  next_line = response.split("\n")[1]
+    #  if next_line =~ /^smb:.*\\>/
+    #    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
+    #    Response.new(response, false)
+    #  end
+    #rescue InternalError => e
+    #  Response.new(e.message, false)
+    #ensure
+    #  unless subdirs.nil?
+    #    subdirs.times { cd '..' }
+    #  end
     end
   
     def close

data/lib/sambal/version.rb

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

data/spec/sambal/client_spec.rb

@@ -14,8 +14,15 @@ describe Sambal::Client do
       f << "Hello"
     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}/#{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}"
     FileUtils.chmod 0777, "#{test_server.share_path}/#{testfile}"
+    @sambal_client.cd('/')
   end
 
   after(:all) do
@@ -34,10 +41,26 @@ describe Sambal::Client do
     'testdir'
   end
 
+  let(:test_sub_directory) do
+    'testdir_sub'
+  end
+
+  let(:sub_directory_path) do
+    "#{test_directory}/#{test_sub_directory}"
+  end
+
   let(:testfile) do
     'testfile.txt'
   end
 
+  let(:testfile_sub) do
+    'testfile_sub.txt'
+  end
+
+  let(:testfile_sub_path) do
+    "#{sub_directory_path}/#{testfile_sub}"
+  end
+
   it "should list files on an smb server" do
     @sambal_client.ls.should have_key(testfile)
   end
@@ -48,6 +71,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 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
+    @sambal_client.cd(sub_directory_path)
+    File.size("/tmp/sambal_spec_testfile_sub.txt").should == @sambal_client.ls[testfile_sub][:size].to_i
+  end
+
   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
@@ -98,7 +128,8 @@ describe Sambal::Client do
     @sambal_client.put_content("some content", "file_to_delete").should be_successful
     @sambal_client.cd('/')
     @sambal_client.del("#{test_directory}/file_to_delete").should be_successful
-    @sambal_client.ls.should have_key(testfile)
+    @sambal_client.cd('/')
+    @sambal_client.ls.should have_key("#{testfile}")
   end
 
   it "should not be successful when command fails" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sambal
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70205361140100 !ruby/object:Gem::Requirement
+  requirement: &70291248058060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70205361140100
+  version_requirements: *70291248058060
 description: Ruby Samba Client using the cmdline smbclient
 email:
 - john@insane.se