moose-inventory 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51f46f508815c46f1822f0c857366ae1db01276d
-  data.tar.gz: 5b6b796bf75a8438d052b97ecdaab36b1a44fd1c
+  metadata.gz: a63b0a4a7ad6bd07ebcd5a046dcd9030968ee1ae
+  data.tar.gz: fa90582f07b70b10ac2e712e0535fd3c092074b7
 SHA512:
-  metadata.gz: 457a392ad4ad90e450cca80fe6c5071009a76735caba56326f6d4bd5554774e4f3d1a7d637c9b1250d7d6c0ad708335df5261cfad68117104fcde72e266a3879
-  data.tar.gz: 7d0a7d1aba9105e12a9fb1a930e201e094f5cc850d0f292c6582e636cebd756803c68bcc7b8c97c6c6c983dda34f27a890640c61bf8840f0794c771507e52b7e
+  metadata.gz: 8103f643b5d66b9f46b1ef076468afc8c7a9307f72e3a2bc211909862d796d9c08a4735c3c07382140e219313b9d038a7428d8d48a827034e6c6c011c1f9e4e3
+  data.tar.gz: 3a26d900604cb5dbcccd3c5da3f6182f1fde5db0210c7ecb662dacaf8c47b0ad3eb3e1c64ae377d3c7dbbc0dd2521a902802990402e6f125eed18f672ac7e4c6

data/README.md

@@ -79,51 +79,30 @@ Additional parameters are also required in the **db** subsection, depending on t
 
 ## Usage
 ### The help system
-The tool itself provides a convenient help feature.  For example, 
+The tool itself provides a convenient help feature.  For example, try each of the following,
 
     > moose-inventory help
-    Commands:
-      moose-inventory group ACTION    # Manipulate groups in…
-      moose-inventory help [COMMAND]  # Describe available c…
-      ⋮
-
-and, 
-
     > moose-inventory help group
-    Commands:
-      moose-inventory group add NAME  # Add a group NAME to …
-      moose-inventory group list      # List the groups, tog…
-      ⋮
-
-and,
-
     > moose-inventory group help add
-    Usage:
-      moose-inventory add NAME
-    
-    Options:
-      [--hosts=HOSTS]  
-    
-    Add a group NAME to the inventory
 
 ###Global switches
 Not described in the built-in help system are a handful of top-level switches, as follows. 
 
-#### - -config FILE
-The *--config* flag sets the configuration file to be used.  If specified, then the file must exist. This takes precedence over all other config files in other locations.  If not provided, then the default is to see in standard locations, see later.
+#### Option `--config <FILE>`
+The *--config* flag sets the configuration file to be used.  If specified, then the file must exist. This takes precedence over all other config files in other locations.  If not provided, then the default is to search standard locations, see later.
 
 For example, 
 
     > moose-inventory --config ./my_conf host list
 
-#### - -env SECTION
+#### Option `--env <SECTION>`
 The *--env* flag sets the section in the configuration file to be used as the environment configuration.  If set, then the section must exist.  If not set, then what ever default is provided in the general::defaultenv parameter of the configuration file will be used. 
 
 For example, 
 
     > moose-inventory --env my_section host list
 
-#### - - format yaml|json|pjson
+#### Option `--format <yaml|json|pjson>`
 The *--format* switch changes the output format from *list* and *get* operations.  Valid formats are yaml, json, pjson (i.e. pretty JSON).   If the switch is not given, then the default is json. 
 
 For example,
@@ -138,7 +117,7 @@ For example,
 The *moose-inventory* tool performs database operations in a transactional manner.  That is to say, either all operations of a command succeed, or they are all rolled back.  
 
 ###Walk-through examples
-In this example, we will walk through the process of creating two hosts and two groups, assigning variables to each, and then then associating hosts with groups.  Once done, we will then remove each association, variable, group and host.  
+This walk-through goes through the process of creating three hosts and three groups, assigning variables to some of each, and then associating hosts with groups.  Once done, each association, variable, group, and host are removed.  
 
 We start by creating three hosts, in this case named *host1*,  *host2*, and *host3*.  Note, we can add as many hosts as we desire via this single command.  Also, although we have used short names here, we could equally have used fully qualified names. 
 
@@ -330,10 +309,11 @@ Removing variables, groups, and hosts is just as easy.  In the following example
     > moose-inventory host rm host1 host2 host3
 
 ### Using moose-inventory with Ansible
-For integration with Ansible, a shim script should be used, in order to set the correct configuration file, environment, etc.  
+The *moose-inventory* tool is compliant with the Ansible specifications for [dynamic inventory sources](http://docs.ansible.com/developing_inventory.html).
+
+However, to make use of *moose-inventory's* multiple environment and configuration file options, a shim script should be used as the target for the [external inventory script](http://docs.ansible.com/intro_dynamic_inventory.html). A trivial example may look something like this,  
 
-A trivial shim script, to be provided to Ansible as the [external inventory script](http://docs.ansible.com/intro_dynamic_inventory.html), may look like this, 
-```bash
+```shell
 #!/bin/bash
 
 CONF='./example.conf'
@@ -343,20 +323,25 @@ moose-inventory --config $CONF --env $ENV $@
 
 exit $?
 ```
-When Ansible calls the external inventory script, it does so using the certain parameters, which *moose-inventory* recognises.  The Ansible parameters, and their equivalent *moose-inventory* native parameters are shown below. 
+When Ansible calls the external inventory script, it does so using certain parameters, which *moose-inventory* automatically recognises and responds to.  The Ansible parameters, and their equivalent *moose-inventory* parameters are shown below. 
 
-Ansible params   | moose-inventory params
+Ansible          | moose-inventory
 ---------------- |-------------
--<sp>-hosts      | host list    
--<sp>-hosts HOST | host get HOST
---groups         | group list      
+`--list`         | `--ansible group list`    
+`--host HOSTNAME` | `--ansible host listvars HOSTNAME`
 
-Note, the above conversions are done automatically by the tool, and are included here only for reference. 
+Note, the above conversions are done **automatically** within *moose-inventory*. 
 
-With *moose-inventory* installed and configured, and a shim script (e.g. shim.sh) in place, then using Ansible would be a bit like this: 
+With *moose-inventory* installed and configured, and a shim script (e.g. *shim.sh*) in place, then use by Ansible can be acheived via Ansible's `-i` option.
 
     ansible -i shim.sh -u ubuntu us-east-1d -m ping
 
+Alternatively, if you are using an [Ansible configuration file](http://docs.ansible.com/intro_configuration.html), then you can set the [inventory](http://docs.ansible.com/intro_configuration.html#inventory) option,
+
+    inventory = ./shim.sh
+    
+Yet another option is to copy the shim script to */etc/ansible/hosts* and `chmod +x` it.  However, since this would essentially fix the config file and environment used, doing so would defeat the flexibility intended for *moose-inventory*.    
+    
 ##Missing features
 The following desired features are yet to be implemented:
 

data/lib/moose_inventory/cli/group.rb

@@ -11,11 +11,12 @@ module Moose
         require_relative 'group_get'
         require_relative 'group_list'
         require_relative 'group_rm'
-        require_relative 'group_addchild'
-        require_relative 'group_rmchild'
+        #require_relative 'group_addchild'
+        #require_relative 'group_rmchild'
         require_relative 'group_addhost'
         require_relative 'group_rmhost'
         require_relative 'group_addvar'
+        require_relative 'group_listvars'
         require_relative 'group_rmvar'
       end
     end

data/lib/moose_inventory/cli/group_list.rb

@@ -10,16 +10,20 @@ module Moose
         #==========================
         desc 'list',
              'List the groups, together with any associated hosts and groupvars'
-        option :ansiblestyle, type: :boolean
         def list # rubocop:disable Metrics/AbcSize
           # Convenience
           db    = Moose::Inventory::DB
-
+          confopts = Moose::Inventory::Config._confopts
+          
           # Process
           results = {}
           db.models[:group].all.each do |group|
+            
             hosts = group.hosts_dataset.map(:name)
 
+            # Hide the automatic ungrouped group, if it's empty
+            next if group[:name] == 'ungrouped' && hosts.length == 0
+            
             groupvars = {}
             group.groupvars_dataset.each do |gv|
               groupvars[gv[:name].to_sym] = gv[:value]
@@ -30,7 +34,11 @@ module Moose
               results[group[:name].to_sym][:hosts] = hosts
             end
             unless groupvars.length == 0
-              results[group[:name].to_sym][:groupvars] = groupvars
+              if confopts[:ansible] == true
+                results[group[:name].to_sym][:vars] = groupvars
+              else
+                results[group[:name].to_sym][:groupvars] = groupvars
+              end
             end
           end
           Formatter.out(results)

data/lib/moose_inventory/cli/group_listvars.rb

@@ -0,0 +1,77 @@
+require 'thor'
+require 'json'
+
+require_relative './formatter.rb'
+require_relative '../db/exceptions.rb'
+
+module Moose
+  module Inventory
+    module Cli
+      ##
+      # implementation of the "group listvars" method of the CLI
+      class Group
+        #==========================
+        desc 'listvar', 'List all variables associated with the group'
+        def listvars(*argv)
+          # Convenience
+          confopts = Moose::Inventory::Config._confopts
+
+          # Note, the Ansible spects don't call for a "--group GROUPNAME" method.
+          # So, strictly, there is no Ansible compatibility for this method.
+          # Instead, the Ansible compatibility included herein is for consistency
+          # with the "hosts listvars" method, which services the Ansible 
+          # "--host HOSTNAME" specs.
+                     
+          # sanity
+          if confopts[:ansible] == true
+            if argv.length != 1
+            abort('ERROR: Wrong number of arguments for Ansible mode, '\
+                  "#{args.length} for 1.")
+            end
+          else
+            if argv.length < 1
+              abort('ERROR: Wrong number of arguments, '\
+                    "#{args.length} for 1 or more.")
+            end
+          end
+
+
+          # Convenience
+          db = Moose::Inventory::DB
+          fmt = Moose::Inventory::Cli::Formatter
+
+          # Arguments
+          names = argv.uniq.map(&:downcase)
+
+          #process
+          results = {}
+            
+          if confopts[:ansible] == true 
+            # This is the implementation per Ansible specs
+            name = names.first
+            group = db.models[:group].find(name: name)
+            if group.nil?
+              fmt.warn "The Group #{name} does not exist."
+            else
+              group.groupvars_dataset.each do |gv|
+                results[gv[:name].to_sym] = gv[:value]
+              end
+            end
+          else
+            # This our more flexible implementation
+            names.each do |name|
+              group = db.models[:group].find(name: name)
+              unless group.nil?
+                results[name.to_sym] = {}
+                group.groupvars_dataset.each do |gv|
+                  results[name.to_sym][gv[:name].to_sym] = gv[:value]
+                end
+              end
+            end
+          end
+          fmt.dump(results)
+        end
+      end
+    end
+  end
+end

data/lib/moose_inventory/cli/host.rb

@@ -17,6 +17,7 @@ module Moose
         require_relative 'host_addgroup'
         require_relative 'host_rmgroup'
         require_relative 'host_addvar'
+        require_relative 'host_listvars'
         require_relative 'host_rmvar'
       end
     end

data/lib/moose_inventory/cli/host_listvars.rb

@@ -0,0 +1,72 @@
+require 'thor'
+require 'json'
+
+require_relative './formatter.rb'
+require_relative '../db/exceptions.rb'
+
+module Moose
+  module Inventory
+    module Cli
+      ##
+      # implementation of the "host listvars" method of the CLI
+      class Host
+        #==========================
+        desc 'listvar', 'List all variables associated with the host'
+        def listvars(*argv)
+          # Convenience
+          confopts = Moose::Inventory::Config._confopts
+          
+          # sanity
+          if confopts[:ansible] == true
+            if argv.length != 1
+            abort('ERROR: Wrong number of arguments for Ansible mode, '\
+                  "#{args.length} for 1.")
+            end
+          else
+            if argv.length < 1
+              abort('ERROR: Wrong number of arguments, '\
+                    "#{args.length} for 1 or more.")
+            end
+          end
+
+
+          # Convenience
+          db = Moose::Inventory::DB
+          fmt = Moose::Inventory::Cli::Formatter
+
+          # Arguments
+          names = argv.uniq.map(&:downcase)
+
+          #process
+          results = {}
+            
+          if confopts[:ansible] == true 
+            # This is the implementation per Ansible specs
+            name = names.first
+            host = db.models[:host].find(name: name)
+            if host.nil?
+              fmt.warn "The host #{name} does not exist."
+            else
+              host.hostvars_dataset.each do |hv|
+                results[hv[:name].to_sym] = hv[:value]
+              end
+            end
+          else
+            # This our more flexible implementation, which is not  compatible 
+            # with the Ansible specs 
+            names.each do |name|
+              host = db.models[:host].find(name: name)
+              unless host.nil?
+                results[name.to_sym] = {}
+                host.hostvars_dataset.each do |hv|
+                  results[name.to_sym][hv[:name].to_sym] = hv[:value]
+                end
+              end
+            end
+          end
+          fmt.dump(results)
+        end
+      end
+    end
+  end
+end

data/lib/moose_inventory/config/config.rb

@@ -32,20 +32,29 @@ module Moose
 
       #----------------------
       def self.top_level_args
-        # Certain top level flags affect the configuration.
+        # The following top-level flags affect the global configuration.
+        #
+        # --ansible      => forces ansible mode in relevant responders
+        #                   Default is not use to use ansible mode
+        #
         # --config FILE  => sets the configuration file to be used.
         #                   Default is to search standard locations.
+        #
         # --env ENV      => sets the section to be used as the configuration.
-        #                   Defaults to ""
+        #                   Defaults to "", which forces the use of the 
+        #                   defaultenv parameter from the general section of 
+        #                   the config file. 
+        #
         # --format FORMAT=> See formatter for supported types.
         #                   Defaults to json.
+        #
+        # -- trace       => Enable more complete exceptions for db transactions
+        #                   Default is not to trace. 
 
-        @_confopts = { env: '', format: 'json', trace: false }
+        @_confopts = { env: '', format: 'json', ansible: false, trace: false }
 
-        # The following are a O(n^m) approach.  TODO: O(n) version?
-          
         # Check for two-part flags   
-        %w(env config format).each do |var|
+        %w(config env format).each do |var|
           @_argv.each_with_index do |val, index|
             next if val != "--#{var}"
             @_confopts[var.to_sym] = @_argv[index + 1]
@@ -55,7 +64,7 @@ module Moose
         end
         
         # Check for one-part flags
-        %w(trace).each do |var|
+        %w(ansible trace).each do |var|
           @_argv.each_with_index do |val, index|
             next if val != "--#{var}"
             @_confopts[var.to_sym] = true
@@ -64,48 +73,49 @@ module Moose
           end
         end
         
+        # Sanity
+        # - Ansible output format must be json
+        # @_confopts[:format] = 'json' if @_confopts[:ansible] == true
+        
       end
 
       #----------------------
       def self.top_level_help
         if @_argv[0] == 'help'
           puts "Global flags:"
+          printf "  %-31s %-10s", "--ansible", "# Force Ansible mode (automatically set when using ansible flags)\n"
           printf "  %-31s %-10s", "--config FILE", "# Specifies a configuration file to use\n"
           printf "  %-31s %-10s", "--env ENV", "# Specifies the environment section of the config to use\n"
-          printf "  %-31s %-10s", "--format yaml|json|pjson", "# Format for the output of 'get' and 'list'\n"
+          printf "  %-31s %-10s", "--format yaml|json|pjson", "# Format for the output of 'get', 'list', and 'listvars' subcommands\n"
+          printf "  %-31s %-10s", "--trace", "# Enable more complete exception dumps for database transactions\n"
           puts "\nAnsible flags:"
-          printf "  %-31s %-10s", "--hosts", "# Retrieves the list of hosts (alias for 'host list'\n"
-          printf "  %-31s %-10s", "--hosts HOST", "# Retrieves the specified host (alias for 'host get HOST')\n"
-          printf "  %-31s %-10s", "--groups", "# Retrieves the list of groups (alias for 'group list')\n\n"
+          printf "  %-31s %-10s", "--host HOSTNAME", "# Retrieves host variables for the specified host (alias for 'host listvars HOSTNAME')\n"
+          printf "  %-31s %-10s", "--list", "# Retrieves the list of groups (alias for 'group list')\n\n"
         end
       end
       
       #----------------------
       def self.ansible_args  # rubocop:disable Metrics/AbcSize
-        # Handle Ansible flags
-        # --hosts           => host list
-        # --hosts HOSTNAME  => host get HOSTNAME
-        # --groups          => lgroup list
-
-        if @_argv[0] == '--hosts'
-          host = @_argv[1]
-          if !host.nil?
+        #
+        # See http://docs.ansible.com/developing_inventory.html for Ansible specs
+        # for dynamic inventory sources
+        
+        # --list            => group list
+        # --host HOSTNAME  => host getvars HOSTNAME
+
+        case @_argv[0]
+          when '--list' 
+            @_confopts[:ansible] = true
+            @_confopts[:format] = 'json'
             @_argv.clear
-            ['host', 'get', "#{host}"].each do |arg|
-              @_argv << arg
-            end
-          else
+            @_argv.concat(['group', 'list']).flatten
+          when '--host'
+            @_confopts[:ansible] = true
+            @_confopts[:format] = 'json'
+            host = @_argv[1]
             @_argv.clear
-            ['host', 'list'].each do |arg|
-              @_argv << arg
-            end
-          end
-        elsif @_argv[0] == '--groups'
-          @_argv.clear
-          ['group', 'list'].each do |arg|
-            @_argv << arg
-          end
-        end
+            @_argv.concat(['host', 'listvars', "#{host}"]).flatten
+        end 
       end
 
       #----------------------

data/lib/moose_inventory/version.rb

@@ -2,6 +2,6 @@ module Moose
   ##
   # The Moose-Tools dynamic inventory management library
   module Inventory
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 end

data/spec/lib/moose_inventory/cli/group_list_spec.rb

@@ -23,6 +23,7 @@ RSpec.describe Moose::Inventory::Cli::Group do
 
     @console = Moose::Inventory::Cli::Formatter
     @group = Moose::Inventory::Cli::Group
+    @cli = Moose::Inventory::Cli 
     @app = Moose::Inventory::Cli::Application
   end
 
@@ -73,7 +74,7 @@ RSpec.describe Moose::Inventory::Cli::Group do
     end
 
     #---------------------
-    it 'should be an alias of --groups (i.e. Ansible parameter)' do
+    it 'should be an alias of --list (i.e. Ansible parameter)' do
       
       host_name = 'test_host'
 
@@ -85,15 +86,14 @@ RSpec.describe Moose::Inventory::Cli::Group do
       end
     
       args = @mockargs.clone
-      args << "--groups"
-      cli = Moose::Inventory::Cli 
+      args << "--list"
     
-      actual = runner{ cli.start(args) }
+      actual = runner{ @cli.start(args) }
         
       #@console.out(actual, 'y')
        
       desired = { aborted: false, STDOUT: '', STDERR: '' }
-      desired[:STDOUT] = mock.to_yaml
+      desired[:STDOUT] = mock.to_json + "\n"
     
       expected(actual, desired)
     end    

data/spec/lib/moose_inventory/cli/group_listvar_spec.rb

@@ -0,0 +1,122 @@
+require 'spec_helper'
+
+RSpec.describe Moose::Inventory::Cli::Group do
+  before(:all) do
+    # Set up the configuration object
+    @mockarg_parts = {
+      config:  File.join(spec_root, 'config/config.yml'),
+      format:  'yaml',
+      env:     'test'
+    }
+
+    @mockargs = []
+    @mockarg_parts.each do |key, val|
+      @mockargs << "--#{key}"
+      @mockargs << val
+    end
+
+    @config = Moose::Inventory::Config
+    @config.init(@mockargs)
+
+    @db = Moose::Inventory::DB
+    @db.init if @db.db.nil?
+
+    @console = Moose::Inventory::Cli::Formatter
+    @group = Moose::Inventory::Cli::Group
+    @cli = Moose::Inventory::Cli 
+    @app = Moose::Inventory::Cli::Application
+  end
+
+  before(:each) do
+    # We make some @cli calls, which changes config, 
+    # so we must reset config on each pass
+    @config.init(@mockargs)
+    @db.reset
+  end
+
+  #==================
+  describe 'listvar' do
+    #-----------------
+    it 'should be responsive' do
+      result = @group.instance_methods(false).include?(:listvars)
+      expect(result).to eq(true)
+    end
+     
+    #-----------------
+    it '<missing args> ... should abort with an error' do
+      actual = runner  {  @app.start(%w(group listvars))  }
+
+      # Check output
+      desired = { aborted: true}
+      desired[:STDERR] = "ERROR: Wrong number of arguments, 0 for 1 or more.\n"
+      expected(actual, desired)
+    end
+    
+    #-----------------
+    it '--ansible <missing args> ... should abort with an error' do
+      
+      args = @mockargs.clone
+      args.concat( %w(--ansible group listvars) ).flatten
+    
+      actual = runner{ @cli.start(args) }
+ 
+      # Check output
+      desired = { aborted: true}
+      desired[:STDERR] = "ERROR: Wrong number of arguments for Ansible mode, 0 for 1.\n"
+      expected(actual, desired)
+    end
+    
+    #------------------------
+    it 'GROUP ... should return a list of group variables grouped by group' do
+      group_name ='test_group'
+      group_vars = %w(foo=bar cow=chicken)
+      
+      tmp = runner {  @app.start(%W(group add #{group_name} )) }
+      tmp = runner {  @app.start(%W(group addvar #{group_name} #{group_vars[0]} #{group_vars[1]})) }
+      
+      actual = runner do
+        @app.start(%W(group listvars #{group_name}))
+      end
+
+      #@console.out(actual, 'y')
+      
+      # Check output
+      mock = {}
+      mock[group_name.to_sym] = {} 
+      group_vars.each do |hv|
+        hv_array = hv.split('=')  
+        mock[group_name.to_sym][hv_array[0].to_sym] = hv_array[1] 
+      end
+      
+      desired = {}
+      desired[:STDOUT] = mock.to_yaml
+      expected(actual, desired)
+    end
+    
+    #------------------------
+    it '--ansible GROUP ... should return a list of group variables, in a  style akin to Ansible\'s \'--host HOSTNAME\'' do
+      group_name ='test_group'
+      group_vars = %w(foo=bar cow=chicken)
+      
+      tmp = runner {  @app.start(%W(group add #{group_name} )) }
+      tmp = runner {  @app.start(%W(group addvar #{group_name} #{group_vars[0]} #{group_vars[1]})) }
+      
+      actual = runner do
+        @cli.start(%W(--ansible group listvars #{group_name}))
+      end
+    
+      #@console.out(actual, 'y')
+      
+      # Check output
+      mock = {}
+      group_vars.each do |hv|
+        hv_array = hv.split('=')  
+        mock[hv_array[0].to_sym] = hv_array[1] 
+      end
+      
+      desired = {}
+      desired[:STDOUT] = mock.to_json + "\n"
+      expected(actual, desired)
+    end
+  end
+end

data/spec/lib/moose_inventory/cli/host_addvar_spec.rb

@@ -40,7 +40,7 @@ RSpec.describe Moose::Inventory::Cli::Host do
       result = @host.instance_methods(false).include?(:addvar)
       expect(result).to eq(true)
     end
-    
+     
     #-----------------
     it 'host addvar <missing args> ... should abort with an error' do
       actual = runner  do

data/spec/lib/moose_inventory/cli/host_get_spec.rb

@@ -101,33 +101,5 @@ RSpec.describe Moose::Inventory::Cli::Host do
        
       expected(actual, desired)
     end
-    
-    #---------------------
-    it 'should be an alias of --hosts HOST (i.e. Ansible parameter)' do
-      
-      mock = {}
-      host = 'host1'
-
-      runner { @app.start(%W(host add #{host})) }
-      mock[host.to_sym] = {}
-      mock[host.to_sym][:groups] = ['ungrouped']
-    
-      args = @mockargs.clone
-      args << '--hosts'
-      args << "#{host}"
-      cli = Moose::Inventory::Cli 
-    
-      # items should now be in the db
-      actual = runner{ cli.start(args) }
-        
-      #@console.out(actual, 'y')
-      
-      desired = { aborted: false, STDOUT: '', STDERR: '' }
-      desired[:STDOUT] = mock.to_yaml
-    
-      expected(actual, desired)
-    end
-    
-        
   end
 end

data/spec/lib/moose_inventory/cli/host_list_spec.rb

@@ -75,31 +75,5 @@ RSpec.describe Moose::Inventory::Cli::Host do
 
       expected(actual, desired)
     end
-    #---------------------
-    it 'should be an alias of --hosts (i.e. Ansible parameter)' do
-      
-      mock = {}
-      hosts = %w(host1 host2)
-      hosts.each do |name|
-        runner { @app.start(%W(host add #{name})) }
-        mock[name.to_sym] = {}
-        mock[name.to_sym][:groups] = ['ungrouped']
-      end
-
-      args = @mockargs.clone
-      args << "--hosts"
-      cli = Moose::Inventory::Cli 
-
-      # items should now be in the db
-      actual = runner{ cli.start(args) }
-        
-      #@console.out(actual, 'y')
-      
-      desired = { aborted: false, STDOUT: '', STDERR: '' }
-      desired[:STDOUT] = mock.to_yaml
-
-      expected(actual, desired)
-    end
-    
   end
 end

data/spec/lib/moose_inventory/cli/host_listvar_spec.rb

@@ -0,0 +1,152 @@
+require 'spec_helper'
+
+# TODO: the usual respond_to? method doesn't seem to work on Thor objects.
+# Why not? For now, we'll check against instance_methods.
+
+RSpec.describe Moose::Inventory::Cli::Host do
+  before(:all) do
+    # Set up the configuration object
+    @mockarg_parts = {
+      config:  File.join(spec_root, 'config/config.yml'),
+      format:  'yaml',
+      env:     'test'
+    }
+
+    @mockargs = []
+    @mockarg_parts.each do |key, val|
+      @mockargs << "--#{key}"
+      @mockargs << val
+    end
+
+    @config = Moose::Inventory::Config
+    @config.init(@mockargs)
+
+    @db = Moose::Inventory::DB
+    @db.init if @db.db.nil?
+
+    @console = Moose::Inventory::Cli::Formatter
+    @host = Moose::Inventory::Cli::Host
+    @cli = Moose::Inventory::Cli 
+    @app = Moose::Inventory::Cli::Application
+  end
+
+  before(:each) do
+    # We make some @cli calls, which changes config, 
+    # so we must reset config on each pass
+    @config.init(@mockargs)
+    @db.reset
+  end
+
+  #==================
+  describe 'listvar' do
+    #-----------------
+    it 'should be responsive' do
+      result = @host.instance_methods(false).include?(:listvars)
+      expect(result).to eq(true)
+    end
+    
+    #-----------------
+    it '<missing args> ... should abort with an error' do
+      actual = runner  {  @app.start(%w(host listvars))  }
+
+      # Check output
+      desired = { aborted: true}
+      desired[:STDERR] = "ERROR: Wrong number of arguments, 0 for 1 or more.\n"
+      expected(actual, desired)
+    end
+    
+    #-----------------
+    it '--ansible <missing args> ... should abort with an error' do
+      
+      args = @mockargs.clone
+      args.concat( %w(--ansible host listvars) ).flatten
+    
+      actual = runner{ @cli.start(args) }
+ 
+      # Check output
+      desired = { aborted: true}
+      desired[:STDERR] = "ERROR: Wrong number of arguments for Ansible mode, 0 for 1.\n"
+      expected(actual, desired)
+    end
+    
+    #------------------------
+    it 'HOST ... should return a list of host variables grouped by host' do
+      host_name ='test_host'
+      host_vars = %w(foo=bar cow=chicken)
+      
+      tmp = runner {  @app.start(%W(host add #{host_name} )) }
+      tmp = runner {  @app.start(%W(host addvar #{host_name} #{host_vars[0]} #{host_vars[1]})) }
+      
+      actual = runner do
+        @app.start(%W(host listvars #{host_name}))
+      end
+
+      #@console.out(actual, 'y')
+      
+      # Check output
+      mock = {}
+      mock[host_name.to_sym] = {} 
+      host_vars.each do |hv|
+        hv_array = hv.split('=')  
+        mock[host_name.to_sym][hv_array[0].to_sym] = hv_array[1] 
+      end
+      
+      desired = {}
+      desired[:STDOUT] = mock.to_yaml
+      expected(actual, desired)
+    end
+    
+    #------------------------
+    it '--ansible HOST ... should return a list of host variables per Ansible specs' do
+      host_name ='test_host'
+      host_vars = %w(foo=bar cow=chicken)
+      
+      tmp = runner {  @app.start(%W(host add #{host_name} )) }
+      tmp = runner {  @app.start(%W(host addvar #{host_name} #{host_vars[0]} #{host_vars[1]})) }
+      
+      actual = runner do
+        @cli.start(%W(--ansible host listvars #{host_name}))
+      end
+    
+      #@console.out(actual, 'y')
+      
+      # Check output
+      mock = {}
+      host_vars.each do |hv|
+        hv_array = hv.split('=')  
+        mock[hv_array[0].to_sym] = hv_array[1] 
+      end
+      
+      desired = {}
+      desired[:STDOUT] = mock.to_json + "\n"
+      expected(actual, desired)
+    end
+    
+    #------------------------
+    it '--ansible HOST ... should be an alias for Ansible\'s --host HOST' do
+      host_name ='test_host'
+      host_vars = %w(foo=bar cow=chicken)
+      
+      tmp = runner {  @app.start(%W(host add #{host_name} )) }
+      tmp = runner {  @app.start(%W(host addvar #{host_name} #{host_vars[0]} #{host_vars[1]})) }
+      
+      actual = runner do
+        @cli.start(%W(--host #{host_name}))
+      end
+    
+      #@console.out(actual, 'y')
+      
+      # Check output
+      mock = {}
+      host_vars.each do |hv|
+        hv_array = hv.split('=')  
+        mock[hv_array[0].to_sym] = hv_array[1] 
+      end
+      
+      desired = {}
+      desired[:STDOUT] = mock.to_json + "\n"
+      expected(actual, desired)
+    end
+    
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moose-inventory
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Russell Davies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: indentation
@@ -278,6 +278,7 @@ files:
 - lib/moose_inventory/cli/group_addvar.rb
 - lib/moose_inventory/cli/group_get.rb
 - lib/moose_inventory/cli/group_list.rb
+- lib/moose_inventory/cli/group_listvars.rb
 - lib/moose_inventory/cli/group_rm.rb
 - lib/moose_inventory/cli/group_rmchild.rb
 - lib/moose_inventory/cli/group_rmhost.rb
@@ -288,6 +289,7 @@ files:
 - lib/moose_inventory/cli/host_addvar.rb
 - lib/moose_inventory/cli/host_get.rb
 - lib/moose_inventory/cli/host_list.rb
+- lib/moose_inventory/cli/host_listvars.rb
 - lib/moose_inventory/cli/host_rm.rb
 - lib/moose_inventory/cli/host_rmgroup.rb
 - lib/moose_inventory/cli/host_rmvar.rb
@@ -311,6 +313,7 @@ files:
 - spec/lib/moose_inventory/cli/group_addvar_spec.rb
 - spec/lib/moose_inventory/cli/group_get_spec.rb
 - spec/lib/moose_inventory/cli/group_list_spec.rb
+- spec/lib/moose_inventory/cli/group_listvar_spec.rb
 - spec/lib/moose_inventory/cli/group_rm_spec.rb
 - spec/lib/moose_inventory/cli/group_rmhost_spec.rb
 - spec/lib/moose_inventory/cli/group_rmvar_spec.rb
@@ -320,6 +323,7 @@ files:
 - spec/lib/moose_inventory/cli/host_addvar_spec.rb
 - spec/lib/moose_inventory/cli/host_get_spec.rb
 - spec/lib/moose_inventory/cli/host_list_spec.rb
+- spec/lib/moose_inventory/cli/host_listvar_spec.rb
 - spec/lib/moose_inventory/cli/host_rm_spec.rb
 - spec/lib/moose_inventory/cli/host_rmgroup_spec.rb
 - spec/lib/moose_inventory/cli/host_rmvar_spec.rb
@@ -363,6 +367,7 @@ test_files:
 - spec/lib/moose_inventory/cli/group_addvar_spec.rb
 - spec/lib/moose_inventory/cli/group_get_spec.rb
 - spec/lib/moose_inventory/cli/group_list_spec.rb
+- spec/lib/moose_inventory/cli/group_listvar_spec.rb
 - spec/lib/moose_inventory/cli/group_rm_spec.rb
 - spec/lib/moose_inventory/cli/group_rmhost_spec.rb
 - spec/lib/moose_inventory/cli/group_rmvar_spec.rb
@@ -372,6 +377,7 @@ test_files:
 - spec/lib/moose_inventory/cli/host_addvar_spec.rb
 - spec/lib/moose_inventory/cli/host_get_spec.rb
 - spec/lib/moose_inventory/cli/host_list_spec.rb
+- spec/lib/moose_inventory/cli/host_listvar_spec.rb
 - spec/lib/moose_inventory/cli/host_rm_spec.rb
 - spec/lib/moose_inventory/cli/host_rmgroup_spec.rb
 - spec/lib/moose_inventory/cli/host_rmvar_spec.rb