sambal 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abe20faeafb0cf4e5117a5decfec59c43c440501
-  data.tar.gz: 20032ebe666efcf9ed27274e28a014917dca1000
+  metadata.gz: 38f975857d880b0980139c775c4209198a0fc61d
+  data.tar.gz: 736a0bff136bf70413f17df9e54a691b38e26a3a
 SHA512:
-  metadata.gz: cbf2111bb855e33b98a28ac6b6c7a0e8c193a03ddfa89b4cc6ea028f5709a010caf66b27789b904a10143b32fed61a28033f0f039bdc40a34330650e9767a14b
-  data.tar.gz: 62c67112d634d2a832a8a97674a9b2c22aec9c1abd24c3e0300d24082e9731af619ceced796c345f2d5a94c8922b049e5669baf7cae35f55d280f9b41d2ad93e
+  metadata.gz: c64dd602dc5e03c8c5d4b2f72664e0fd2edf37fca88b795ee0f1ebb9d977d483c0e071728d187f45ce10bbbf4cb94f20b4fc7fe62a2eea031d11909201b07fad
+  data.tar.gz: 16d10c22578db5eb2ac0b30835d892b41588cf4a79b953d9ad3231e0c3735a8808001edde69f8d1631470d9ff41a997fe5aacc9017efd66f34c2fb9c8cb20be6

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sambal.gemspec
 gemspec
+
+gem 'rspec_junit_formatter', '0.2.2'

data/README.md

@@ -1,3 +1,5 @@
+[![Circle CI](https://circleci.com/gh/johnae/sambal.svg?style=svg)](https://circleci.com/gh/johnae/sambal)
+
 # Sambal
 
 Sambal is a ruby samba client

data/Spookfile

@@ -0,0 +1,11 @@
+-- How much output do we want?
+log_level "INFO"
+
+rspec = command "bundle exec rspec -f d"
+
+watch "lib", "spec", ->
+  on_changed "^(spec)/(spec_helper%.rb)", -> rspec "spec"
+  on_changed "^spec/(.*)_spec%.rb", (a) -> rspec "spec/#{a}_spec.rb"
+  on_changed "^lib/sambal%.rb", (a) -> rspec "spec/sambal/client_spec.rb"
+
+notifier "#{os.getenv('HOME')}/.spook/notifiers"

data/circle.yml

@@ -0,0 +1,4 @@
+dependencies:
+  pre:
+    - sudo apt-get update -qq
+    - sudo apt-get install -y smbclient samba

data/lib/sambal.rb

@@ -1,284 +1,10 @@
-# coding: UTF-8
-
-require "sambal/version"
-require 'open3'
-require 'logger'
-require 'json'
-require 'pty'
-require 'expect'
 require 'time'
 require 'tempfile'
 
-module Sambal
+require 'sambal/version'
+require 'sambal/client'
+require 'sambal/response'
 
+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
-
-    def initialize(options={})
-      begin
-        options = {domain: 'WORKGROUP', host: '127.0.0.1', share: '', user: 'guest', password: '--no-pass', port: 445, timeout: 10}.merge(options)
-        @timeout = options[:timeout].to_i
-        @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(/(.*\n)?smb:.*\\>/, @timeout)[0] rescue nil
-        @connected = case res
-        when nil
-          $stderr.puts "Failed to connect"
-          false
-        when /^put/
-          res['putting'].nil? ? false : true
-        else
-          if res['NT_STATUS']
-            false
-          elsif res['timed out'] || res['Server stopped']
-            false
-          else
-            true
-          end
-        end
-
-        unless @connected
-          close if @pid
-          exit(1)
-        end
-      rescue Exception => e
-        raise RuntimeError.exception("Unknown Process Failed!! (#{$!.to_s}): #{e.message.inspect}\n"+e.backtrace.join("\n"))
-      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
-        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(qualifier = '*')
-      parse_files(ask_wrapped('ls', qualifier))
-    end
-
-    def cd(dir)
-      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|
-          response = ask_wrapped '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
-    end
-
-    def put(file, destination)
-      response = ask_wrapped 'put', [file, destination]
-      if response =~ /^putting\sfile.*$/
-        Response.new(response, true)
-      else
-        Response.new(response, false)
-      end
-    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|
-        f << content
-      end
-      response = ask_wrapped 'put', [t.path, destination]
-      if response =~ /^putting\sfile.*$/
-        Response.new(response, true)
-      else
-        Response.new(response, false)
-      end
-    rescue InternalError => e
-      Response.new(e.message, false)
-    ensure
-      t.close
-    end
-
-    def rmdir(dir)
-      response = cd dir
-      return response if response.failure?
-      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
-        file_context(file) do |file|
-          response = ask_wrapped '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
-      @i.close
-      @o.close
-      Process.wait(@pid)
-      @connected = false
-    end
-
-    def ask(cmd)
-      @i.printf("#{cmd}\n")
-      response = @o.expect(/^smb:.*\\>/,@timeout)[0] rescue nil
-      if response.nil?
-        $stderr.puts "Failed to do #{cmd}"
-        raise Exception.new, "Failed to do #{cmd}"
-      else
-        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{2,}/)
-          #$stderr.puts "lsplit: #{lsplit}"
-          lsplit.shift ## remove first empty string
-          name = lsplit.shift#$1
-          if lsplit.first =~ /^[A-Za-z]+$/
-            type = lsplit.shift
-          else
-            type = ""
-          end
-          size = lsplit.shift#$3
-          date = lsplit.join(' ')#$4
-          name.gsub!(/\s+$/,'')
-          files[name] = if type =~/^D.*$/
-            {type: :directory, size: size, modified: (Time.parse(date) rescue "!!#{date}")}
-          else
-            {type: :file, size: size , modified: (Time.parse(date) rescue "!!#{date}")}
-          end
-        end
-      end
-      files
-    end
-
-  end
 end

data/lib/sambal/client.rb

@@ -0,0 +1,258 @@
+# encoding: UTF-8
+
+require 'logger'
+require 'pty'
+require 'expect'
+
+module Sambal
+  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, timeout: 10, columns: 80}.merge(options)
+        @timeout = options[:timeout].to_i
+        @o, @i, @pid = PTY.spawn("COLUMNS=#{options[:columns]} smbclient \"//#{options[:host]}/#{options[:share]}\" '#{options[:password]}' -W \"#{options[:domain]}\" -U \"#{options[:user]}\" -p #{options[:port]}")
+        res = @o.expect(/(.*\n)?smb:.*\\>/, @timeout)[0] rescue nil
+        @connected = case res
+        when nil
+          $stderr.puts "Failed to connect"
+          false
+        when /^put/
+          res['putting'].nil? ? false : true
+        else
+          if res['NT_STATUS']
+            false
+          elsif res['timed out'] || res['Server stopped']
+            false
+          else
+            true
+          end
+        end
+
+        unless @connected
+          close if @pid
+          exit(1)
+        end
+      rescue Exception => e
+        raise RuntimeError.exception("Unknown Process Failed!! (#{$!.to_s}): #{e.message.inspect}\n"+e.backtrace.join("\n"))
+      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
+        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(qualifier = '*')
+      parse_files(ask_wrapped('ls', qualifier))
+    end
+
+    def cd(dir)
+      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|
+          response = ask_wrapped '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
+    end
+
+    def put(file, destination)
+      response = ask_wrapped 'put', [file, destination]
+      if response =~ /^putting\sfile.*$/
+        Response.new(response, true)
+      else
+        Response.new(response, false)
+      end
+    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|
+        f << content
+      end
+      response = ask_wrapped 'put', [t.path, destination]
+      if response =~ /^putting\sfile.*$/
+        Response.new(response, true)
+      else
+        Response.new(response, false)
+      end
+    rescue InternalError => e
+      Response.new(e.message, false)
+    ensure
+      t.close
+    end
+
+    def mkdir(directory)
+      return Response.new('directory name is empty', false) if directory.strip.empty?
+      response = ask_wrapped('mkdir', directory)
+      if response =~ /NT_STATUS_OBJECT_NAME_(INVALID|COLLISION)/
+        Response.new(response, false)
+      else
+        Response.new(response, true)
+      end
+    end
+
+    def rmdir(dir)
+      response = cd dir
+      return response if response.failure?
+      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
+        file_context(file) do |file|
+          response = ask_wrapped '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
+      @i.close
+      @o.close
+      Process.wait(@pid)
+      @connected = false
+    end
+
+    def ask(cmd)
+      @i.printf("#{cmd}\n")
+      response = @o.expect(/^smb:.*\\>/,@timeout)[0] rescue nil
+      if response.nil?
+        $stderr.puts "Failed to do #{cmd}"
+        raise Exception.new, "Failed to do #{cmd}"
+      else
+        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{2,}/)
+          #$stderr.puts "lsplit: #{lsplit}"
+          lsplit.shift ## remove first empty string
+          name = lsplit.shift#$1
+          if lsplit.first =~ /^[A-Za-z]+$/
+            type = lsplit.shift
+          else
+            type = ""
+          end
+          size = lsplit.shift#$3
+          date = lsplit.join(' ')#$4
+          name.gsub!(/\s+$/,'')
+          files[name] = if type =~/^D.*$/
+            {type: :directory, size: size, modified: (Time.parse(date) rescue "!!#{date}")}
+          else
+            {type: :file, size: size , modified: (Time.parse(date) rescue "!!#{date}")}
+          end
+        end
+      end
+      files
+    end
+  end
+end

data/lib/sambal/response.rb

@@ -0,0 +1,25 @@
+module Sambal
+  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
+end

data/lib/sambal/smb.conf.erb

@@ -34,6 +34,8 @@
 
 ## Browsing/Identification ###
 
+ncalrpc dir = <%= ncalrpc_dir %>
+
 # Change this to the workgroup/NT-domain name your Samba server will part of
    workgroup = WORKGROUP
 
@@ -75,7 +77,7 @@
 
 # This tells Samba to use a separate log file for each machine
 # that connects
-   log file = /tmp/vp6samba/samba/log.%m
+log file = <%= log_path %>/log.%m
 
 # Cap the size of the individual log files (in KiB).
    max log size = 1000
@@ -99,8 +101,8 @@
 # in this server for every user accessing the server. See
 # /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/ServerType.html
 # in the samba-doc package for details.
-# security = user
-  security = share
+ security = user
+#  security = share
 # we set it to whoever is running the specs
   guest account = <%= local_user %>
 

data/lib/sambal/test_server.rb

@@ -26,20 +26,30 @@ module Sambal
     attr_reader :port
     attr_reader :share_path
     attr_reader :root_path
+    attr_reader :tmp_path
+    attr_reader :private_dir
+    attr_reader :cache_dir
+    attr_reader :state_dir
     attr_reader :config_path
     attr_reader :share_name
     attr_reader :run_as
     attr_reader :host
 
-    def initialize(root_path="/tmp/sambal_test_server_#{Time.now.to_i}", share_name='sambal_test', run_as=ENV['USER'])
+    def initialize(share_name='sambal_test', run_as=ENV['USER'])
       @erb_path = "#{File.expand_path(File.dirname(__FILE__))}/smb.conf.erb"
       @host = "127.0.0.1" ## will always just be localhost
-      @root_path = root_path
-      @share_path = "#{root_path}/share"
+      @root_path = File.expand_path(File.dirname(File.dirname(File.dirname(__FILE__))))
+      @tmp_path = "#{root_path}/spec_tmp"
+      @share_path = "#{tmp_path}/share"
       @share_name = share_name
-      @config_path = "#{root_path}/smb.conf"
-      @lock_path = "#{root_path}"
-      @pid_dir = "#{root_path}"
+      @config_path = "#{tmp_path}/smb.conf"
+      @lock_path = "#{tmp_path}"
+      @pid_dir = "#{tmp_path}"
+      @cache_dir = "#{tmp_path}"
+      @state_dir = "#{tmp_path}"
+      @log_path = "#{tmp_path}"
+      @private_dir = "#{tmp_path}"
+      @ncalrpc_dir = "#{tmp_path}"
       @port = Random.new(Time.now.to_i).rand(2345..5678).to_i
       @run_as = run_as
       FileUtils.mkdir_p @share_path
@@ -53,18 +63,18 @@ module Sambal
 
     def write_config
       File.open(@config_path, 'w') do |f|
-        f << Document.new(IO.binread(@erb_path)).interpolate(samba_share: @share_path, local_user: @run_as, share_name: @share_name)
+        f << Document.new(IO.binread(@erb_path)).interpolate(samba_share: @share_path, local_user: @run_as, share_name: @share_name, log_path: @log_path, ncalrpc_dir: @ncalrpc_dir)
       end
     end
 
     def start
       if RUBY_PLATFORM=="java"
         @smb_server_pid = Thread.new do
-          `smbd -S -F -s #{@config_path} -p #{@port} --lockdir=#{@lock_path} --piddir=#{@pid_dir}`
+          `smbd -S -F -s #{@config_path} -p #{@port} --lockdir=#{@lock_path} --piddir=#{@pid_dir} --private-dir=#{@private_dir} --cachedir=#{@cache_dir} --statedir=#{@state_dir} > #{@log_path}/smb.log`
         end
       else
         @smb_server_pid = fork do
-          `smbd -S -F -s #{@config_path} -p #{@port} --lockdir=#{@lock_path} --piddir=#{@pid_dir}`
+          `smbd -S -F -s #{@config_path} -p #{@port} --lockdir=#{@lock_path} --piddir=#{@pid_dir} --private-dir=#{@private_dir} --cachedir=#{@cache_dir} --statedir=#{@state_dir} > #{@log_path}/smb.log`
         end
       end
       sleep 2 ## takes a short time to start up
@@ -78,8 +88,8 @@ module Sambal
 
     def stop!
       stop
-      FileUtils.rm_rf @root_path
+      FileUtils.rm_rf @tmp_path unless ENV.key?('KEEP_SMB_TMP')
     end
 
   end
-end
+end

data/lib/sambal/version.rb

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

data/sambal.gemspec

@@ -15,5 +15,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Sambal::VERSION
 
-  gem.add_development_dependency "rspec", '>=2.6.0'
+  gem.add_development_dependency "rspec", '>=3.4.0'
 end

data/spec/sambal/client_spec.rb

@@ -5,31 +5,47 @@ require 'tempfile'
 
 describe Sambal::Client do
 
+  TEST_DIRECTORY_WITH_SPACE_IN_NAME = 'my dir with spaces in name'
+  TEST_FILE_IN_DIRECTORY_WITH_SPACE_IN_NAME = 'a_file_in_a_dir_with_spaces_in_name'
+  TEST_SPACES_IN_NAME_PATH = "#{TEST_DIRECTORY_WITH_SPACE_IN_NAME}/#{TEST_FILE_IN_DIRECTORY_WITH_SPACE_IN_NAME}"
+  TEST_DIRECTORY = 'testdir'
+  TEST_SUB_DIRECTORY = 'testdir_sub'
+  SUB_DIRECTORY_PATH = "#{TEST_DIRECTORY}/#{TEST_SUB_DIRECTORY}"
+  TESTFILE = 'testfile.txt'
+  TESTFILE2 = 'testfile.tx'
+  TESTFILE3 = 'testfil.txt'
+  TESTFILE_SUB = 'testfile_sub.txt'
+  TESTFILE_SUB_PATH = "#{SUB_DIRECTORY_PATH}/#{TESTFILE_SUB}"
+
   before(:all) do
     @sambal_client = described_class.new(host: test_server.host, share: test_server.share_name, port: test_server.port)
   end
 
   before(:each) do
-    File.open("#{test_server.share_path}/#{testfile}", 'w') do |f|
+    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|
+    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|
+    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}"
-    FileUtils.chmod 0777, "#{test_server.share_path}/#{testfile}"
+    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}"
+    FileUtils.chmod 0777, "#{test_server.share_path}/#{TESTFILE}"
     @sambal_client.cd('/')
   end
 
+  after(:each) do
+    FileUtils.rm_rf "#{test_server.share_path}/*"
+  end
+
   after(:all) do
     @sambal_client.close
   end
@@ -42,174 +58,175 @@ 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
-
-  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(:testfile2) do
-    'testfile.tx'
-  end
-
-  let(:testfile3) do
-    'testfil.txt'
-  end
-
-  let(:testfile_sub) do
-    'testfile_sub.txt'
-  end
-
-  let(:testfile_sub_path) do
-    "#{sub_directory_path}/#{testfile_sub}"
-  end
-
   describe 'ls' do
     before(:all) 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}"
+      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)
+      expect(result).to 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)
-      result.should have_key(testfile2)
-      result.should have_key(testfile3)
+      expect(result).to have_key(TESTFILE)
+      expect(result).to have_key(TESTFILE2)
+      expect(result).to have_key(TESTFILE3)
     end
 
     it "should list files using a wildcard on an smb server" do
       result = @sambal_client.ls '*.txt'
-      result.should have_key(testfile)
-      result.should_not have_key(testfile2)
-      result.should have_key(testfile3)
+      expect(result).to have_key(TESTFILE)
+      expect(result).to_not have_key(TESTFILE2)
+      expect(result).to have_key(TESTFILE3)
+    end
+  end
+
+  describe 'mkdir' do
+    before(:all) do
+      @sambal_client.cd('/')
+    end
+
+    it 'should create a new directory' do
+      result = @sambal_client.mkdir('test')
+      expect(result).to be_successful
+
+      expect(@sambal_client.ls).to have_key('test')
+    end
+
+    it 'should create a directory with spaces' do
+      result = @sambal_client.mkdir('test spaces directory')
+      expect(result).to be_successful
+      expect(@sambal_client.ls).to have_key('test spaces directory')
+    end
+
+    it 'should not create an invalid directory' do
+      result = @sambal_client.mkdir('**')
+      expect(result).to_not be_successful
+    end
+
+    it 'should not overwrite an existing directory' do
+      # Ensure our test directory exists
+      @sambal_client.rmdir('test')
+      @sambal_client.mkdir('test')
+      expect(@sambal_client.ls).to have_key('test')
+
+      result = @sambal_client.mkdir('test')
+      expect(result).to_not be_successful
+    end
+
+    it 'should handle empty directory names' do
+      expect(@sambal_client.mkdir('')).to_not be_successful
+      expect(@sambal_client.mkdir('   ')).to_not be_successful
     end
   end
 
   it "should get files from an smb server" do
-    @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
+    expect(@sambal_client.get(TESTFILE, "/tmp/sambal_spec_testfile.txt")).to be_successful
+    expect(File.exists?("/tmp/sambal_spec_testfile.txt")).to eq true
+    expect(File.size("/tmp/sambal_spec_testfile.txt")).to eq @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
+    expect(@sambal_client.get(TEST_SPACES_IN_NAME_PATH, "/tmp/sambal_this_file_was_in_dir_with_spaces.txt")).to be_successful
+    expect(File.exists?("/tmp/sambal_this_file_was_in_dir_with_spaces.txt")).to eq true
+    @sambal_client.cd(TEST_DIRECTORY_WITH_SPACE_IN_NAME)
+    expect(File.size("/tmp/sambal_this_file_was_in_dir_with_spaces.txt")).to eq @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
-    @sambal_client.cd(sub_directory_path)
-    File.size("/tmp/sambal_spec_testfile_sub.txt").should == @sambal_client.ls[testfile_sub][:size].to_i
+    expect(@sambal_client.get(TESTFILE_SUB_PATH, "/tmp/sambal_spec_testfile_sub.txt")).to be_successful
+    expect(File.exists?("/tmp/sambal_spec_testfile_sub.txt")).to eq true
+    @sambal_client.cd(SUB_DIRECTORY_PATH)
+    expect(File.size("/tmp/sambal_spec_testfile_sub.txt")).to eq @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
-    result.message.should match /^NT_.*$/
-    result.message.split("\n").should have(1).line
-    File.exists?("/tmp/sambal_spec_non_existant_file.txt").should == false
+    expect(result).to_not be_successful
+    expect(result.message).to match(/^NT_.*$/)
+    expect(result.message.split("\n").size).to eq 1
+    expect(File.exists?("/tmp/sambal_spec_non_existant_file.txt")).to eq 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').should be_successful
-    @sambal_client.ls.should have_key("uploaded_file.txt")
+    expect(@sambal_client.ls).to_not have_key("uploaded_file.txt")
+    expect(@sambal_client.put(file_to_upload.path, 'uploaded_file.txt')).to be_successful
+    expect(@sambal_client.ls).to 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').should be_successful
-    @sambal_client.ls.should have_key("content_uploaded_file.txt")
+    expect(@sambal_client.ls).to_not have_key("content_uploaded_file.txt")
+    expect(@sambal_client.put_content("Content upload", 'content_uploaded_file.txt')).to be_successful
+    expect(@sambal_client.ls).to have_key("content_uploaded_file.txt")
   end
 
   it "should delete files on an smb server" do
-    @sambal_client.del(testfile).should be_successful
-    @sambal_client.ls.should_not have_key(testfile)
+    expect(@sambal_client.del(TESTFILE)).to be_successful
+    expect(@sambal_client.ls).to_not have_key(TESTFILE)
   end
 
   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
+    expect(result).to_not be_successful
+    expect(result.message).to match(/^NT_.*$/)
+    expect(result.message.split("\n").size).to eq 1
   end
 
   it "should switch directory on an smb server" do
-    @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).should be_successful
-    @sambal_client.ls.should_not have_key('dirtest.txt')
-    @sambal_client.put_content("in #{test_directory}", 'intestdir.txt').should be_successful
-    @sambal_client.ls.should have_key('intestdir.txt')
-    @sambal_client.cd('..').should be_successful
-    @sambal_client.ls.should_not have_key('intestdir.txt')
-    @sambal_client.ls.should have_key('dirtest.txt')
+    expect(@sambal_client.put_content("testing directories", 'dirtest.txt')).to be_successful ## a bit stupid, but now we can check that this isn't listed when we switch dirs
+    expect(@sambal_client.ls).to have_key('dirtest.txt')
+    expect(@sambal_client.cd(TEST_DIRECTORY)).to be_successful
+    expect(@sambal_client.ls).to_not have_key('dirtest.txt')
+    expect(@sambal_client.put_content("in #{TEST_DIRECTORY}", 'intestdir.txt')).to be_successful
+    expect(@sambal_client.ls).to have_key('intestdir.txt')
+    expect(@sambal_client.cd('..')).to be_successful
+    expect(@sambal_client.ls).to_not have_key('intestdir.txt')
+    expect(@sambal_client.ls).to have_key('dirtest.txt')
   end
 
   it "should delete files in subdirectory while in a higher level 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(TEST_DIRECTORY)
+    expect(@sambal_client.put_content("some content", "file_to_delete")).to be_successful
     @sambal_client.cd('/')
-    @sambal_client.del("#{test_directory}/file_to_delete").should be_successful
+    expect(@sambal_client.del("#{TEST_DIRECTORY}/file_to_delete")).to be_successful
     @sambal_client.cd('/')
-    @sambal_client.ls.should have_key("#{testfile}")
+    expect(@sambal_client.ls).to 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(TEST_DIRECTORY)
+    expect(@sambal_client.put_content("some content", "file_to_delete")).to be_successful
     @sambal_client.cd('/')
-    @sambal_client.rmdir("#{test_directory}").should be_successful
+    expect(@sambal_client.rmdir("#{TEST_DIRECTORY}")).to be_successful
     @sambal_client.cd('/')
-    @sambal_client.ls.should_not have_key("#{test_directory}")
+    expect(@sambal_client.ls).to_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
+    expect(@sambal_client.rmdir("this_doesnt_exist")).to_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
+    expect(result).to_not be_successful
   end
 
   it 'should create commands with one wrapped filename' do
-    @sambal_client.wrap_filenames('cmd','file1').should eq('cmd "file1"')
+    expect(@sambal_client.wrap_filenames('cmd','file1')).to eq('cmd "file1"')
   end
 
   it 'should create commands with more than one wrapped filename' do
-    @sambal_client.wrap_filenames('cmd',['file1','file2']).should eq('cmd "file1" "file2"')
+    expect(@sambal_client.wrap_filenames('cmd',['file1','file2'])).to eq('cmd "file1" "file2"')
   end
 
   it 'should create commands with pathnames instead of strings' do
-    @sambal_client.wrap_filenames('cmd',[Pathname.new('file1'), Pathname.new('file2')]).should eq('cmd "file1" "file2"')
+    expect(@sambal_client.wrap_filenames('cmd',[Pathname.new('file1'), Pathname.new('file2')])).to eq('cmd "file1" "file2"')
   end
 
 end

data/spec/spec_helper.rb

@@ -9,10 +9,11 @@ $:.unshift(lib_path) if File.directory?(lib_path) && !$:.include?(lib_path)
 
 require 'sambal'
 require 'sambal/test_server'
+require 'rspec/expectations'
 
 RSpec::Matchers.define :be_successful do
   match do |actual|
-    actual.success?.should be_true
+    actual.success? == true
   end
 end
 
@@ -31,7 +32,7 @@ RSpec.configure do |config|
   # config.mock_with :flexmock
   # config.mock_with :rr
   config.mock_with :rspec
-  
+
   ## perhaps this should be removed as well
   ## and done in Rakefile?
   config.color = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sambal
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - John Axel Eriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 3.4.0
 description: Ruby Samba Client using the cmdline smbclient
 email:
 - john@insane.se
@@ -36,7 +36,11 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- Spookfile
+- circle.yml
 - lib/sambal.rb
+- lib/sambal/client.rb
+- lib/sambal/response.rb
 - lib/sambal/smb.conf.erb
 - lib/sambal/test_server.rb
 - lib/sambal/version.rb