Skip to content

Commit 9fb7919

Browse files
author
Feña Agar
committed
added middleman-deploy
1 parent fdf1252 commit 9fb7919

File tree

3 files changed

+64
-38
lines changed

3 files changed

+64
-38
lines changed

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ gem 'rake', '~> 10.0.3'
66
gem 'sass', '~> 3.2.5'
77
gem 'zurb-foundation', '~> 4.0.5', require: false
88

9-
gem 'middleman', '~> 3.1.0'
9+
gem 'middleman', '~> 3.2.0'
10+
gem 'middleman-deploy', '~> 1.0'
1011
gem 'builder'
1112
gem 'sitemap_generator'
1213
gem 'coffee-script'
1314
gem 'nokogiri'
1415
gem 'redcarpet'
1516
gem 'pygments.rb'
1617

18+
1719
gem 'html5-boilerplate', :require => 'html5-boilerplate',
1820
:git => 'git://github.com/edenspiekermann/compass-html5-boilerplate.git',
1921
:branch => 'padrino'

Gemfile.lock

Lines changed: 44 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ GIT
99
GEM
1010
remote: https://rubygems.org/
1111
specs:
12-
activesupport (3.2.12)
13-
i18n (~> 0.6)
12+
activesupport (3.2.22)
13+
i18n (~> 0.6, >= 0.6.4)
1414
multi_json (~> 1.0)
1515
builder (3.2.0)
1616
chunky_png (1.2.7)
@@ -24,86 +24,92 @@ GEM
2424
sass (~> 3.1)
2525
execjs (1.4.0)
2626
multi_json (~> 1.0)
27-
ffi (1.4.0)
27+
ffi (1.9.10)
2828
fssm (0.2.10)
29-
haml (4.0.3)
29+
haml (4.0.7)
3030
tilt
3131
hike (1.2.3)
32-
i18n (0.6.4)
32+
i18n (0.6.11)
3333
icalendar (1.2.2)
34-
kramdown (1.1.0)
35-
listen (1.2.3)
34+
json (1.8.3)
35+
kramdown (1.9.0)
36+
listen (1.3.1)
3637
rb-fsevent (>= 0.9.3)
3738
rb-inotify (>= 0.9)
3839
rb-kqueue (>= 0.2)
39-
middleman (3.1.5)
40+
middleman (3.2.2)
4041
coffee-script (~> 2.2.0)
4142
compass (>= 0.12.2)
4243
execjs (~> 1.4.0)
4344
haml (>= 3.1.6)
44-
kramdown (~> 1.1.0)
45-
middleman-core (= 3.1.5)
46-
middleman-more (= 3.1.5)
45+
kramdown (~> 1.2)
46+
middleman-core (= 3.2.2)
4747
middleman-sprockets (>= 3.1.2)
4848
sass (>= 3.1.20)
49-
uglifier (~> 2.1.0)
50-
middleman-core (3.1.5)
49+
uglifier (~> 2.4.0)
50+
middleman-core (3.2.2)
5151
activesupport (~> 3.2.6)
5252
bundler (~> 1.1)
53-
i18n (~> 0.6.1)
54-
listen (~> 1.2.2)
53+
i18n (~> 0.6.9)
54+
listen (~> 1.1)
5555
rack (>= 1.4.5)
5656
rack-test (~> 0.6.1)
5757
thor (>= 0.15.2, < 2.0)
58-
tilt (~> 1.3.6)
59-
middleman-more (3.1.5)
60-
middleman-sprockets (3.1.4)
61-
middleman-core (>= 3.0.14)
62-
middleman-more (>= 3.0.14)
63-
sprockets (~> 2.1)
64-
sprockets-helpers (~> 1.0.0)
65-
sprockets-sass (~> 1.0.0)
58+
tilt (~> 1.4.1)
59+
middleman-deploy (1.0.0)
60+
middleman-core (>= 3.2)
61+
net-sftp
62+
ptools
63+
middleman-sprockets (3.3.3)
64+
middleman-core (>= 3.2)
65+
sprockets (~> 2.2)
66+
sprockets-helpers (~> 1.1.0)
67+
sprockets-sass (~> 1.1.0)
6668
mini_portile (0.6.2)
67-
multi_json (1.6.1)
69+
multi_json (1.11.2)
70+
net-sftp (2.1.2)
71+
net-ssh (>= 2.6.5)
72+
net-ssh (3.0.1)
6873
nokogiri (1.6.6.2)
6974
mini_portile (~> 0.6.0)
7075
posix-spawn (0.3.6)
76+
ptools (1.3.3)
7177
puma (1.6.3)
7278
rack (~> 1.2)
7379
pygments.rb (0.4.2)
7480
posix-spawn (~> 0.3.6)
7581
yajl-ruby (~> 1.1.0)
76-
rack (1.4.5)
82+
rack (1.6.4)
7783
rack-contrib (1.1.0)
7884
rack (>= 0.9.1)
7985
rack-rewrite (1.3.3)
80-
rack-test (0.6.2)
86+
rack-test (0.6.3)
8187
rack (>= 1.0)
8288
rake (10.0.3)
83-
rb-fsevent (0.9.3)
84-
rb-inotify (0.9.0)
89+
rb-fsevent (0.9.6)
90+
rb-inotify (0.9.5)
8591
ffi (>= 0.5.0)
86-
rb-kqueue (0.2.0)
92+
rb-kqueue (0.2.4)
8793
ffi (>= 0.5.0)
8894
redcarpet (2.2.2)
8995
sass (3.2.6)
9096
sitemap_generator (3.4)
9197
builder
92-
sprockets (2.10.0)
98+
sprockets (2.12.4)
9399
hike (~> 1.2)
94100
multi_json (~> 1.0)
95101
rack (~> 1.0)
96102
tilt (~> 1.1, != 1.3.0)
97-
sprockets-helpers (1.0.1)
103+
sprockets-helpers (1.1.0)
98104
sprockets (~> 2.0)
99-
sprockets-sass (1.0.2)
105+
sprockets-sass (1.1.0)
100106
sprockets (~> 2.0)
101107
tilt (~> 1.1)
102-
thor (0.18.1)
103-
tilt (1.3.7)
104-
uglifier (2.1.2)
108+
thor (0.19.1)
109+
tilt (1.4.1)
110+
uglifier (2.4.0)
105111
execjs (>= 0.3.0)
106-
multi_json (~> 1.0, >= 1.0.2)
112+
json (>= 1.8.0)
107113
yajl-ruby (1.1.0)
108114
zurb-foundation (4.0.5)
109115
sass (>= 3.2.0)
@@ -116,7 +122,8 @@ DEPENDENCIES
116122
coffee-script
117123
html5-boilerplate!
118124
icalendar
119-
middleman (~> 3.1.0)
125+
middleman (~> 3.2.0)
126+
middleman-deploy (~> 1.0)
120127
nokogiri
121128
puma (~> 1.6.3)
122129
pygments.rb

config.rb

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,23 @@
6262

6363
set :images_dir, 'images'
6464

65+
# Github Pages
66+
activate :deploy do |deploy|
67+
deploy.method = :git
68+
# remote is optional (default is "origin")
69+
# run `git remote -v` to see a list of possible remotes
70+
deploy.remote = "origin"
71+
72+
# branch is optional (default is "gh-pages")
73+
# run `git branch -a` to see a list of possible branches
74+
deploy.branch = "gh-pages"
75+
76+
# strategy is optional (default is :force_push)
77+
deploy.strategy = :force_push
78+
79+
deploy.build_before = true
80+
end
81+
6582
# Build-specific configuration
6683
configure :build do
6784
# For example, change the Compass output style for deployment

0 commit comments

Comments
 (0)