ansible_spec 0.3.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d87ec24d89e985e499037877255f902b7eb7345a4fd4d4af1d262c55287ef9a
-  data.tar.gz: 819cc6ef8696ac2dbd09026e00ef05ffea63ccb6ca59a54cea75bb54dce0981d
+  metadata.gz: 4d6f9c6e42c88594d1b2cc2d7f18d96d172f2362e26fffac1a4a4e8b334600ab
+  data.tar.gz: f1d479135980a9cfa9a8e658ca9f55df3b95e63dba68e5d788347e892b477164
 SHA512:
-  metadata.gz: 7f59e840375f84b5df3df071cc1e9687734038556c3a6a888c7f8529f710130f337db4161dad2234ef787f0c493bbc88ce2256c19e95cd8e6052d37be478dc8b
-  data.tar.gz: 01d38a3d50b2f704351ae2c9f0e33c18d101b85f5c049d6126d66f485e6132634ef6936a3ca7059d7ff53f371cf8296b85f3d4cd2c4d916574850b785c1b445a
+  metadata.gz: 1572a692ac1d26119f0646d48c626b2956d0944c9cd8339a75f1a16def2e14565254cf01ce7e06358825e627d007a6bd17c5aefa8f185205e87c3714689a0f8e
+  data.tar.gz: ee34a574f2f29f3c959c417d4587baed95b04ce278b7534b6d960f6b47737982f48174927084ca789ae753f2ebc5cbcd852df7e170fe7d40ee436adf98a19813

data/.github/workflows/build.yml

@@ -0,0 +1,45 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: build
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # https://github.com/ruby/setup-ruby#supported-versions
+        # EOL >= 2.6
+        ruby-version: ['2.6.10', '2.7.7', '3.0.5', '3.1.3', '3.2.11', '3.3.12', '3.4.10']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+      uses: ruby/setup-ruby@v1
+      #uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        # 'latest', the latest compatible Bundler version is installed (Bundler 2 on Ruby >= 2.3, Bundler 1 on Ruby < 2.3).
+        bundler: latest
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Install dependencies
+      run: bundle install --jobs=3 --retry=3
+    - name: check env
+      run: |
+        bundle list
+    - name: Run tests
+      run: bundle exec rspec spec

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v1.0.0
+- Support Ruby 3.2, 3.3, 3.4
+ - Merge [#155 Support Ruby 3.2.11](https://github.com/volanja/ansible_spec/pull/155) by volanja
+ - Merge [#156 Add test case 3.3.12, 3.4.10](https://github.com/volanja/ansible_spec/pull/156) by volanja
+
+# v0.3.2
+- Merge [#135 Fix wrong index by empty group](https://github.com/volanja/ansible_spec/pull/135) by [mamiya312](https://github.com/mamiya312)
+
 # v0.3.1
 - Fix [#126 no implicit conversion of nil into Array Error when process get_parent](https://github.com/volanja/ansible_spec/issues/126) by [shogos3](https://github.com/shogos3)
 

data/Gemfile

@@ -3,17 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in ansible_spec.gemspec
 gemspec
 
-if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  # net-ssh 3.x dropped Ruby 1.8 and 1.9 support.
-  gem 'net-ssh', '~> 2.7'
-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
-
 if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1')
   # Ansible::Vault support Ruby 2.1.0 and higher.
   gem 'ansible-vault'

data/README.md

@@ -1,7 +1,7 @@
 # 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)
+[![build](https://github.com/volanja/ansible_spec/actions/workflows/build.yml/badge.svg)](https://github.com/volanja/ansible_spec/actions/workflows/build.yml)
 
 This is a Ruby gem that implements an Ansible Config Parser for Serverspec.
 It creates a Rake task that can run tests, using Ansible inventory files
@@ -336,3 +336,6 @@ To contribute your change, create a GitHub pull request as follows:
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request at https://github.com/volanja/ansible_spec
+
+# Old CI
+[Travis CI - volanja/ansible_spec](https://travis-ci.org/github/volanja/ansible_spec)

data/ansible_spec.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ansible_spec/version'
+require_relative 'lib/ansible_spec/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "ansible_spec"
@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+  gem.required_ruby_version = '>= 2.1.0'
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"

data/lib/ansible_spec/load_ansible.rb

@@ -190,7 +190,7 @@ module AnsibleSpec
     f = '.ansiblespec'
     y = nil
     if File.exist?(f)
-      y = YAML.load_file(f)
+      y = load_yaml_file(f)
     end
     if ENV["PLAYBOOK"]
       playbook = ENV["PLAYBOOK"]
@@ -226,7 +226,7 @@ module AnsibleSpec
       path = File.join(rolepath, role, "meta", "main.yml")
 
       if File.exist?(path)
-        dependencies = YAML.load_file(path).fetch("dependencies", [])
+        dependencies = load_yaml_file(path).fetch("dependencies", [])
         unless dependencies.nil?
           new_deps = dependencies.map { |h|
             h["role"] || h
@@ -243,21 +243,27 @@ module AnsibleSpec
   # return: json
   #         {"name"=>"Ansible-Sample-TDD", "hosts"=>"server", "user"=>"root", "roles"=>["nginx", "mariadb"]}
   def self.load_playbook(f)
-    playbook = YAML.load_file(f)
+    playbook = load_yaml_file(f)
 
     # e.g. comment-out
     if playbook === false
       puts "Error: No data in #{f}"
       exit
     end
+    # for Ruby 3.1.
+    if playbook.nil?
+      puts "Error: No data in #{f}"
+      exit
+    end
+
     properties = Array.new
     playbook.each do |site|
       if site.has_key?("include")
-          YAML.load_file(site["include"]).each { |site|
+          load_yaml_file(site["include"]).each { |site|
             properties.push site
           }
       elsif site.has_key?("import_playbook")
-          YAML.load_file(site["import_playbook"]).each { |site|
+          load_yaml_file(site["import_playbook"]).each { |site|
             properties.push site
           }
       else
@@ -313,7 +319,7 @@ module AnsibleSpec
     f = '.ansiblespec'
     y = nil
     if File.exist?(f)
-      y = YAML.load_file(f)
+      y = load_yaml_file(f)
     end
     hash_behaviour = 'replace'
     if ENV["HASH_BEHAVIOUR"]
@@ -377,12 +383,12 @@ module AnsibleSpec
           if Ansible::Vault.encrypted?(vars_file)
             yaml = load_encrypted_file(vars_file)
           else
-            yaml = YAML.load_file(vars_file)
+            yaml = load_yaml_file(vars_file)
           end
           vars = merge_variables(vars, yaml)
         else
           # Ruby 1.9 and 2.0
-          yaml = YAML.load_file(vars_file)
+          yaml = load_yaml_file(vars_file)
           vars = merge_variables(vars, yaml)
         end
       end
@@ -458,7 +464,7 @@ module AnsibleSpec
     f = '.ansiblespec'
     y = nil
     if File.exist?(f)
-      y = YAML.load_file(f)
+      y = load_yaml_file(f)
     end
     if ENV["VARS_DIRS_PATH"]
       vars_dirs_path = ENV["VARS_DIRS_PATH"]
@@ -477,7 +483,7 @@ module AnsibleSpec
       target_host.keys[0]
   end
 
-  # query replace jinja2 templates with target values 
+  # query replace jinja2 templates with target values
   # param: hash (cf. result self.get_variables)
   # param: number of iterations if found_template
   # return: hash
@@ -497,15 +503,15 @@ module AnsibleSpec
         # ignore whitespaces (\s*)
         # use non-greedy regex (.*?)
         target = template.gsub(/{{\s*(.*?)\s*}}/, '\1')
-        
+
         # lookup value of target variable
         value = vars[target]
-        
+
         # return lookup value if it exists
-        # or leave template alone  
-        if value.nil? 
+        # or leave template alone
+        if value.nil?
           template
-        else 
+        else
           found_template = true
           value
         end
@@ -516,7 +522,7 @@ module AnsibleSpec
 
   def self.get_variables(host, group_idx, hosts=nil)
     vars = {}
-    p = self.get_properties
+    p = self.get_properties.compact.reject{|e| e["hosts"].length == 0}
 
     # roles default
     p[group_idx]['roles'].each do |role|
@@ -580,6 +586,16 @@ module AnsibleSpec
 
   end
 
+  def self.load_yaml_file(file)
+    begin
+      # Psych::VERSION >= '3.1.0'
+      YAML.load_file(file, permitted_classes: [Symbol], aliases: true)
+    rescue ArgumentError
+      # Fallback for older Psych versions
+      YAML.load_file(file)
+    end
+  end
+
   class AnsibleCfg
     def initialize
       @cfg = self.class.load_ansible_cfg
@@ -598,16 +614,19 @@ module AnsibleSpec
          "./ansible.cfg",
          ENV["ANSIBLE_CFG"],
         ].each do |f|
-          files << f if f and File.exists? f
+          files << f if f and File.exist? f
         end
       end
 
+      # return : Hash
       def load_ansible_cfg()
-        cfg = IniFile.new
+        cfg_hash = {}
         self.find_ansible_cfgs.each do |file|
-          cfg = cfg.merge(IniFile.new :filename => file)
+          cfg_file = IniFile.new :filename => file
+          # Merge without calling tainted? method
+          cfg_hash.merge!(cfg_file.to_h)
         end
-        cfg.to_h
+        cfg_hash  # return Hash
       end
     end
 

data/lib/ansible_spec/version.rb

@@ -1,3 +1,3 @@
 module AnsibleSpec
-  VERSION = "0.3.1"
+  VERSION = "1.0.0"
 end

data/lib/ansible_spec.rb

@@ -65,7 +65,7 @@ module AnsibleSpec
   end
 
   def self.safe_touch(file)
-    unless File.exists? "#{file}"
+    unless File.exist? "#{file}"
       File.open("#{file}", 'w') do |f|
           #f.puts content
       end

data/spec/case/get_variable/empty_group/group_vars/group_a.yml

@@ -0,0 +1,2 @@
+---
+group_a_var: hoge

data/spec/case/get_variable/empty_group/group_vars/group_b.yml

@@ -0,0 +1,2 @@
+---
+group_b_var: fuga

data/spec/case/get_variable/empty_group/hosts

@@ -0,0 +1,3 @@
+[group_a]
+[group_b]
+localhost.localdomain ansible_ssh_private_key_file=~/.ssh/id_rsa

data/spec/case/get_variable/empty_group/site.yml

@@ -0,0 +1,9 @@
+---
+- name: playbook_a
+  hosts: group_a
+  roles:
+    - role_a
+- name: playbook_b
+  hosts: group_b
+  roles:
+    - role_b

data/spec/get_variable_spec.rb

@@ -362,6 +362,45 @@ describe "get_variablesの実行" do
     end
   end
 
+  # Fixed a problem that there is a gap between Index passed from Rakefile when empty group exists. by #135
+  # cat hosts
+  # [group_a]  #no host
+  # [group_b]
+  # localhost.localdomain ansible_ssh_private_key_file=~/.ssh/id_rsa
+
+  context 'Correct operation : empty group PR #135 ' do
+    before do
+      @current_dir = Dir.pwd()
+      Dir.chdir('spec/case/get_variable/empty_group')
+      ENV["PLAYBOOK"] = 'site.yml'
+      ENV["INVENTORY"] = 'hosts'
+      ENV["VARS_DIRS_PATH"] = ''
+      @res = AnsibleSpec.get_variables("localhost.localdomain", 0)
+    end
+
+    it 'res is hash' do
+      expect(@res.instance_of?(Hash)).to be_truthy
+    end
+
+    it 'exist 1 pair in Hash' do
+      expect(@res.length).to eq 1
+    end
+
+    it 'get correct variable' do
+      expect(@res).to eq("group_b_var" => "fuga")
+    end
+
+    it 'not get incorrect variables' do
+      expect(@res).not_to eq("group_a_var" => "hoge")
+    end
+
+    after do
+      ENV.delete('PLAYBOOK')
+      ENV.delete('INVENTORY')
+      ENV.delete('VARS_DIRS_PATH')
+      Dir.chdir(@current_dir)
+    end
+  end
 end
 
 describe "get_hash_behaviourの実行" do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ansible_spec
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0
 platform: ruby
 authors:
 - volanja
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -159,9 +158,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -190,6 +189,10 @@ files:
 - spec/case/get_variable/deep_merge/hosts
 - spec/case/get_variable/deep_merge/roles/test/defaults/main.yml
 - spec/case/get_variable/deep_merge/site.yml
+- spec/case/get_variable/empty_group/group_vars/group_a.yml
+- spec/case/get_variable/empty_group/group_vars/group_b.yml
+- spec/case/get_variable/empty_group/hosts
+- spec/case/get_variable/empty_group/site.yml
 - spec/case/get_variable/group_all/group_vars/all.yml
 - spec/case/get_variable/group_all/hosts
 - spec/case/get_variable/group_all/roles/test/defaults/main.yml
@@ -346,7 +349,6 @@ homepage: https://github.com/volanja/ansible_spec
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -354,15 +356,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Ansible Config Parser for Serverspec. Run test Multi Role and Multi Host
   by Ansible Configuration
@@ -379,6 +380,10 @@ test_files:
 - spec/case/get_variable/deep_merge/hosts
 - spec/case/get_variable/deep_merge/roles/test/defaults/main.yml
 - spec/case/get_variable/deep_merge/site.yml
+- spec/case/get_variable/empty_group/group_vars/group_a.yml
+- spec/case/get_variable/empty_group/group_vars/group_b.yml
+- spec/case/get_variable/empty_group/hosts
+- spec/case/get_variable/empty_group/site.yml
 - spec/case/get_variable/group_all/group_vars/all.yml
 - spec/case/get_variable/group_all/hosts
 - spec/case/get_variable/group_all/roles/test/defaults/main.yml

data/.travis.yml

@@ -1,15 +0,0 @@
-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.8
-  - 2.4.9
-  - 2.5.7
-  - 2.6.5
-  - 2.7.0
-script:
-    - rspec spec