ansible_spec 0.2.6 → 0.2.7.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f3f3fdce96a604720925a233a0b2cf0f11caf0b
-  data.tar.gz: aa92bf9f29d175293cb755145fb8e4b6123e6f63
+  metadata.gz: e1bec80ee7959dd64b421907391935a92b0c6ce3
+  data.tar.gz: 4d6c85a0bbf27248258d93973761da23f2c7bb1c
 SHA512:
-  metadata.gz: 39a6ec70aaf382a4bd991536b02a56d767401477ce9def30cf71ec3320fb857880a7b9386f15f661e0300a1796b827f54cb0b2dc5dfafc8022d50799bc8dd819
-  data.tar.gz: 9b78e44c7fcad0d64324465311a6126ff911e931dd0b8e0af599d23a66d150dace9a4a16a76ff4287cfd8bb5263c305f89611daa6bbef1e99314fe5ad2186843
+  metadata.gz: 12363bc7150b16d8798af0708b33dbcc52f0becf9bddd65e13fc3d49a818962b05197545421502f9b0e5bcf490aa148cd6cd26f6d7b6cc451296565dc365e7d7
+  data.tar.gz: bc0c99d1a0e31833ceaef6a0c48f1b84552b2f96bf40521491b8c6dac56a16995bfdb97a960acb5c0b1ec5e1d1fc7649444a689d75b32d69b7251af71bac042c

data/lib/ansible_spec/load_ansible.rb

@@ -93,7 +93,8 @@ module AnsibleSpec
 
   # param filename
   #       {"databases":{"hosts":["aaa.com","bbb.com"],"vars":{"a":true}}}
-  # return {"databases"=>["aaa.com", "bbb.com"]}
+  #       {"webservers":["aaa.com","bbb.com"]}
+  # return: Hash {"databases"=>[{"uri" => "aaa.com", "port" => 22}, {"uri" => "bbb.com", "port" => 22}]}
   def self.get_dynamic_inventory(file)
     if file[0] == "/"
       file_path = file
@@ -106,12 +107,21 @@ module AnsibleSpec
 
     if dyn_inv.key?('_meta')
       # assume we have an ec2.py created dynamic inventory
-      res = dyn_inv.tap{ |h| h.delete("_meta") }
-    else
-      dyn_inv.each{|k,v|
-        res["#{k.to_s}"] = v['hosts']
-      }
+      dyn_inv = dyn_inv.tap{ |h| h.delete("_meta") }
     end
+    dyn_inv.each{|k,v|
+      res["#{k.to_s}"] = Array.new unless res.has_key?("#{k.to_s}")
+      if v.is_a?(Array)
+        # {"webservers":["aaa.com","bbb.com"]}
+        v.each {|host|
+          res["#{k.to_s}"] << {"uri"=> host, "port"=> 22}
+        }
+      elsif v.has_key?("hosts") && v['hosts'].is_a?(Array)
+        v['hosts'].each {|host|
+          res["#{k.to_s}"] << {"uri"=> host, "port"=> 22}
+        }
+      end
+    }
     return res
   end
 

data/lib/ansible_spec/version.rb

@@ -1,3 +1,3 @@
 module AnsibleSpec
-  VERSION = "0.2.6"
+  VERSION = "0.2.7.beta"
 end

data/spec/dynamic_inventory_spec.rb

@@ -2,7 +2,43 @@
 require 'ansible_spec'
 
 describe "load_targetsの実行" do
-  context '正常系:単グループ:DynamicInventory' do
+  context '正常系:DynamicInventory:1 Group, 1 hosts' do
+    tmp_hosts = 'hosts'
+    before do
+      content_h = <<'EOF'
+#!/bin/bash
+echo '{"databases": {"hosts": ["host1.example.com"],"vars":{"a": true}}}'
+EOF
+      create_file(tmp_hosts,content_h)
+      File.chmod(0755,tmp_hosts)
+      @res = AnsibleSpec.load_targets(tmp_hosts)
+    end
+
+    it 'res is hash' do
+      expect(@res.instance_of?(Hash)).to be_truthy
+    end
+
+    it 'exist 1 group' do
+      expect(@res.length).to eq 1
+    end
+
+    it 'exist group' do
+      expect(@res.key?('databases')).to be_truthy
+    end
+
+    it 'databases host1.example.com' do
+      obj = @res['databases'][0]
+      expect(obj.instance_of?(Hash)).to be_truthy
+      expect(obj).to include({'uri' => 'host1.example.com',
+                              'port' => 22})
+    end
+
+    after do
+      File.delete(tmp_hosts)
+    end
+  end
+
+  context '正常系:DynamicInventory:1 Group, 2 hosts' do
     tmp_hosts = 'hosts'
     before do
       content_h = <<'EOF'
@@ -26,16 +62,60 @@ EOF
       expect(@res.key?('databases')).to be_truthy
     end
 
-    it 'databases aaa.com' do
+    it 'databases host1.example.com' do
       obj = @res['databases'][0]
-      expect(obj.instance_of?(String)).to be_truthy
-      expect(obj).to eq 'host1.example.com'
+      expect(obj.instance_of?(Hash)).to be_truthy
+      expect(obj).to include({'uri' => 'host1.example.com',
+                              'port' => 22})
     end
 
-    it 'databases bbb.com' do
+    it 'databases host2.example.com' do
       obj = @res['databases'][1]
-      expect(obj.instance_of?(String)).to be_truthy
-      expect(obj).to eq 'host2.example.com'
+      expect(obj.instance_of?(Hash)).to be_truthy
+      expect(obj).to include({'uri' => 'host2.example.com',
+                              'port' => 22})
+    end
+
+    after do
+      File.delete(tmp_hosts)
+    end
+  end
+  context '正常系:DynamicInventory:1 Group, 2 hosts. but no vars' do
+    tmp_hosts = 'hosts'
+    before do
+      content_h = <<'EOF'
+#!/bin/bash
+echo '{"webservers": [ "host2.example.com", "host3.example.com" ]}'
+EOF
+      create_file(tmp_hosts,content_h)
+      File.chmod(0755,tmp_hosts)
+      @res = AnsibleSpec.load_targets(tmp_hosts)
+    end
+
+    it 'res is hash' do
+      expect(@res.instance_of?(Hash)).to be_truthy
+    end
+
+    it 'exist 1 group' do
+      expect(@res.length).to eq 1
+    end
+
+    it 'exist group' do
+      expect(@res.key?('webservers')).to be_truthy
+    end
+
+    it 'databases host1.example.com' do
+      obj = @res['webservers'][0]
+      expect(obj.instance_of?(Hash)).to be_truthy
+      expect(obj).to include({'uri' => 'host2.example.com',
+                              'port' => 22})
+    end
+
+    it 'databases host2.example.com' do
+      obj = @res['webservers'][1]
+      expect(obj.instance_of?(Hash)).to be_truthy
+      expect(obj).to include({'uri' => 'host3.example.com',
+                              'port' => 22})
     end
 
     after do

data/spec/ec2_dynamic_inventory_spec.rb

@@ -32,17 +32,55 @@ EOF
 
     it 'tag_some_other_key1 contains host-1 and host-2' do
       obj = @res['tag_some_other_key1'][0]
-      expect(obj.instance_of?(String)).to be_truthy
-      expect(obj).to eq 'host-1'
+      expect(obj.instance_of?(Hash)).to be_truthy
+      expect(obj).to include({'uri' => 'host-1',
+                              'port' => 22})
       obj = @res['tag_some_other_key1'][1]
-      expect(obj.instance_of?(String)).to be_truthy
-      expect(obj).to eq 'host-2'
+      expect(obj.instance_of?(Hash)).to be_truthy
+      expect(obj).to include({'uri' => 'host-2',
+                              'port' => 22})
     end
 
     it 'some_other_key2 contains host-1' do
       obj = @res['some_other_key2'][0]
-      expect(obj.instance_of?(String)).to be_truthy
-      expect(obj).to eq 'host-1'
+      expect(obj.instance_of?(Hash)).to be_truthy
+      expect(obj).to include({'uri' => 'host-1',
+                              'port' => 22})
+    end
+
+    after do
+      File.delete(tmp_hosts)
+    end
+  end
+  context 'EC2_DynamicInventory' do
+    tmp_hosts = 'hosts'
+    before do
+      content_h = <<'EOF'
+#!/bin/bash
+echo '{ "_meta" : {"hostvars": {"54.1.2.3": {"ec2_ip_address": "54.1.2.3","ec2_key_name": "my-secret-key", "ec2_launch_time": "2016-01-06T03:59:56.000Z", "ec2_tag_Name": "sample-app", "ec2_tag_Stack": "sample-app"}}},"tag_Name_sample_app": ["54.1.2.3"]}'
+EOF
+      create_file(tmp_hosts,content_h)
+      File.chmod(0755,tmp_hosts)
+      @res = AnsibleSpec.load_targets(tmp_hosts)
+    end
+
+    it 'res is hash' do
+      expect(@res.instance_of?(Hash)).to be_truthy
+    end
+
+    it 'contains 1 groups' do
+      expect(@res.length).to eq 1
+    end
+
+    it 'contains key tag_Name_sample_app' do
+      expect(@res.key?('tag_Name_sample_app')).to be_truthy
+    end
+
+    it 'tag_Name_sample_app contains hash' do
+      obj = @res['tag_Name_sample_app'][0]
+      expect(obj.instance_of?(Hash)).to be_truthy
+      expect(obj).to include({'uri' => '54.1.2.3',
+                              'port' => 22})
     end
 
     after do

data/spec/ssh_spec.rb

@@ -13,25 +13,7 @@ describe 'ssh' do
       n = 0
       properties.each do |property|
         property["hosts"].each do |host|
-          #ENV['TARGET_PRIVATE_KEY'] = '~/.ssh/id_rsa'
-          #t.pattern = 'roles/{' + property["roles"].join(',') + '}/spec/*_spec.rb'
-          @ssh = double(:ssh)
-          if host.instance_of?(Hash)
-            set :host, host["uri"]
-            unless host["user"].nil?
-              user = host["user"]
-            else
-              user = property["user"]
-            end
-            set :ssh_options, :user => user, :port => host["port"], :keys => host["private_key"]
-            allow(@ssh).to receive(:port).and_return(Specinfra.configuration.ssh_options[:port])
-            allow(@ssh).to receive(:keys).and_return(Specinfra.configuration.ssh_options[:keys])
-          else
-            set :host, host
-            set :ssh_options, :user => property["user"]
-          end
-          allow(@ssh).to receive(:host).and_return(Specinfra.configuration.host)
-          allow(@ssh).to receive(:user).and_return(Specinfra.configuration.ssh_options[:user])
+          @ssh = set_ssh(property, host)
           @h["task_#{n}"] = @ssh
           n += 1
         end
@@ -43,23 +25,24 @@ describe 'ssh' do
       expect(v.user).to eq 'root'
       expect(v.host).to eq '192.168.0.1'
     end
+
     it '192.168.0.2:22' do
       v = @h["task_1"]
       expect(v.user).to eq 'root'
       expect(v.host).to eq '192.168.0.2'
-      expect(v.port).to eq 22
+      expect(v.port).to eq '22'
     end
-    it '192.168.0.3 ansible_ssh_port=22' do
+    it '192.168.0.3:5309' do
       v = @h["task_2"]
       expect(v.user).to eq 'root'
       expect(v.host).to eq '192.168.0.3'
-      expect(v.port).to eq 5309
+      expect(v.port).to eq '5309'
     end
     it '192.168.0.4 ansible_ssh_private_key_file=~/.ssh/id_rsa' do
       v = @h["task_3"]
       expect(v.user).to eq 'root'
       expect(v.host).to eq '192.168.0.4'
-      expect(v.port).to eq 22
+      expect(v.port).to eq '22'
       expect(v.keys).to eq '~/.ssh/id_rsa'
     end
 
@@ -67,14 +50,14 @@ describe 'ssh' do
       v = @h["task_4"]
       expect(v.user).to eq 'git'
       expect(v.host).to eq '192.168.0.5'
-      expect(v.port).to eq 22
+      expect(v.port).to eq '22'
     end
 
     it 'jumper ansible_ssh_port=5555 ansible_ssh_host=192.168.1.50' do
       v = @h["task_5"]
       expect(v.user).to eq 'root'
       expect(v.host).to eq '192.168.1.50'
-      expect(v.port).to eq 5555
+      expect(v.port).to eq '5555'
     end
 
     it 'www[01:02].example.com' do
@@ -107,6 +90,55 @@ describe 'ssh' do
   end
 end
 
+
+describe 'ssh with dynamic inventory' do
+  context 'ssh with' do
+    before do
+      create_dynamic_inventory
+      properties = AnsibleSpec.get_properties
+      @h = Hash.new
+      n = 0
+      properties.each do |property|
+        property["hosts"].each do |host|
+          #t.pattern = 'roles/{' + property["roles"].join(',') + '}/spec/*_spec.rb'
+          @ssh = set_ssh(property, host)
+          @h["task_#{n}"] = @ssh
+          n += 1
+        end
+      end
+    end
+
+    it 'tag_Name_sample_app' do
+      v = @h["task_0"]
+      expect(v.user).to eq 'root'
+      expect(v.host).to eq '54.1.2.3'
+      expect(v.port).to eq '22'
+    end
+
+    after do
+      delete_normality
+    end
+
+  end
+end
+
+# summary: lib/src/Rakefile
+def set_ssh(property, host)
+  @ssh = double(:ssh)
+  set :host, host["uri"]
+  unless host["user"].nil?
+    user = host["user"]
+  else
+    user = property["user"]
+  end
+  set :ssh_options, :user => user, :port => host["port"].to_s, :keys => host["private_key"]
+  allow(@ssh).to receive(:host).and_return(Specinfra.configuration.host)
+  allow(@ssh).to receive(:user).and_return(Specinfra.configuration.ssh_options[:user])
+  allow(@ssh).to receive(:port).and_return(Specinfra.configuration.ssh_options[:port])
+  allow(@ssh).to receive(:keys).and_return(Specinfra.configuration.ssh_options[:keys])
+  return @ssh
+end
+
 def create_normality
   tmp_ansiblespec = '.ansiblespec'
   tmp_playbook = 'site.yml'
@@ -151,6 +183,45 @@ EOF
   end
 end
 
+def create_dynamic_inventory
+  tmp_ansiblespec = '.ansiblespec'
+  tmp_playbook = 'site.yml'
+  tmp_hosts = 'hosts'
+
+  content = <<'EOF'
+---
+-
+  playbook: site.yml
+  inventory: hosts
+EOF
+
+  content_p = <<'EOF'
+- name: Ansible-Sample-TDD
+  hosts: tag_Name_sample_app
+  user: root
+  roles:
+    - nginx
+    - mariadb
+EOF
+
+  content_h = <<'EOF'
+#!/bin/bash
+echo '{ "_meta" : {"hostvars": {"54.1.2.3": {"ec2_ip_address": "54.1.2.3","ec2_key_name": "my-secret-key", "ec2_launch_time": "2016-01-06T03:59:56.000Z", "ec2_tag_Name": "sample-app", "ec2_tag_Stack": "sample-app"}}},"tag_Name_sample_app": ["54.1.2.3"]}'
+EOF
+
+  File.open(tmp_ansiblespec, 'w') do |f|
+    f.puts content
+  end
+  File.open(tmp_playbook, 'w') do |f|
+    f.puts content_p
+  end
+  File.open(tmp_hosts, 'w') do |f|
+    f.puts content_h
+  end
+  File.chmod(0755,tmp_hosts)
+end
+
+
 def delete_normality
   tmp_ansiblespec = '.ansiblespec'
   tmp_playbook = 'site.yml'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible_spec
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7.beta
 platform: ruby
 authors:
 - volanja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,9 +156,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.11