tnargav 1.2.3 → 1.3.3

data/test/unit/vagrant/cli_test.rb

@@ -8,6 +8,7 @@ describe Vagrant::CLI do
       ui = double("UI::Silent")
       ui.stub(:info => "bar")
       env = double("Vagrant::Environment")
+      env.stub(:active_machines => [])
       env.stub(:ui => ui)
       env.stub(:root_path => "foo")
       env.stub(:machine_names => [])

data/test/unit/vagrant/config/v2/root_test.rb

@@ -41,6 +41,24 @@ describe Vagrant::Config::V2::Root do
     }
   end
 
+  describe "finalization" do
+    it "should finalize un-used keys" do
+      foo_class = Class.new do
+        attr_accessor :foo
+
+        def finalize!
+          @foo = "SET"
+        end
+      end
+
+      map = { :foo => foo_class }
+      instance = described_class.new(map)
+      instance.finalize!
+
+      instance.foo.foo.should == "SET"
+    end
+  end
+
   describe "validation" do
     let(:instance) do
       map = { :foo => Object, :bar => Object }

data/test/unit/vagrant/environment_test.rb

@@ -581,6 +581,31 @@ VF
       machine.config.ssh.port.should == 100
     end
 
+    it "should load the box configuration for a V2 box and custom Vagrantfile name" do
+      register_provider("foo")
+
+      environment = isolated_environment do |env|
+        env.file("some_other_name", <<-VF)
+Vagrant.configure("2") do |config|
+  config.vm.box = "base"
+end
+VF
+
+        env.box2("base", :foo, :vagrantfile => <<-VF)
+Vagrant.configure("2") do |config|
+  config.ssh.port = 100
+end
+VF
+      end
+
+      env = with_temp_env("VAGRANT_VAGRANTFILE" => "some_other_name") do
+        environment.create_vagrant_env
+      end
+
+      machine = env.machine(:default, :foo)
+      machine.config.ssh.port.should == 100
+    end
+
     it "should load the box configuration for other formats for a V2 box" do
       register_provider("foo", nil, box_format: "bar")
 

data/test/unit/vagrant/util/downloader_test.rb

@@ -21,12 +21,14 @@ describe Vagrant::Util::Downloader do
   end
 
   describe "#download!" do
+    let(:curl_options) {
+      ["--fail", "--location", "--max-redirs", "10", "--user-agent", described_class::USER_AGENT, "--output", destination, source, {}]
+    }
+
     context "with a good exit status" do
       let(:exit_code) { 0 }
 
       it "downloads the file and returns true" do
-        curl_options = ["--fail", "--location", "--max-redirs", "10", "--output", destination, source, {}]
-
         Vagrant::Util::Subprocess.should_receive(:execute).
           with("curl", *curl_options).
           and_return(subprocess_result)
@@ -39,8 +41,6 @@ describe Vagrant::Util::Downloader do
       let(:exit_code) { 1 }
 
       it "raises an exception" do
-        curl_options = ["--fail", "--location", "--max-redirs", "10", "--output", destination, source, {}]
-
         Vagrant::Util::Subprocess.should_receive(:execute).
           with("curl", *curl_options).
           and_return(subprocess_result)

data/test/unit/vagrant_test.rb

@@ -53,4 +53,22 @@ describe Vagrant do
         to raise_error(Vagrant::Errors::PluginLoadFailed)
     end
   end
+
+  describe "has_plugin?" do
+    after(:each) do
+      described_class.plugin('2').manager.reset!
+    end
+
+    it "should return true if the plugin is installed" do
+      plugin = Class.new(described_class.plugin('2')) do
+        name "i_am_installed"
+      end
+
+      described_class.has_plugin?("i_am_installed").should be_true
+    end
+
+    it "should return false if the plugin is not installed" do
+      described_class.has_plugin?("i_dont_exist").should be_false
+    end
+  end
 end

data/website/docs/.buildpacks

@@ -0,0 +1,2 @@
+https://github.com/heroku/heroku-buildpack-ruby.git
+https://github.com/hashicorp/heroku-buildpack-middleman.git

data/website/docs/Gemfile

@@ -0,0 +1,13 @@
+source "https://rubygems.org"
+
+gem "less", "~> 2.2.2"
+gem "middleman", "~> 3.0.6"
+gem "middleman-minify-html", "~> 3.0.0"
+gem "rack-contrib", "~> 1.1.0"
+gem "redcarpet", "~> 2.2.2"
+gem "therubyracer", "~> 0.12.0"
+gem "thin", "~> 1.5.0"
+
+group :development do
+  gem "highline", "~> 1.6.15"
+end

data/website/docs/Gemfile.lock

@@ -0,0 +1,141 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    POpen4 (0.1.4)
+      Platform (>= 0.4.0)
+      open4
+    Platform (0.4.0)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    chunky_png (1.2.8)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.3.3)
+    commonjs (0.2.7)
+    compass (0.12.2)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
+    daemons (1.1.9)
+    eventmachine (1.0.3)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    fssm (0.2.10)
+    haml (4.0.3)
+      tilt
+    highline (1.6.19)
+    hike (1.2.3)
+    htmlcompressor (0.0.7)
+      yui-compressor (~> 0.9.6)
+    http_router (0.10.2)
+      rack (>= 1.0.0)
+      url_mount (~> 0.2.1)
+    i18n (0.6.1)
+    less (2.2.2)
+      commonjs (~> 0.2.6)
+    libv8 (3.16.14.3)
+    listen (0.7.3)
+    maruku (0.6.1)
+      syntax (>= 1.0.0)
+    middleman (3.0.14)
+      middleman-core (= 3.0.14)
+      middleman-more (= 3.0.14)
+      middleman-sprockets (~> 3.1.0)
+    middleman-core (3.0.14)
+      activesupport (~> 3.2.6)
+      bundler (~> 1.1)
+      listen (~> 0.7.3)
+      rack (~> 1.4.1)
+      rack-test (~> 0.6.1)
+      rb-fsevent (~> 0.9.3)
+      thor (~> 0.15.4)
+      tilt (~> 1.3.6)
+    middleman-minify-html (3.0.0)
+      htmlcompressor
+      middleman-core (~> 3.0.0)
+    middleman-more (3.0.14)
+      coffee-script (~> 2.2.0)
+      coffee-script-source (~> 1.3.3)
+      compass (>= 0.12.2)
+      execjs (~> 1.4.0)
+      haml (>= 3.1.6)
+      i18n (~> 0.6.0, < 0.6.2)
+      maruku (~> 0.6.0)
+      middleman-core (= 3.0.14)
+      padrino-helpers (= 0.10.7)
+      sass (>= 3.1.20)
+      uglifier (~> 1.2.6)
+    middleman-sprockets (3.1.4)
+      middleman-core (>= 3.0.14)
+      middleman-more (>= 3.0.14)
+      sprockets (~> 2.1)
+      sprockets-helpers (~> 1.0.0)
+      sprockets-sass (~> 1.0.0)
+    multi_json (1.8.0)
+    open4 (1.3.0)
+    padrino-core (0.10.7)
+      activesupport (~> 3.2.0)
+      http_router (~> 0.10.2)
+      sinatra (~> 1.3.1)
+      thor (~> 0.15.2)
+      tilt (~> 1.3.0)
+    padrino-helpers (0.10.7)
+      i18n (~> 0.6)
+      padrino-core (= 0.10.7)
+    rack (1.4.5)
+    rack-contrib (1.1.0)
+      rack (>= 0.9.1)
+    rack-protection (1.5.0)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rb-fsevent (0.9.3)
+    redcarpet (2.2.2)
+    ref (1.0.5)
+    sass (3.2.10)
+    sinatra (1.3.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
+    sprockets (2.10.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-helpers (1.0.1)
+      sprockets (~> 2.0)
+    sprockets-sass (1.0.1)
+      sprockets (~> 2.0)
+      tilt (~> 1.1)
+    syntax (1.0.0)
+    therubyracer (0.12.0)
+      libv8 (~> 3.16.14.0)
+      ref
+    thin (1.5.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+    thor (0.15.4)
+    tilt (1.3.7)
+    uglifier (1.2.7)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.3)
+    url_mount (0.2.1)
+      rack
+    yui-compressor (0.9.6)
+      POpen4 (>= 0.1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  highline (~> 1.6.15)
+  less (~> 2.2.2)
+  middleman (~> 3.0.6)
+  middleman-minify-html (~> 3.0.0)
+  rack-contrib (~> 1.1.0)
+  redcarpet (~> 2.2.2)
+  therubyracer (~> 0.12.0)
+  thin (~> 1.5.0)

data/website/docs/Procfile

@@ -0,0 +1 @@
+web: bundle exec thin start -p $PORT

data/website/docs/README.md

@@ -0,0 +1,26 @@
+# Vagrant Documentation
+
+This is the repository for the [Vagrant Documentation website](http://docs.vagrantup.com).
+
+This is a [Middleman](http://middlemanapp.com) project, which builds a static
+site from these source files. The site is hosted on [Heroku](http://heroku.com)
+and then fronted by [Fastly](http://fastly.com).
+
+## Contributions Welcome!
+
+If you find a typo or you feel like you can improve the HTML, CSS, or
+JavaScript, we welcome contributions. Feel free to open issues or pull
+requests like any normal GitHub project, and we'll merge it in.
+
+## Running the Site Locally
+
+Running the site locally is simple. Clone this repo and run the following
+commands:
+
+```
+$ bundle
+$ bundle exec middleman server
+```
+
+Then open up `localhost:4567`. Note that some URLs you may need to append
+".html" to make them work (in the navigation and such).

data/website/docs/config.rb

@@ -0,0 +1,78 @@
+###
+# Compass
+###
+
+# Susy grids in Compass
+# First: gem install susy --pre
+# require 'susy'
+
+# Change Compass configuration
+# compass_config do |config|
+#   config.output_style = :compact
+# end
+
+###
+# Page options, layouts, aliases and proxies
+###
+
+# Per-page layout changes:
+#
+# With no layout
+# page "/path/to/file.html", :layout => false
+#
+# With alternative layout
+# page "/path/to/file.html", :layout => :otherlayout
+#
+# A path which all have the same layout
+# with_layout :admin do
+#   page "/admin/*"
+# end
+
+# Proxy (fake) files
+# page "/this-page-has-no-template.html", :proxy => "/template-file.html" do
+#   @which_fake_page = "Rendering a fake page with a variable"
+# end
+
+###
+# Helpers
+###
+
+# Automatic image dimensions on image_tag helper
+# activate :automatic_image_sizes
+
+# Methods defined in the helpers block are available in templates
+# helpers do
+#   def some_helper
+#     "Helping"
+#   end
+# end
+
+set :css_dir, 'stylesheets'
+set :js_dir, 'javascripts'
+set :images_dir, 'images'
+
+# Use the RedCarpet Markdown engine
+set :markdown_engine, :redcarpet
+set :markdown, :fenced_code_blocks => true
+
+# Build-specific configuration
+configure :build do
+  activate :asset_hash
+  activate :minify_css
+  activate :minify_html
+  activate :minify_javascript
+
+  # Enable cache buster
+  # activate :cache_buster
+
+  # Use relative URLs
+  # activate :relative_assets
+
+  # Compress PNGs after build
+  # First: gem install middleman-smusher
+  # require "middleman-smusher"
+  # activate :smusher
+
+  # Or use a different image path
+  # set :http_path, "/Content/images/"
+end

data/website/docs/config.ru

@@ -0,0 +1,44 @@
+require "rack"
+require "rack/auth/basic"
+require "rack/contrib/not_found"
+require "rack/contrib/response_headers"
+require "rack/contrib/static_cache"
+require "rack/contrib/try_static"
+
+require File.expand_path("../lib/redirect_to_latest", __FILE__)
+require File.expand_path("../lib/redirect_v1_docs", __FILE__)
+
+# Properly compress the output if the client can handle it.
+use Rack::Deflater
+
+# Redirect the homepage to the latest documentation
+use HashiCorp::Rack::RedirectToLatest
+
+# Redirect the V1 documentation to the GitHub pages hosted version
+use HashiCorp::Rack::RedirectV1Docs
+
+# Set the "forever expire" cache headers for these static assets. Since
+# we hash the contents of the assets to determine filenames, this is safe
+# to do.
+use Rack::StaticCache,
+  :root => "build",
+  :urls => ["/images", "/javascripts", "/stylesheets"],
+  :duration => 2,
+  :versioning => false
+
+# For anything that matches below this point, we set the surrogate key
+# for Fastly so that we can quickly purge all the pages without touching
+# the static assets.
+use Rack::ResponseHeaders do |headers|
+  headers["Surrogate-Key"] = "page"
+end
+
+# Try to find a static file that matches our request, since Middleman
+# statically generates everything.
+use Rack::TryStatic,
+  :root => "build",
+  :urls => ["/"],
+  :try  => [".html", "index.html", "/index.html"]
+
+# 404 if we reached this point. Sad times.
+run Rack::NotFound.new(File.expand_path("../build/404.html", __FILE__))

data/website/docs/helpers/sidebar_helpers.rb

@@ -0,0 +1,19 @@
+module SidebarHelpers
+  # This helps by setting the "current" class for sidebar nav elements
+  # if the YAML frontmatter matches the expected value.
+  def sidebar_current(expected)
+    current = current_page.data.sidebar_current
+    if current == expected || sidebar_section == expected
+      return " class=\"current\""
+    else
+      return ""
+    end
+  end
+
+  # This returns the overall section of the documentation we're on.
+  def sidebar_section
+    current = current_page.data.sidebar_current
+    return "" if !current
+    current.split("-")[0]
+  end
+end