barking_iguana-compound 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f10ea4870a872ee548218f97221d9faa31f403ba
-  data.tar.gz: 6ea058ad7892a8356239b0076dd54c2b7d7250de
+  metadata.gz: 106a0aa890444d7853a237f477ca89fc8e7ee819
+  data.tar.gz: c1428c31024ad408401d1846f08db595e6cd6726
 SHA512:
-  metadata.gz: ebcbe74de8838638b30ab98a6b8fb4c84abdebdae09fab3b0305a39791a68d41bbddfb28914c1adbe282d336df443705301991b83e1d40b670d3299db17f888c
-  data.tar.gz: ecc1ad97fd7ceb18d40a194a3ea7a4b0dced5cb77862a358d7438caee0770c22c97e9e6935f527e9c16cd508b5ae00a8150a7e349a16b0a06a6d27ed4f625d8e
+  metadata.gz: 01d7729b3fd5103175969d6799a4dd95993cb97da198c8f45dda8a2ef0c53b425c71383aa952f48f27c6f7d4bf1fed9b1e2f7d1daa100dd91b839411f9a3b4e1
+  data.tar.gz: 13ddaf33b37681936fe62fdf2f27586469e2aa61ad38d61e492a1e0f837014ea6d4264096147668ef1985dee54cc879ceb180868ba22484fc25daa05e12c2036

data/docs/CHANGELOG.md

@@ -2,10 +2,21 @@
 
 Entries are in reverse chronological order.
 
-## *0.1.6* (Current Development)
+## *0.1.7* (Current Development)
 
 Add release notes here, as things are added to the project.
 
+## *0.1.6* (2017-01-05)
+
+  * Allow setting ENV variables for the Vagrant command by adding an `env` file
+    to the test suite or individual test.
+
+  * Bug fix: set correct Ansible variable for SSH key to access VMs.
+
+  * Allow setting verbosity of Ansible output using `ANSIBLE_VERBOSITY`. This
+    will only be seen if `LOG_LEVEL` is `debug`, but it can be handy even in
+    that case.
+
 ## *0.1.5* (2016-12-29)
 
   * Bug fix: Only generate connection inventory for those hosts in the current

data/lib/barking_iguana/compound.rb

@@ -14,6 +14,7 @@ require 'barking_iguana/compound/ansible/inventory_parser'
 require 'barking_iguana/compound/ansible/inventory_writer'
 require 'barking_iguana/compound/ansible/playbook'
 require 'barking_iguana/compound/command_line_client'
+require 'barking_iguana/compound/environment'
 require 'barking_iguana/compound/host_manager'
 require 'barking_iguana/compound/host'
 require 'barking_iguana/compound/server_spec'

data/lib/barking_iguana/compound/ansible/inventory_writer.rb

@@ -2,6 +2,8 @@ module BarkingIguana
   module Compound
     module Ansible
       class InventoryWriter
+        include BarkingIguana::Logging::Helper
+
         attr_accessor :path
         private :path=
 
@@ -29,11 +31,15 @@ module BarkingIguana
 
         def write_file
           File.open path, 'w' do |inventory|
-            hosts.sort_by(&:name).each do |h|
-              inventory.puts "#{h.inventory_name} ansible_host=#{h.ip_address} ansible_user=#{h.ssh_username} ansible_ssh_private_key_path=#{h.ssh_key} ansible_ssh_extra_args=\"#{h.ssh_extra_args}\""
-            end
+            inventory.puts to_s
           end
         end
+
+        def to_s
+          hosts.sort_by(&:name).map do |h|
+            %Q(#{h.inventory_name} ansible_host=#{h.ip_address} ansible_user=#{h.ssh_username} ansible_ssh_private_key_file=#{h.ssh_key} ansible_ssh_extra_args="#{h.ssh_extra_args}")
+          end.join("\n")
+        end
       end
     end
   end

data/lib/barking_iguana/compound/environment.rb

@@ -0,0 +1,53 @@
+module BarkingIguana
+  module Compound
+    class Environment
+      include BarkingIguana::Logging::Helper
+
+      attr_accessor :file
+      private :file=, :file
+
+      attr_accessor :overrides
+      private :overrides=, :overrides
+
+      def initialize file
+        self.file = file
+        self.overrides = []
+      end
+
+      def merge override
+        logger.debug { "ENV registering override: #{override.inspect}" }
+        overrides << override
+        self
+      end
+
+      def to_h
+        logger.debug { "ENV evaluating #{file.inspect} (present: #{present?})" }
+        h = my_values
+        logger.debug { "ENV from #{file.inspect}: #{h.inspect}" }
+        overrides.each do |override|
+          h.merge! override.to_h
+          logger.debug { "ENV after merging #{override.inspect}: #{h.inspect}" }
+        end
+        logger.debug { "ENV returned from #{file.inspect}: #{h.inspect}" }
+        h
+      end
+
+      def present?
+        File.exists? file
+      end
+
+      private
+
+      def my_values
+        return {} unless present?
+        text = File.read file
+        logger.debug { "ENV reading from #{file.inspect}" }
+        text.split(/\n/).inject({}) do |env, line|
+          name, value = line.split '=', 2
+          env[name] = value
+          env
+        end
+      end
+    end
+  end
+end

data/lib/barking_iguana/compound/test.rb

@@ -68,9 +68,18 @@ module BarkingIguana
         logger.debug { "Does #{vagrant_file_template_path} exist? -> #{File.exists? vagrant_file_template_path}" }
         options[:vagrant_file_template_path] = vagrant_file_template_path if File.exists? vagrant_file_template_path
         options[:root] = directory
+        options[:environment] = suite.environment.merge environment
         options
       end
 
+      def environment_file
+        File.join directory, 'env'
+      end
+
+      def environment
+        @environment ||= Environment.new(environment_file)
+      end
+
       def vagrant_file_template_path
         File.join directory, 'Vagrantfile.erb'
       end

data/lib/barking_iguana/compound/test_stage.rb

@@ -77,6 +77,7 @@ module BarkingIguana
                   h = test.host_manager.find_by_name host.inventory_name
                   i.add_host h
                 end
+                logger.debug { "#{name}: writing connection inventory:\n#{i.to_s}" }
                 i.write_file
               end
             end
@@ -95,8 +96,13 @@ module BarkingIguana
         test.suite.control_directory
       end
 
+      def ansible_verbosity
+        return 2 unless ENV['ANSIBLE_VERBOSITY']
+        ENV['ANSIBLE_VERBOSITY'].to_i
+      end
+
       def playbook
-        Ansible.playbook(playbook_path, run_from: control_directory).inventory(generated_inventory).stream_to(logger).verbosity(2).diff
+        Ansible.playbook(playbook_path, run_from: control_directory).inventory(generated_inventory).stream_to(logger).verbosity(ansible_verbosity).diff
       end
 
       def suite

data/lib/barking_iguana/compound/test_suite.rb

@@ -68,6 +68,14 @@ module BarkingIguana
         end
       end
 
+      def environment_file
+        File.join directory, 'env'
+      end
+
+      def environment
+        @environment ||= Environment.new(environment_file)
+      end
+
       private
 
       def test_directories

data/lib/barking_iguana/compound/vagrant.rb

@@ -33,8 +33,9 @@ class Vagrant
       logger.debug { "MERGED ARGS: #{merged_args.inspect}" }
       command_line = "/usr/local/bin/vagrant #{command} #{merged_args}".strip
       logger.debug { "COMMAND LINE: #{command_line.inspect}" }
-      c = Mixlib::ShellOut.new command_line, cwd: root, env: environment, live_stream: logger
-      benchmark "running command #{command_line.inspect} in #{root.inspect} with env #{environment.inspect}" do
+      logger.debug { "COMMAND ENV: #{environment.inspect}" }
+      c = Mixlib::ShellOut.new command_line, cwd: root, env: environment.to_h, live_stream: logger
+      benchmark "running command #{command_line.inspect} in #{root.inspect} with env #{environment.to_h.inspect}" do
         c.run_command
       end
       c.error!

data/lib/barking_iguana/compound/version.rb

@@ -1,5 +1,5 @@
 module BarkingIguana
   module Compound
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,167 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: barking_iguana-compound
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Craig R Webster
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: barking_iguana-logging
   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'
 - !ruby/object:Gem::Dependency
   name: barking_iguana-benchmark
   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'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   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'
 - !ruby/object:Gem::Dependency
   name: rspec-wait
   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'
 - !ruby/object:Gem::Dependency
   name: ansible_spec
   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'
 - !ruby/object:Gem::Dependency
   name: colorize
   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'
 - !ruby/object:Gem::Dependency
   name: hostlist_expression
   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'
 - !ruby/object:Gem::Dependency
   name: oj
   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: Compound testing of Ansible playbooks
@@ -172,8 +172,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
+- .gitignore
+- .rspec
 - Gemfile
 - README.md
 - Rakefile
@@ -192,6 +192,7 @@ files:
 - lib/barking_iguana/compound/ansible/inventory_writer.rb
 - lib/barking_iguana/compound/ansible/playbook.rb
 - lib/barking_iguana/compound/command_line_client.rb
+- lib/barking_iguana/compound/environment.rb
 - lib/barking_iguana/compound/host.rb
 - lib/barking_iguana/compound/host_manager.rb
 - lib/barking_iguana/compound/server_spec.rb
@@ -212,17 +213,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Compound testing of Ansible playbooks