ansibler 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 482625d6227526cbebcd9444ef8293fe7ce71bd6
-  data.tar.gz: 93d2b3aa918400c7488bf59f09d34fb3d9f202f9
+  metadata.gz: ad3f390ab2a019c1318d15733761a14e514f5fe9
+  data.tar.gz: 688864fd71078ef9019ae50404d65022597343be
 SHA512:
-  metadata.gz: fac162d7e116d451d2c9270c32fe5a51352e2e307a465ac1e7dff50991c1ea22b43feab5d6eba21fcee3da596568fc41406a416cf0abf72d29c9c22c6b34cff4
-  data.tar.gz: 03ae7b896d9b3c7555e76d9f0d66c0d8f9e44489678797b09a1c9e8b2023b157f3f75e4b163b4311a27d230d1aafbaa32d31048f8ea8f8655e962e7396abc76e
+  metadata.gz: c6ab65dc5051e544afd29837c704a17e016c0d1f49caf0aafeaf087b9058feee1025f1b7ebc46a3cec04225fc739fdf00d1c114eace3ff7d5f74f8d2ff9c19a0
+  data.tar.gz: 88d93fadf6a0b8486900e200960469f0bf5432b9b0da32fc988f0351fa2925f7109ee2f24339945f8fb34981d9be25541d3e4c801912fcb717c0e37541c08c97

data/Rakefile

@@ -21,6 +21,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = 'ansibler is a Ruby gem that provides utility classes for modeling, reading and writing Ansible inventory and playbook files.'
   gem.email = 'aisrael@gmail.com'
   gem.authors = ['Alistair A. Israel']
+  gem.required_ruby_version = '>= 1.9'
 
   # dependencies defined in Gemfile
 

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/ansibler.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: ansibler 0.2.1 ruby lib
+# stub: ansibler 0.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ansibler"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/aisrael/ansibler"
   s.licenses = ["MIT"]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9")
   s.rubygems_version = "2.4.6"
   s.summary = "Ruby gem for reading and writing Ansible files"
   s.test_files = ["features/README.md", "features/inventory/reading.feature", "features/inventory/writing.feature", "features/step_definitions/common_steps.rb", "features/support/env.rb"]

data/features/inventory/writing.feature

@@ -27,3 +27,12 @@ Feature: Inventory Writing
       [databases:children]
       mysql
       """
+
+  Scenario: prevent adding the same host twice, even with vars
+    Given the following code snippet:
+      """ruby
+      @ansible_inventory = Ansible::Inventory.new
+      @ansible_inventory.hosts.add 'host1', ansible_ssh_host: '172.31.3.134', ansible_ssh_user: 'ubuntu'
+      @ansible_inventory.hosts.add 'host1', ansible_ssh_user: 'ubuntu', ansible_ssh_host: '172.31.3.134'
+      """
+    Then there should be 1 host

data/lib/ansible/inventory.rb

@@ -1,3 +1,5 @@
+require 'active_support/all'
+
 module Ansible
 
   class Inventory
@@ -28,10 +30,10 @@ module Ansible
               child_group = inventory.groups[host_name] || inventory.groups.add(host_name)
               last_group.children << child_group.name
             elsif in_vars && host_name.index('=') && rest.empty?
-              k, v = host_name.split('=')
+              k, v = host_name.split('=', 2)
               last_group.vars[k] = v
             else
-              vars = Hash[rest.map {|s| s.split('=')}]
+              vars = ActiveSupport::HashWithIndifferentAccess[rest.map {|s| s.split('=', 2)}]
               if last_group
                 host = inventory.hosts.find {|h| h.name == host_name} || Host.new(host_name, vars)
                 last_group.hosts << host
@@ -39,8 +41,6 @@ module Ansible
                 inventory.hosts.add host_name, vars
               end
             end
-          else
-            puts line
           end
         end
         inventory
@@ -89,9 +89,12 @@ module Ansible
     end
 
     class Host < Struct.new :name, :vars
-      def initialize(*args)
-        super
-        self.vars = {} unless vars
+      def initialize(name, hash = {})
+        super(name)
+        self.vars = ActiveSupport::HashWithIndifferentAccess.new(hash)
+      end
+      def ==(other)
+        (name == other.name) && (vars == other.vars)
       end
       class Collection < Array
         def add(*args)
@@ -100,8 +103,16 @@ module Ansible
           else
             Host.new(*args)
           end
-          self << host
-          host
+          # prevent dups
+          if existing = self.find {|h| h == host}
+            existing
+          else
+            self << host
+            host
+          end
+        end
+        def [](name)
+          find {|host| host.name == name}
         end
       end
     end
@@ -110,7 +121,7 @@ module Ansible
       def initialize(*args)
         super
         self.hosts = Host::Collection.new unless hosts
-        self.vars = {} unless vars
+        self.vars = ActiveSupport::HashWithIndifferentAccess.new(vars)
         self.children = []
       end
       class Collection < Array

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ansibler
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Alistair A. Israel
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="