winrm-fs 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b1a70aed7f4cd1c07905037789c4063351a4f5f0
+  data.tar.gz: 33d94b11b030a71ceaddb83d4c91527ad6ee1b5f
+SHA512:
+  metadata.gz: d03094f7a70dffd988e3c494b3041d1212b31c24ea2e9e36d6ee746914f144935c9cf4af202943ef3db8372275e65fe7fcf18034ca2db4db8a6c72fa017c5e63
+  data.tar.gz: aee15954eddd17e38e30b0c45d7cf2769a14a4c81c41fbe60761b0720f91cbc3d1ee385e99693bc578803422968245dfb0c655ee93fce73ef987bfbe4b5a8667

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/changelog.md

@@ -1,5 +1,8 @@
 # WinRM-fs Gem Changelog
 
+# 0.2.3
+- Fix yielding progress data, issue #23
+
 # 0.2.2
 - Fix powershell streams leaking to standard error breaking Windows 10, issue #18
 

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

@@ -30,9 +30,9 @@ module WinRM
         # @param [String] Path to the local source file on this machine
         # @param [String] Path to the file on the target machine
         # @return [Integer] Count of bytes uploaded
-        def upload(local_file, remote_file)
+        def upload(local_file, remote_file, &block)
           @command_executor.run_powershell(prepare_script(remote_file))
-          do_upload(local_file, dos_path(remote_file))
+          do_upload(local_file, dos_path(remote_file), &block)
         end
 
         private

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

@@ -29,7 +29,7 @@ module WinRM
           @logger = Logging.logger[self]
         end
 
-        def upload_file(local_path, remote_path)
+        def upload_file(local_path, remote_path, &block)
           # If the src has a file extension and the destination does not
           # we can assume the caller specified the dest as a directory
           if File.extname(local_path) != '' && File.extname(remote_path) == ''
@@ -38,16 +38,16 @@ module WinRM
           temp_path = temp_file_path(local_path)
           with_command_executor do |cmd_executor|
             return 0 unless out_of_date?(cmd_executor, local_path, remote_path)
-            do_file_upload(cmd_executor, local_path, temp_path, remote_path)
+            do_file_upload(cmd_executor, local_path, temp_path, remote_path, &block)
           end
         end
 
-        def upload_directory(local_path, remote_path)
+        def upload_directory(local_path, remote_path, &block)
           with_local_zip(local_path) do |local_zip|
             temp_path = temp_file_path(local_zip.path)
             with_command_executor do |cmd_executor|
               return 0 unless out_of_date?(cmd_executor, local_zip.path, temp_path)
-              do_file_upload(cmd_executor, local_zip.path, temp_path, remote_path)
+              do_file_upload(cmd_executor, local_zip.path, temp_path, remote_path, &block)
             end
           end
         end

data/spec/file_manager_spec.rb

@@ -87,13 +87,16 @@ describe WinRM::FS::FileManager, integration: true do
     end
 
     it 'yields progress data' do
+      block_called = false
       total = subject.upload(this_file, dest_file) do \
         |bytes_copied, total_bytes, local_path, remote_path|
         expect(total_bytes).to be > 0
         expect(bytes_copied).to eq(total_bytes)
         expect(local_path).to eq(this_file)
         expect(remote_path).to eq(dest_file)
+        block_called = true
       end
+      expect(block_called).to be true
       expect(total).to be > 0
     end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winrm-fs
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors:
 - Shawn Neal
@@ -10,129 +9,114 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.28.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.28.0
-description: ! '    Ruby library for file system operations via Windows Remote Management
-
-'
+description: |2
+      Ruby library for file system operations via Windows Remote Management
 email:
 - sneal@sneal.net
 - matt@mattwrock.com
@@ -143,10 +127,10 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -178,33 +162,29 @@ files:
 - winrm-fs.gemspec
 homepage: http://github.com/WinRb/winrm-fs
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- -x
+- "-x"
 - test/
-- -x
+- "-x"
 - examples/
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 353666175085628840
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: WinRM File System
 test_files: []