vagrant-flow 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92db8f3c803af815f86d35449631d5e9970063bd
-  data.tar.gz: 0cc86fd855e718068bdb3ea9f331a0358ea8a1c9
+  metadata.gz: 401cee25b17f0b8597e4b5d48158c123c11a0ea1
+  data.tar.gz: dbe23f829c09483393347486d5523f3a56d5a363
 SHA512:
-  metadata.gz: 68d24fb420d824b7d1813d434c4e6e92e75d4580827fc5d9b190f06c15c8442b8feea31dc4342f84b52a1155a8033a9ca3c376abc5735fae3120d5894a833758
-  data.tar.gz: 30603ad22a32e7fec26408ccbd78aaeedb09199d56fdc1152f54466fd24d15ef4c45258cf6a33fbb237fb6d96ab8fc6c90feccce5b4fd8756c379416982a76c8
+  metadata.gz: fb1a3db4d14ae50e54b89a44bce09e4b9dda4904e5892613031624d31c9a098d7780df3c762c3deb43a20640178c2346e85a909aed983f4b8c7eb18191112bd7
+  data.tar.gz: fd7c34424f9dd1579f155dffce8393b5457988517c28ccc2fea3801dd4f074e9adcc5e3bfc322e2e31af9bb7655fa80a9c44acf3269029bd70fc9dd987aed77e

data/Gemfile

@@ -6,5 +6,7 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+
+  # Can use for testing
+  # gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
 end

data/README.md

@@ -2,8 +2,14 @@
 
 Vagrant Plugin allows for a better ansible flow also generates ansible inventory files, and runs playbooks
 
+
 ## Installation
 
+`vagrant plugin install vagrant-flow`
+
+
+Below is how to install as a regular gem which won't work
+
 Add this line to your application's Gemfile:
 
     gem 'vagrant-flow'
@@ -18,7 +24,7 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+`vagrant ansible-inventory`
 
 ## Contributing
 
@@ -29,6 +35,38 @@ TODO: Write usage instructions here
 5. Create new Pull Request
 
 
+## Development Flow
+
+```
+# cd to vagrant-flow
+
+# build the plugin
+
+rake build
+
+# install the plugin locally
+
+vagrant plugin install pkg/vagrant-flow-1.0.3.gem
+
+#
+# use it and test
+#
+
+vagrant plugin uninstall vagrant-flow
+
+
+#
+# when done testing and ready to publish
+#
+
+rake release
+
+
+# install for real from the repo
+
+vagrant plugin vagrant-flow
+```
+
 # Background Research
 
 Vagrant Plugin List
@@ -54,4 +92,4 @@ rake build                 # It's a helper that will build your gem
 rake install               # It's a helper that will build and install locally
 rake release               # It's a helper that will push/release to rubygems
 
-```
+```

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'bundler'
-# require 'bundler/setup'    # Was in the example
+require 'bundler/setup'    # Was in the example
 require 'bundler/gem_tasks'  # Was in the template version
 
 # Immediately sync all stdout so that tools like buildbot can

data/lib/vagrant-flow/command.rb

@@ -30,16 +30,16 @@ module VagrantPlugins
           o.separator ""
 
           # Don't use either of these, just keeping them here as examples of what options are possible 
-          o.on("--provision-with x,y,z", Array,
-                  "Enable only certain provisioners, by type.") do |list|
-            options[:provision_types] = list.map { |type| type.to_sym }
-          end
+          #o.on("--provision-with x,y,z", Array,
+          #        "Enable only certain provisioners, by type.") do |list|
+          #  options[:provision_types] = list.map { |type| type.to_sym }
+          #end
           
           # This option isn't used.
-          o.on("--[no-]parallel",
-               "Enable or disable parallelism if provider supports it.") do |parallel|
-            options[:parallel] = parallel
-          end
+          #o.on("--[no-]parallel",
+          #     "Enable or disable parallelism if provider supports it.") do |parallel|
+          #  options[:parallel] = parallel
+          #end
 
         end
 
@@ -57,22 +57,9 @@ module VagrantPlugins
         # Go over each VM and bring it up
         @logger.debug("'ansible-inventory' created for the whole env")
 
-        # Example from the up command
-        
-        # Build up the batch job of what we'll do
-        # @env.batch(options[:parallel]) do |batch|
-        #   with_target_vms(argv, :provider => options[:provider]) do |machine|
-        #     @env.ui.info(I18n.t(
-        #       "vagrant.commands.up.upping",
-        #       :name => machine.name,
-        #       :provider => machine.provider_name))
-        # 
-        #     batch.action(machine, :up, options)
-        #   end
-        # end
-        
         
         
+        provisioners = {}
         with_target_vms(argv, :provider => options[:provider]) do |machine|
           # @env.ui
           # output methods: :ask, :detail, :warn, :error, :info, :output, :success
@@ -90,15 +77,10 @@ module VagrantPlugins
             :forward_agent => ssh_info[:forward_agent],
             :forward_x11   => ssh_info[:forward_x11]
           }
-          
           # Outputs to the stdout
-          # @env.ui.info(machine.name)
-          
-          # From - Vagrant::Util::SafePuts
-          # Template is erb
           
-          # Implementation picks the first key
-          # ssh_info[:private_key_path] returns an array
+          #The provisioning information from teh vagrant file, this will contain our defined ansible groups
+          provisioners = machine.config.vm.provisioners
           
           inventory_configs = {
             :vagrant_file_dir => machine.env.root_path,
@@ -106,108 +88,72 @@ module VagrantPlugins
           }
           
           machines_configs[variables[:host_key]]= variables
-          
-          # ansible_template = '<%= host_key %> ansible_ssh_host=<%= ssh_host %> ansible_ssh_port=<%= ssh_port %> ansible_ssh_user=<%= ssh_user %> ansible_ssh_private_key_file=<%= private_key_path[0] %> # Machine Name: <%= host_key %>'
-          # safe_puts(Vagrant::Util::TemplateRenderer.render_string(ansible_template, variables))
-
         end
         
+        
+        # Outputs to the stdout
+        # @env.ui.info(machine.name)
+        
+        # From - Vagrant::Util::SafePuts
+        # Template is erb
+        
+        # Implementation picks the first key
+        # ssh_info[:private_key_path] returns an array
+ 
+        #outputs is going to contain our strings that are the formatted ansible configs
+        #the key will be the vm name, the value will the be formatted sring
+        outputs = {}
+        
         inventory_configs[:vagrant_flow_file].open('w') do |file|
-          header_txt="# Generated by vagrant-flow, part of NeverwinterDP\n\n"
-          safe_puts(header_txt)
-          file.write(header_txt)
           machines_configs.each do |host, variables|
             ansible_template = '<%= host_key %> ansible_ssh_host=<%= ssh_host %> ansible_ssh_port=<%= ssh_port %> ansible_ssh_user=<%= ssh_user %> ansible_ssh_private_key_file=<%= private_key_path[0] %> # Machine Name: <%= host_key %>'
-            host_txt=Vagrant::Util::TemplateRenderer.render_string(ansible_template, variables)
-            safe_puts(host_txt)
-            file.write("#{host_txt}\n")
+            outputs[variables[:host_key]] = Vagrant::Util::TemplateRenderer.render_string(ansible_template, variables)
+            #safe_puts(host_txt)
+            #file.write("#{host_txt}\n")
           end
         end
         
-        # Test writing the the path variables out.
-        # safe_puts("vagrant_file_dir: #{inventory_configs[:vagrant_file_dir]}")
-        # safe_puts("vagrant_flow_file: #{inventory_configs[:vagrant_flow_file]}")
-        
-        
-        
-        # Give it machine from with_target_vms
-        # def setup_inventory_file(machine)
-        #   return config.inventory_path if config.inventory_path
-        # 
-        #   ssh = machine.ssh_info
-        # 
-        #   generated_inventory_file =
-        #     machine.env.root_path.join("vagrant_ansible_inventory_#{machine.name}")
-        # 
-        #   generated_inventory_file.open('w') do |file|
-        #     file.write("# Generated by Vagrant\n\n")
-        #     file.write("#{machine.name} ansible_ssh_host=#{ssh[:host]} ansible_ssh_port=#{ssh[:port]}\n")
-        # 
-        #     # Write out groups information.  Only include current
-        #     # machine and its groups to avoid Ansible errors on
-        #     # provisioning.
-        #     groups_of_groups = {}
-        #     included_groups = []
-        # 
-        #     config.groups.each_pair do |gname, gmembers|
-        #       if gname.end_with?(":children")
-        #         groups_of_groups[gname] = gmembers
-        #       elsif gmembers.include?("#{machine.name}")
-        #         included_groups << gname
-        #         file.write("\n[#{gname}]\n")
-        #         file.write("#{machine.name}\n")
-        #       end
-        #     end
-        # 
-        #     groups_of_groups.each_pair do |gname, gmembers|
-        #       unless (included_groups & gmembers).empty?
-        #         file.write("\n[#{gname}]\n")
-        #         gmembers.each do |gm|
-        #           file.write("#{gm}\n") if included_groups.include?(gm)
-        #         end
-        #       end
-        #     end
-        #   end
-        # 
-        #   return generated_inventory_file.to_s
-        # end
-        
-        # Documentation Ahead is from:
-        # http://docs.ansible.com/intro_inventory.html
-        
-        # ansible_ssh_host
-        #   The name of the host to connect to, if different from the alias you wish to give to it.
-        # ansible_ssh_port
-        #   The ssh port number, if not 22
-        # ansible_ssh_user
-        #   The default ssh user name to use.
-        # ansible_ssh_pass
-        #   The ssh password to use (this is insecure, we strongly recommend using --ask-pass or SSH keys)
-        # ansible_sudo_pass
-        #   The sudo password to use (this is insecure, we strongly recommend using --ask-sudo-pass)
-        # ansible_connection
-        #   Connection type of the host. Candidates are local, ssh or paramiko.  The default is paramiko before Ansible 1.2, and 'smart' afterwards which detects whether usage of 'ssh' would be feasible based on whether ControlPersist is supported.
-        # ansible_ssh_private_key_file
-        #   Private key file used by ssh.  Useful if using multiple keys and you don't want to use SSH agent.
-        # ansible_python_interpreter
-        #   The target host python path. This is useful for systems with more
-        #   than one Python or not located at "/usr/bin/python" such as \*BSD, or where /usr/bin/python
-        #   is not a 2.X series Python.  We do not use the "/usr/bin/env" mechanism as that requires the remote user's
-        #   path to be set right and also assumes the "python" executable is named python, where the executable might
-        #   be named something like "python26".
-        # ansible\_\*\_interpreter
-        #   Works for anything such as ruby or perl and works just like ansible_python_interpreter.
-        #   This replaces shebang of modules which will run on that host.
-        
-        
-        # Success, exit status 0
-        
-        
+        #require 'pp'
+        #puts "PROVISIONERS"
+        #PP.pp(provisioners)
+        #puts "OUTPUTS"
+        #PP.pp(outputs)
+        #puts "\n\n"
         
+        inventory_configs[:vagrant_flow_file].open('w') do |file|
+          header_txt="# Generated by vagrant-flow, part of NeverwinterDP\n\n"
+          safe_puts(header_txt)
+          file.write(header_txt)
+          
+          #Now we maps from our VAGRANTFILE defined groups in our provisioners.config.groups
+          #To our configuration strings we got from outputs
+          provisioners.each do |prov|
+            prov.config.groups.each do |groupname,machines|
+              puts "["+groupname+"]\n"
+              file.write "["+groupname+"]\n"
+              machines.each do |machinename|
+                #if we match :children, then we have an ansible config that's
+                #pointing to another group, not a specific machine
+                if /:children/.match(groupname)
+                  puts machinename
+                  file.write machinename+"\n"
+                else
+                  puts outputs[machinename.to_sym]+"\n"
+                  file.write outputs[machinename.to_sym]+"\n"
+                end
+              end
+              puts "\n"
+              file.write "\n"
+            end    
+          end          
+        end
         0
       end # End Execute
       
       
+      # Documentation reference
+      # http://docs.ansible.com/intro_inventory.html
+      
       def setup_inventory_file(machine)
         return machine.config.inventory_path if machine.config.inventory_path
 

data/lib/vagrant-flow/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantFlow
-    VERSION = "1.0.2"
+    VERSION = "1.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-flow
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Steve Morin