sambal 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec4f0b1b79fd466d3545c06238d4685e02d690cd
-  data.tar.gz: 8036f666109f31542df162291523a7742af88d81
+  metadata.gz: 5aa72cf029b53169fa955bba66735424b1947fbd
+  data.tar.gz: 78c1a1d13b7215826210ea6218a08c33f8d70714
 SHA512:
-  metadata.gz: 73f4147a17833f4d2c308c60a0b66a1687d2e98eb5ab384d60bfb1442d9e92f922515fd8c1f62a4514aa54153342a12edaa1c8906da0e64e3d36127b6d6bba6d
-  data.tar.gz: a5407cf3408aa99a2b8887b8863c62713b35f602b637303160e740033711c86e0d2542d5395897e6b7ca066f463b3c712e023e3cdb9bae4c077ac19da0e02c5b
+  metadata.gz: 9bf4c8fea3956f86d9f78d2142fb77d7e5763d20abe0f7674b1ce15a54f81aca07c9be017ea6c0681c0a349b0620e5b84caf0d9fc0faf129893151daac8ef523
+  data.tar.gz: 88ced4ce2d2be7272c735f83747ff033221b0034a41f3b44746ec3a41791a5d08776320eb6b322bd8a6df1c0f1af0542ffa38e7423120292b37398a43263415d

data/lib/sambal/client.rb

@@ -15,7 +15,7 @@ module Sambal
         host: '127.0.0.1',
         share: '',
         user: 'guest',
-        password: '--no-pass',
+        password: false,
         port: 445,
         timeout: 10,
         columns: 80
@@ -31,8 +31,11 @@ module Sambal
         options = parsed_options(user_options)
         @timeout = options[:timeout].to_i
 
-        option_flags = "-W \"#{options[:domain]}\" -U \"#{options[:user]}\" -I #{options[:ip_address]} -p #{options[:port]}"
-        command = "COLUMNS=#{options[:columns]} smbclient \"//#{options[:host]}/#{options[:share]}\" '#{options[:password]}'"
+        option_flags = "-W \"#{options[:domain]}\" -U \"#{options[:user]}\""
+        option_flags = "#{option_flags} -I #{options[:ip_address]}" if options[:ip_address]
+        option_flags = "#{option_flags} -p #{options[:port]} -s /dev/null"
+        password = options[:password] ? "'#{options[:password]}'" : "--no-pass"
+        command = "COLUMNS=#{options[:columns]} smbclient \"//#{options[:host]}/#{options[:share]}\" #{password}"
 
         @output, @input, @pid = PTY.spawn(command + ' ' + option_flags)
 

data/lib/sambal/smb.conf.erb

@@ -80,7 +80,7 @@ ncalrpc dir = <%= ncalrpc_dir %>
 log file = <%= log_path %>/log.%m
 
 # Cap the size of the individual log files (in KiB).
-   max log size = 1000
+max log size = 1000
 
 # If you want Samba to only log through syslog then set the following
 # parameter to 'yes'.
@@ -89,7 +89,7 @@ log file = <%= log_path %>/log.%m
 # We want Samba to log a minimum amount of information to syslog. Everything
 # should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log
 # through syslog you should set the following parameter to something higher.
-   syslog = 0
+syslog = 0
 
 # Do something sensible when Samba crashes: mail the admin a backtrace
 #   panic action = /usr/share/samba/panic-action %d
@@ -101,18 +101,20 @@ log file = <%= log_path %>/log.%m
 # 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 = user
 #  security = share
 # we set it to whoever is running the specs
-  guest account = <%= local_user %>
+guest account = <%= local_user %>
+
+map to guest = Bad User
 
 # You may wish to use password encryption.  See the section on
 # 'encrypt passwords' in the smb.conf(5) manpage before enabling.
-   encrypt passwords = true
+encrypt passwords = true
 
 # If you are using encrypted passwords, Samba will need to know what
 # password database type you are using.
- passdb backend = tdbsam
+passdb backend = tdbsam
 
 # obey pam restrictions = yes
 
@@ -187,12 +189,13 @@ log file = <%= log_path %>/log.%m
 
 # If you want to automatically load your printer list rather
 # than setting them up individually then you'll need this
-#   load printers = yes
+load printers = no
 
 # lpr(ng) printing. You may wish to override the location of the
 # printcap file
-;   printing = bsd
-;   printcap name = /etc/printcap
+printing = bsd
+printcap name = /dev/null
+disable spoolss = yes
 
 # CUPS printing.  See also the cupsaddsmb(8) manpage in the
 # cupsys-client package.
@@ -200,6 +203,7 @@ log file = <%= log_path %>/log.%m
 ;   printcap name = cups
 
 ############ Misc ############
+enable core files = no
 
 # Using the following line enables you to customise your configuration
 # on a per machine basis. The %m gets replaced with the netbios name
@@ -333,7 +337,7 @@ log file = <%= log_path %>/log.%m
    comment = Spec directory
    read only = no
    writeable = yes
-   write list = <%= local_user %>, @staff
+   write list = <%= local_user %>, @<%= `groups`.split(' ').first %>
    locking = no
    path = <%= samba_share %>
    guest ok = yes
@@ -342,11 +346,9 @@ log file = <%= log_path %>/log.%m
    directory mask = 777
    force create mode = 777
    force directory mode = 775
-   force group = staff
    force user = <%= local_user %>
-   guest account = <%= local_user %>
+   force group = <%= `groups`.split(' ').first %>
    guest only = yes
-   security = share
    acl check permissions = False
 
 # The next two parameters show how to auto-mount a CD-ROM when the

data/lib/sambal/test_server.rb

@@ -53,6 +53,7 @@ module Sambal
       @port = Random.new(Time.now.to_i).rand(2345..5678).to_i
       @run_as = run_as
       FileUtils.mkdir_p @share_path
+      File.chmod 0777, @share_path
       write_config
     end
 
@@ -70,11 +71,11 @@ module Sambal
     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} --private-dir=#{@private_dir} --cachedir=#{@cache_dir} --statedir=#{@state_dir} > #{@log_path}/smb.log`
+          `smbd -S -F -s #{@config_path} -p #{@port} --option="lockdir"=#{@lock_path} --option="pid directory"=#{@pid_dir} --option="private directory"=#{@private_dir} --option="cache directory"=#{@cache_dir} --option="state directory"=#{@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} --private-dir=#{@private_dir} --cachedir=#{@cache_dir} --statedir=#{@state_dir} > #{@log_path}/smb.log`
+          `smbd -S -F -s #{@config_path} -p #{@port} --option="lockdir"=#{@lock_path} --option="pid directory"=#{@pid_dir} --option="private directory"=#{@private_dir} --option="cache directory"=#{@cache_dir} --option="state directory"=#{@state_dir} > #{@log_path}/smb.log`
         end
       end
       sleep 2 ## takes a short time to start up

data/lib/sambal/version.rb

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

data/spec/sambal/client_spec.rb

@@ -36,10 +36,10 @@ describe Sambal::Client do
     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}/#{TEST_DIRECTORY_WITH_SPACE_IN_NAME}/#{TEST_FILE_IN_DIRECTORY_WITH_SPACE_IN_NAME}"
+    FileUtils.chmod 0777, "#{test_server.share_path}/#{TEST_DIRECTORY}/#{TEST_SUB_DIRECTORY}/#{TESTFILE_SUB}"
+    FileUtils.chmod 0777, "#{test_server.share_path}/#{TEST_DIRECTORY}/#{TEST_SUB_DIRECTORY}"
+    FileUtils.chmod 0777, "#{test_server.share_path}/#{TEST_DIRECTORY}"
     FileUtils.chmod 0777, "#{test_server.share_path}/#{TESTFILE}"
     @sambal_client.cd('/')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sambal
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - John Axel Eriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby Samba Client