tnargav 1.2.2 → 1.2.3

data/plugins/provisioners/puppet/provisioner/puppet.rb

@@ -19,12 +19,12 @@ module VagrantPlugins
           root_path = @machine.env.root_path
           @expanded_manifests_path = @config.expanded_manifests_path(root_path)
           @expanded_module_paths   = @config.expanded_module_paths(root_path)
-          @manifest_file           = @config.manifest_file
+          @manifest_file           = File.join(manifests_guest_path, @config.manifest_file)
 
           # Setup the module paths
           @module_paths = []
           @expanded_module_paths.each_with_index do |path, i|
-            @module_paths << [path, File.join(config.pp_path, "modules-#{i}")]
+            @module_paths << [path, File.join(config.temp_dir, "modules-#{i}")]
           end
 
           # Share the manifests directory with the guest
@@ -52,11 +52,26 @@ module VagrantPlugins
 
           # Verify Puppet is installed and run it
           verify_binary("puppet")
+
+          # Make sure the temporary directory is properly set up
+          @machine.communicate.tap do |comm|
+            comm.sudo("mkdir -p #{config.temp_dir}")
+            comm.sudo("chmod 0777 #{config.temp_dir}")
+          end
+
+          # Upload Hiera configuration if we have it
+          @hiera_config_path = nil
+          if config.hiera_config_path
+            local_hiera_path   = File.expand_path(config.hiera_config_path, @machine.env.root_path)
+            @hiera_config_path = File.join(config.temp_dir, "hiera.yaml")
+            @machine.communicate.upload(local_hiera_path, @hiera_config_path)
+          end
+
           run_puppet_apply
         end
 
         def manifests_guest_path
-          File.join(config.pp_path, "manifests")
+          File.join(config.temp_dir, "manifests")
         end
 
         def verify_binary(binary)
@@ -78,6 +93,11 @@ module VagrantPlugins
             options << "--modulepath '#{module_paths.join(':')}'"
           end
 
+          if @hiera_config_path
+            options << "--hiera_config=#{@hiera_config_path}"
+          end
+
+          options << "--detailed-exitcodes"
           options << @manifest_file
           options = options.join(" ")
 
@@ -92,10 +112,13 @@ module VagrantPlugins
             facter = "#{facts.join(" ")} "
           end
 
-          command = "cd #{manifests_guest_path} && #{facter}puppet apply #{options} --detailed-exitcodes || [ $? -eq 2 ]"
+          command = "#{facter}puppet apply #{options} || [ $? -eq 2 ]"
+          if config.working_directory
+            command = "cd #{config.working_directory} && #{command}"
+          end
 
           @machine.env.ui.info I18n.t("vagrant.provisioners.puppet.running_puppet",
-                                      :manifest => @manifest_file)
+                                      :manifest => config.manifest_file)
 
           @machine.communicate.sudo(command) do |type, data|
             data.chomp!

data/templates/commands/init/Vagrantfile.erb

@@ -27,6 +27,10 @@ Vagrant.configure("2") do |config|
   # your network.
   # config.vm.network :public_network
 
+  # If true, then any SSH connections made will enable agent forwarding.
+  # Default value: false
+  # config.ssh.forward_agent = true
+
   # Share an additional folder to the guest VM. The first argument is
   # the path on the host to the actual folder. The second argument is
   # the path on the guest to mount the folder. And the optional third

data/templates/guests/arch/network_dhcp.erb

@@ -1,4 +1,4 @@
-CONNECTION='ethernet'
-DESCRIPTION='A basic dhcp ethernet connection'
-INTERFACE='eth<%= options[:interface] %>'
-IP='dhcp'
+Description='A basic dhcp ethernet connection'
+Interface=eth<%= options[:interface] %>
+Connection=ethernet
+IP=dhcp

data/templates/guests/arch/network_static.erb

@@ -1,6 +1,5 @@
-CONNECTION='ethernet'
-DESCRIPTION='A basic static ethernet connection'
-INTERFACE='eth<%= options[:interface] %>'
-IP='static'
-ADDR='<%= options[:ip]%>'
-NETMASK='<%= options[:netmask] %>'
+Connection=ethernet
+Description='A basic static ethernet connection'
+Interface=eth<%= options[:interface] %>
+IP=static
+Address=('<%= options[:ip]%>/24')

data/templates/locales/en.yml

@@ -167,6 +167,14 @@ en:
         available below.
 
         %{help}
+      command_unavailable: |-
+        The executable '%(file)' Vagrant is trying to run was not
+        found in the PATH variable. This is an error. Please verify
+        this software is installed and on the path.
+      command_unavailable_windows: |-
+        The executable '%(file)' Vagrant is trying to run was not
+        found in the %PATH% variable. This is an error. Please verify
+        this software is installed and on the path.
       config_invalid: |-
         There are errors in the configuration of this machine. Please fix
         the following errors and try again:
@@ -418,6 +426,10 @@ en:
         usually indicates that SSH within the guest machine was unable to
         properly start up. Please boot the VM in GUI mode to check whether
         it is booting properly.
+      ssh_no_route: |-
+        While attempting to connect with SSH, a "no route to host" (EHOSTUNREACH)
+        error was received. Please verify your network settings are correct
+        and try again.
       ssh_host_down: |-
         While attempting to connect with SSH, a "host is down" (EHOSTDOWN)
         error was received. Please verify your SSH settings are correct
@@ -528,8 +540,8 @@ en:
         %{supported_versions}
       virtualbox_kernel_module_not_loaded: |-
         VirtualBox is complaining that the kernel module is not loaded. Please
-        run `VBoxManage --version` to see the error message which should contain
-        instructions on how to fix this error.
+        run `VBoxManage --version` or open the VirtualBox GUI to see the error
+        message which should contain instructions on how to fix this error.
       virtualbox_install_incomplete: |-
         VirtualBox is complaining that the installation is incomplete. Please
         run `VBoxManage --version` to see the error message which should contain
@@ -597,8 +609,6 @@ en:
         network_invalid: |-
           The network type '%{type}' is not valid. Please use
           'hostonly' or 'bridged'.
-        network_ip_required: |-
-          Host only networks require an IP as an argument.
         network_ip_invalid: |-
           The host only network IP '%{ip}' is invalid.
         network_ip_ends_one: |-
@@ -613,6 +623,8 @@ en:
         nfs_requires_host: |-
           Using NFS shared folders requires a host to be specified
           using `config.vagrant.host`.
+        network_ip_required: |-
+          An IP is required for a private network.
         network_fp_host_not_unique: |-
           Forwarded port '%{host}' (host port) is declared multiple times
         network_fp_requires_ports: |-

data/templates/provisioners/chef_solo/solo.erb

@@ -3,7 +3,9 @@ node_name "<%= node_name %>"
 <% end %>
 file_cache_path "<%= provisioning_path %>"
 cookbook_path <%= cookbooks_path.inspect %>
+<% if roles_path %>
 role_path <%= roles_path.inspect %>
+<% end %>
 log_level <%= log_level.inspect %>
 
 encrypted_data_bag_secret "<%= encrypted_data_bag_secret %>"

data/test/unit/vagrant/guest_test.rb

@@ -10,6 +10,9 @@ describe Vagrant::Guest do
   let(:machine) do
     double("machine").tap do |m|
       m.stub(:inspect => "machine")
+      m.stub(:config => double("config"))
+      m.config.stub(:vm => double("vm_config"))
+      m.config.vm.stub(:guest => nil)
     end
   end
 
@@ -143,6 +146,16 @@ describe Vagrant::Guest do
       subject.chain.map { |x| x[1] }.map(&:name).should == [:baz, :bar, :foo]
     end
 
+    it "detects the forced guest setting" do
+      register_guest(:foo, nil, false)
+      register_guest(:bar, nil, false)
+
+      machine.config.vm.stub(:guest => :bar)
+
+      subject.detect!
+      subject.name.should == :bar
+    end
+
     it "raises an exception if no guest can be detected" do
       expect { subject.detect! }.
         to raise_error(Vagrant::Errors::GuestNotDetected)

data/tnargav.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.add_dependency "childprocess", "~> 0.3.7"
   s.add_dependency "erubis", "~> 2.7.0"
   s.add_dependency "i18n", "~> 0.6.0"
-  s.add_dependency "json", ">= 1.5.1", "< 1.8.0"
   s.add_dependency "log4r", "~> 1.1.9"
   s.add_dependency "net-ssh", "~> 2.6.6"
   s.add_dependency "net-scp", "~> 1.1.0"

data/vagrant.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.add_dependency "childprocess", "~> 0.3.7"
   s.add_dependency "erubis", "~> 2.7.0"
   s.add_dependency "i18n", "~> 0.6.0"
-  s.add_dependency "json", ">= 1.5.1", "< 1.8.0"
   s.add_dependency "log4r", "~> 1.1.9"
   s.add_dependency "net-ssh", "~> 2.6.6"
   s.add_dependency "net-scp", "~> 1.1.0"

data/vendor/bundle/ruby/1.9.1/bin/autospec

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'rspec-core' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'rspec-core', version
+load Gem.bin_path('rspec-core', 'autospec', version)

data/vendor/bundle/ruby/1.9.1/bin/erubis

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'erubis' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'erubis', version
+load Gem.bin_path('erubis', 'erubis', version)

data/vendor/bundle/ruby/1.9.1/bin/htmldiff

@@ -0,0 +1,25 @@
+#!/bin/sh
+'exec' "ruby" '-x' "$0" "$@"
+#!/Users/davidnghiem/.yarvm/.rvm/rubies/ruby-1.9.3-p429/bin/ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'diff-lcs' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'diff-lcs', version
+load Gem.bin_path('diff-lcs', 'htmldiff', version)

data/vendor/bundle/ruby/1.9.1/bin/ldiff

@@ -0,0 +1,25 @@
+#!/bin/sh
+'exec' "ruby" '-x' "$0" "$@"
+#!/Users/davidnghiem/.yarvm/.rvm/rubies/ruby-1.9.3-p429/bin/ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'diff-lcs' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'diff-lcs', version
+load Gem.bin_path('diff-lcs', 'ldiff', version)

data/vendor/bundle/ruby/1.9.1/bin/rake

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'rake', version
+load Gem.bin_path('rake', 'rake', version)

data/vendor/bundle/ruby/1.9.1/bin/rspec

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'rspec-core' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'rspec-core', version
+load Gem.bin_path('rspec-core', 'rspec', version)

data/vendor/bundle/ruby/1.9.1/bin/vagrant

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'tnargav' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'tnargav', version
+load Gem.bin_path('tnargav', 'vagrant', version)

data/vendor/bundle/ruby/1.9.1/gems/childprocess-0.3.9/.document

@@ -0,0 +1,6 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+-
+LICENSE

data/vendor/bundle/ruby/1.9.1/gems/childprocess-0.3.9/.gitignore

@@ -0,0 +1,23 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+.rbx
+Gemfile.lock
+
+## PROJECT::SPECIFIC

data/vendor/bundle/ruby/1.9.1/gems/childprocess-0.3.9/.rspec

@@ -0,0 +1 @@
+--color

data/vendor/bundle/ruby/1.9.1/gems/childprocess-0.3.9/.travis.yml

@@ -0,0 +1,16 @@
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - jruby
+  - rbx
+  - 2.0.0
+  - ruby-head
+env:
+  - CHILDPROCESS_POSIX_SPAWN=true
+  - CHILDPROCESS_POSIX_SPAWN=false
+matrix:
+  allow_failures:
+    - rvm: jruby
+      env: CHILDPROCESS_POSIX_SPAWN=true
+    - rvm: rbx
+      env: CHILDPROCESS_POSIX_SPAWN=true

data/vendor/bundle/ruby/1.9.1/gems/childprocess-0.3.9/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in child_process.gemspec
+gemspec

data/vendor/bundle/ruby/1.9.1/gems/childprocess-0.3.9/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010-2013 Jari Bakken
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/vendor/bundle/ruby/1.9.1/gems/childprocess-0.3.9/README.md

@@ -0,0 +1,150 @@
+# childprocess
+
+This gem aims at being a simple and reliable solution for controlling
+external programs running in the background on any Ruby / OS combination.
+
+The code originated in the [selenium-webdriver](https://rubygems.org/gems/selenium-webdriver) gem, but should prove useful as
+a standalone library.
+
+[![Build Status](https://secure.travis-ci.org/jarib/childprocess.png)](http://travis-ci.org/jarib/childprocess)
+
+# Usage
+
+The object returned from `ChildProcess.build` will implement `ChildProcess::AbstractProcess`.
+
+### Basic examples
+
+```ruby
+process = ChildProcess.build("ruby", "-e", "sleep")
+
+# inherit stdout/stderr from parent...
+process.io.inherit!
+
+# ...or pass an IO
+process.io.stdout = Tempfile.new("child-output")
+
+# modify the environment for the child
+process.environment["a"] = "b"
+process.environment["c"] = nil
+
+# set the child's working directory
+process.cwd = '/some/path'
+
+# start the process
+process.start
+
+# check process status
+process.alive?    #=> true
+process.exited?   #=> false
+
+# wait indefinitely for process to exit...
+process.wait
+process.exited?   #=> true
+
+# get the exit code
+process.exit_code #=> 0
+
+# ...or poll for exit + force quit
+begin
+  process.poll_for_exit(10)
+rescue ChildProcess::TimeoutError
+  process.stop # tries increasingly harsher methods to kill the process.
+end
+```
+
+### Advanced examples
+
+#### Output to pipe
+
+```ruby
+r, w = IO.pipe
+
+proc = ChildProcess.build("echo", "foo")
+proc.io.stdout = proc.io.stderr = w
+proc.start
+w.close
+
+begin
+  loop { print r.readpartial(8192) }
+rescue EOFError
+end
+
+proc.wait
+```
+
+Note that if you just want to get the output of a command, the backtick method on Kernel may be a better fit.
+
+#### Write to stdin
+
+```ruby
+process = ChildProcess.build("cat")
+
+out      = Tempfile.new("duplex")
+out.sync = true
+
+process.io.stdout = process.io.stderr = out
+process.duplex    = true # sets up pipe so process.io.stdin will be available after .start
+
+process.start
+process.io.stdin.puts "hello world"
+process.io.stdin.close
+
+process.poll_for_exit(exit_timeout_in_seconds)
+
+out.rewind
+out.read #=> "hello world\n"
+```
+
+#### Pipe output to another ChildProcess
+
+```ruby
+search           = ChildProcess.build("grep", '-E', %w(redis memcached).join('|'))
+search.duplex    = true # sets up pipe so search.io.stdin will be available after .start
+search.io.stdout = $stdout
+search.start
+
+listing           = ChildProcess.build("ps", "aux")
+listing.io.stdout = search.io.stdin
+listing.start
+listing.wait
+
+search.io.stdin.close
+search.wait
+```
+
+#### Prefer posix_spawn on *nix
+
+If the parent process is using a lot of memory, `fork+exec` can be very expensive. The `posix_spawn()` API removes this overhead.
+
+```ruby
+ChildProcess.posix_spawn = true
+process = ChildProcess.build(*args)
+```
+
+#### Detach from parent
+
+```ruby
+process = ChildProcess.build("sleep", "10")
+process.detach = true
+process.start
+```
+
+# Implementation
+
+How the process is launched and killed depends on the platform:
+
+* Unix     : `fork + exec` (or `posix_spawn` if enabled)
+* Windows  : `CreateProcess()` and friends
+* JRuby    : `java.lang.{Process,ProcessBuilder}`
+
+# Note on Patches/Pull Requests
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a future version unintentionally.
+* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+# Copyright
+
+Copyright (c) 2010-2013 Jari Bakken. See LICENSE for details.

data/vendor/bundle/ruby/1.9.1/gems/childprocess-0.3.9/Rakefile

@@ -0,0 +1,61 @@
+require 'rubygems'
+require 'rake'
+require 'tmpdir'
+
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+include Rake::DSL if defined?(::Rake::DSL)
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.ruby_opts  = "-I lib:spec"
+  spec.pattern    = 'spec/**/*_spec.rb'
+end
+
+desc 'Run specs for rcov'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.ruby_opts = "-I lib:spec"
+  spec.pattern   = 'spec/**/*_spec.rb'
+  spec.rcov      = true
+  spec.rcov_opts = %w[--exclude spec,ruby-debug,/Library/Ruby,.gem --include lib/childprocess]
+end
+
+task :default => :spec
+
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new
+rescue LoadError
+  task :yardoc do
+    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
+  end
+end
+
+task :clean do
+  rm_rf "pkg"
+  rm_rf "childprocess.jar"
+end
+
+desc 'Create jar to bundle in selenium-webdriver'
+task :jar => [:clean, :build] do
+  tmpdir = Dir.mktmpdir("childprocess-jar")
+  gem_to_package = Dir['pkg/*.gem'].first
+  gem_name = File.basename(gem_to_package, ".gem")
+  p :gem_to_package => gem_to_package, :gem_name => gem_name
+
+  sh "gem install -i #{tmpdir} #{gem_to_package} --ignore-dependencies --no-rdoc --no-ri"
+  sh "jar cf childprocess.jar -C #{tmpdir}/gems/#{gem_name}/lib ."
+  sh "jar tf childprocess.jar"
+end
+
+task :env do
+  $:.unshift File.expand_path("../lib", __FILE__)
+  require 'childprocess'
+end
+
+desc 'Calculate size of posix_spawn structs for the current platform'
+task :generate => :env do
+  require 'childprocess/tools/generator'
+  ChildProcess::Tools::Generator.generate
+end