middleman-hashicorp 0.2.0 → 0.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/.dockerignore +3 -0
  3. data/Makefile +8 -4
  4. data/docker/Dockerfile +18 -12
  5. data/lib/middleman-hashicorp/version.rb +1 -1
  6. data/middleman-hashicorp.gemspec +8 -18
  7. metadata +12 -123
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 22ae581076fddd0d3c319e985475dc95120de6c5
4
- data.tar.gz: 768afeb115efd81a88a9bf225261265879f62cbd
3
+ metadata.gz: 8b4ca6fb4a8a6349d8ca952f071eaf4f3ddec9fe
4
+ data.tar.gz: eea8e3638e7ed20057812f63a78c51814e0b2a2e
5
5
  SHA512:
6
- metadata.gz: 9c7c8549a0e2d615f2139f835b5a10b386ce8406f67962f63306f181bdbd41f429b5a9c96116149c014ebdc00cbd9f4a8e918cbb97b495ffdbe2d0e401081436
7
- data.tar.gz: b909e93685a22177b4a7c0343e39986aa5116cd93d555bd1c0d6883cef7ee8bc91e2fda372c1ef0503d25090ea6a948059cc1ca14f345565eed9bc908d963fe7
6
+ metadata.gz: 3b7d445920e0ae1b3ce27f67dbcf81b497d6613795f2c721adcd497b9542778f42ee0ed7f5f9664383a883b7ffedff21b498d6e0472940fa8cf9824ccea6ca6b
7
+ data.tar.gz: c14475bd0425c2bab61b6c06ee76beee959f39b07163f525c88f5e5c00d05414c2f3d834e69869c3e0ee437f47817994fb54769faaabaf27856ab31374de94f8
data/.dockerignore ADDED
@@ -0,0 +1,3 @@
1
+ .bundle/
2
+ .git/
3
+ vendor/
data/Makefile CHANGED
@@ -1,19 +1,23 @@
1
1
  VERSION?=$(shell awk -F\" '/VERSION/ { print $$2; exit }' lib/middleman-hashicorp/version.rb)
2
2
 
3
- docker:
3
+ docker: build
4
4
  @echo "==> Building container v${VERSION}..."
5
5
  @docker build \
6
- --build-arg "VERSION=${VERSION}" \
7
- --label "${VERSION}" \
8
6
  --file "docker/Dockerfile" \
9
7
  --tag "hashicorp/middleman-hashicorp" \
10
8
  --tag "hashicorp/middleman-hashicorp:${VERSION}" \
11
9
  --pull \
12
10
  --rm \
13
- $(shell pwd)/docker
11
+ .
12
+
13
+ build:
14
+ @echo "==> Building gem v${VERSION}..."
15
+ @rm -rf pkg/
16
+ @bundle exec rake build
14
17
 
15
18
  gem:
16
19
  @echo "==> Building and releasing gem v${VERSION}..."
20
+ @rm -rf pkg/
17
21
  @bundle exec rake release
18
22
 
19
23
  release: gem docker
data/docker/Dockerfile CHANGED
@@ -1,22 +1,28 @@
1
- FROM ruby:2.3-slim
1
+ FROM ruby:2.3-alpine
2
2
  MAINTAINER Seth Vargo <seth@hashicorp.com>
3
3
 
4
- # Required packages
5
- RUN \
6
- apt-get -qq update && \
7
- apt-get install -yqq build-essential git python-setuptools
4
+ # Install packages
5
+ RUN apk add --no-cache build-base nodejs python py-setuptools
8
6
 
9
7
  # Install s3cmd
10
- RUN \
11
- curl -sLo /s3cmd-1.6.1.tar.gz https://github.com/s3tools/s3cmd/releases/download/v1.6.1/s3cmd-1.6.1.tar.gz && \
12
- tar -xzvf /s3cmd-1.6.1.tar.gz && \
8
+ ADD https://github.com/s3tools/s3cmd/releases/download/v1.6.1/s3cmd-1.6.1.tar.gz /s3cmd-1.6.1.tar.gz
9
+ RUN tar -xzvf /s3cmd-1.6.1.tar.gz && \
13
10
  cd /s3cmd-1.6.1 && \
14
11
  python setup.py install && \
15
12
  rm -rf /s3cmd-1.6.1*
16
13
 
14
+ # Add the context
15
+ ADD pkg/ /pkg
16
+
17
17
  # Install the bundle
18
- RUN \
19
- gem install middleman-hashicorp --version "${VERSION}"
18
+ RUN gem install /pkg/middleman-hashicorp-*.gem \
19
+ && rm -rf /pkg
20
+
21
+ # Mounts
22
+ WORKDIR /website
23
+
24
+ ENTRYPOINT ["bundle", "exec", "middleman"]
25
+
26
+ CMD ["server"]
20
27
 
21
- CMD (bundle check || bundle install) && \
22
- bundle exec middleman build --clean
28
+ # docker run -v="$(pwd):/website" -p=4567:4567 hashicorp/middleman-hashicorp
data/lib/middleman-hashicorp/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Middleman
2
2
  module HashiCorp
3
- VERSION = "0.2.0"
3
+ VERSION = "0.3.0"
4
4
  end
5
5
  end
data/middleman-hashicorp.gemspec CHANGED
@@ -18,31 +18,21 @@ Gem::Specification.new do |spec|
18
18
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
19
19
  spec.require_paths = ['lib']
20
20
 
21
- spec.required_ruby_version = '>= 2.0.0'
21
+ spec.required_ruby_version = '>= 2.3'
22
22
 
23
23
  # Middleman
24
- spec.add_dependency 'middleman', '~> 3.4'
25
- spec.add_dependency 'middleman-minify-html', '~> 3.4'
26
- spec.add_dependency 'middleman-livereload', '~> 3.4'
27
- spec.add_dependency 'middleman-syntax', '~> 3.0'
24
+ spec.add_dependency 'middleman', '~> 3.4'
25
+ spec.add_dependency 'middleman-livereload', '~> 3.4'
26
+ spec.add_dependency 'middleman-syntax', '~> 3.0'
28
27
 
29
28
  # Assets
30
29
  spec.add_dependency 'bootstrap-sass', '~> 3.3'
31
30
  spec.add_dependency 'builder', '~> 3.2'
32
- spec.add_dependency 'less', '~> 2.6'
33
- spec.add_dependency 'redcarpet', '~> 3.2'
34
- spec.add_dependency 'therubyracer', '~> 0.12'
35
-
36
- # Server
37
- spec.add_dependency 'rack-contrib', '~> 1.2'
38
- spec.add_dependency 'rack-protection', '~> 1.5'
39
- spec.add_dependency 'rack-rewrite', '~> 1.5'
40
- spec.add_dependency 'thin', '~> 1.6'
41
- spec.add_dependency 'rack-ssl-enforcer', '~> 0.2'
31
+ spec.add_dependency 'redcarpet', '~> 3.3'
42
32
 
43
33
  # Development dependencies
44
- spec.add_development_dependency 'rspec', '~> 3.2'
34
+ spec.add_development_dependency 'rspec', '~> 3.5'
45
35
 
46
- spec.add_development_dependency 'bundler', '~> 1.7'
47
- spec.add_development_dependency 'rake', '~> 10.4'
36
+ spec.add_development_dependency 'bundler', '~> 1.13'
37
+ spec.add_development_dependency 'rake', '~> 11.3'
48
38
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman-hashicorp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Seth Vargo
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-10-06 00:00:00.000000000 Z
11
+ date: 2016-10-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: middleman
@@ -24,20 +24,6 @@ dependencies:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '3.4'
27
- - !ruby/object:Gem::Dependency
28
- name: middleman-minify-html
29
- requirement: !ruby/object:Gem::Requirement
30
- requirements:
31
- - - "~>"
32
- - !ruby/object:Gem::Version
33
- version: '3.4'
34
- type: :runtime
35
- prerelease: false
36
- version_requirements: !ruby/object:Gem::Requirement
37
- requirements:
38
- - - "~>"
39
- - !ruby/object:Gem::Version
40
- version: '3.4'
41
27
  - !ruby/object:Gem::Dependency
42
28
  name: middleman-livereload
43
29
  requirement: !ruby/object:Gem::Requirement
@@ -94,160 +80,62 @@ dependencies:
94
80
  - - "~>"
95
81
  - !ruby/object:Gem::Version
96
82
  version: '3.2'
97
- - !ruby/object:Gem::Dependency
98
- name: less
99
- requirement: !ruby/object:Gem::Requirement
100
- requirements:
101
- - - "~>"
102
- - !ruby/object:Gem::Version
103
- version: '2.6'
104
- type: :runtime
105
- prerelease: false
106
- version_requirements: !ruby/object:Gem::Requirement
107
- requirements:
108
- - - "~>"
109
- - !ruby/object:Gem::Version
110
- version: '2.6'
111
83
  - !ruby/object:Gem::Dependency
112
84
  name: redcarpet
113
85
  requirement: !ruby/object:Gem::Requirement
114
86
  requirements:
115
87
  - - "~>"
116
88
  - !ruby/object:Gem::Version
117
- version: '3.2'
118
- type: :runtime
119
- prerelease: false
120
- version_requirements: !ruby/object:Gem::Requirement
121
- requirements:
122
- - - "~>"
123
- - !ruby/object:Gem::Version
124
- version: '3.2'
125
- - !ruby/object:Gem::Dependency
126
- name: therubyracer
127
- requirement: !ruby/object:Gem::Requirement
128
- requirements:
129
- - - "~>"
130
- - !ruby/object:Gem::Version
131
- version: '0.12'
132
- type: :runtime
133
- prerelease: false
134
- version_requirements: !ruby/object:Gem::Requirement
135
- requirements:
136
- - - "~>"
137
- - !ruby/object:Gem::Version
138
- version: '0.12'
139
- - !ruby/object:Gem::Dependency
140
- name: rack-contrib
141
- requirement: !ruby/object:Gem::Requirement
142
- requirements:
143
- - - "~>"
144
- - !ruby/object:Gem::Version
145
- version: '1.2'
146
- type: :runtime
147
- prerelease: false
148
- version_requirements: !ruby/object:Gem::Requirement
149
- requirements:
150
- - - "~>"
151
- - !ruby/object:Gem::Version
152
- version: '1.2'
153
- - !ruby/object:Gem::Dependency
154
- name: rack-protection
155
- requirement: !ruby/object:Gem::Requirement
156
- requirements:
157
- - - "~>"
158
- - !ruby/object:Gem::Version
159
- version: '1.5'
160
- type: :runtime
161
- prerelease: false
162
- version_requirements: !ruby/object:Gem::Requirement
163
- requirements:
164
- - - "~>"
165
- - !ruby/object:Gem::Version
166
- version: '1.5'
167
- - !ruby/object:Gem::Dependency
168
- name: rack-rewrite
169
- requirement: !ruby/object:Gem::Requirement
170
- requirements:
171
- - - "~>"
172
- - !ruby/object:Gem::Version
173
- version: '1.5'
174
- type: :runtime
175
- prerelease: false
176
- version_requirements: !ruby/object:Gem::Requirement
177
- requirements:
178
- - - "~>"
179
- - !ruby/object:Gem::Version
180
- version: '1.5'
181
- - !ruby/object:Gem::Dependency
182
- name: thin
183
- requirement: !ruby/object:Gem::Requirement
184
- requirements:
185
- - - "~>"
186
- - !ruby/object:Gem::Version
187
- version: '1.6'
188
- type: :runtime
189
- prerelease: false
190
- version_requirements: !ruby/object:Gem::Requirement
191
- requirements:
192
- - - "~>"
193
- - !ruby/object:Gem::Version
194
- version: '1.6'
195
- - !ruby/object:Gem::Dependency
196
- name: rack-ssl-enforcer
197
- requirement: !ruby/object:Gem::Requirement
198
- requirements:
199
- - - "~>"
200
- - !ruby/object:Gem::Version
201
- version: '0.2'
89
+ version: '3.3'
202
90
  type: :runtime
203
91
  prerelease: false
204
92
  version_requirements: !ruby/object:Gem::Requirement
205
93
  requirements:
206
94
  - - "~>"
207
95
  - !ruby/object:Gem::Version
208
- version: '0.2'
96
+ version: '3.3'
209
97
  - !ruby/object:Gem::Dependency
210
98
  name: rspec
211
99
  requirement: !ruby/object:Gem::Requirement
212
100
  requirements:
213
101
  - - "~>"
214
102
  - !ruby/object:Gem::Version
215
- version: '3.2'
103
+ version: '3.5'
216
104
  type: :development
217
105
  prerelease: false
218
106
  version_requirements: !ruby/object:Gem::Requirement
219
107
  requirements:
220
108
  - - "~>"
221
109
  - !ruby/object:Gem::Version
222
- version: '3.2'
110
+ version: '3.5'
223
111
  - !ruby/object:Gem::Dependency
224
112
  name: bundler
225
113
  requirement: !ruby/object:Gem::Requirement
226
114
  requirements:
227
115
  - - "~>"
228
116
  - !ruby/object:Gem::Version
229
- version: '1.7'
117
+ version: '1.13'
230
118
  type: :development
231
119
  prerelease: false
232
120
  version_requirements: !ruby/object:Gem::Requirement
233
121
  requirements:
234
122
  - - "~>"
235
123
  - !ruby/object:Gem::Version
236
- version: '1.7'
124
+ version: '1.13'
237
125
  - !ruby/object:Gem::Dependency
238
126
  name: rake
239
127
  requirement: !ruby/object:Gem::Requirement
240
128
  requirements:
241
129
  - - "~>"
242
130
  - !ruby/object:Gem::Version
243
- version: '10.4'
131
+ version: '11.3'
244
132
  type: :development
245
133
  prerelease: false
246
134
  version_requirements: !ruby/object:Gem::Requirement
247
135
  requirements:
248
136
  - - "~>"
249
137
  - !ruby/object:Gem::Version
250
- version: '10.4'
138
+ version: '11.3'
251
139
  description: A series of helpers for consistency among HashiCorp's middleman sites
252
140
  email:
253
141
  - sethvargo@gmail.com
@@ -255,6 +143,7 @@ executables: []
255
143
  extensions: []
256
144
  extra_rdoc_files: []
257
145
  files:
146
+ - ".dockerignore"
258
147
  - ".gitignore"
259
148
  - ".travis.yml"
260
149
  - Gemfile
@@ -311,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
311
200
  requirements:
312
201
  - - ">="
313
202
  - !ruby/object:Gem::Version
314
- version: 2.0.0
203
+ version: '2.3'
315
204
  required_rubygems_version: !ruby/object:Gem::Requirement
316
205
  requirements:
317
206
  - - ">="