ansible_spec 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39b483b0e6e4712c41e9785d82a8a7f04c0bdaea
-  data.tar.gz: c4f559f6ffa278fc2c50f553fff48af455cd6431
+  metadata.gz: 3b872942bcb5a26a23247723d84188a992f97a60
+  data.tar.gz: 21638a57a71751bddee6bffbe849f9f8fbe39ee3
 SHA512:
-  metadata.gz: d4d2724571d72783076e2ce0f27cdd4f9516720015cb2977f796353e92ac7aae9e93e40e62c7a2e6929c456a1b284e1544e1d088ffd642161df6dcbbfa3ef499
-  data.tar.gz: 0807543a869a4bfe97ef9ed716f223840975c419f76d964dda4eacc88d4d533061b97b614bf44f1d51b2f24a1184c40ffe4535c83cb6917d4480a06f36932e0b
+  metadata.gz: 47625ffe1bf1c4e0f81c22908c2b904215b7681a719f95559fab61e522524d28be309cec5bd77a21a3a4f28fa872e1036df637ae417ccb4e36947f9b7022285c
+  data.tar.gz: 05078e9080269b7f7dc9d793dde918e4a1af5c1839b3905fcdde229c4c74f707e2980ff650dcfebb8baf787214231d5e1d6818166ac93a8bec22a0934344a2b9

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+- v0.2.11
+- Merge [Support Windows](https://github.com/volanja/ansible_spec/pull/68) by [takuyakawabuchi](https://github.com/takuyakawabuchi)
+
 # v0.2.10
 - Merge [support group and host variables without yml extention.](https://github.com/volanja/ansible_spec/pull/66) by [okamototk](https://github.com/okamototk)
 

data/ansible_spec.gemspec

@@ -26,5 +26,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "serverspec", ">= 2.0.0"
   gem.add_runtime_dependency "hostlist_expression"
   gem.add_runtime_dependency "oj"
+  gem.add_runtime_dependency "winrm"
 
 end

data/lib/ansible_spec/load_ansible.rb

@@ -148,6 +148,8 @@ module AnsibleSpec
         host['private_key'] = value if key == "ansible_ssh_private_key_file"
         host['user'] = value if key == "ansible_ssh_user"
         host['uri'] = value if key == "ansible_ssh_host"
+        host['pass'] = value if key == "ansible_ssh_pass"
+        host['connection'] = value if key == "ansible_connection"
       end
     }
     return host

data/lib/ansible_spec/version.rb

@@ -1,3 +1,3 @@
 module AnsibleSpec
-  VERSION = "0.2.10"
+  VERSION = "0.2.11"
 end

data/lib/src/Rakefile

@@ -22,6 +22,8 @@ namespace :serverspec do
         else
           ENV['TARGET_USER'] = property["user"]
         end
+        ENV['TARGET_PASSWORD'] = host["pass"]
+        ENV['TARGET_CONNECTION'] = host["connection"]
 
         roles = property["roles"]
         for role in property["roles"]

data/lib/src/spec/spec_helper.rb

@@ -1,46 +1,86 @@
 require 'serverspec'
 require 'net/ssh'
 require 'ansible_spec'
+require 'winrm'
 
-set :backend, :ssh
+#
+# Set ansible variables to serverspec property
+#
+host = ENV['TARGET_HOST']
 
-if ENV['ASK_SUDO_PASSWORD']
-  begin
-    require 'highline/import'
-  rescue LoadError
-    fail "highline is not available. Try installing it."
-  end
-  set :sudo_password, ask("Enter sudo password: ") { |q| q.echo = false }
-else
-  set :sudo_password, ENV['SUDO_PASSWORD']
-end
+group_idx = ENV['TARGET_GROUP_INDEX'].to_i
+vars = AnsibleSpec.get_variables(host, group_idx)
+set_property vars
 
-host = ENV['TARGET_HOST']
+connection = ENV['TARGET_CONNECTION']
+
+if connection != 'winrm'
+#
+# OS type: UN*X
+#
+  set :backend, :ssh
 
-options = Net::SSH::Config.for(host)
+  if ENV['ASK_SUDO_PASSWORD']
+    begin
+      require 'highline/import'
+    rescue LoadError
+      fail "highline is not available. Try installing it."
+    end
+    set :sudo_password, ask("Enter sudo password: ") { |q| q.echo = false }
+  else
+    set :sudo_password, ENV['SUDO_PASSWORD']
+  end
 
-options[:user] ||= ENV['TARGET_USER']
-options[:port] ||= ENV['TARGET_PORT']
-options[:keys] ||= ENV['TARGET_PRIVATE_KEY']
+  options = Net::SSH::Config.for(host)
 
-set :host,        options[:host_name] || host
-set :ssh_options, options
+  options[:user] ||= ENV['TARGET_USER']
+  options[:port] ||= ENV['TARGET_PORT']
+  options[:keys] ||= ENV['TARGET_PRIVATE_KEY']
 
-# Disable sudo
-# set :disable_sudo, true
+  set :host,        options[:host_name] || host
+  set :ssh_options, options
 
+  # Disable sudo
+  # set :disable_sudo, true
 
-# Set environment variables
-# set :env, :LANG => 'C', :LC_MESSAGES => 'C'
 
-# Set PATH
-# set :path, '/sbin:/usr/local/sbin:$PATH'
+  # Set environment variables
+  # set :env, :LANG => 'C', :LC_MESSAGES => 'C'
 
+  # Set PATH
+  # set :path, '/sbin:/usr/local/sbin:$PATH'
+else
 #
-# Set ansible variables to serverspec property
+# OS type: Windows
 #
+  set :backend, :winrm
+  set :os, :family => 'windows'
 
-group_idx = ENV['TARGET_GROUP_INDEX'].to_i
+  user = ENV['TARGET_USER']
+  port = ENV['TARGET_PORT']
+  pass = ENV['TARGET_PASSWORD']
 
-vars = AnsibleSpec.get_variables(host, group_idx)
-set_property vars
+  if user.nil?
+    begin
+      require 'highline/import'
+    rescue LoadError
+      fail "highline is not available. Try installing it."
+    end
+    user = ask("\nEnter #{host}'s login user: ") { |q| q.echo = true }
+  end
+  if pass.nil?
+    begin
+      require 'highline/import'
+    rescue LoadError
+      fail "highline is not available. Try installing it."
+    end
+    pass = ask("\nEnter #{user}@#{host}'s login password: ") { |q| q.echo = false }
+  end
+
+  endpoint = "http://#{host}:#{port}/wsman"
+
+  winrm = ::WinRM::WinRMWebService.new(endpoint, :ssl, :user => user, :pass => pass, :basic_auth_only => true)
+  winrm.set_timeout 300 # 5 minutes max timeout for any operation
+  Specinfra.configuration.winrm = winrm
+
+end

data/spec/ssh_spec.rb

@@ -84,6 +84,13 @@ describe 'ssh' do
       expect(v.host).to eq 'db-b.example.com'
     end
 
+    it '192.168.1.3 ansible_connection=winrm ansible_ssh_port=5985 ansible_ssh_user=administrator ansible_ssh_pass=Passw0rd' do
+      v = @h["task_10"]
+      expect(v.host).to eq '192.168.1.3'
+      expect(v.user).to eq 'administrator'
+      expect(v.port).to eq '5985'
+    end
+
     after do
       delete_normality
     end
@@ -170,6 +177,7 @@ EOF
 jumper ansible_ssh_port=5555 ansible_ssh_host=192.168.1.50
 www[01:02].example.com
 db-[a:b].example.com
+192.168.1.3 ansible_connection=winrm ansible_ssh_port=5985 ansible_ssh_user=administrator ansible_ssh_pass=Passw0rd
 EOF
 
   File.open(tmp_ansiblespec, 'w') do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible_spec
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - volanja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-13 00:00:00.000000000 Z
+date: 2016-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: winrm
+  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'
 description: Ansible Config Parser for Serverspec. Run test Multi Role and Multi Host
   by Ansible Configuration
 email: