ansible_spec 0.2.25 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c590bfdd84716132e5a14c1ac3aa372aada32bbbc6f5e80e20c412db07cdcd48
-  data.tar.gz: bc136b7cc0ee1af57b2d9b4183de15b0efe20747b36b8cf023d4a5c3f6b51873
+  metadata.gz: 250f5355a569c40d24193b19685ecc4d5ad454aa7c60ff445b12503b81a6a23a
+  data.tar.gz: 3b72c2519bc7600ba81c789b07a3415ac1ebd286d23c0133bdc39dce93ccd47a
 SHA512:
-  metadata.gz: adfac09e9e273d179093a7d9aed9bec84b67cca40136958d6b387d6e2454370f2d1ebb3fc918d3ee508ad97b1e124da5b553c349596f1ab5e8372fb7792d33f8
-  data.tar.gz: aaea9c5fc67e8d9bf3f4966ba4673baac23229cc78a6d4e1a7cdee360eec7fc48920d50eed0d5c3f080583afe65677d3b73bda2925c64b35e7188e7cd8bf758d
+  metadata.gz: c8f3fb9cc3861c77526ea9c8d24657550fa4ee1f0f1d74299660765721008af3fd00531b3045e4b72357d527ef6e02d94d3937ef1e486e7749a1d3173fd24f98
+  data.tar.gz: a0c3454aa81f7c374208ac78e7abd0e2fe95427080f6cd104230e9b22bcea981576c77fbe82bcec489873bf66d258bc420f7427f139053c37ebe2db7172b1ab4

data/.travis.yml

@@ -1,12 +1,15 @@
 language: ruby
+dist: trusty  # work at Ubuntu 14.04 for install Ruby 1.9.3
 sudo: false
 rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.10
   - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.3.8
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
+  - 2.7.0-preview1
 script:
     - rspec spec

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v0.3
+- Support Ansible Vault  (Run Ruby 2.1.0 and higher.)
+ - Merge [#116 Feature ansible vault](https://github.com/volanja/ansible_spec/pull/116) by [RebelCodeBase](https://github.com/RebelCodeBase)
+ - Merge [#123 skip test at unsupported version ref ansible vault](https://github.com/volanja/ansible_spec/pull/123) by volanja
+
+And Some Bug Fixed. See [Milestone v0.3](https://github.com/volanja/ansible_spec/milestone/13?closed=1)
+
 # v0.2.25
 - Merge [#118 Incorporate group parent child relationships into variable assignment hierarchy](https://github.com/volanja/ansible_spec/pull/118) by [rbramwell](https://github.com/rbramwell)
 

data/Gemfile

@@ -13,3 +13,8 @@ if Gem::Version.new(RUBY_VERSION.dup) <= Gem::Version.new('1.9.3')
   # winrm 2.1.1 dropped Ruby 1.9 support.
   gem 'winrm', '< 2.1.1'
 end
+
+if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1')
+  # Ansible::Vault support Ruby 2.1.0 and higher.
+  gem 'ansible-vault'
+end

data/README.md

@@ -1,6 +1,6 @@
 # ansible_spec
 
-[![Gem Version](https://badge.fury.io/rb/ansible_spec.svg)](http://badge.fury.io/rb/ansible_spec)
+[![Gem Version](https://badge.fury.io/rb/ansible_spec.svg)](https://badge.fury.io/rb/ansible_spec)
 [![Build Status](https://travis-ci.org/volanja/ansible_spec.svg?branch=master)](https://travis-ci.org/volanja/ansible_spec)
 
 This is a Ruby gem that implements an Ansible Config Parser for Serverspec.

data/ansible_spec.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency "bundler", "~> 1.3"
+  gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "diff-lcs"
   gem.add_development_dependency "simplecov"
@@ -28,5 +28,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "oj"
   gem.add_runtime_dependency "winrm"
   gem.add_runtime_dependency "inifile"
+  gem.add_runtime_dependency "ansible-vault"
 
 end

data/lib/ansible_spec/load_ansible.rb

@@ -5,6 +5,9 @@ require 'open3'
 require 'yaml'
 require 'inifile'
 require 'ansible_spec/vendor/hash'
+if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1')
+  require 'ansible/vault'
+end
 
 module AnsibleSpec
   # param: inventory file of Ansible
@@ -158,6 +161,7 @@ module AnsibleSpec
     # 初期値
     host['name'] = line
     host['port'] = 22
+    host['connection'] = "ssh"
     if line.include?(":") # 192.168.0.1:22
       host['uri']  = line.split(":")[0]
       host['port'] = line.split(":")[1].to_i
@@ -365,15 +369,39 @@ module AnsibleSpec
       if File.directory?(vars_file)
         Dir.glob(File.join(vars_file, '*')).each { |f|
           vars = load_vars_file(vars, f)
-	      }
+        }
       else
-        yaml = YAML.load_file(vars_file)
-        vars = merge_variables(vars, yaml)
+        # you can use Ansible::Vault when use ruby 2.1.0 and higher.
+        # Ansible::Vault support Ruby 2.1.0 and higher.
+        if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1')
+          if Ansible::Vault.encrypted?(vars_file)
+            yaml = load_encrypted_file(vars_file)
+          else
+            yaml = YAML.load_file(vars_file)
+          end
+          vars = merge_variables(vars, yaml)
+        else
+          # Ruby 1.9 and 2.0
+          yaml = YAML.load_file(vars_file)
+          vars = merge_variables(vars, yaml)
+        end
       end
     end
     return vars
   end
 
+  # param: variable file
+  # return: be merged hash
+  def self.load_encrypted_file(vars_file)
+    cfg = AnsibleSpec::AnsibleCfg.new
+    vault_password_file = cfg.get('defaults', 'vault_password_file')
+    if vault_password_file
+      vault_password = File.open(vault_password_file).read.chomp
+      yaml = YAML.load(Ansible::Vault.read(path: vars_file, password: vault_password))
+    end
+    return yaml
+  end
+
   # param: target hash
   # param: be merged hash
   def self.merge_variables(vars, hash)

data/lib/ansible_spec/version.rb

@@ -1,3 +1,3 @@
 module AnsibleSpec
-  VERSION = "0.2.25"
+  VERSION = "0.3"
 end

data/lib/src/spec/spec_helper.rb

@@ -23,15 +23,16 @@ when 'ssh'
 #
   set :backend, :ssh
 
+  # Ansible use `BECOME`, But Serverspec use `SUDO`.
   if ENV['ASK_BECOME_PASSWORD']
     begin
       require 'highline/import'
     rescue LoadError
       fail "highline is not available. Try installing it."
     end
-    set :become_password, ask("Enter become password: ") { |q| q.echo = false }
+    set :sudo_password, ask("Enter become password: ") { |q| q.echo = false }
   else
-    set :become_password, ENV['BECOME_PASSWORD']
+    set :sudo_password, ENV['BECOME_PASSWORD']
   end
 
   options = Net::SSH::Config.for(host)
@@ -48,8 +49,8 @@ when 'ssh'
   set :host,        options[:host_name] || host
   set :ssh_options, options
 
-  # Disable become
-  # set :become, false
+  # Disable become (Serverspec use sudo)
+  # set :disable_sudo, true
 
 
   # Set environment variables

data/spec/case/load_vars_file/vault_dir/ansible.cfg

@@ -0,0 +1,2 @@
+[defaults]
+vault_password_file = vault-password-file

data/spec/case/load_vars_file/vault_dir/group_vars/all/vault_file

@@ -0,0 +1,6 @@
+$ANSIBLE_VAULT;1.1;AES256
+33623930383865383331633337653461646233633934353935376363306265636331363565306532
+3935313131623364363162616335333530376134383137350a376231363430353963646535313335
+36383533346433306666623162663335353035333931366162353131383539643239646637333561
+3963386635663534310a323134643666343962303733616263613535623965366337393666623832
+3032

data/spec/case/load_vars_file/vault_dir/vault-password-file

@@ -0,0 +1 @@
+supersecretpassword

data/spec/get_variable_spec.rb

@@ -638,4 +638,33 @@ describe "load_vars_fileの実行" do
     end
   end
 
+  # Ansible::Vault support Ruby 2.1.0 and higher.
+  # Skip test when Ruby 1.9.3 & 2.0.0
+  if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1')
+    context 'Correct operation : vaults in directory' do
+      before do
+        @current_dir = Dir.pwd()
+        Dir.chdir('spec/case/load_vars_file/vault_dir/')
+        vars = Hash.new
+        file = 'group_vars/all'
+        @res = AnsibleSpec.load_vars_file(vars, file)
+      end
+
+      it 'res is hash' do
+        expect(@res.instance_of?(Hash)).to be_truthy
+      end
+
+      it 'exists one pair in Hash' do
+        expect(@res.length).to eq 1
+      end
+
+      it 'exists the pair' do
+        expect(@res).to include({'vault_var' => 'val'})
+      end
+
+      after do
+        Dir.chdir(@current_dir)
+      end
+    end
+  end
 end

data/spec/load_ansible_spec.rb

@@ -1531,16 +1531,20 @@ EOF
       expect(@res[0]['hosts'].instance_of?(Array)).to be_truthy
       expect([{'name' => '192.168.0.103',
                'uri' => '192.168.0.103',
-               'port' => 22},
+               'port' => 22,
+               'connection' => 'ssh'},
               {'name' => '192.168.0.104',
                'uri' => '192.168.0.104',
-               'port' => 22},
+               'port' => 22,
+               'connection' => 'ssh'},
               {'name' => '192.168.0.105',
                'uri' => '192.168.0.105',
-               'port' => 22},
+               'port' => 22,
+               'connection' => 'ssh'},
               {'name' => '192.168.0.106',
                'uri' => '192.168.0.106',
-               'port' => 22}]).to match_array(@res[0]['hosts'])
+               'port' => 22,
+               'connection' => 'ssh'}]).to match_array(@res[0]['hosts'])
     end
 
     it 'exist user' do
@@ -1676,18 +1680,22 @@ EOF
       expect([{'name' => '192.168.0.103',
                'uri' => '192.168.0.103',
                'port' => 22,
+               'connection' => 'ssh',
                'hosts'=>'server'},
               {'name' => '192.168.0.104',
                'uri' => '192.168.0.104',
                'port' => 22,
+               'connection' => 'ssh',
                'hosts'=>'server'},
               {'name' => '192.168.0.105',
                'uri' => '192.168.0.105',
                'port' => 22,
+               'connection' => 'ssh',
                'hosts'=>'server2'},
               {'name' => '192.168.0.106',
                'uri' => '192.168.0.106',
                'port' => 22,
+               'connection' => 'ssh',
                'hosts'=>'server2'}]).to match_array(@res[0]['hosts'])
     end
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ansible_spec
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: '0.3'
 platform: ruby
 authors:
 - volanja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-26 00:00:00.000000000 Z
+date: 2019-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ansible-vault
+  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:
@@ -310,6 +324,9 @@ files:
 - spec/case/load_vars_file/group_all_deep_merge/group_vars/all.yml
 - spec/case/load_vars_file/vars_dir/group_vars/all/file1
 - spec/case/load_vars_file/vars_dir/group_vars/all/file2
+- spec/case/load_vars_file/vault_dir/ansible.cfg
+- spec/case/load_vars_file/vault_dir/group_vars/all/vault_file
+- spec/case/load_vars_file/vault_dir/vault-password-file
 - spec/commands_spec.rb
 - spec/dependency_spec.rb
 - spec/dynamic_inventory_hosts_childrens_spec.rb
@@ -497,6 +514,9 @@ test_files:
 - spec/case/load_vars_file/group_all_deep_merge/group_vars/all.yml
 - spec/case/load_vars_file/vars_dir/group_vars/all/file1
 - spec/case/load_vars_file/vars_dir/group_vars/all/file2
+- spec/case/load_vars_file/vault_dir/ansible.cfg
+- spec/case/load_vars_file/vault_dir/group_vars/all/vault_file
+- spec/case/load_vars_file/vault_dir/vault-password-file
 - spec/commands_spec.rb
 - spec/dependency_spec.rb
 - spec/dynamic_inventory_hosts_childrens_spec.rb