winrm-fs 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1bad32e758ab3552176a7907414d5529cad1db3
-  data.tar.gz: 8778d4a1a9beec6bfadee7f12cf5abb7685daed9
+  metadata.gz: 25523f58a1507ead05b61f90d98320452a2f3df1
+  data.tar.gz: 6105e8ff011fbce698bdfe528c258d9a28ee1536
 SHA512:
-  metadata.gz: 63c1400c846c939cda45acd5a4f1f41e5b0500683bfe7d8da933943d4f35946228a5fa6ec33fa43f38be7dfcf262e325f6a19bc8ee4c105ed40ebbf9ea094591
-  data.tar.gz: b0bee4dc8f4a8d2e8d7260efefc1d0f7de97d0d9cb530615c5b28c0ceceb5780bee27eabc98341a6be4b169eb13c80ac2b840cc6c379dd67c1cf8becd6269791
+  metadata.gz: 257bde0c5fca5583f87fa47b7de424842b38fb15ecc02d2779ceca8f74fe5e0011141f821cf0dc9b594d72b37076d05e43e4c29f7d4b4e067ac0b9020e4a8b8c
+  data.tar.gz: e4b411c83c16bac8918a420dcd9af67e886b6464ca51d370f4cf5477c2a58d5cd24ba2fc9f57b909cf8d2cd7c4764466fae333bf9e977ff6d2f4ae58dc65ac8d

data/.gitignore

@@ -1,11 +1,11 @@
-*.swp
-*.gem
-pkg/*
-.rvmrc
-.idea
-.bundle
-spec/spec/creds*.json
-spec/config.yml
-traces/
-Gemfile.lock
+*.swp
+*.gem
+pkg/*
+.rvmrc
+.idea
+.bundle
+spec/spec/creds*.json
+spec/config.yml
+traces/
+Gemfile.lock
 .vagrant

data/.rspec

@@ -1,3 +1,3 @@
---color
---format nested
---require spec_helper
+--color
+--format nested
+--require spec_helper

data/.rubocop.yml

@@ -1,9 +1,9 @@
-Style/FileName:
-  Exclude:
-    - 'lib/winrm-fs.rb'
-
-Style/Encoding:
-  Enabled: true
-
-Metrics/LineLength:
-  Max: 100
+Style/FileName:
+  Exclude:
+    - 'lib/winrm-fs.rb'
+
+Style/Encoding:
+  Enabled: true
+
+Metrics/LineLength:
+  Max: 100

data/.travis.yml

@@ -1,5 +1,5 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - 2.0.0
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
   - 2.1.0

data/Gemfile

@@ -1,3 +1,3 @@
-# encoding: UTF-8
-source 'https://rubygems.org'
-gemspec
+# encoding: UTF-8
+source 'https://rubygems.org'
+gemspec

data/LICENSE

@@ -1,202 +1,202 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/Vagrantfile

@@ -1,9 +1,9 @@
-# encoding: UTF-8
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-VAGRANTFILE_API_VERSION = '2'
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = 'mwrock/Windows2012R2'
-end
+# encoding: UTF-8
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+VAGRANTFILE_API_VERSION = '2'
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = 'mwrock/Windows2012R2'
+end

data/bin/rwinrmcp

@@ -1,86 +1,86 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-#
-# Copyright 2014 Shawn Neal <sneal@sneal.net>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# TODO: refactor this
-# rubocop:disable all
-
-$LOAD_PATH.push File.expand_path('../../lib', __FILE__)
-
-require 'io/console'
-require 'winrm-fs'
-
-def help_msg
-  puts 'Usage: rwinrmcp sourcefile user@host:directory/targetfile'
-  puts ''
-end
-
-def parse_options
-  options = {}
-  fail 'Missing required options' unless ARGV.length == 2
-
-  options[:source_path] = ARGV[0]
-  fail "Cannot find source file: #{options[:source_path]}" unless \
-    File.exist?(options[:source_path])
-
-  m = /^(?<user>[a-z0-9\.\!\$ _-]+)@{1}(?<host>[a-z0-9\.\-]+)(?<port>:[0-9]+)?:{1}(?<file>.+)/i.match(ARGV[1])
-  fail "#{ARGV[1]} is an invalid destination" unless m
-  options[:user] = m[:user]
-  options[:endpoint] = "http://#{m[:host]}#{m[:port] || ':5985'}/wsman"
-  options[:dest_path] = m[:file]
-
-  # Get the password
-  print 'Password: '
-  options[:pass] = STDIN.noecho(&:gets).chomp
-  puts
-
-  # Set some defaults required by WinRM WS
-  options[:auth_type] = :plaintext
-  options[:basic_auth_only] = true
-
-  options
-rescue StandardError => e
-  puts e.message
-  help_msg
-  exit 1
-end
-
-def file_manager(options)
-  service = WinRM::WinRMWebService.new(
-    options[:endpoint],
-    options[:auth_type].to_sym,
-    options)
-  WinRM::FS::FileManager.new(service)
-end
-
-def run(options)
-  bytes = file_manager(options).upload(options[:source_path], options[:dest_path])
-  puts "#{bytes} total bytes transfered"
-  exit 0
-rescue Interrupt
-  puts 'exiting'
-  # ctrl-c
-rescue WinRM::WinRMAuthorizationError
-  puts 'Authentication failed, bad user name or password'
-  exit 1
-rescue StandardError => e
-  puts e.message
-  exit 1
-end
-
-run(parse_options)
-
-# rubocop:enable all
+#!/usr/bin/env ruby
+# encoding: UTF-8
+#
+# Copyright 2014 Shawn Neal <sneal@sneal.net>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# TODO: refactor this
+# rubocop:disable all
+
+$LOAD_PATH.push File.expand_path('../../lib', __FILE__)
+
+require 'io/console'
+require 'winrm-fs'
+
+def help_msg
+  puts 'Usage: rwinrmcp sourcefile user@host:directory/targetfile'
+  puts ''
+end
+
+def parse_options
+  options = {}
+  fail 'Missing required options' unless ARGV.length == 2
+
+  options[:source_path] = ARGV[0]
+  fail "Cannot find source file: #{options[:source_path]}" unless \
+    File.exist?(options[:source_path])
+
+  m = /^(?<user>[a-z0-9\.\!\$ _-]+)@{1}(?<host>[a-z0-9\.\-]+)(?<port>:[0-9]+)?:{1}(?<file>.+)/i.match(ARGV[1])
+  fail "#{ARGV[1]} is an invalid destination" unless m
+  options[:user] = m[:user]
+  options[:endpoint] = "http://#{m[:host]}#{m[:port] || ':5985'}/wsman"
+  options[:dest_path] = m[:file]
+
+  # Get the password
+  print 'Password: '
+  options[:pass] = STDIN.noecho(&:gets).chomp
+  puts
+
+  # Set some defaults required by WinRM WS
+  options[:auth_type] = :plaintext
+  options[:basic_auth_only] = true
+
+  options
+rescue StandardError => e
+  puts e.message
+  help_msg
+  exit 1
+end
+
+def file_manager(options)
+  service = WinRM::WinRMWebService.new(
+    options[:endpoint],
+    options[:auth_type].to_sym,
+    options)
+  WinRM::FS::FileManager.new(service)
+end
+
+def run(options)
+  bytes = file_manager(options).upload(options[:source_path], options[:dest_path])
+  puts "#{bytes} total bytes transfered"
+  exit 0
+rescue Interrupt
+  puts 'exiting'
+  # ctrl-c
+rescue WinRM::WinRMAuthorizationError
+  puts 'Authentication failed, bad user name or password'
+  exit 1
+rescue StandardError => e
+  puts e.message
+  exit 1
+end
+
+run(parse_options)
+
+# rubocop:enable all

data/changelog.md

@@ -1,5 +1,8 @@
 # WinRM-fs Gem Changelog
 
+# 0.4.1
+- Fixes a regression on Windows 2008 R2/Windows 7 and below where the WinRM service corrupts the check files metadata resulting in malformed destination paths.
+
 # 0.4.0
 - Correct the destination path of individual files. Always assume it is the full destination path unless it is an existing directory. This may potentialy break some callers expecting the remote path to be a directory that winrm-fs will create if missing as the destination of the local file. A new directory will not be created and the local file will be uploaded directly to the remote path.
 

data/lib/winrm-fs.rb

@@ -1,28 +1,28 @@
-# encoding: UTF-8
-#
-# Copyright 2015 Shawn Neal <sneal@sneal.net>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'winrm'
-require 'logger'
-require 'pathname'
-require_relative 'winrm-fs/exceptions'
-require_relative 'winrm-fs/file_manager'
-
-module WinRM
-  # WinRM File System
-  module FS
-    # Top level module code
-  end
-end
+# encoding: UTF-8
+#
+# Copyright 2015 Shawn Neal <sneal@sneal.net>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'winrm'
+require 'logger'
+require 'pathname'
+require_relative 'winrm-fs/exceptions'
+require_relative 'winrm-fs/file_manager'
+
+module WinRM
+  # WinRM File System
+  module FS
+    # Top level module code
+  end
+end

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

@@ -79,6 +79,7 @@ module WinRM
             files = make_files_hash(Array(locals), remote)
             report = check_files(files)
             merge_with_report!(files, report)
+            reconcile_destinations!(files)
           end
           total_size = total_base64_transfer_size(files)
 
@@ -131,6 +132,22 @@ module WinRM
         # @api private
         attr_reader :executor
 
+        # Examines the files and corrects the file destination if it is
+        # targeting an existing folder. In this case, the destination path
+        # will have the base name of the source file appended. This only
+        # applies to file uploads and not to folder uploads.
+        #
+        # @param files [Hash] files hash, keyed by the local MD5 digest
+        # @return [Hash] a report hash, keyed by the local MD5 digest
+        # @api private
+        def reconcile_destinations!(files)
+          files.each do |_, data|
+            if data['target_is_folder'] == 'True'
+              data['dst'] = File.join(data['dst'], File.basename(data['src']))
+            end
+          end
+        end
+
         # Adds an entry to a files Hash (keyed by local MD5 digest) for a
         # directory. When a directory is added, a temporary Zip file is created
         # containing the contents of the directory and any file-related data
@@ -381,6 +398,9 @@ module WinRM
               "(exitcode: 0), but stderr present\n#{pretty_stderr}"
           end
 
+          logger.debug 'Parsing CSV Response'
+          logger.debug output.stdout
+
           array = CSV.parse(output.stdout, headers: true).map(&:to_hash)
           array.each { |h| h.each { |key, value| h[key] = nil if value == '' } }
           Hash[array.map { |entry| [entry.fetch('src_md5'), entry] }]

data/lib/winrm-fs/exceptions.rb

@@ -1,28 +1,28 @@
-# encoding: UTF-8
-#
-# Copyright 2015 Shawn Neal <sneal@sneal.net>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module WinRM
-  module FS
-    # WinRM-FS base class for errors
-    class WinRMFSError < StandardError; end
-
-    # Error that occurs when a file upload fails
-    class WinRMUploadError < WinRMFSError; end
-
-    # Error that occurs when a file download fails
-    class WinRMDownloadError < WinRMFSError; end
-  end
-end
+# encoding: UTF-8
+#
+# Copyright 2015 Shawn Neal <sneal@sneal.net>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module WinRM
+  module FS
+    # WinRM-FS base class for errors
+    class WinRMFSError < StandardError; end
+
+    # Error that occurs when a file upload fails
+    class WinRMUploadError < WinRMFSError; end
+
+    # Error that occurs when a file download fails
+    class WinRMDownloadError < WinRMFSError; end
+  end
+end

data/lib/winrm-fs/scripts/check_files.ps1.erb

@@ -1,3 +1,4 @@
+$host.ui.RawUI.WindowSize.Width=256
 $hash_file = "<%= hash_file %>"
 
 Function Cleanup($o) { if (($o -ne $null) -and ($o.GetType().GetMethod("Dispose") -ne $null)) { $o.Dispose() } }
@@ -28,9 +29,9 @@ Function Check-Files($h) {
       dst_md5 = ($dMd5 = if ($exists) { Get-MD5Sum $dst } else { $null })
       chk_dirty = ($dirty = if ($sMd5 -ne $dMd5) { $true } else { $false })
       verifies = if ($dirty -eq $false) { $true } else { $false }
-      dst = if($dst_changed) { $dst } else { $_.Value.dst }
+      target_is_folder = $dst_changed
     }
-  } | Select-Object -Property chk_exists,src_md5,dst_md5,chk_dirty,verifies,dst
+  } | Select-Object -Property chk_exists,src_md5,dst_md5,chk_dirty,verifies,target_is_folder
 }
 
 Function Get-MD5Sum($src) {

data/lib/winrm-fs/scripts/checksum.ps1.erb

@@ -1,13 +1,13 @@
-$p = $ExecutionContext.SessionState.Path
-$path = $p.GetUnresolvedProviderPathFromPSPath("<%= path %>")
-
-if (Test-Path $path -PathType Leaf) {
-  $cryptoProv = New-Object -TypeName System.Security.Cryptography.MD5CryptoServiceProvider
-  $file = [System.IO.File]::Open($path,
-      [System.IO.Filemode]::Open, [System.IO.FileAccess]::Read)
-  $md5 = ([System.BitConverter]::ToString($cryptoProv.ComputeHash($file)))
-  $md5 = $md5.Replace("-","").ToLower()
-  $file.Close()
-
-  Write-Output $md5
-}
+$p = $ExecutionContext.SessionState.Path
+$path = $p.GetUnresolvedProviderPathFromPSPath("<%= path %>")
+
+if (Test-Path $path -PathType Leaf) {
+  $cryptoProv = New-Object -TypeName System.Security.Cryptography.MD5CryptoServiceProvider
+  $file = [System.IO.File]::Open($path,
+      [System.IO.Filemode]::Open, [System.IO.FileAccess]::Read)
+  $md5 = ([System.BitConverter]::ToString($cryptoProv.ComputeHash($file)))
+  $md5 = $md5.Replace("-","").ToLower()
+  $file.Close()
+
+  Write-Output $md5
+}

data/lib/winrm-fs/scripts/create_dir.ps1.erb

@@ -1,6 +1,6 @@
-$p = $ExecutionContext.SessionState.Path
-$path = $p.GetUnresolvedProviderPathFromPSPath("<%= path %>")
-if (!(Test-Path $path)) {
-  New-Item -ItemType Directory -Force -Path $path | Out-Null
-}
-exit 0
+$p = $ExecutionContext.SessionState.Path
+$path = $p.GetUnresolvedProviderPathFromPSPath("<%= path %>")
+if (!(Test-Path $path)) {
+  New-Item -ItemType Directory -Force -Path $path | Out-Null
+}
+exit 0

data/lib/winrm-fs/scripts/delete.ps1.erb

@@ -1,6 +1,6 @@
-$p = $ExecutionContext.SessionState.Path
-$path = $p.GetUnresolvedProviderPathFromPSPath("<%= path %>")
-if (Test-Path $path) {
-  Remove-Item $path -Force -Recurse
-}
-exit 0
+$p = $ExecutionContext.SessionState.Path
+$path = $p.GetUnresolvedProviderPathFromPSPath("<%= path %>")
+if (Test-Path $path) {
+  Remove-Item $path -Force -Recurse
+}
+exit 0

data/lib/winrm-fs/scripts/exists.ps1.erb

@@ -1,8 +1,10 @@
 $p = $ExecutionContext.SessionState.Path
 $path = $p.GetUnresolvedProviderPathFromPSPath("<%= path %>")
 if (Test-Path $path) {
+  $true
   exit 0
 }
 else {
+  $false
   exit 1
 }

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

@@ -1,31 +1,31 @@
-# encoding: UTF-8
-#
-# Copyright 2015 Shawn Neal <sneal@sneal.net>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'erubis'
-
-module WinRM
-  module FS
-    # PS1 scripts
-    module Scripts
-      def self.render(template, context)
-        template_path = File.expand_path(
-          "#{File.dirname(__FILE__)}/#{template}.ps1.erb")
-        template = File.read(template_path)
-        Erubis::Eruby.new(template).result(context)
-      end
-    end
-  end
-end
+# encoding: UTF-8
+#
+# Copyright 2015 Shawn Neal <sneal@sneal.net>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'erubis'
+
+module WinRM
+  module FS
+    # PS1 scripts
+    module Scripts
+      def self.render(template, context)
+        template_path = File.expand_path(
+          "#{File.dirname(__FILE__)}/#{template}.ps1.erb")
+        template = File.read(template_path)
+        Erubis::Eruby.new(template).result(context)
+      end
+    end
+  end
+end

data/spec/matchers.rb

@@ -1,58 +1,58 @@
-# encoding: UTF-8
-require 'rspec/expectations'
-
-RSpec::Matchers.define :have_created do |remote_file|
-  match do |file_manager|
-    if @expected_content
-      downloaded_file = Tempfile.new('downloaded')
-      downloaded_file.close
-
-      subject.download(remote_file, downloaded_file.path)
-      @actual_content = File.read(downloaded_file.path)
-      downloaded_file.delete
-
-      file_manager.exists?(remote_file) && \
-        @actual_content == @expected_content
-    else
-      file_manager.exists?(remote_file)
-    end
-  end
-  chain :with_content do |expected_content|
-    expected_content = File.read(expected_content) if File.file?(expected_content)
-    @expected_content = expected_content
-  end
-  failure_message do
-    if @expected_content
-      <<-EOH
-Expected file '#{remote_file}' to exist with content:
-
-#{@expected_content}
-
-but instead got content:
-
-#{@actual_content}
-      EOH
-    else
-      "Expected file '#{remote_file}' to exist"
-    end
-  end
-end
-
-RSpec::Matchers.define :contain_zip_entries do |zip_entries|
-  match do |temp_zip_file|
-    zip_entries = [zip_entries] if zip_entries.is_a? String
-    @zip_file = Zip::File.open(temp_zip_file.path)
-    @missing_entries = []
-    zip_entries.each do |entry|
-      @missing_entries << entry unless @zip_file.find_entry(entry)
-    end
-    @missing_entries.empty?
-  end
-  failure_message do |temp_zip_file|
-    msg = "Expected #{temp_zip_file.path} to contain zip entries: #{@missing_entries}\n Got: "
-    @zip_file.each do |entry|
-      msg << entry.name << ', '
-    end
-    msg
-  end
-end
+# encoding: UTF-8
+require 'rspec/expectations'
+
+RSpec::Matchers.define :have_created do |remote_file|
+  match do |file_manager|
+    if @expected_content
+      downloaded_file = Tempfile.new('downloaded')
+      downloaded_file.close
+
+      subject.download(remote_file, downloaded_file.path)
+      @actual_content = File.read(downloaded_file.path)
+      downloaded_file.delete
+
+      file_manager.exists?(remote_file) && \
+        @actual_content == @expected_content
+    else
+      file_manager.exists?(remote_file)
+    end
+  end
+  chain :with_content do |expected_content|
+    expected_content = File.read(expected_content) if File.file?(expected_content)
+    @expected_content = expected_content
+  end
+  failure_message do
+    if @expected_content
+      <<-EOH
+Expected file '#{remote_file}' to exist with content:
+
+#{@expected_content}
+
+but instead got content:
+
+#{@actual_content}
+      EOH
+    else
+      "Expected file '#{remote_file}' to exist"
+    end
+  end
+end
+
+RSpec::Matchers.define :contain_zip_entries do |zip_entries|
+  match do |temp_zip_file|
+    zip_entries = [zip_entries] if zip_entries.is_a? String
+    @zip_file = Zip::File.open(temp_zip_file.path)
+    @missing_entries = []
+    zip_entries.each do |entry|
+      @missing_entries << entry unless @zip_file.find_entry(entry)
+    end
+    @missing_entries.empty?
+  end
+  failure_message do |temp_zip_file|
+    msg = "Expected #{temp_zip_file.path} to contain zip entries: #{@missing_entries}\n Got: "
+    @zip_file.each do |entry|
+      msg << entry.name << ', '
+    end
+    msg
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winrm-fs
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Shawn Neal
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis