ansible_spec 0.2.22 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c7c2e8e332c8081556cb66d7f6fbdd97fe61248
-  data.tar.gz: a8350998cdbf812f4b148ff45fd4904e1c56354f
+  metadata.gz: ea92ad1db5c6331ab0f51cb0cc9f8357d6fad5a1
+  data.tar.gz: 3529e094be9910fb8acb9c1e3df7661e4e21135e
 SHA512:
-  metadata.gz: ffc9bc8b58c2adb1a335e21ec9454d92706ae8c74b9db3b99cce12a52b6aa79f9cf8600cb0f6496b5a68f17fd2278dd8183424b317448c14bade7faf9aab3074
-  data.tar.gz: 8766b40e4bfb60f1d5c3b61f0f78ed34b3d29d023622bd530f3d1f386e1d3ae193c52205c04b96575e1355f67176452b2024a942362e27f040e576076f4f73bb
+  metadata.gz: 4f8121627c3ffb1b2011e8b77d2ef0704b8f64ab59075c2973e7768c7fb26a1c21606332acdb7a6faedc1d4d17be4287abf354de010fc4c72ded2d7db003aa88
+  data.tar.gz: ded735c540319da5a2443d9639390f3e0a5d915a5249e410d0295f3f32b99b09bcc6625384d2778784bf8f7484f4f199a6a5c52b6dce9eb2f0a6149927f59d3b

data/.travis.yml

@@ -4,8 +4,9 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.10
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
 script:
     - rspec spec

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.23
+- Merge [#115 Support import_playbook](https://github.com/volanja/ansible_spec/pull/115) by [seiji](https://github.com/seiji)
+- Merge [#113 Make ENV variables override SSH config file options](https://github.com/volanja/ansible_spec/pull/113) by [Jonnymcc](https://github.com/Jonnymcc)
+
 # v0.2.22
 - Merge [#111 fix sudo directive for after Ansible 1.9](https://github.com/volanja/ansible_spec/pull/111) by [katsuhisa91](https://github.com/katsuhisa91)
 

data/README.md

@@ -155,6 +155,13 @@ Ansible variables supported by following condition.
 * Inventory variables are not supported.
 * Facts are not supported.
 
+## SSH config priority (from v0.2.23)
+
+1. ENV['SSH_CONFIG_FILE'] (high priority)
+1. ssh_args( -F "filename") in [ssh_connection] section of ansible.cfg
+1. user from site.yml
+1. ~/.ssh/config (low priority)
+
 ### Sample
 
 Support variables are in site.yml, group_vars, host_vars, roles.
@@ -277,7 +284,7 @@ sample is [here](https://github.com/volanja/ansible-sample-tdd)
 
 ## Playbook
 
-playbook can use `include`
+playbook can use `import_playbook` & `include[DEPRECATION]`
 
 ```site.yml
 - name: Ansible-Sample-TDD

data/lib/ansible_spec/load_ansible.rb

@@ -234,6 +234,10 @@ module AnsibleSpec
           YAML.load_file(site["include"]).each { |site|
             properties.push site
           }
+      elsif site.has_key?("import_playbook")
+          YAML.load_file(site["import_playbook"]).each { |site|
+            properties.push site
+          }
       else
         properties.push site
       end

data/lib/ansible_spec/version.rb

@@ -1,3 +1,3 @@
 module AnsibleSpec
-  VERSION = "0.2.22"
+  VERSION = "0.2.23"
 end

data/lib/src/spec/spec_helper.rb

@@ -34,15 +34,16 @@ when 'ssh'
     set :become_password, ENV['BECOME_PASSWORD']
   end
 
-  unless ssh_config_file
-    options = Net::SSH::Config.for(host)
-  else
-    options = Net::SSH::Config.for(host,files=[ssh_config_file])
-  end
+  options = Net::SSH::Config.for(host)
 
-  options[:user] ||= ENV['TARGET_USER']
-  options[:port] ||= ENV['TARGET_PORT']
-  options[:keys] ||= ENV['TARGET_PRIVATE_KEY']
+  options[:user] = ENV['TARGET_USER'] || options[:user]
+  options[:port] = ENV['TARGET_PORT'] || options[:port]
+  options[:keys] = ENV['TARGET_PRIVATE_KEY'] || options[:keys]
+
+  if ssh_config_file
+    from_config_file = Net::SSH::Config.for(host,files=[ssh_config_file])
+    options.merge!(from_config_file)
+  end
 
   set :host,        options[:host_name] || host
   set :ssh_options, options

data/spec/load_ansible_spec.rb

@@ -570,22 +570,23 @@ EOF
     end
   end
 
-  context '正常系(include)' do
-    require 'yaml'
-    tmp_pb = 'site.yml'
-    tmp_inc = 'nginx.yml'
-    before do
-      content_pb = <<'EOF'
+  %w[include import_playbook].each do |action|
+    context "正常系(#{action})" do
+      require 'yaml'
+      tmp_pb = 'site.yml'
+      tmp_inc = 'nginx.yml'
+      before do
+        content_pb = <<"EOF"  # ヒアドキュメント内で変数展開する時は""(double quote)で囲む。
 - name: Ansible-Sample-TDD
   hosts: server
   user: root
   roles:
     - mariadb
-- include: nginx.yml
+- #{action}: nginx.yml
 EOF
-      create_file(tmp_pb,content_pb)
+        create_file(tmp_pb,content_pb)
 
-      content_inc = <<'EOF'
+        content_inc = <<'EOF'
 - name: Ansible-Nginx
   hosts: web
   user: nginx
@@ -598,87 +599,88 @@ EOF
   roles:
    - nginx-proxy
 EOF
-      create_file(tmp_inc,content_inc)
+        create_file(tmp_inc,content_inc)
 
-      @res = AnsibleSpec.load_playbook(tmp_pb)
-    end
+        @res = AnsibleSpec.load_playbook(tmp_pb)
+      end
 
-    it 'res is array' do
-      expect(@res.instance_of?(Array)).to be_truthy
-    end
+      it 'res is array' do
+        expect(@res.instance_of?(Array)).to be_truthy
+      end
 
-    it 'res has three groups' do
-      expect(@res.length).to eq 3
-    end
+      it 'res has three groups' do
+        expect(@res.length).to eq 3
+      end
 
 
-    it 'res is hash' do
-      expect(@res[0].instance_of?(Hash)).to be_truthy
-    end
+      it 'res is hash' do
+        expect(@res[0].instance_of?(Hash)).to be_truthy
+      end
 
-    it 'check 1 group' do
-      expect(@res[0].length).to eq 4
-    end
+      it 'check 1 group' do
+        expect(@res[0].length).to eq 4
+      end
 
-    it 'exist name' do
-      expect(@res[0].key?('name')).to be_truthy
-      expect(@res[0]['name']).to eq 'Ansible-Sample-TDD'
-    end
+      it 'exist name' do
+        expect(@res[0].key?('name')).to be_truthy
+        expect(@res[0]['name']).to eq 'Ansible-Sample-TDD'
+      end
 
-    it 'exist hosts' do
-      expect(@res[0].key?('hosts')).to be_truthy
-      expect(@res[0]['hosts']).to eq 'server'
-    end
+      it 'exist hosts' do
+        expect(@res[0].key?('hosts')).to be_truthy
+        expect(@res[0]['hosts']).to eq 'server'
+      end
 
-    it 'exist user' do
-      expect(@res[0].key?('user')).to be_truthy
-      expect(@res[0]['user']).to eq 'root'
-    end
+      it 'exist user' do
+        expect(@res[0].key?('user')).to be_truthy
+        expect(@res[0]['user']).to eq 'root'
+      end
 
-    it 'exist roles' do
-      expect(@res[0].key?('roles')).to be_truthy
-      expect(@res[0]['roles'].instance_of?(Array)).to be_truthy
-      expect(@res[0]['roles'][0]).to eq 'mariadb'
-    end
+      it 'exist roles' do
+        expect(@res[0].key?('roles')).to be_truthy
+        expect(@res[0]['roles'].instance_of?(Array)).to be_truthy
+        expect(@res[0]['roles'][0]).to eq 'mariadb'
+      end
 
-    # - include: nginx.yml
-    it 'res is hash' do
-      expect(@res[1].instance_of?(Hash)).to be_truthy
-    end
+      # - include: nginx.yml
+      it 'res is hash' do
+        expect(@res[1].instance_of?(Hash)).to be_truthy
+      end
 
-    it 'check 1 group' do
-      expect(@res[1].length).to eq 4
-    end
+      it 'check 1 group' do
+        expect(@res[1].length).to eq 4
+      end
 
-    it 'exist name' do
-      expect(@res[1].key?('name')).to be_truthy
-      expect(@res[1]['name']).to eq 'Ansible-Nginx'
-    end
+      it 'exist name' do
+        expect(@res[1].key?('name')).to be_truthy
+        expect(@res[1]['name']).to eq 'Ansible-Nginx'
+      end
 
-    it 'exist hosts' do
-      expect(@res[1].key?('hosts')).to be_truthy
-      expect(@res[1]['hosts']).to eq 'web'
-    end
+      it 'exist hosts' do
+        expect(@res[1].key?('hosts')).to be_truthy
+        expect(@res[1]['hosts']).to eq 'web'
+      end
 
-    it 'exist user' do
-      expect(@res[1].key?('user')).to be_truthy
-      expect(@res[1]['user']).to eq 'nginx'
-    end
+      it 'exist user' do
+        expect(@res[1].key?('user')).to be_truthy
+        expect(@res[1]['user']).to eq 'nginx'
+      end
 
-    it 'exist roles' do
-      expect(@res[1].key?('roles')).to be_truthy
-      expect(@res[1]['roles'].instance_of?(Array)).to be_truthy
-      expect(@res[1]['roles'][0]).to eq 'nginx'
-    end
+      it 'exist roles' do
+        expect(@res[1].key?('roles')).to be_truthy
+        expect(@res[1]['roles'].instance_of?(Array)).to be_truthy
+        expect(@res[1]['roles'][0]).to eq 'nginx'
+      end
 
-    it 'exist name' do
-      expect(@res[2].key?('name')).to be_truthy
-      expect(@res[2]['name']).to eq 'Ansible-Nginx2'
-    end
+      it 'exist name' do
+        expect(@res[2].key?('name')).to be_truthy
+        expect(@res[2]['name']).to eq 'Ansible-Nginx2'
+      end
 
-    after do
-      File.delete(tmp_pb)
-      File.delete(tmp_inc)
+      after do
+        File.delete(tmp_pb)
+        File.delete(tmp_inc)
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible_spec
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.2.23
 platform: ruby
 authors:
 - volanja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler