ansible_spec 0.1.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6eaba7458c50a2f92bd8ce3530b2ab86aa77049
-  data.tar.gz: ef13b0f21260f8c85ce13a170ffb2af381be52e1
+  metadata.gz: e07abc240db36cb4184a4e946f019a330bd78716
+  data.tar.gz: db7a9f7a615c072f922927aed321e35233e018d0
 SHA512:
-  metadata.gz: 7bb98c90e0511d304265e652d9a45da6b49bd3c10cda64fc95e0c36dad399507086b5aef12d0df7ed9bdb6c40a9a146e57a26279a1fb580f2c10e93b202eb2c4
-  data.tar.gz: 11de186207b955da4bbd73b2fe52ac247884378e5b45d96e0dcf55cbfb4d228e025aedddee64c1688dd9a35e8ab22f02aa77a31c8f7a79be566d44e64edd6662
+  metadata.gz: fe5e7d75a375f5dd0bc9aeeecf37f0f2409ee819bb496dcd5e657cd880196b6dbbc80747383ee03447cfdfcb07ab775edf14d2c5ac6ad81142b303700f41aabe
+  data.tar.gz: a3b2e12c8ae73ff2aeafd5bb0990def9433bda0031ce3b0b2d4e121dba13f04db119acdcd4830e0dab7190b3a7d619d4b5fc0a58d19479ee70fb984537606d97

data/CHANGELOG.md

@@ -0,0 +1,43 @@
+# v0.2
+- fix #24 Support ENV
+
+```
+Example:
+$ PLAYBOOK=site.yml INVENTORY=hosts rake serverspec:Ansible-Sample-TDD 
+```
+
+# v0.1.1
+
+fix #22
+
+
+# v0.1
+
+- Support Serverspec v2
+- Simplification Rakefile and Modularization. Because of Improvement of testability.
+- Support InventoryParameters  
+  - ansible_ssh_port
+  - ansible_ssh_user
+  - ansible_ssh_host
+  - ansible_ssh_private_key_file
+- Support [hostlist expressions](http://docs.ansible.com/intro_inventory.html#hosts-and-groups)
+- Support DynamicInventory
+
+This gem created template file until v0.0.1.4,  
+But it was modularized on v0.1. Because module is easy to unit-test and Rakefile is simple.  
+
+If you want old release that can create template, use `gem install ansible_spec -v 0.0.1.4`  
+But I can't support(Bug fix, Add feature) old release.  
+
+## VersionUp from v0.0.1.4 to v0.1
+
+```
+$ rm Rakefile
+$ rm spec/spec_helper.md
+$ ansiblespec-init 
+```
+
+# v0.0.1.3
+- Support `.ansiblespec`
+
+

data/README.md

@@ -6,16 +6,9 @@ This gem is Ansible Config Parser for Serverspec.
 Serverspec RakeTask uses Ansible Config(InventoryFile and Playbook).  
 Support Run Multi Role and Multi Host of Ansible.  
 
-This gem created template file until v0.0.1.4,  
-But it was modularized on v0.1. Because module is easy to unit-test and Rakefile is simple.  
-
-If you want old release that can create template, use `gem install ansible_spec -v 0.0.1.4`  
-But I can't support(Bug fix, Add feature) old release.  
-
-## New feature at v0.1
+# feature
 
 - Support Serverspec v2
-- Simplification Rakefile and Modularization. Because of Improvement of testability.
 - Support InventoryParameters  
   - ansible_ssh_port
   - ansible_ssh_user
@@ -24,7 +17,7 @@ But I can't support(Bug fix, Add feature) old release.
 - Support [hostlist expressions](http://docs.ansible.com/intro_inventory.html#hosts-and-groups)
 - Support DynamicInventory
 
-## Installation
+# Installation
 
 install it yourself as:
 
@@ -32,8 +25,8 @@ install it yourself as:
 $ gem install ansible_spec
 ```
 
-## Usage
-### Create Rakafile & spec/spec_helper.rb
+# Usage
+## Create Rakafile & spec/spec_helper.rb
 
 ```
 $ ansiblespec-init 
@@ -43,18 +36,10 @@ $ ansiblespec-init
     create  .ansiblespec
 ```
 
-### VersionUp from v0.0.1.4 to v0.1
-
-```
-$ rm Rakefile
-$ rm spec/spec_helper.md
-$ ansiblespec-init 
-```
-
-### Change .ansiblespec(v0.0.1.3)
-If `.ansiblespec` is exist, use variables(playbook and inventory).  
-So, If you don't use `site.yml` and `hosts`, you change this file.  
-If `.ansiblespec` not found, use `site.yml` as playbook and `hosts` as inventory.  
+## [option] .ansiblespec
+if `.ansiblespec` is exist, use variables(playbook and inventory).  
+so, if you don't use `site.yml` and `hosts`, you change this file.  
+if `.ansiblespec` not found, use `site.yml` as playbook and `hosts` as inventory.  
 
 ```.ansiblespec
 --- 
@@ -63,38 +48,21 @@ If `.ansiblespec` not found, use `site.yml` as playbook and `hosts` as inventory
   inventory: hosts
 ```
 
-### Create Ansible Directory
+## [option] Environment variable
+You can use Environment variable, when RakeTask command. It listed below.
 
-sample is [here](https://github.com/volanja/ansible-sample-tdd)
+- PLAYBOOK  playbook name       (e.g. site.yml)
+- INVENTORY inventory file name (e.g. hosts)
+I prioritize ENV more than `.ansiblespec`
 
 ```
-.
-├── .ansiblespec                 #Create file (use Serverspec). read above section.
-├── README.md
-├── hosts                        #use Ansible and Serverspec if .ansiblespec is not exist.
-├── site.yml                     #use Ansible and Serverspec if .ansiblespec is not exist. 
-├── nginx.yml                    #(comment-out) incluted by site.yml
-├── roles
-│   └── nginx
-│       ├── handlers
-│       │   └── main.yml
-│       ├── spec                 #use Serverspec
-│       │   └── nginx_spec.rb
-│       ├── tasks
-│       │   └── main.yml
-│       ├── templates
-│       │   └── nginx.repo
-│       └── vars
-│           └── main.yml
-├── Rakefile                     #Create file (use Serverspec)
-└── spec                         #Create file (use Serverspec)
-    └── spec_helper.rb
+Example:
+$ PLAYBOOK=site.yml INVENTORY=hosts rake serverspec:Ansible-Sample-TDD
 ```
 
-### Serverspec with Ansible
-Serverspec use Ansible file.  (Rakefile understand Notation of Ansible.)  
+## Inventory
+Serverspec use Ansible Inventory.  (Rakefile understand Notation of Ansible.)  
 
-* Inventory file
 Inventory file can sue this:
 - InventoryParameters
   - ansible_ssh_port
@@ -105,6 +73,8 @@ Inventory file can sue this:
 - Group Children
 - [DynamicInventory](http://docs.ansible.com/intro_dynamic_inventory.html)
 
+### Sample
+
 ```hosts
 [server]
 # skip line(comment)
@@ -139,14 +109,43 @@ server
 databases
 ```
 
-or DynamicInventory(need execute permission)
+## DynamicInventory(need execute permission)
 
 ```
 #!/bin/bash
 echo '{"databases": {"hosts": ["host1.example.com", "host2.example.com"],"vars":{"a": true}}}'
 ```
 
-* playbook
+
+# Sample
+## Directory
+sample is [here](https://github.com/volanja/ansible-sample-tdd)
+
+```
+.
+├── .ansiblespec                 #Create file (use Serverspec). read above section.
+├── README.md
+├── hosts                        #use Ansible and Serverspec if .ansiblespec is not exist.
+├── site.yml                     #use Ansible and Serverspec if .ansiblespec is not exist. 
+├── nginx.yml                    #(comment-out) incluted by site.yml
+├── roles
+│   └── nginx
+│       ├── handlers
+│       │   └── main.yml
+│       ├── spec                 #use Serverspec
+│       │   └── nginx_spec.rb
+│       ├── tasks
+│       │   └── main.yml
+│       ├── templates
+│       │   └── nginx.repo
+│       └── vars
+│           └── main.yml
+├── Rakefile                     #Create file (use Serverspec)
+└── spec                         #Create file (use Serverspec)
+    └── spec_helper.rb
+```
+
+## Playbook
 playbook can use `include`  
 
 ```site.yml
@@ -162,7 +161,7 @@ playbook can use `include`
     - nginx
 ```
 
-## Run Test(Sample)
+## Run Test
 
 ```
 $ rake -T
@@ -178,7 +177,7 @@ Finished in 0.34306 seconds
 11 examples, 0 failures
 ```
 
-## Contributing
+# Contributing
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)

data/lib/ansible_spec/load_ansible.rb

@@ -121,7 +121,10 @@ module AnsibleSpec
   # return: playbook, inventoryfile
   def self.load_ansiblespec()
     f = '.ansiblespec'
-    if File.exist?(f)
+    if ENV["PLAYBOOK"] && ENV["INVENTORY"]
+      playbook = ENV["PLAYBOOK"]
+      inventoryfile = ENV["INVENTORY"]
+    elsif File.exist?(f)
       y = YAML.load_file(f)
       playbook = y[0]['playbook']
       inventoryfile = y[0]['inventory']
@@ -129,6 +132,7 @@ module AnsibleSpec
       playbook = 'site.yml'
       inventoryfile = 'hosts'
     end
+
     if File.exist?(playbook) == false
       puts 'Error: ' + playbook + ' is not Found. create site.yml or ./.ansiblespec  See https://github.com/volanja/ansible_spec'
       exit 1

data/lib/ansible_spec/version.rb

@@ -1,3 +1,3 @@
 module AnsibleSpec
-  VERSION = "0.1.1"
+  VERSION = "0.2"
 end

data/spec/load_ansible_spec.rb

@@ -530,7 +530,36 @@ EOF
 end
 
 describe "load_ansiblespecの実行" do
-  context '正常系' do
+  context '正常系(環境変数)' do
+    require 'yaml'
+    tmp_playbook = 'site_env.yml'
+    tmp_hosts = 'hosts_env'
+
+    before do
+      ENV['PLAYBOOK'] = tmp_playbook
+      ENV['INVENTORY'] = tmp_hosts
+      create_file(tmp_playbook,'')
+      create_file(tmp_hosts,'')
+      @playbook, @inventoryfile = AnsibleSpec.load_ansiblespec()
+    end
+
+    it "playbook is #{tmp_playbook}" do
+      expect(@playbook).to eq tmp_playbook
+    end
+
+    it "inventoryfile is #{tmp_hosts}" do
+      expect(@inventoryfile).to eq tmp_hosts
+    end
+
+    after do
+      ENV.delete('PLAYBOOK')
+      ENV.delete('INVENTORY')
+      File.delete(tmp_playbook)
+      File.delete(tmp_hosts)
+    end
+  end
+
+  context '正常系(.ansiblespec)' do
     require 'yaml'
     tmp_ansiblespec = '.ansiblespec'
     tmp_playbook = 'site.yml'
@@ -544,94 +573,212 @@ describe "load_ansiblespecの実行" do
   playbook: site.yml
   inventory: hosts
 EOF
+      create_file(tmp_ansiblespec,content)
+      create_file(tmp_playbook,'')
+      create_file(tmp_hosts,'')
+      @playbook, @inventoryfile = AnsibleSpec.load_ansiblespec()
+    end
 
-      content_p = <<'EOF'
-- name: Ansible-Sample-TDD
-  hosts: server
-  user: root
-  roles:
-    - nginx
-    - mariadb
-EOF
+    it "playbook is #{tmp_playbook}" do
+      expect(@playbook).to eq tmp_playbook
+    end
 
-      content_h = <<'EOF'
-[server]
-192.168.0.103
-192.168.0.104
-EOF
-      create_file(tmp_ansiblespec,content)
-      create_file(tmp_playbook,content_p)
-      create_file(tmp_hosts,content_h)
+    it "inventoryfile is #{tmp_hosts}" do
+      expect(@inventoryfile).to eq tmp_hosts
+    end
+
+    after do
+      File.delete(tmp_ansiblespec)
+      File.delete(tmp_playbook)
+      File.delete(tmp_hosts)
+    end
+  end
+
+  context '正常系(.ansiblespecと環境変数がある場合、環境変数が優先される)' do
+    require 'yaml'
+    tmp_ansiblespec = '.ansiblespec'
+    tmp_playbook = 'site.yml'
+    tmp_hosts = 'hosts'
+    env_playbook = 'site_env.yml'
+    env_hosts = 'hosts_env'
+
+    before do
+      ENV['PLAYBOOK'] = env_playbook
+      ENV['INVENTORY'] = env_hosts
+      create_file(tmp_ansiblespec,'')
+      create_file(tmp_playbook,'')
+      create_file(tmp_hosts,'')
+      create_file(env_playbook,'')
+      create_file(env_hosts,'')
       @playbook, @inventoryfile = AnsibleSpec.load_ansiblespec()
     end
 
-    it 'playbook is site.yml' do
-      expect(@playbook).to eq 'site.yml'
+    it "playbook is #{env_playbook}" do
+      expect(@playbook).to eq env_playbook
     end
 
-    it 'inventoryfile is hosts' do
-      expect(@inventoryfile).to eq 'hosts'
+    it "inventoryfile is #{env_hosts}" do
+      expect(@inventoryfile).to eq env_hosts
     end
 
     after do
+      ENV.delete('PLAYBOOK')
+      ENV.delete('INVENTORY')
       File.delete(tmp_ansiblespec)
       File.delete(tmp_playbook)
       File.delete(tmp_hosts)
+      File.delete(env_playbook)
+      File.delete(env_hosts)
     end
   end
 
-  context '異常系(.ansiblespecがないが、site.ymlとhostsがある場合)' do
+  context '正常系(.ansiblespecと環境変数がないが、site.ymlとhostsがある場合)' do
     require 'yaml'
     tmp_playbook = 'site.yml'
     tmp_hosts = 'hosts'
 
     before do
+      create_file(tmp_playbook,'')
+      create_file(tmp_hosts,'')
+      @playbook, @inventoryfile = AnsibleSpec.load_ansiblespec()
+    end
 
-      content_p = <<'EOF'
-- name: Ansible-Sample-TDD
-  hosts: server
-  user: root
-  roles:
-    - nginx
-    - mariadb
-EOF
+    it "playbook is #{tmp_playbook}" do
+      expect(@playbook).to eq tmp_playbook
+    end
 
-      content_h = <<'EOF'
-[server]
-192.168.0.103
-192.168.0.104
-EOF
-      create_file(tmp_playbook,content_p)
-      create_file(tmp_hosts,content_h)
+    it "inventoryfile is #{tmp_hosts}" do
+      expect(@inventoryfile).to eq tmp_hosts
+    end
+
+    after do
+      File.delete(tmp_playbook)
+      File.delete(tmp_hosts)
+    end
+  end
+
+  context '異常系(環境変数PLAYBOOKがないので初期値を使う)' do
+    require 'yaml'
+    tmp_playbook = 'site.yml'
+    tmp_hosts = 'hosts'
+    env_hosts = 'hosts_env'
+
+    before do
+      ENV['INVENTORY'] = tmp_hosts
+      create_file(tmp_playbook,'')
+      create_file(tmp_hosts,'')
       @playbook, @inventoryfile = AnsibleSpec.load_ansiblespec()
     end
 
-    it 'playbook is site.yml' do
-      expect(@playbook).to eq 'site.yml'
+    it "playbook is #{tmp_playbook}" do
+      expect(@playbook).to eq tmp_playbook
     end
 
-    it 'inventoryfile is hosts' do
-      expect(@inventoryfile).to eq 'hosts'
+    it "inventoryfile is #{tmp_hosts}" do
+      expect(@inventoryfile).to eq tmp_hosts
     end
 
     after do
+      ENV.delete('INVENTORY')
       File.delete(tmp_playbook)
       File.delete(tmp_hosts)
     end
   end
 
-  context '異常系(.ansiblespecとsite.ymlがないが、hostsがある場合)' do
+  context '異常系(環境変数INVENTORYがないので初期値を使う)' do
     require 'yaml'
+    tmp_playbook = 'site.yml'
     tmp_hosts = 'hosts'
+    env_playbook = 'site_env.yml'
 
     before do
+      ENV['PLAYBOOK'] = tmp_playbook
+      create_file(tmp_playbook,'')
+      create_file(tmp_hosts,'')
+      @playbook, @inventoryfile = AnsibleSpec.load_ansiblespec()
+    end
 
-      content_h = <<'EOF'
-[server]
-192.168.0.103
-192.168.0.104
+    it "playbook is #{tmp_playbook}" do
+      expect(@playbook).to eq tmp_playbook
+    end
+
+    it "inventoryfile is #{tmp_hosts}" do
+      expect(@inventoryfile).to eq tmp_hosts
+    end
+
+    after do
+      ENV.delete('PLAYBOOK')
+      File.delete(tmp_playbook)
+      File.delete(tmp_hosts)
+    end
+  end
+
+  context '異常系(環境変数INVENTORYがないので.ansiblespecを使う)' do
+    require 'yaml'
+    tmp_ansiblespec = '.ansiblespec'
+    tmp_playbook = 'site_spec.yml'
+    tmp_hosts = 'hosts_spec'
+    env_playbook = 'site_env.yml'
+    env_hosts = 'hosts_env'
+
+    before do
+      ENV['PLAYBOOK'] = env_playbook
+      content = <<'EOF'
+---
+-
+  playbook: site_spec.yml
+  inventory: hosts_spec
 EOF
-      create_file(tmp_hosts,content_h)
+      create_file(tmp_ansiblespec,content)
+      create_file(tmp_playbook,'')
+      create_file(tmp_hosts,'')
+      create_file(env_playbook,'')
+      create_file(env_hosts,'')
+      @playbook, @inventoryfile = AnsibleSpec.load_ansiblespec()
+    end
+
+    it "playbook is #{tmp_playbook}" do
+      expect(@playbook).to eq tmp_playbook
+    end
+
+    it "inventoryfile is #{tmp_hosts}" do
+      expect(@inventoryfile).to eq tmp_hosts
+    end
+
+    after do
+      ENV.delete('PLAYBOOK')
+      File.delete(tmp_ansiblespec)
+      File.delete(tmp_playbook)
+      File.delete(tmp_hosts)
+      File.delete(env_playbook)
+      File.delete(env_hosts)
+    end
+  end
+
+  context '異常系(環境変数で指定したファイルがない場合)' do
+    require 'yaml'
+
+    before do
+      ENV['PLAYBOOK'] = 'site_env.yml'
+      ENV['INVENTORY'] = 'hosts_env'
+    end
+
+    it 'exitする' do
+      expect{ AnsibleSpec.load_ansiblespec }.to raise_error(SystemExit)
+    end
+
+    after do
+      ENV.delete('PLAYBOOK')
+      ENV.delete('INVENTORY')
+    end
+  end
+
+  context '異常系(.ansiblespecとsite.ymlがないが、hostsがある場合)' do
+    require 'yaml'
+    tmp_hosts = 'hosts'
+
+    before do
+      create_file(tmp_hosts,'')
     end
 
     it 'exitする' do
@@ -648,16 +795,7 @@ EOF
     tmp_playbook = 'site.yml'
 
     before do
-
-      content_p = <<'EOF'
-- name: Ansible-Sample-TDD
-  hosts: server
-  user: root
-  roles:
-    - nginx
-    - mariadb
-EOF
-      create_file(tmp_playbook,content_p)
+      create_file(tmp_playbook,'')
     end
 
     it 'exitする' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible_spec
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
 platform: ruby
 authors:
 - volanja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,6 +120,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md