winrm-fs 1.3.4 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cf37aded4f1476cc49122bbbca6471a99f8aca993c576814b84cbc5c5df5a19
-  data.tar.gz: 065cbd45d85cac20c802fb80658f2827973575a66fca2ebf3e4d7d89850e26f9
+  metadata.gz: 85111e8743dcffa4aafcf63f815eff675bda56e951ff83c0f7e63d7b97e4b25c
+  data.tar.gz: 29c072897a7d7372391d64446e1f7256d60e02a9846914f0b6decb497343b7c2
 SHA512:
-  metadata.gz: c03405f8768546eb314bbac0ec02e0d41af49126c3686bc653cdbe8087d474805b293d278bce4951532d62d15638af7e9f4e06697a3d1cb11ee69900f40b00ac
-  data.tar.gz: 9b2a13482f0aee40125d1879943ad526dc22a9d74f87a7e21f122474af7449033fa3006b2637e27ae8e26abc97f0122fcfacd8d422cc13250cc63d7060b088f2
+  metadata.gz: 658a0ee64bfb237dc03e31e6e2b25db8d90cf692452d82fe3c25fe09d41ab568611d588c6830b9a6496d582181b5221e9689994a5b4ce51af024188bdfa6c4ea
+  data.tar.gz: 4adf7ef9cd6ae186f402b0f8b8e29b09d37e5f325e0b9aa648a2ca4f2eb0c399793fab4e13c6866ba087fb464db09108bffef8fa0d7ebc0b368b57f7ce0727a6

data/README.md

@@ -1,14 +1,16 @@
 # File system operations over Windows Remote Management (WinRM) for Ruby
-[![Build Status](https://travis-ci.org/WinRb/winrm-fs.svg?branch=master)](https://travis-ci.org/WinRb/winrm-fs)
+
+[![CI](https://github.com/WinRb/winrm-fs/actions/workflows/ci.yml/badge.svg)](https://github.com/WinRb/winrm-fs/actions/workflows/ci.yml)
 [![Gem Version](https://badge.fury.io/rb/winrm-fs.svg)](http://badge.fury.io/rb/winrm-fs)
-[![Build status](https://ci.appveyor.com/api/projects/status/wm6apa8ojfhfmwsf?svg=true)](https://ci.appveyor.com/project/winrb/winrm-fs)
 
 ## Uploading files
+
 Files may be copied from the local machine to the winrm endpoint. Individual files or directories, as well as arrays of files and directories may be specified. Data from a `StringIO` object may also be uploaded to a remote file.
+
 ```ruby
 require 'winrm-fs'
 
-connection = WinRM::Connection.new(...
+connection = WinRM::Connection.new(...)
 file_manager = WinRM::FS::FileManager.new(connection)
 
 # upload file.txt from the current working directory
@@ -29,11 +31,14 @@ file_manager.upload([
 ```
 
 ### Optimizing WinRM settings
+
 Since winrm-fs 1.0/winrm 2.0, files are uploaded using the PSRP protocol and transfer speeds are dramatically improved from previous versions. This is largely due to the fact that the size of chunks that can be transferred at one time are now governed by the `MaxEnvelopeSizekb` winrm configuration setting on the endpoint. This default to 500 on Windows 2012 R2 and 150 on Windows 2008 R2. You may experience much faster transfer rates on 2008 R2 by increasing this setting.
 
 ### Handling progress events
+
 If you want to implement your own custom progress handling, you can pass a code
-block and use the proggress data that `upload` yields to this block:
+block and use the progress data that `upload` yields to this block:
+
 ```ruby
 file_manager.upload('c:/dev/my_dir', '$env:AppData') do |bytes_copied, total_bytes, local_path, remote_path|
   puts "#{bytes_copied}bytes of #{total_bytes}bytes copied"
@@ -53,20 +58,20 @@ first.
 3. Run the unit and integration tests (bundle exec rake integration)
 4. Commit your changes (git commit -am "Added a sweet feature")
 5. Push to the branch (git push origin my_feature_branch)
-6. Create a pull requst from your branch into master (Please be sure to provide enough detail for us to cipher what this change is doing)
+6. Create a pull request from your branch into main (Please be sure to provide enough detail for us to cipher what this change is doing)
 
 ### Running the tests
 
 We use Bundler to manage dependencies during development.
 
-```
-$ bundle install
+```bash
+bundle install
 ```
 
 Once you have the dependencies, you can run the unit tests with `rake`:
 
-```
-$ bundle exec rake spec
+```bash
+bundle exec rake spec
 ```
 
 To run the integration tests you will need a Windows box with the WinRM service properly configured. Its easiest to use the Vagrant Windows box in the Vagrantilfe of this repo.
@@ -76,6 +81,7 @@ To run the integration tests you will need a Windows box with the WinRM service
 3. Run `bundle exec rake integration`
 
 ## WinRM-fs Authors
+
 * Shawn Neal (https://github.com/sneal)
 * Matt Wrock (https://github.com/mwrock)
 

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

@@ -17,11 +17,10 @@
 # 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 'digest' unless defined?(Digest)
+require 'securerandom' unless defined?(SecureRandom)
+require 'stringio' unless defined?(StringIO)
 
 require 'winrm/exceptions'
 require 'winrm-fs/core/tmp_zip'
@@ -67,6 +66,7 @@ module WinRM
           @shell  = shell
           @logger = shell.logger
           @id_generator = opts.fetch(:id_generator) { -> { SecureRandom.uuid } }
+          require 'zip'
           Zip.unicode_names = true
         end
 
@@ -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
@@ -405,6 +409,8 @@ module WinRM
               "(exitcode: 0), but stderr present\n#{stderr}"
           end
 
+          require 'csv'
+
           logger.debug 'Parsing CSV Response'
           logger.debug output.stdout
 

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 'logger' unless defined?(Logger)
+require 'pathname' unless defined?(Pathname)
+require 'tempfile' unless defined?(Tempfile)
 
 module WinRM
   module FS
@@ -68,7 +68,8 @@ module WinRM
         # @param logger [#debug,#debug?] an optional logger/ui object that
         #   responds to `#debug` and `#debug?` (default `nil`)
         def initialize(dir, logger = nil)
-          @logger = logger || Logging.logger[self]
+          require 'zip'
+          @logger = logger || Logger.new(nil)
           @dir = clean_dirname(dir)
           @zip_io = Tempfile.open(['tmpzip-', '.zip'], binmode: true)
           write_zip
@@ -113,13 +114,7 @@ module WinRM
         #   directory, excluding directories
         # @api private
         def entries
-          Pathname.glob(dir.join('**/*')).delete_if(&:directory?).sort
-        end
-
-        # (see Logging.log_subject)
-        # @api private
-        def log_subject
-          @log_subject ||= [self.class.to_s.split('::').last, path].join('::')
+          Pathname.glob(dir.join('**/.*')).push(*Pathname.glob(dir.join('**/*'))).delete_if(&:directory?).sort
         end
 
         # Adds all file entries to the Zip output stream.
@@ -149,12 +144,12 @@ module WinRM
           end
         end
 
+        # rubyzip 3.x takes optional Entry arguments as keywords
         def zip_entry(entry_path)
           Zip::Entry.new(
             zip_io.path,
             entry_path.to_s,
-            nil, nil, nil, nil, nil, nil,
-            ::Zip::DOSTime.new(2000)
+            time: ::Zip::DOSTime.new(2000)
           )
         end
 

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)

data/lib/winrm-fs/scripts/scripts.rb

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'erubi'
+require 'erb'
 
 module WinRM
   module FS
@@ -40,7 +40,7 @@ module WinRM
         else
           raise ArgumentError
         end
-        b.eval(Erubi::Engine.new(template).src)
+        ERB.new(template).result(b)
       end
     end
   end

data/lib/winrm-fs.rb

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

metadata

@@ -1,64 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: winrm-fs
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.7
 platform: ruby
 authors:
 - Shawn Neal
 - Matt Wrock
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2026-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: erubi
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: csv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: logging
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +103,7 @@ dependencies:
         version: '10.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +113,7 @@ dependencies:
         version: '10.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '14'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -127,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.68.0
+        version: 1.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.68.0
+        version: 1.26.0
 description: "    Ruby library for file system operations via Windows Remote Management\n"
 email:
 - sneal@sneal.net
@@ -143,8 +150,8 @@ executables:
 - rwinrmcp
 extensions: []
 extra_rdoc_files:
-- README.md
 - LICENSE
+- README.md
 files:
 - LICENSE
 - README.md
@@ -166,7 +173,6 @@ homepage: http://github.com/WinRb/winrm-fs
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
 rdoc_options:
 - "-x"
 - test/
@@ -178,16 +184,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: WinRM File System
 test_files: []