From 37eb3043f55a1208325c0a107e7c66be932c8dfd Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Mon, 6 Oct 2014 20:35:19 -0400 Subject: [PATCH] Upgrade to middleman-hashicorp --- website/Gemfile | 14 +---- website/Gemfile.lock | 44 ++++++++++++--- website/config.rb | 93 ++----------------------------- website/source/downloads.html.erb | 12 ++-- website/source/index.html.erb | 4 +- 5 files changed, 50 insertions(+), 117 deletions(-) diff --git a/website/Gemfile b/website/Gemfile index 99e3e69cc..936305b5e 100644 --- a/website/Gemfile +++ b/website/Gemfile @@ -1,13 +1,3 @@ -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' diff --git a/website/Gemfile.lock b/website/Gemfile.lock index dd50f1ecc..faf7ce071 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -1,3 +1,20 @@ +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! diff --git a/website/config.rb b/website/config.rb index 5d77fc11e..d28854f76 100644 --- a/website/config.rb +++ b/website/config.rb @@ -1,93 +1,10 @@ -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 diff --git a/website/source/downloads.html.erb b/website/source/downloads.html.erb index 36f18d710..52c7cccff 100644 --- a/website/source/downloads.html.erb +++ b/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 here. + for packages here.

- <% $packer_os.each do |os| %> + <% product_versions.each do |os, versions| %>
-
<%= image_tag "/images/icons/icon_#{os}.png" %>
+
<%= system_icon(os) %>
-

<%= download_os_human(os) %>

+

<%= os %>

diff --git a/website/source/index.html.erb b/website/source/index.html.erb index 4bb3a1d8b..3d4f3522e 100644 --- a/website/source/index.html.erb +++ b/website/source/index.html.erb @@ -27,7 +27,7 @@
- + <%= image_tag 'screenshots/vmware_and_virtualbox.png' %>
@@ -61,7 +61,7 @@
- + <%= image_tag 'screenshots/works_with.png' %>