kitchen-vagrant_winrm 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 082033c6b24f15d781a783f13f4785c456c5174c
-  data.tar.gz: 3436d5c5d2049e9f1da06d5cdb53e1756a2c880a
+  metadata.gz: 16ecf0da894a2cc18d5686f0202880622a7e6b2c
+  data.tar.gz: e6ed107fd4d07554d62852dc9015afe17bbbfd1e
 SHA512:
-  metadata.gz: af6133e59fada0709cf38b16853f621481651477a5a98b70f52dca63bfbe8b299c749fe838d73d6d77f1eb9f71c6dca3816c9d8af40cd2889bb7a932dd638a5e
-  data.tar.gz: 4b382ec24002ca1e69356caa33e3df711ef2b1c8d6bf79798c35b0b37b0b9fe001094f9f6898038ff31ff87440fb8acd762543a8abdee2e77d16461bbf3f94d7
+  metadata.gz: a52555efa90e670fe9a0a291a50d345b42ae2985719cd139f325785a7d2420546e6cbfa479eb6a249d79ac7b185c6b3cb1492d516efbfddcade5ccbddfa820e1
+  data.tar.gz: 4e3aeae19e62c66e20eb6c2e8a4848ef8936a45c53c95ea6f9839677038def8dc968aa83cfaf3e50b47ce226e6c97e001ffa619f5fc76d1d4b9db1ef1230f2ec

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+deploy:
+  provider: rubygems
+  api_key:
+    secure: UM1xgIt9jc8oy0ZL6R7VTPApn/JTrjvIM1J1QcPNtKkp4b9Ykr62uozsadyk4giTlMU3/Fhswx6wdInwzKwLy63OVn1P4iSJn66SlOAcnn1EuK5oqyJ7UsDL8ZUphIHx0OQD+FYn/ax3ClqieWfC4W/jU277skziS9lOkEQ8FLw=
+  gem: kitchen-vagant_winrm
+  on:
+    tags: true
+    all_branches: true
+    repo: criteo/kitchen-vagant_winrm

data/CHANGELOG.md

@@ -1,3 +1,13 @@
-## 0.1.0 / Unreleased
+## 0.2.0
+* Use vagrant-winrm (>=0.4) compression feature
+* Use shell script instead of winrm commands
+* Define more default configuration options
 
-* Initial release
+## 0.1.2
+* Do not append '.vagrantup.com' to hostname
+
+## 0.1.1
+* First clean release
+
+## 0.1.0 / Unrelease
+* Initial implementation

data/README.md

@@ -70,15 +70,16 @@ platforms:
   - name: windows-2008r2
     driver:
       name: vagrant_winrm
-      provisioner:
-        name: chef-zero
-        sudo: false
-      driver_config:
-        guest: windows
-        communicator: 'winrm'
-        winrm_username: 'vagrant'
-        winrm_password: 'vagrant'
-        #...
+    provisioner:
+      name: chef_zero
+      sudo: false
+      root_path: /var/chef/
+    driver_config:
+      guest: windows
+      communicator: 'winrm'
+      winrm_username: 'vagrant'
+      winrm_password: 'vagrant'
+      #...
 ```
 
 Please read the [Driver usage][driver_usage] page for more details.

data/kitchen-vagrant_winrm.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'test-kitchen', '~> 1.2'
+  spec.add_dependency 'test-kitchen', '>= 1.2.1'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/lib/kitchen/driver/vagrant_winrm.rb

@@ -12,10 +12,17 @@ module Kitchen
     # @author Baptiste Courtois <b.courtois@criteo.com>
     class VagrantWinrm < Base
 
-      default_config :customize, {}
+      default_config :communicator, :winrm
+      default_config :customize, {
+        vrde: 'on',
+        vrdeport: '5000-5100',
+        vrdeauthtype: 'null',
+      }
+      default_config :guest, :windows
       default_config :network, []
-      default_config :synced_folders, []
       default_config :pre_create_command, nil
+      default_config :require_chef_omnibus, false
+      default_config :synced_folders, []
 
       default_config :vagrantfile_erb,
         File.join(File.dirname(__FILE__), '../../../templates/Vagrantfile.erb')
@@ -24,7 +31,7 @@ module Kitchen
         ENV.fetch('VAGRANT_DEFAULT_PROVIDER', 'virtualbox')
 
       default_config :vm_hostname do |driver|
-        "#{driver.instance.name}.vagrantup.com"
+        driver.instance.name
       end
 
       default_config :box do |driver|
@@ -53,9 +60,11 @@ module Kitchen
         run_remote provisioner.install_command
         run_remote provisioner.init_command
 
-        Dir.glob("#{provisioner.sandbox_path}/*").each do |file|
-          upload file, File.join(provisioner[:root_path], File.basename(file))
-        end
+        sandbox_path = provisioner.sandbox_path
+        root_path = provisioner[:root_path]
+
+        debug("Uploading #{sandbox_path} to #{root_path} through WinRM")
+        run "vagrant winrm-upload -c '#{sandbox_path}' '#{root_path}'"
 
         run_remote provisioner.prepare_command
         run_remote provisioner.run_command
@@ -65,13 +74,13 @@ module Kitchen
 
       def setup(state)
         create_vagrantfile
-        run_remote busser_setup_cmd
+        run_remote busser.setup_cmd
       end
 
       def verify(state)
         create_vagrantfile
-        run_remote busser_sync_cmd
-        run_remote busser_run_cmd
+        run_remote busser.sync_cmd
+        run_remote busser.run_cmd
       end
 
       def destroy(state)
@@ -87,6 +96,7 @@ module Kitchen
 
       def verify_dependencies
         check_vagrant_version
+        check_vagrant_winrm_version
       end
 
       def instance=(instance)
@@ -95,20 +105,25 @@ module Kitchen
       end
 
       protected
-
       WEBSITE = 'http://downloads.vagrantup.com/'
-      MIN_VER = '1.1.0'
-
-      def upload(source, destination)
-        debug("Uploading #{source} to #{destination} through WinRM")
-        run "vagrant winrm-upload \"#{source}\" \"#{destination}\""
-      end
+      VAGRANT_MIN_VER = '1.6.0'
+      VAGRANT_WINRM_MIN_VER = '0.4.0'
 
       def run_remote(cmd)
         return unless cmd
 
         debug("Executing winRM command #{cmd}")
-        run "vagrant winrm -c \"#{cmd.gsub(/["`\\\x0]/, '\\\\\0')}\""
+        tmp = ::Tempfile.new(['script', '.sh'])
+        begin
+          tmp << cmd
+          tmp.close
+
+          remote_script = run "vagrant winrm-upload -t '#{tmp.path}'"
+          run "vagrant winrm -c 'sh \"#{remote_script}\"'"
+        ensure
+          tmp.close
+          tmp.unlink
+        end
       end
 
       def run(cmd, options = {})
@@ -194,15 +209,36 @@ module Kitchen
         version_string = silently_run('vagrant --version')
         version_string = version_string.chomp.split(' ').last
       rescue Errno::ENOENT
-        raise UserError, "Vagrant #{MIN_VER} or higher is not installed." +
-          " Please download a package from #{WEBSITE}."
+        raise UserError, <<-EOS
+Vagrant #{VAGRANT_MIN_VER} or higher is not installed.
+Please download a package from #{WEBSITE}.
+EOS
       end
 
       def check_vagrant_version
         version = vagrant_version
-        if Gem::Version.new(version) < Gem::Version.new(MIN_VER)
-          raise UserError, "Detected an old version of Vagrant (#{version})." +
-            " Please upgrade to version #{MIN_VER} or higher from #{WEBSITE}."
+        if Gem::Version.new(version) < Gem::Version.new(VAGRANT_MIN_VER)
+          raise UserError, <<-EOS
+Detected an old version of Vagrant (#{version}).
+Please upgrade to version #{VAGRANT_MIN_VER} or higher from #{WEBSITE}.
+EOS
+        end
+      end
+
+      def vagrant_winrm_version
+        silently_run('vagrant winrm --plugin-version').chomp.split(' ').last
+      rescue Errno::ENOENT
+        raise UserError,
+          "Vagrant-winrm #{VAGRANT_WINRM_MIN_VER} or higher is not installed."
+      end
+
+      def check_vagrant_winrm_version
+        version = vagrant_winrm_version
+        if Gem::Version.new(version) < Gem::Version.new(VAGRANT_WINRM_MIN_VER)
+          raise UserError, <<-EOS
+Detected an old version of Vagrant-winrm (#{version}).
+Please upgrade to version #{VAGRANT_WINRM_MIN_VER} or higher.
+EOS
         end
       end
     end

data/lib/kitchen/driver/vagrant_winrm_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for VagrantWinrm Kitchen driver
-    VAGRANT_WINRM_VERSION = '0.1.1'
+    VAGRANT_WINRM_VERSION = '0.2.1'
   end
 end

data/spec/spec_helper.rb

@@ -4,12 +4,6 @@
 # loaded once.
 #
 require 'rspec'
-require './lib/vagrant-winrm.rb'
-require './lib/vagrant-winrm/plugin.rb'
-require './lib/vagrant-winrm/plugin.rb'
-require './lib/vagrant-winrm/commands/winrm.rb'
-require './lib/vagrant-winrm/commands/winrm_config.rb'
-require './lib/vagrant-winrm/commands/winrm_upload.rb'
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
@@ -39,4 +33,4 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
-end
+end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant_winrm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Baptiste Courtois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tailor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Kitchen::Driver::VagrantWinRM - A Test Kitchen Driver using Vagrant-WinRM
@@ -115,10 +115,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .cane
-- .gitignore
-- .rspec
-- .tailor
+- ".cane"
+- ".gitignore"
+- ".rspec"
+- ".tailor"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -139,17 +140,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver using vagrant winrm