sambal 0.0.3 → 0.0.4

data/{spec → lib/sambal}/smb.conf.erb

@@ -327,7 +327,7 @@
 ;   path = /cdrom
 ;   guest ok = yes
 
-[spec]
+[<%= share_name %>]
    comment = Spec directory
    read only = no
    writeable = yes

data/lib/sambal/test_server.rb

@@ -0,0 +1,77 @@
+# coding: UTF-8
+
+require "erb"
+require "fileutils"
+
+class Hash
+  def to_binding(object = Object.new)
+    object.instance_eval("def binding_for(#{keys.join(",")}) binding end")
+    object.binding_for(*values)
+  end
+end
+
+class Document
+  def initialize(template)
+    @template = ERB.new(template)
+  end
+  
+  def interpolate(replacements = {})
+    @template.result(replacements.to_binding)
+  end
+end
+
+module Sambal
+  class TestServer
+
+    attr_reader :port
+    attr_reader :share_path
+    attr_reader :root_path
+    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'])
+      @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"
+      @share_name = share_name
+      @config_path = "#{root_path}/smb.conf"
+      @port = Random.new(Time.now.to_i).rand(2345..5678).to_i
+      @run_as = run_as
+      FileUtils.mkdir_p @share_path
+      write_config
+    end
+  
+    def find_pids
+      pids = `ps ax | grep smbd | grep #{@port} | grep -v grep | awk '{print \$1}'`.chomp
+      pids.split("\n").map {|p| (p.nil? || p=='') ? nil : p.to_i }
+    end
+
+    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)
+      end
+    end
+
+    def start
+      @smb_server_pid = fork do
+        `smbd -S -F -s #{@config_path} -p #{@port}`
+      end
+      sleep 2 ## takes a short time to start up
+    end
+
+    def stop
+      ## stopping is done in an ugly way by grepping
+      pids = find_pids
+      pids.each { |ppid| `kill -9 #{ppid} 2> /dev/null` }
+    end
+
+    def stop!
+      stop
+      FileUtils.rm_rf @root_path
+    end
+
+  end
+end

data/lib/sambal/version.rb

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

data/spec/sambal/client_spec.rb

@@ -5,26 +5,18 @@ require 'tempfile'
 
 describe Sambal::Client do
 
-  SMB_PORT = 2321
-  SHARE_NAME = 'spec'
-
-  def smbd_pids
-    pids = `ps ax | grep smbd | grep #{SMB_PORT} | grep -v grep | awk '{print \$1}'`.chomp
-    pids.split("\n").map {|p| (p.nil? || p=='') ? nil : p.to_i }
-  end
-
-  def start_smbd
-    ## we just start an smb server here for the duration of this spec
-    @smb_server_pid = fork do
-      `smbd -S -F -s #{SAMBA_CONF} -p 2321`
+  before(:all) do
+    File.open("#{test_server.share_path}/#{testfile}", 'w') do |f|
+      f << "Hello"
     end
-    sleep 2 ## takes a short time to start up
+    FileUtils.mkdir_p "#{test_server.share_path}/#{test_directory}"
+    FileUtils.chmod 0775, "#{test_server.share_path}/#{test_directory}"
+    FileUtils.chmod 0777, "#{test_server.share_path}/#{testfile}"
+    @sambal_client = described_class.new(host: test_server.host, share: test_server.share_name, port: test_server.port)
   end
-  
-  def stop_smbd
-    ## stopping is done in an ugly way now by greping etc - it works
-    pids = smbd_pids
-    pids.each { |ppid| `kill -9 #{ppid} 2> /dev/null` }
+
+  after(:all) do
+    @sambal_client.close
   end
 
   let(:file_to_upload) do
@@ -43,22 +35,6 @@ describe Sambal::Client do
     'testfile.txt'
   end
 
-  before(:all) do
-    File.open("#{SAMBA_SHARE}/#{testfile}", 'w') do |f|
-      f << "Hello"
-    end
-    FileUtils.mkdir_p "#{SAMBA_SHARE}/#{test_directory}"
-    FileUtils.chmod 0775, "#{SAMBA_SHARE}/#{test_directory}"
-    FileUtils.chmod 0777, "#{SAMBA_SHARE}/#{testfile}"
-    start_smbd
-    @sambal_client = described_class.new(host: '127.0.0.1', share: SHARE_NAME, port: SMB_PORT)
-  end
-
-  after(:all) do
-    @sambal_client.close
-    stop_smbd
-  end
-
   it "should list files on an smb server" do
     @sambal_client.ls.should have_key(testfile)
   end

data/spec/spec_helper.rb

@@ -8,41 +8,7 @@ lib_path = File.expand_path('../lib', File.dirname(__FILE__))
 $:.unshift(lib_path) if File.directory?(lib_path) && !$:.include?(lib_path)
 
 require 'sambal'
-
-FileUtils.rm_rf "/tmp/sambal_spec/samba"
-FileUtils.mkdir_p "/tmp/sambal_spec/samba/"
-
-spec_path = File.expand_path('./', File.dirname(__FILE__))
-
-SAMBA_SHARE = "#{spec_path}/sambashare"
-SAMBA_CONF = "#{spec_path}/smb.conf"
-
-FileUtils.rm_rf SAMBA_SHARE
-FileUtils.mkdir_p SAMBA_SHARE
-#
-require "erb"
-#
-class Hash
-  def to_binding(object = Object.new)
-    object.instance_eval("def binding_for(#{keys.join(",")}) binding end")
-    object.binding_for(*values)
-  end
-end
-
-class Document
-  def initialize(template)
-    @template = ERB.new(template)
-  end
-  
-  def interpolate(replacements = {})
-    @template.result(replacements.to_binding)
-  end
-end
-#
-
-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
+require 'sambal/test_server'
 
 RSpec::Matchers.define :be_successful do
   match do |actual|
@@ -50,8 +16,11 @@ RSpec::Matchers.define :be_successful do
   end
 end
 
-#
-#
+module TestServer
+  def test_server
+    $test_server
+  end
+end
 
 RSpec.configure do |config|
   # == Mock Framework
@@ -68,4 +37,16 @@ RSpec.configure do |config|
   config.color_enabled = true
   ## dont do this, do it in Rakefile instead
   #config.formatter = 'd'
+
+  config.before(:suite) do
+    $test_server = Sambal::TestServer.new
+    $test_server.start
+  end
+
+  config.after(:suite) do
+    $test_server.stop! ## removes any created directories
+  end
+
+  config.include TestServer
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sambal
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70152943099320 !ruby/object:Gem::Requirement
+  requirement: &70339101671600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70152943099320
+  version_requirements: *70339101671600
 description: Ruby Samba Client using the cmdline smbclient
 email:
 - john@insane.se
@@ -35,10 +35,11 @@ files:
 - README.md
 - Rakefile
 - lib/sambal.rb
+- lib/sambal/smb.conf.erb
+- lib/sambal/test_server.rb
 - lib/sambal/version.rb
 - sambal.gemspec
 - spec/sambal/client_spec.rb
-- spec/smb.conf.erb
 - spec/spec_helper.rb
 homepage: https://github.com/johnae/sambal
 licenses: []
@@ -66,5 +67,4 @@ specification_version: 3
 summary: Ruby Samba Client
 test_files:
 - spec/sambal/client_spec.rb
-- spec/smb.conf.erb
 - spec/spec_helper.rb