sambal 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 70c296f73caebfc4f2f4ab9905e5fd026ab0901c
-  data.tar.gz: b6b08da8925d1aff26b44d0efa02c629a080ded9
+SHA256:
+  metadata.gz: fd8dcc698177728a2089a8ef9bf157d4e1e0d11e59083399b5b0fceecf9b0331
+  data.tar.gz: 8ff8321bc0480bc5fe4422c697dceceb0a2743e0a4ac6e35cfc4ef4dab739ee4
 SHA512:
-  metadata.gz: f0df7b2ceaeb41f7cb134c7878d5b06a14db34c58612139bf8191bd2a31d0cac85be95ddc7864b69aaafc413f7e9e23ba5cd9570fea5ea3e843742f91c68fb80
-  data.tar.gz: 0aab39d00f27e5625118698bf0f69fe21bc4df20f4f956743b356708d39ff74201fb19e4eaaed5b2fe3fa843ebc72f902309d2fcad710484f43fc71f3f8c1f04
+  metadata.gz: 313f5d0d5ae699228ba5874cc69f72debe1ae7364643e2040d19aa98ae81e874017be52978c576e67478a7bb63ce27170db00f3801dc262b9620778a367f22f1
+  data.tar.gz: 040f2c1e8d7bf126feeda45bdf28c6aeba75778f9491afd5d2999e1b15953540e74239ad0d1ca92518ba51ccff030df3ec84175a172609800f6e7a9671f5bb61

data/lib/sambal/client.rb

@@ -31,18 +31,21 @@ module Sambal
         options = parsed_options(user_options)
         @timeout = options[:timeout].to_i
 
-        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"
+        password =
+          if options[:authfile]
+            "--authentication-file #{options[:authfile]}"
+          elsif options[:password]
+            options[:password]
+          else
+            '--no-pass'
+          end
         command = "COLUMNS=#{options[:columns]} smbclient \"//#{options[:host]}/#{options[:share]}\" #{password}"
 
-        @output, @input, @pid = PTY.spawn(command + ' ' + option_flags)
+        @output, @input, @pid = PTY.spawn("#{command} #{option_flags(options)}")
 
         res = @output.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
@@ -58,7 +61,7 @@ module Sambal
 
         unless @connected
           close if @pid
-          exit(1)
+          raise 'Failed to connect'
         end
       rescue => e
         raise RuntimeError, "Unknown Process Failed!! (#{$!.to_s}): #{e.message.inspect}\n"+e.backtrace.join("\n")
@@ -123,6 +126,17 @@ module Sambal
       end
     end
 
+    def rename(old_filename, new_filename)
+      response = ask_wrapped 'rename', [old_filename, new_filename]
+      if response =~ /renaming\sfile/ # "renaming" reponse only exist if has error
+        Response.new(response, false)
+      else
+        Response.new(response, true)
+      end
+    rescue InternalError => e
+      Response.new(e.message, false)
+    end
+
     def put(file, destination)
       response = ask_wrapped 'put', [file, destination]
       if response =~ /^putting\sfile.*$/
@@ -286,5 +300,24 @@ module Sambal
       end
       Hash[listing.sort]
     end
+
+    private
+
+    def option_flags(options)
+      flags = []
+      flags << "--workgroup \"#{options[:domain]}\"" if options[:domain] && !options[:authfile]
+      flags << "--user \"#{options[:user]}\"" if options[:user] && !options[:authfile]
+      flags << "--ip-address #{options[:ip_address]}" if options[:ip_address]
+      flags << "--send-buffer #{options[:buffer_size]}" if options[:buffer_size]
+      flags << "--debuglevel #{options[:debug_level]}" if options[:debug_level]
+      flags << '--encrypt' if options[:encrypt]
+      flags << "--max-protocol #{options[:max_protocol]}" if options[:max_protocol]
+      flags << '--use-ccache' if options[:use_ccache]
+      flags << "--socket-options #{options[:socket_options]}" if options[:socket_options]
+      flags << "--port #{options[:port]}" if options[:port]
+      flags << "--name-resolve #{options[:name_resolve]}" if options[:name_resolve]
+      flags << (options[:configfile] ? "--configfile #{options[:configfile]}" : '--configfile /dev/null')
+      flags.join(' ')
+    end
   end
 end

data/lib/sambal/version.rb

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

data/spec/sambal/client_spec.rb

@@ -140,6 +140,17 @@ describe Sambal::Client do
     end
   end
 
+  describe 'rename' do
+    it 'is successful when renaming an existing file' do
+      expect(@sambal_client.rename(TESTFILE, 'renamed_file.txt')).to be_successful
+      expect(File.exists?(File.join(test_server.share_path, 'renamed_file.txt'))).to eq true
+    end
+
+    it 'is unsuccessful when the file does not exist' do
+      expect(@sambal_client.rename('unknown_file.txt', 'renamed_file.txt')).not_to be_successful
+    end
+  end
+
   it "should get files from an smb server" do
     expect(@sambal_client.get(TESTFILE, "/tmp/sambal_spec_testfile.txt")).to be_successful
     expect(File.exists?("/tmp/sambal_spec_testfile.txt")).to eq true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sambal
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - John Axel Eriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2018-08-12 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.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby Samba Client