vagrant-ansible_auto 0.1.5 → 0.2.1

data/spec/unit/vagrant/ansible_auto/util/keys_spec.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+require 'vagrant/ansible_auto/util/keys'
+
+describe VagrantPlugins::AnsibleAuto::Util::Keys do
+  include_context 'machine'
+
+  let(:including_klass) do
+    Class.new do
+      include VagrantPlugins::AnsibleAuto::Util::Keys
+    end
+  end
+
+  let(:including_instance) { including_klass.new }
+
+  let(:fake_private_key_path) { temporary_file('+-----NOT AN RSA PRIVATE KEY-----+') }
+
+  describe '#insecure_key_path' do
+    it 'returns the path to the Vagrant insecure key' do
+      expect(including_instance.insecure_key_path).to be_a Pathname
+    end
+  end
+
+  describe '#insecure_key_contents' do
+    it 'returns the contents of the Vagrant insecure key' do
+      expect(including_instance.insecure_key_contents).to be_a String
+      expect(including_instance.insecure_key_contents).to include('BEGIN RSA PRIVATE KEY')
+    end
+  end
+
+  describe '#insecure_key?' do
+    it 'indicates whether the provided key file contains the Vagrant insecure key' do
+      expect(including_instance.insecure_key?(including_instance.insecure_key_path)).to be true
+      expect(including_instance.insecure_key?(fake_private_key_path)).to be false
+    end
+  end
+
+  describe '#fetch_private_key' do
+    context 'given a machine with no private keys configured' do
+      before do
+        allow(machine).to receive(:ssh_info).and_return(nil)
+        allow(machine.config.ssh).to receive(:insert_key).and_return(true)
+      end
+
+      it "returns the machine's default private key" do
+        expect(including_instance.fetch_private_key(machine)).to eq(machine.env.default_private_key_path)
+      end
+    end
+
+    context 'given a machine with at least one private key configured' do
+      let(:private_key_paths) do
+        [including_instance.insecure_key_path, fake_private_key_path]
+      end
+
+      before do
+        allow(ssh_info).to receive(:fetch).with(:private_key_path, anything).and_return(private_key_paths)
+      end
+
+      it "returns the first of the machine's private keys that is not the Vagrant insecure key" do
+        expect(including_instance.fetch_private_key(machine)).to eq(fake_private_key_path)
+      end
+    end
+  end
+end

data/vagrant-ansible_auto.gemspec

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'vagrant/ansible_auto/version'
@@ -16,17 +17,18 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |file|
-    file.start_with?('.') or spec.test_files.include?(file)
+    file.start_with?('.') || spec.test_files.include?(file)
   end
 
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler',  '~> 1.12.5'
-  spec.add_development_dependency 'rake',     '~> 10.0'
-  spec.add_development_dependency 'rspec',    '~> 2.14.0'
+  spec.add_development_dependency 'bundler',      '~> 1.12.5'
+  spec.add_development_dependency 'rake',         '~> 10.0'
+  spec.add_development_dependency 'rspec',        '~> 2.14'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'cane'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'yard'
 end

data/vagrant-spec.config.rb

@@ -0,0 +1,3 @@
+Vagrant::Spec::Acceptance.configure do |c|
+  c.component_paths << 'spec/acceptance'
+end

data/yard/extensions.rb

@@ -0,0 +1,45 @@
+require 'vagrant'
+
+module YARD
+  module VagrantPlugins
+    # Custom class handler for documenting class inheritance from
+    # +Vagrant.plugin+
+    class ClassHandler < YARD::Handlers::Ruby::ClassHandler
+    private
+
+      def parse_superclass(superclass)
+        return nil unless superclass
+
+        case superclass.type
+        when :call, :command_call
+          cname = superclass.namespace.source
+          if cname =~ /^Vagrant$/ && superclass.method_name(true) == :plugin
+            members = superclass.parameters.map { |m| handle_superclass_parameter(m) }
+
+            begin
+              return Vagrant.plugin(*(members[0..1])).to_s
+            end
+          end
+        end
+
+        super
+      end
+
+      def handle_superclass_parameter(parameter)
+        case parameter
+        when TrueClass, FalseClass, NilClass
+          parameter
+        else
+          case parameter.type
+          when :symbol_literal
+            parameter.source[1..-1].to_sym
+          when :int
+            parameter.source.to_i
+          else
+            parameter.source
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ansible_auto
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.1
 platform: ruby
 authors:
 - Ignacio Galindo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Helps defining and building ansible inventory files programatically via
   configuration and command modules.
 email:
@@ -116,17 +130,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.md
 - README.md
 - Rakefile
 - TODO.md
 - Vagrantfile
-- Vagrantfile2
-- Vagrantfile3
-- Vagrantfile4
 - lib/vagrant/ansible_auto.rb
-- lib/vagrant/ansible_auto/cap/guest/posix/bash_installed.rb
+- lib/vagrant/ansible_auto/cap/guest/posix.rb
 - lib/vagrant/ansible_auto/cap/guest/posix/check_open_port.rb
 - lib/vagrant/ansible_auto/cap/guest/posix/executable_installed.rb
 - lib/vagrant/ansible_auto/cap/guest/posix/gateway_addresses.rb
@@ -141,13 +154,25 @@ files:
 - lib/vagrant/ansible_auto/inventory.rb
 - lib/vagrant/ansible_auto/plugin.rb
 - lib/vagrant/ansible_auto/provisioner.rb
-- lib/vagrant/ansible_auto/util.rb
+- lib/vagrant/ansible_auto/util/config.rb
+- lib/vagrant/ansible_auto/util/hash_with_indifferent_access.rb
+- lib/vagrant/ansible_auto/util/keys.rb
+- lib/vagrant/ansible_auto/util/shell_quote.rb
 - lib/vagrant/ansible_auto/version.rb
+- locales/en.yml
 - playbooks/test.yml
 - spec/spec_helper.rb
-- spec/vagrant/ansible_auto/host_spec.rb
-- spec/vagrant/ansible_auto/inventory_spec.rb
+- spec/support/context.rb
+- spec/support/matchers.rb
+- spec/unit/vagrant/ansible_auto/config_spec.rb
+- spec/unit/vagrant/ansible_auto/host_spec.rb
+- spec/unit/vagrant/ansible_auto/inventory_spec.rb
+- spec/unit/vagrant/ansible_auto/provisioner_spec.rb
+- spec/unit/vagrant/ansible_auto/util/config_spec.rb
+- spec/unit/vagrant/ansible_auto/util/keys_spec.rb
 - vagrant-ansible_auto.gemspec
+- vagrant-spec.config.rb
+- yard/extensions.rb
 homepage: https://github.com/joiggama/vagrant-ansible_auto
 licenses:
 - MIT

data/Vagrantfile2

@@ -1,4 +0,0 @@
-Vagrant.configure(2) do |config|
-  config.vm.box = 'ubuntu/trusty64'
-  config.vm.network :private_network, type: :dhcp
-end

data/Vagrantfile3

@@ -1,8 +0,0 @@
-Vagrant.configure(2) do |config|
-  config.vm.box = 'trusty64'
-  config.vm.network :private_network, type: :dhcp
-
-  config.ansible.groups = {
-    'ubuntu' => ['default']
-  }
-end

data/Vagrantfile4

@@ -1,31 +0,0 @@
-Vagrant.configure(2) do |config|
-  config.vm.box = 'hashicorp/precise64'
-
-  (1..2).each do |i|
-    name = "ansible-test-worker-#{i}"
-    config.vm.define name do |target|
-    end
-  end
-
-  config.vm.define 'ansible-test-control' do |machine|
-    machine.vm.provision :ansible_auto do |ansible|
-      ansible.limit = '*'
-      ansible.playbook = 'playbooks/test.yml'
-    end
-  end
-
-  config.ansible.groups = {
-    'control'           => %w(ansible-test-control),
-    'worker'            => %w(ansible-test-worker-1 ansible-test-worker-2),
-    'cluster:children'  => %w(control worker),
-  }
-
-  config.ansible.vars = {
-    'control'   => {
-        'role'  => 'ansible-control',
-    },
-    'worker'    => {
-        'role'  => 'ansible-worker',
-    }
-  }
-end

data/lib/vagrant/ansible_auto/cap/guest/posix/bash_installed.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-module VagrantPlugins
-  module AnsibleAuto
-    module Cap
-      module Guest
-        module POSIX
-          class BashInstalled
-            class << self
-              def bash_installed?(machine, version = nil)
-                machine.communicate.execute(%q(command bash -c 'printf -- "%s\t%s" "$BASH" "$BASH_VERSION"'), error_check: false) do |type, data|
-                  data.chomp!
-
-                  # Not sure why, but we always get an empty first line...
-                  next if data.empty?
-
-                  if type == :stdout
-                    bash_path, bash_version = *data.split("\t")
-                    return (!bash_path.empty? and (version.nil? or version == bash_version))
-                  end
-                end
-
-                false
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/ansible_auto/util.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-module VagrantPlugins
-  module AnsibleAuto
-    module Util
-      # Adapted from VagrantPlugins::CommunicatorSSH::Communicator#insecure_key?.
-      # This will test whether +path+ is the Vagrant insecure private key.
-      #
-      # @param [String] path
-      def insecure_key?(path)
-        return false if path.nil? or !File.file?(path)
-        @__insecure_key ||= Vagrant.source_root.join('keys/vagrant').read.chomp
-        File.read(path).chomp == @_insecure_key
-      end
-
-      def fetch_private_key(machine)
-        if machine.config.ssh.insert_key && !machine.ssh_info.nil?
-          machine.ssh_info.fetch(:private_key_path, []).find { |k| !insecure_key?(k) }
-        else
-          machine.env.default_private_key_path
-        end
-      end
-    end
-  end
-end

data/spec/vagrant/ansible_auto/host_spec.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-require 'spec_helper'
-
-require 'vagrant/ansible_auto/host'
-
-describe VagrantPlugins::AnsibleAuto::HostMachine do
-  include_context 'machine'
-
-  subject { described_class.new(machine) }
-
-  describe '#ssh_user' do
-    it 'corresponds to machine.ssh_info[:username]' do
-      expect(ssh_info).to receive(:[]).with(:username).and_return('me')
-      expect(subject.ssh_user).to eq 'me'
-    end
-  end
-
-  describe '#ssh_host' do
-    it 'corresponds to machine.ssh_info[:host]' do
-      expect(ssh_info).to receive(:[]).with(:host).and_return('foo.bar.net')
-      expect(subject.ssh_host).to eq 'foo.bar.net'
-    end
-  end
-
-  describe '#ssh_port' do
-    it 'corresponds to machine.ssh_info[:port]' do
-      expect(ssh_info).to receive(:[]).with(:port).and_return(2222)
-      expect(subject.ssh_port).to eq 2222
-    end
-  end
-
-  describe '#ssh_private_key_file' do
-    it 'corresponds to machine.ssh_info[:private_key_path]' do
-      expect(ssh_info).to receive(:fetch).with(:private_key_path, anything).and_return(['/path/to/private_key'])
-      expect(subject.ssh_private_key_file).to eq '/path/to/private_key'
-    end
-
-    it 'has no default' do
-      expect(ssh_info).to receive(:fetch).with(:private_key_path, anything).and_return([])
-      expect(subject.ssh_private_key_file).to be_nil
-    end
-  end
-end

data/spec/vagrant/ansible_auto/inventory_spec.rb

@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-require 'spec_helper'
-
-require 'vagrant/ansible_auto/inventory'
-
-describe VagrantPlugins::AnsibleAuto::Inventory do
-  subject { described_class.new }
-
-  # include_context 'machine'
-
-  describe '#add_group' do
-    it 'adds a list of hosts to the group cache' do
-      subject.add_group(:mygroup, 'db', 'bastion', 'firewall')
-      subject.groups.tap do |groups|
-        expect(groups).to have_key("mygroup")
-        expect(groups["mygroup"]).to include('db', 'bastion', 'firewall')
-      end
-    end
-
-    it 'appends new hosts to existing groups' do
-      subject.add_group(:mygroup, 'db', 'bastion', 'firewall')
-      subject.add_group(:mygroup, 'repo')
-      subject.groups.tap do |groups|
-        expect(groups).to have_key("mygroup")
-        expect(groups["mygroup"]).to include('db', 'bastion', 'firewall', 'repo')
-      end
-    end
-  end
-
-  describe '#add_host' do
-    include_context 'host'
-
-    it 'adds a host to the host cache' do
-      subject.add_host(host)
-      expect(subject.hosts).to include(host)
-    end
-
-    it 'does not allow duplicates' do
-      2.times { subject.add_host(host) }
-      expect(subject.hosts).to have(1).items
-    end
-
-    it 'coerces instances of Vagrant::Machine to instances of Host' do
-      subject.add_host(machine)
-      expect(subject.hosts).to all(be_a(VagrantPlugins::AnsibleAuto::Host))
-    end
-
-    it 'coerces names + hostvars to instances of Host' do
-      subject.add_host("mymachine", ansible_ssh_host: 'foo.bar.net')
-    end
-  end
-
-  describe '#groups=' do
-    it 'returns a hash of sets' do
-      expect(subject.groups).to be_a(Hash)
-      expect(subject.groups[:foo]).to be_a(Set)
-    end
-  end
-
-  describe '#hosts=' do
-    it 'returns a set' do
-      expect(subject.hosts).to be_a(Set)
-    end
-  end
-
-  describe '#vars=' do
-    it 'returns a hash of hashes' do
-      expect(subject.vars).to be_a(Hash)
-      expect(subject.vars[:meh]).to be_a(Hash)
-    end
-  end
-
-  describe '#children=' do
-    it 'returns a hash of sets' do
-      expect(subject.children).to be_a(Hash)
-      expect(subject.children[:quux]).to be_a(Set)
-    end
-  end
-end