ansible_spec 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b23a5303fd8abc86840d5450d162dbb43d6e5e34
-  data.tar.gz: 1440c45d801dceaf4b0c745a4f10b46160adade8
+  metadata.gz: baff775dd82d3fa1555008475cbbb7ea8a939b11
+  data.tar.gz: bd4eb48292c5c2353d23f58afd5d68eb37fd9007
 SHA512:
-  metadata.gz: 7f3b1574d6a15feb18ccb8ca038172ce8196407135a4647aad90c3ad08a4fc7bc235e1fe3e1ae0cb16649546aa4e9bae45260a16d8eae0c29e02e19bf85a66e6
-  data.tar.gz: 059a9313c114296ba18db37d96a7d9a0b7a0f71adad091cd76abe76266d9275b5f6fd2882d9f9170e8f4e7dc7927ed5df2ed6ce980a0c6a51cf1a2fe7117e2bc
+  metadata.gz: ddaefbc6f737b5595eaa7d421aa8c296f2c9daaa233c5b858ef6994a87b2c643612a31baccd6ff2ff3ed6143d3e911c459ff859b670ce9d449b770d0562ab09b
+  data.tar.gz: 73c7d5967c18f2ae82bddc6fda33a256ea8e76d287e88d3d84eeeb6c810e7582654600f96ddbb946afbbd1585c0fc1267758bbe25e505b0184b9deec75816642

data/.travis.yml

@@ -4,7 +4,8 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.10
-  - 2.2.5
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
 script:
     - rspec spec

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.2.17
+- Merge [#90 Check if all array elements have a name](https://github.com/volanja/ansible_spec/pull/90) by [agx](https://github.com/agx)
+- Merge [#91 Parse roledirs from ansible.cfg](https://github.com/volanja/ansible_spec/pull/91) by [agx](https://github.com/agx)
+- Merge [#92 should use winrm < v2.1.1 at ruby 1.9.3](https://github.com/volanja/ansible_spec/pull/92) by volanja
+- Merge [#93 #89 use ENV['SSH_CONFIG_FILE'] or ssh_args at ansible_cfg](https://github.com/volanja/ansible_spec/pull/93) by volanja  
+Original idea [#89 set a option, it can select file of SSH-configration](https://github.com/volanja/ansible_spec/pull/89) by [gigathlete](https://github.com/gigathlete)
+- Merge [add test at ruby 2.4.0 & 2.3.3 & 2.2.6 (drop test 2.3.1 & 2.2.5)](https://github.com/volanja/ansible_spec/pull/94) by volanja
+
 # v0.2.16
 - Merge [#88 fix nil dependencies](https://github.com/volanja/ansible_spec/pull/88) by [developerinlondon](https://github.com/developerinlondon)
 - Merge [#87 added .DS_Store to gitignore](https://github.com/volanja/ansible_spec/pull/87) by [developerinlondon](https://github.com/developerinlondon)

data/Gemfile

@@ -10,4 +10,6 @@ end
 
 if Gem::Version.new(RUBY_VERSION.dup) <= Gem::Version.new('1.9.3')
   gem 'json', '~> 1.8.3'
+  # winrm 2.1.1 dropped Ruby 1.9 support.
+  gem 'winrm', '< 2.1.1'
 end

data/README.md

@@ -58,6 +58,9 @@ You can use environment variables with the `rake` command. They are listed below
 - `PLAYBOOK`       -- playbook name                                (e.g. `site.yml`)
 - `INVENTORY`      -- inventory file name                          (e.g. `hosts`)
 - `HASH_BEHAVIOUR` -- hash behaviour when duplicate hash variables (e.g. `merge`)
+- `SSH_CONFIG_FILE` -- ssh configuration file path (e.g. `ssh_config`)  
+`SSH_CONFIG_FILE` take precedence over the path at ssh_args( -F "filename") in [ssh_connection] section of ansible.cfg
+
 
 Environment variables take precedence over the `.ansiblespec` file.
 
@@ -171,6 +174,14 @@ Support variables are in site.yml, group_vars, host_vars, roles.
 
 ```
 
+**Note:** Parse roledirs from ansible.cfg. This allows us to find specs that are not under ./roles.
+
+```
+# ansible.cfg
+[defaults]
+roles_path = moreroles
+```
+
 #### Define variable(site.yml)
 
 

data/ansible_spec.gemspec

@@ -27,5 +27,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "hostlist_expression"
   gem.add_runtime_dependency "oj"
   gem.add_runtime_dependency "winrm"
+  gem.add_runtime_dependency "inifile"
 
 end

data/lib/ansible_spec/load_ansible.rb

@@ -3,6 +3,7 @@ require 'hostlist_expression'
 require 'oj'
 require 'open3'
 require 'yaml'
+require 'inifile'
 require 'ansible_spec/vendor/hash'
 
 module AnsibleSpec
@@ -241,7 +242,7 @@ module AnsibleSpec
     if name_exist?(properties)
       return properties
     else
-      fail "Please insert name on playbook"
+      fail "Please insert name on playbook '#{f}'"
     end
   end
 
@@ -273,8 +274,8 @@ module AnsibleSpec
   #         true: name is exist on playbook
   #         false: name is not exist on playbook
   def self.name_exist?(array)
-    array.each do |site|
-      return site.has_key?("name") ? true : false
+    array.all? do |site|
+      site.has_key?("name")
     end
   end
 
@@ -299,6 +300,33 @@ module AnsibleSpec
     return hash_behaviour
   end
 
+  # param: none
+  # return: file path
+  def self.get_ssh_config_file()
+    ssh_config_file = nil
+
+    cfg = AnsibleSpec::AnsibleCfg.new
+    ssh_args = cfg.get('ssh_connection', 'ssh_args')
+    if ssh_args
+      array = ssh_args.split(" ")
+      if array.index("-F") && array[array.index("-F") + 1]
+        ssh_config_file = array[array.index("-F") + 1]
+      end
+    end
+
+    if ENV["SSH_CONFIG_FILE"]
+      ssh_config_file = ENV["SSH_CONFIG_FILE"]
+    end
+
+    return nil if ssh_config_file.nil?
+
+    if File.exist?(ssh_config_file)
+      return ssh_config_file
+    else
+      return nil
+    end
+  end
+
   # param: hash
   # param: variable file
   # param: flag to extention
@@ -424,4 +452,45 @@ module AnsibleSpec
     return vars
 
   end
+
+  class AnsibleCfg
+    def initialize
+      @cfg = self.class.load_ansible_cfg
+    end
+
+    def roles_path
+      rp = (self.get('defaults', 'roles_path') or '').split(':')
+      rp << 'roles'  # Roles is always searched
+    end
+
+    class << self
+      def find_ansible_cfgs()
+        files = []
+        ["/etc/ansible/ansible.cfg",
+         File.expand_path("~/.ansible.cfg"),
+         "./ansible.cfg",
+         ENV["ANSIBLE_CFG"],
+        ].each do |f|
+          files << f if f and File.exists? f
+        end
+      end
+
+      def load_ansible_cfg()
+        cfg = IniFile.new
+        self.find_ansible_cfgs.each do |file|
+          cfg = cfg.merge(IniFile.new :filename => file)
+        end
+        cfg.to_h
+      end
+    end
+
+    def get(section, key)
+      s = @cfg[section]
+      if s
+        return s[key]
+      else
+        return nil
+      end
+    end
+  end
 end

data/lib/ansible_spec/version.rb

@@ -1,3 +1,3 @@
 module AnsibleSpec
-  VERSION = "0.2.16"
+  VERSION = "0.2.17"
 end

data/lib/src/Rakefile

@@ -6,6 +6,7 @@ require 'ansible_spec'
 properties = AnsibleSpec.get_properties
 # {"name"=>"Ansible-Sample-TDD", "hosts"=>["192.168.0.103","192.168.0.103"], "user"=>"root", "roles"=>["nginx", "mariadb"]}
 # {"name"=>"Ansible-Sample-TDD", "hosts"=>[{"name" => "192.168.0.103:22","uri"=>"192.168.0.103","port"=>22, "private_key"=> "~/.ssh/id_rsa"}], "user"=>"root", "roles"=>["nginx", "mariadb"]}
+cfg = AnsibleSpec::AnsibleCfg.new
 
 desc "Run serverspec to all test"
 task :all => "serverspec:all"
@@ -36,7 +37,7 @@ namespace :serverspec do
           deps = AnsibleSpec.load_dependencies(role)
           roles += deps
         end
-        t.pattern = 'roles/{' + roles.join(',') + '}/spec/*_spec.rb'
+        t.pattern = '{' + cfg.roles_path.join(',') + '}/{' + roles.join(',') + '}/spec/*_spec.rb'
       end
     end
   end

data/lib/src/spec/spec_helper.rb

@@ -11,6 +11,7 @@ hosts = ENV["TARGET_HOSTS"]
 
 group_idx = ENV['TARGET_GROUP_INDEX'].to_i
 vars = AnsibleSpec.get_variables(host, group_idx,hosts)
+ssh_config_file = AnsibleSpec.get_ssh_config_file
 set_property vars
 
 connection = ENV['TARGET_CONNECTION']
@@ -32,7 +33,11 @@ if connection != 'winrm'
     set :sudo_password, ENV['SUDO_PASSWORD']
   end
 
-  options = Net::SSH::Config.for(host)
+  unless ssh_config_file
+    options = Net::SSH::Config.for(host)
+  else
+    options = Net::SSH::Config.for(host,files=[ssh_config_file])
+  end
 
   options[:user] ||= ENV['TARGET_USER']
   options[:port] ||= ENV['TARGET_PORT']

data/spec/load_ansible_cfg_spec.rb

@@ -0,0 +1,91 @@
+# coding: utf-8
+require 'fileutils'
+require 'ansible_spec'
+
+def create_file(name,content)
+  dir = File.dirname(name)
+  unless File.directory?(dir)
+    FileUtils.mkdir_p(dir)
+  end
+  File.open(name, 'w') do |f|
+    f.puts content
+  end
+end
+
+describe "load_ansible_cfg" do
+  context 'with ANSIBLE_CFG set' do
+    tmp_cfg = 'tmp_ansible.cfg'
+    saved_env = nil
+
+    before do
+      content = <<'EOF'
+[ansible_spec1]
+roles_path = roles_path1:roles_path2
+EOF
+      create_file(tmp_cfg,content)
+      saved_env = ENV['ANSIBLE_CFG']
+      ENV['ANSIBLE_CFG'] = tmp_cfg
+      @res = AnsibleSpec::AnsibleCfg.load_ansible_cfg()
+    end
+
+    it 'res is hash' do
+      expect(@res.instance_of?(Hash)).to be_truthy
+    end
+
+    it 'res has section' do
+      expect(@res).to include('ansible_spec1')
+    end
+
+    it 'section has roles_path' do
+      expect(@res['ansible_spec1']).to include('roles_path')
+    end
+
+    it 'roles_path is set' do
+      expect(@res['ansible_spec1']['roles_path']).to eq('roles_path1:roles_path2')
+    end
+
+    after do
+      File.delete(tmp_cfg)
+      ENV['ANSIBLE_CFG'] = saved_env
+    end
+  end
+end
+
+describe "AnsibleCfg" do
+  context 'with ANSIBLE_CFG set' do
+    tmp_cfg = 'tmp_ansible.cfg'
+    saved_env = nil
+
+    before do
+      content = <<'EOF'
+[ansible_spec1]
+roles_path = roles_path1:roles_path2
+EOF
+      create_file(tmp_cfg,content)
+      saved_env = ENV['ANSIBLE_CFG']
+      ENV['ANSIBLE_CFG'] = tmp_cfg
+      @cfg = AnsibleSpec::AnsibleCfg.new
+    end
+
+    it 'elem handles unknown sections' do
+      expect(@cfg.get('doesnot', 'exist')).to be_nil
+    end
+
+    it 'elem handles unknown keys' do
+      expect(@cfg.get('ansible_spec1', 'doesnot_exist')).to be_nil
+    end
+
+    it 'elem handles known eys ' do
+      expect(@cfg.get('ansible_spec1', 'roles_path')).to be_truthy
+    end
+
+    it 'cfg has a roles path' do
+       expect(@cfg.roles_path).to be_truthy
+     end
+
+    after do
+      File.delete(tmp_cfg)
+      ENV['ANSIBLE_CFG'] = saved_env
+    end
+  end
+end

data/spec/load_ansible_cfg_ssh_spec.rb

@@ -0,0 +1,152 @@
+# coding: utf-8
+require 'fileutils'
+require 'ansible_spec'
+
+def create_file(name,content)
+  dir = File.dirname(name)
+  unless File.directory?(dir)
+    FileUtils.mkdir_p(dir)
+  end
+  File.open(name, 'w') do |f|
+    f.puts content
+  end
+end
+
+describe "get_ssh_config_file" do
+  context 'with SSH_CONFIG_FILE set' do
+    tmp_cfg = 'tmp_ansible.cfg'
+    tmp_ssh_cfg = 'hoge_config'
+    tmp_env_ssh_cfg = 'env_config'
+    saved_env = nil
+
+    before do
+      content = <<'EOF'
+[ssh_connection]
+ssh_args = -F hoge_config
+EOF
+      content_ssh = <<'EOF'
+EOF
+      create_file(tmp_cfg,content)
+      create_file(tmp_env_ssh_cfg,content_ssh)
+      saved_env = ENV['SSH_CONFIG_FILE']
+      ENV['SSH_CONFIG_FILE'] = tmp_env_ssh_cfg
+      @res = AnsibleSpec.get_ssh_config_file()
+    end
+
+    it 'res is hash' do
+      expect(@res.instance_of?(String)).to be_truthy
+    end
+
+    it 'res has section' do
+      expect(@res).to eq('env_config')
+    end
+
+    after do
+      File.delete(tmp_cfg)
+      File.delete(tmp_env_ssh_cfg)
+      ENV['SSH_CONFIG_FILE'] = saved_env
+    end
+  end
+
+  context 'without SSH_CONFIG_FILE set' do
+    tmp_cfg = 'tmp_ansible.cfg'
+    tmp_ssh_cfg = 'hoge_config'
+    saved_env = nil
+    saved_env_ansible = nil
+
+    before do
+      content = <<'EOF'
+[ssh_connection]
+ssh_args = -F hoge_config
+EOF
+      content_ssh = <<'EOF'
+EOF
+      create_file(tmp_cfg,content)
+      saved_env_ansible = ENV['ANSIBLE_CFG']
+      ENV['ANSIBLE_CFG'] = tmp_cfg
+
+      create_file(tmp_ssh_cfg,content_ssh)
+
+      saved_env = ENV['SSH_CONFIG_FILE']
+      ENV['SSH_CONFIG_FILE'] = nil
+      @res = AnsibleSpec.get_ssh_config_file()
+    end
+
+    it 'res is hash' do
+      expect(@res.instance_of?(String)).to be_truthy
+    end
+
+    it 'res has section' do
+      expect(@res).to eq('hoge_config')
+    end
+
+    after do
+      File.delete(tmp_cfg)
+      File.delete(tmp_ssh_cfg)
+      ENV['ANSIBLE_CFG'] = saved_env_ansible
+      ENV['SSH_CONFIG_FILE'] = saved_env
+    end
+  end
+
+  context 'not set -F <file> at ANSIBLE_CFG' do
+    tmp_cfg = 'tmp_ansible.cfg'
+    saved_env = nil
+    saved_env_ansible = nil
+
+    before do
+      content = <<'EOF'
+[ssh_connection]
+ssh_args = -o ControlMaster=auto
+EOF
+      content_ssh = <<'EOF'
+EOF
+      create_file(tmp_cfg,content)
+      saved_env_ansible = ENV['ANSIBLE_CFG']
+      ENV['ANSIBLE_CFG'] = tmp_cfg
+
+      saved_env = ENV['SSH_CONFIG_FILE']
+      ENV['SSH_CONFIG_FILE'] = nil
+      @res = AnsibleSpec.get_ssh_config_file()
+    end
+
+    it 'res has section' do
+      expect(@res).to eq nil
+    end
+
+    after do
+      File.delete(tmp_cfg)
+      ENV['SSH_CONFIG_FILE'] = saved_env
+      ENV['ANSIBLE_CFG'] = saved_env_ansible
+    end
+  end
+
+  context 'not exist SSH_CONFIG_FILE' do
+    tmp_cfg = 'tmp_ansible.cfg'
+    saved_env = nil
+    saved_env_ansible = nil
+
+    before do
+      content = <<'EOF'
+[ssh_connection]
+ssh_args = -F hoge_config
+EOF
+      create_file(tmp_cfg,content)
+      saved_env = ENV['SSH_CONFIG_FILE']
+      ENV['SSH_CONFIG_FILE'] = nil
+      saved_env_ansible = ENV['ANSIBLE_CFG']
+      ENV['ANSIBLE_CFG'] = tmp_cfg
+      @res = AnsibleSpec.get_ssh_config_file()
+    end
+
+    it 'res has section' do
+      expect(@res).to eq nil
+    end
+
+    after do
+      File.delete(tmp_cfg)
+      ENV['SSH_CONFIG_FILE'] = saved_env
+      ENV['ANSIBLE_CFG'] = saved_env_ansible
+    end
+  end
+end
+

data/spec/load_ansible_spec.rb

@@ -701,7 +701,7 @@ EOF
     end
 
     it 'exitする' do
-      expect{ AnsibleSpec.load_playbook(tmp_pb) }.to raise_error("Please insert name on playbook")
+      expect{ AnsibleSpec.load_playbook(tmp_pb) }.to raise_error("Please insert name on playbook 'playbook'")
     end
 
     after do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible_spec
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - volanja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-12 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: inifile
+  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:
@@ -264,6 +278,8 @@ files:
 - spec/get_variable_hosts_childrens_spec.rb
 - spec/get_variable_spec.rb
 - spec/inventory_parameters_spec.rb
+- spec/load_ansible_cfg_spec.rb
+- spec/load_ansible_cfg_ssh_spec.rb
 - spec/load_ansible_spec.rb
 - spec/spec_helper.rb
 - spec/ssh_spec.rb
@@ -407,6 +423,8 @@ test_files:
 - spec/get_variable_hosts_childrens_spec.rb
 - spec/get_variable_spec.rb
 - spec/inventory_parameters_spec.rb
+- spec/load_ansible_cfg_spec.rb
+- spec/load_ansible_cfg_ssh_spec.rb
 - spec/load_ansible_spec.rb
 - spec/spec_helper.rb
 - spec/ssh_spec.rb