Merge remote-tracking branch 'upstream/master'

website/Gemfile

-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "less",                  "~> 2.6"
-gem "middleman",             "~> 3.3"
-gem "middleman-minify-html", "~> 3.4"
-gem "rack-contrib",          "~> 1.1"
-gem "redcarpet",             "~> 3.1"
-gem "therubyracer",          "~> 0.12"
-gem "thin",                  "~> 1.6"
-
-group :development do
-  gem "highline", "~> 1.6"
-end
+gem 'middleman-hashicorp', github: 'hashicorp/middleman-hashicorp'

website/Gemfile.lock

+GIT
+  remote: git://github.com/hashicorp/middleman-hashicorp.git
+  revision: fe7d5bb4b04c408857dbe94345341cafcbc02de4
+  specs:
+    middleman-hashicorp (0.1.0)
+      bootstrap-sass (~> 3.2)
+      builder (~> 3.2)
+      less (~> 2.6)
+      middleman (~> 3.3)
+      middleman-livereload (~> 3.3)
+      middleman-minify-html (~> 3.4)
+      middleman-syntax (~> 2.0)
+      rack-contrib (~> 1.1)
+      redcarpet (~> 3.1)
+      therubyracer (~> 0.12)
+      thin (~> 1.6)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -7,6 +24,9 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
+    bootstrap-sass (3.2.0.2)
+      sass (~> 3.2)
+    builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     chunky_png (1.3.1)
@@ -28,18 +48,21 @@ GEM
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
     daemons (1.1.9)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
     eventmachine (1.0.3)
     execjs (2.2.1)
     ffi (1.9.5)
     haml (4.0.5)
       tilt
-    highline (1.6.21)
     hike (1.2.3)
     hitimes (1.2.2)
     hooks (0.4.0)
       uber (~> 0.0.4)
     htmlcompressor (0.1.2)
+    http_parser.rb (0.6.0)
     i18n (0.6.11)
     json (1.8.1)
     kramdown (1.4.2)
@@ -73,6 +96,10 @@ GEM
       rack-test (~> 0.6.2)
       thor (>= 0.15.2, < 2.0)
       tilt (~> 1.4.1, < 2.0)
+    middleman-livereload (3.3.4)
+      em-websocket (~> 0.5.1)
+      middleman-core (~> 3.2)
+      rack-livereload (~> 0.3.15)
     middleman-minify-html (3.4.0)
       htmlcompressor (~> 0.1.0)
       middleman-core (>= 3.2)
@@ -81,6 +108,9 @@ GEM
       sprockets (~> 2.12.1)
       sprockets-helpers (~> 1.1.0)
       sprockets-sass (~> 1.2.0)
+    middleman-syntax (2.0.0)
+      middleman-core (~> 3.2)
+      rouge (~> 1.0)
     minitest (5.4.2)
     multi_json (1.10.1)
     padrino-helpers (0.12.3)
@@ -92,6 +122,8 @@ GEM
     rack (1.5.2)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
+    rack-livereload (0.3.15)
+      rack
     rack-test (0.6.2)
       rack (>= 1.0)
     rb-fsevent (0.9.4)
@@ -99,6 +131,7 @@ GEM
       ffi (>= 0.5.0)
     redcarpet (3.1.2)
     ref (1.0.5)
+    rouge (1.7.2)
     sass (3.4.5)
     sprockets (2.12.2)
       hike (~> 1.2)
@@ -133,11 +166,4 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  highline (~> 1.6)
-  less (~> 2.6)
-  middleman (~> 3.3)
-  middleman-minify-html (~> 3.4)
-  rack-contrib (~> 1.1)
-  redcarpet (~> 3.1)
-  therubyracer (~> 0.12)
-  thin (~> 1.6)
+  middleman-hashicorp!

website/config.rb

-require "net/http"
-
-raise "PACKER_VERSION must be set." if !ENV["PACKER_VERSION"]
-
-#-------------------------------------------------------------------------
-# Download the list of Packer downloads
-#-------------------------------------------------------------------------
-
-$packer_files = {}
-$packer_os = []
-
-if !ENV["PACKER_DISABLE_DOWNLOAD_FETCH"]
-  raise "BINTRAY_API_KEY must be set." if !ENV["BINTRAY_API_KEY"]
-  http = Net::HTTP.new("dl.bintray.com", 80)
-  req = Net::HTTP::Get.new("/mitchellh/packer/")
-  req.basic_auth "mitchellh", ENV["BINTRAY_API_KEY"]
-  response = http.request(req)
-
-  response.body.split("\n").each do |line|
-    next if line !~ /\/mitchellh\/packer\/packer_(#{Regexp.quote(ENV["PACKER_VERSION"])}.+?)'/
-    filename = $1.to_s
-    os = filename.split("_")[1]
-    next if os == "SHA256SUMS"
-
-    $packer_files[os] ||= []
-    $packer_files[os] << filename
-  end
-
-  $packer_os = ["darwin", "linux", "windows"] & $packer_files.keys
-  $packer_os += $packer_files.keys
-  $packer_os.uniq!
-
-  $packer_files.each do |key, value|
-    value.sort!
-  end
-end
-
 #-------------------------------------------------------------------------
 # Configure Middleman
 #-------------------------------------------------------------------------
 
-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,
-    :with_toc_data => true
-
-# Build-specific configuration
-configure :build do
-  activate :asset_hash
-  activate :minify_css
-  activate :minify_html
-  activate :minify_javascript
-end
-
-#-------------------------------------------------------------------------
-# Helpers
-#-------------------------------------------------------------------------
-helpers do
-  def download_arch(file)
-    parts = file.split("_")
-    return "" if parts.length != 3
-    parts[2].split(".")[0]
-  end
-
-  def download_os_human(os)
-    if os == "darwin"
-      return "Mac OS X"
-    elsif os == "freebsd"
-      return "FreeBSD"
-    elsif os == "openbsd"
-      return "OpenBSD"
-    elsif os == "Linux"
-      return "Linux"
-    elsif os == "windows"
-      return "Windows"
-    else
-      return os
-    end
-  end
-
-  def download_url(file)
-    "https://dl.bintray.com/mitchellh/packer/packer_#{file}"
-  end
-
-  def latest_version
-    ENV["PACKER_VERSION"]
-  end
+activate :hashicorp do |h|
+  h.version      = '0.7.1'
+  h.bintray_repo = 'mitchellh/packer'
+  h.bintray_user = 'mitchellh'
+  h.bintray_key  = ENV['BINTRAY_API_KEY']
 end

website/config.ru

@@ -12,7 +12,7 @@ use Rack::Deflater
 # to do.
 use Rack::StaticCache,
   :root => "build",
-  :urls => ["/images", "/javascripts", "/stylesheets"],
+  :urls => ["/assets"],
   :duration => 2,
   :versioning => false
 

website/source/stylesheets/_components.scss → website/source/assets/stylesheets/_components.scss

@@ -15,7 +15,7 @@ header .header {
 
 .hero {
     height: $hero-height;
-    background: #000000 url(/images/hero_image.jpg) no-repeat 35px -40px;
+    background: #000000 image-url('hero_image.jpg') no-repeat 35px -40px;
     background-size: 960px 467px;
 
     h2 {
@@ -30,7 +30,7 @@ header .header {
     }
 
     .download-container {
-        background: url(/images/down_arrow.png) no-repeat top left;
+        background: image-url('down_arrow.png') no-repeat top left;
         display: inline-block;
         min-height: 73px;
         margin: 0 auto;
@@ -294,7 +294,7 @@ header .header {
         width: $nav-height;
         border-right: $border;
         float: left;
-        background: $white url(/images/arrow-left.png) no-repeat center center;
+        background: $white image-url('arrow-left.png') no-repeat center center;
         @include respond-to(mobile) {
             width: 50%;
             background-position: left center;
@@ -302,7 +302,7 @@ header .header {
     }
 
     .next-section {
-        background: $white url(/images/arrow-right.png) no-repeat center right;
+        background: $white image-url('arrow-right.png') no-repeat center right;
     }
 }
 

website/source/stylesheets/_footer.scss → website/source/assets/stylesheets/_footer.scss

@@ -29,7 +29,7 @@ margin-left: -20px;
 		}
 
 		.hashi-logo {
-		background: url(/images/logo_footer.png) no-repeat center top;
+		background: image-url('logo_footer.png') no-repeat center top;
 		height: 40px;
 		width: 40px;
 		background-size: 37px 40px;

website/source/stylesheets/_helpers.scss → website/source/assets/stylesheets/_helpers.scss

@@ -58,9 +58,9 @@ $mono: 'Inconsolata', 'courier new', courier, mono-space;
 
 @font-face {
     font-family: 'HeimatStencil-SemiBold';
-    src: url('../../fonts/2772B2_0_0.eot');
-    src: url('../../fonts/2772B2_0_0.woff') format('woff'),
-         url('../../fonts/2772B2_0_0.ttf') format('truetype');
+    src: font-url('2772B2_0_0.eot');
+    src: font-url('2772B2_0_0.woff') format('woff'),
+         font-url('2772B2_0_0.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
 }
@@ -89,7 +89,7 @@ background-color: $white;
 
 //elements
 .divider {
-background: url(/images/divider.png) no-repeat center bottom;
+background: image-url('divider.png') no-repeat center bottom;
 height: 70px;
 width: 70px;
 background-size: 70px 70px;

website/source/stylesheets/_nav.scss → website/source/assets/stylesheets/_nav.scss

@@ -22,7 +22,7 @@ nav {
     }
 
     .packer-logo {
-        background: url(/images/logo_nav.png) no-repeat center top;
+        background: image-url('logo_nav.png') no-repeat center top;
         height: 80px;
         width: 80px;
         background-size: 34px 50px;

website/source/docs/other/environmental-variables.html.markdown

@@ -11,22 +11,22 @@ Packer uses a variety of environmental variables. A listing and description of e
 
 * `PACKER_CONFIG` - The location of the core configuration file. The format
      of the configuration file is basic JSON.
-     See the [core configuration page](docs/other/core-configuration.html).
+     See the [core configuration page](/docs/other/core-configuration.html).
 
 * `PACKER_LOG` - Setting this to any value will enable the logger.
-     See the [debugging page](docs/other/debugging.html).
+     See the [debugging page](/docs/other/debugging.html).
 
 * `PACKER_LOG_PATH` - The location of the log file. Note: `PACKER_LOG` must
-     be set for any logging to occur. See the [debugging page](docs/other/debugging.html).
+     be set for any logging to occur. See the [debugging page](/docs/other/debugging.html).
 
 * `PACKER_NO_COLOR` - Setting this to any value will disable color in the terminal.
 
 * `PACKER_PLUGIN_MAX_PORT` - The maximum port that Packer uses for
      communication with plugins, since plugin communication happens over
      TCP connections on your local host. The default is 25,000.
-     See the [core configuration page](docs/other/core-configuration.html).
+     See the [core configuration page](/docs/other/core-configuration.html).
 
 * `PACKER_PLUGIN_MIN_PORT` - The minimum port that Packer uses for
      communication with plugins, since plugin communication happens
      over TCP connections on your local host. The default is 10,000.
-     See the [core configuration page](docs/other/core-configuration.html).
+     See the [core configuration page](/docs/other/core-configuration.html).

website/source/downloads.html.erb

@@ -17,19 +17,19 @@ page_title: "Downloads"
 			Below are all available downloads for the latest version of Packer
 			(<%= latest_version %>). Please download the proper package for your
 			operating system and architecture. You can find SHA256 checksums
-			for packages <a href="https://dl.bintray.com/mitchellh/packer/packer_<%= latest_version %>_SHA256SUMS?direct">here</a>.
+			for packages <a href="https://dl.bintray.com/mitchellh/packer/<%= latest_version %>_SHA256SUMS?direct">here</a>.
 			</p>
 		</div>
 	</div>
-	<% $packer_os.each do |os| %>
+	<% product_versions.each do |os, versions| %>
 		<div class="row">
 			<div class="span8 offset2 download">
-				<div class="icon pull-left"><%= image_tag "/images/icons/icon_#{os}.png" %></div>
+				<div class="icon pull-left"><%= system_icon(os) %></div>
 				<div class="details">
-					<h2 class="os-name"><%= download_os_human(os) %></h2>
+					<h2 class="os-name"><%= os %></h2>
 					<ul>
-						<% $packer_files[os].each do |file| %>
-						<li><a href="<%= download_url(file) %>"><%= download_arch(file) %></a></li>
+						<% versions.each do |url| %>
+						<li><a href="<%= url %>"><%= arch_for_filename(url) %></a></li>
 						<% end %>
 					</ul>
 					<div class="clearfix"></div>

website/source/index.html.erb

@@ -27,7 +27,7 @@
 	<div class="container">
 		<div class="row">
 			<div class="span6">
-				<img src="/images/screenshots/vmware_and_virtualbox.png">
+        <%= image_tag 'screenshots/vmware_and_virtualbox.png' %>
 			</div>
 
 			<div class="span6">
@@ -61,7 +61,7 @@
 			</div>
 
 			<div class="span6">
-				<img src="/images/screenshots/works_with.png">
+        <%= image_tag 'screenshots/works_with.png' %>
 			</div>
 		</div>
 	</div>