middleman-hashicorp 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b4ca6fb4a8a6349d8ca952f071eaf4f3ddec9fe
-  data.tar.gz: eea8e3638e7ed20057812f63a78c51814e0b2a2e
+  metadata.gz: 1c359c01d2d1627f1f574090f58112bbc3108ef3
+  data.tar.gz: 10929ce28a6d3f649f93be98546fd6e2edaae71c
 SHA512:
-  metadata.gz: 3b7d445920e0ae1b3ce27f67dbcf81b497d6613795f2c721adcd497b9542778f42ee0ed7f5f9664383a883b7ffedff21b498d6e0472940fa8cf9824ccea6ca6b
-  data.tar.gz: c14475bd0425c2bab61b6c06ee76beee959f39b07163f525c88f5e5c00d05414c2f3d834e69869c3e0ee437f47817994fb54769faaabaf27856ab31374de94f8
+  metadata.gz: 440b68944e78da9548cdbb049735e889962846ff74dcc73cc4755312c3ffcb81119baf728d3205d981c8e6b502fa8c6a329088aec4888a8e5bafaaf0a6864bb8
+  data.tar.gz: a5bc45777e184efd9fa1115a43cff02d47858e444b57a99c0c5b3373ae62f8eecc41e12ff89a0742e3f7f51b8061915de2c7bb5f66b092d67f1f19c95fff1cfb

data/.travis.yml

@@ -3,10 +3,13 @@ cache: bundler
 sudo: false
 
 rvm:
-  - 2.0.0
+  - 2.3.1
 
 branches:
   only:
     - master
 
+before_install:
+  - gem update bundler
+
 bundler_args: --jobs 7

data/Makefile

@@ -1,6 +1,6 @@
 VERSION?=$(shell awk -F\" '/VERSION/ { print $$2; exit }' lib/middleman-hashicorp/version.rb)
 
-docker: build
+docker:
 	@echo "==> Building container v${VERSION}..."
 	@docker build \
 		--file "docker/Dockerfile" \
@@ -10,16 +10,16 @@ docker: build
 		--rm \
 		.
 
-build:
-	@echo "==> Building gem v${VERSION}..."
-	@rm -rf pkg/
-	@bundle exec rake build
+docker-push:
+	@echo "==> Pushing to Docker registry..."
+	@docker push "hashicorp/middleman-hashicorp:latest"
+	@docker push "hashicorp/middleman-hashicorp:${VERSION}"
 
 gem:
 	@echo "==> Building and releasing gem v${VERSION}..."
 	@rm -rf pkg/
 	@bundle exec rake release
 
-release: gem docker
+release: gem docker docker-push
 
-.PHONY: docker gem release
+.PHONY: docker docker-push gem release

data/docker/Dockerfile

@@ -14,15 +14,27 @@ RUN tar -xzvf /s3cmd-1.6.1.tar.gz && \
 # Add the context
 ADD pkg/ /pkg
 
+# Upgrade bundler
+RUN gem update --no-document
+
 # Install the bundle
-RUN gem install /pkg/middleman-hashicorp-*.gem \
+RUN gem install /pkg/middleman-hashicorp-*.gem --no-document \
   && rm -rf /pkg
 
+RUN gem list | grep mini
+
+# For some reason, this isn't installed by default
+# RUN gem install minitest --version "~> 5.9"
+
 # Mounts
 WORKDIR /website
 
-ENTRYPOINT ["bundle", "exec", "middleman"]
+# Expose ports
+EXPOSE 4567
+EXPOSE 35729
 
-CMD ["server"]
+ADD docker/entrypoint.sh /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
 
-# docker run -v="$(pwd):/website" -p=4567:4567 hashicorp/middleman-hashicorp
+CMD ["server"]

data/docker/entrypoint.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+# Install any additional dependencies our bundle needs. Most of the core
+# dependencies are already included in the container, so this just any
+# additional things that were not originally present in the build.
+if ! bundle check &>/dev/null; then
+  echo "==> Warning! You have missing dependencies. This is probably okay but"
+  echo "    it means your build is going to take a bit longer each time. You"
+  echo "    may want to consider adding your requirements to the container for"
+  echo "    a faster build."
+  echo ""
+  echo "==> Installing missing dependencies. This may take some time..."
+  bundle install
+fi
+
+exec "$@"

data/lib/middleman-hashicorp/extension.rb

@@ -81,16 +81,6 @@ class Middleman::HashiCorpExtension < ::Middleman::Extension
         activate :minify_javascript
       end
 
-      # Minify HTML
-      require "middleman-minify-html"
-      activate :minify_html do |html|
-        html.remove_quotes = false
-        html.remove_script_attributes = false
-        html.remove_multi_spaces = false
-        html.remove_http_protocol = false
-        html.remove_https_protocol = false
-      end
-
       # Enable cache buster
       activate :asset_hash
     end

data/lib/middleman-hashicorp/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module HashiCorp
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-hashicorp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-08 00:00:00.000000000 Z
+date: 2016-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman
@@ -175,6 +175,7 @@ files:
 - assets/javascripts/ie-compat/respond.js
 - assets/javascripts/jquery.js
 - docker/Dockerfile
+- docker/entrypoint.sh
 - lib/middleman-hashicorp.rb
 - lib/middleman-hashicorp/bintray.rb
 - lib/middleman-hashicorp/extension.rb