winrm-fs 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cf37aded4f1476cc49122bbbca6471a99f8aca993c576814b84cbc5c5df5a19
-  data.tar.gz: 065cbd45d85cac20c802fb80658f2827973575a66fca2ebf3e4d7d89850e26f9
+  metadata.gz: 22197843455d6d73e34d00c91fd58d4a6201d08f02f61a64d5b971085360aebf
+  data.tar.gz: fd9181f9187df12ad0a6812891c29a1e917ccfc9f2d4064448a52d08f0455d05
 SHA512:
-  metadata.gz: c03405f8768546eb314bbac0ec02e0d41af49126c3686bc653cdbe8087d474805b293d278bce4951532d62d15638af7e9f4e06697a3d1cb11ee69900f40b00ac
-  data.tar.gz: 9b2a13482f0aee40125d1879943ad526dc22a9d74f87a7e21f122474af7449033fa3006b2637e27ae8e26abc97f0122fcfacd8d422cc13250cc63d7060b088f2
+  metadata.gz: ebf3f8d594d00219a5b19f6eb2ba17ae4f466de4d4eb0929b6f61f8f9075473ccdaff127ab3ed10a06280a309cfe3b5d8976a1857970c3f02a22080413690667
+  data.tar.gz: a56cf8645bcb803c377f7146a1c5a005496e74b9b7993b6f18f38dd70c2a4de00174c65cd7abc3a0e409b07fa10a10bab7fce145b5dfb6991744f2c720d9a2e0

data/lib/winrm-fs.rb

@@ -15,9 +15,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'winrm'
+require 'winrm' unless defined?(WinRM::Connection)
 require 'logger'
-require 'pathname'
+require 'pathname' unless defined?(Pathname)
 require_relative 'winrm-fs/exceptions'
 require_relative 'winrm-fs/file_manager'
 

data/lib/winrm-fs/core/file_transporter.rb

@@ -17,11 +17,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'benchmark'
-require 'csv'
-require 'digest'
-require 'securerandom'
-require 'stringio'
+require 'benchmark' unless defined?(Benchmark)
+require 'csv' unless defined?(CSV)
+require 'digest' unless defined?(Digest)
+require 'securerandom' unless defined?(SecureRandom)
+require 'stringio' unless defined?(StringIO)
 
 require 'winrm/exceptions'
 require 'winrm-fs/core/tmp_zip'
@@ -117,6 +117,10 @@ module WinRM
           [total_size, files]
         end
 
+        def close
+          shell.close
+        end
+
         private
 
         # @return [String] the Array pack template for Base64 encoding a stream

data/lib/winrm-fs/core/tmp_zip.rb

@@ -18,9 +18,9 @@
 # limitations under the License.
 
 require 'delegate'
-require 'pathname'
-require 'tempfile'
-require 'zip'
+require 'pathname' unless defined?(Pathname)
+require 'tempfile' unless defined?(Tempfile)
+require 'zip' unless defined?(Zip)
 
 module WinRM
   module FS
@@ -113,7 +113,7 @@ module WinRM
         #   directory, excluding directories
         # @api private
         def entries
-          Pathname.glob(dir.join('**/*')).delete_if(&:directory?).sort
+          Pathname.glob(dir.join('**/.*')).push(*Pathname.glob(dir.join('**/*'))).delete_if(&:directory?).sort
         end
 
         # (see Logging.log_subject)

data/lib/winrm-fs/file_manager.rb

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'winrm'
+require 'winrm' unless defined?(WinRM::Connection)
 require_relative 'scripts/scripts'
 require_relative 'core/file_transporter'
 
@@ -37,7 +37,7 @@ module WinRM
       def checksum(path, digest = 'SHA1')
         @logger.debug("checksum with #{digest}: #{path}")
         script = WinRM::FS::Scripts.render('checksum', path: path, digest: digest)
-        @connection.shell(:powershell) { |e| e.run(script).stdout.chomp }
+        ps_run(script).exitcode == 0
       end
 
       # Create the specifed directory recursively
@@ -46,7 +46,7 @@ module WinRM
       def create_dir(path)
         @logger.debug("create_dir: #{path}")
         script = WinRM::FS::Scripts.render('create_dir', path: path)
-        @connection.shell(:powershell) { |e| e.run(script).exitcode == 0 }
+        ps_run(script).exitcode == 0
       end
 
       # Deletes the file or directory at the specified path
@@ -55,7 +55,7 @@ module WinRM
       def delete(path)
         @logger.debug("deleting: #{path}")
         script = WinRM::FS::Scripts.render('delete', path: path)
-        @connection.shell(:powershell) { |e| e.run(script).exitcode == 0 }
+        ps_run(script).exitcode == 0
       end
 
       # Downloads the specified remote file to the specified local path
@@ -87,7 +87,7 @@ module WinRM
 
       def _output_from_file(remote_path, chunk_size, index)
         script = WinRM::FS::Scripts.render('download', path: remote_path, chunk_size: chunk_size, index: index)
-        @connection.shell(:powershell) { |e| e.run(script) }
+        ps_run(script)
       end
 
       def _write_file(tofd, output)
@@ -106,7 +106,7 @@ module WinRM
       def exists?(path)
         @logger.debug("exists?: #{path}")
         script = WinRM::FS::Scripts.render('exists', path: path)
-        @connection.shell(:powershell) { |e| e.run(script).exitcode == 0 }
+        ps_run(script).exitcode == 0
       end
 
       # Gets the current user's TEMP directory on the remote system, for example
@@ -114,7 +114,7 @@ module WinRM
       # @return [String] Full path to the temp directory
       def temp_dir
         @temp_dir ||= begin
-          (@connection.shell(:powershell) { |e| e.run('$env:TEMP') }).stdout.chomp.tr('\\', '/')
+          ps_run('$env:TEMP').stdout.chomp.tr('\\', '/')
         end
       end
 
@@ -139,12 +139,25 @@ module WinRM
       def upload(local_path, remote_path, &block)
         @connection.shell(:powershell) do |shell|
           file_transporter ||= WinRM::FS::Core::FileTransporter.new(shell)
-          file_transporter.upload(local_path, remote_path, &block)[0]
+          begin
+            file_transporter.upload(local_path, remote_path, &block)[0]
+          ensure
+            file_transporter.close
+          end
         end
       end
 
       private
 
+      def ps_run(cmd)
+        shell = @connection.shell(:powershell)
+        begin
+          shell.run(cmd)
+        ensure
+          shell.close
+        end
+      end
+
       def download_dir(remote_path, local_path, chunk_size, first)
         local_path = File.join(local_path, File.basename(remote_path.to_s)) if first
         FileUtils.mkdir_p(local_path) unless File.directory?(local_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winrm-fs
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Shawn Neal
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -185,8 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: WinRM File System