Permalink
Browse files

Update to middleman 4.1.7

  • Loading branch information...
ikuwow committed Apr 17, 2016
1 parent ce02f18 commit e7d002480a8a99031512e17d5a692f973214b563
Showing with 69 additions and 104 deletions.
  1. +3 −5 Gemfile
  2. +58 −80 Gemfile.lock
  3. +2 −10 config.rb
  4. +2 −0 source/{javascripts/ga_tracking_code.js → _ga_tracking_code.erb}
  5. +2 −7 source/_head_css.erb
  6. +2 −2 source/layout.erb
View
@@ -2,16 +2,14 @@
# the following line to use "https"
source 'https://rubygems.org'
-gem "middleman", "~> 3.4.1"
+gem "middleman"
gem "middleman-blog"
gem "middleman-livereload"
-gem "middleman-deploy"
gem "middleman-favicon-maker"
-gem "middleman-s3_sync", "~> 3.0"
+gem "middleman-s3_sync"
gem "middleman-syntax"
-gem "middleman-sitemap"
+gem 'middleman-search_engine_sitemap'
gem "middleman-minify-html"
-gem "middleman-inliner"
gem "font-awesome-middleman"
gem "nokogiri"
View
@@ -7,32 +7,24 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- addressable (2.3.8)
+ addressable (2.4.0)
ansi (1.5.0)
+ backports (3.6.8)
builder (3.2.2)
- capybara (2.4.4)
+ capybara (2.5.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
- chunky_png (1.3.5)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
- compass (1.0.3)
- chunky_png (~> 1.2)
- compass-core (~> 1.0.2)
- compass-import-once (~> 1.0.5)
- rb-fsevent (>= 0.9.3)
- rb-inotify (>= 0.9)
- sass (>= 3.3.13, < 3.5)
- compass-core (1.0.3)
- multi_json (~> 1.0)
- sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
+ concurrent-ruby (1.0.1)
+ contracts (0.13.0)
docile (1.1.5)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
@@ -41,6 +33,9 @@ GEM
eventmachine (1.2.0.1)
excon (0.49.0)
execjs (2.6.0)
+ fast_blank (1.0.0)
+ fastimage (2.0.0)
+ addressable (~> 2)
favicon_maker (1.3.1)
docile (~> 1.1)
ffi (1.9.10)
@@ -59,14 +54,14 @@ GEM
fog-xml (0.1.2)
fog-core
nokogiri (~> 1.5, >= 1.5.11)
- font-awesome-middleman (4.5.0)
- middleman-core (~> 3.0)
+ font-awesome-middleman (4.2.1)
+ middleman-core (>= 3.0.0)
formatador (0.2.5)
haml (4.0.7)
tilt
- hike (1.2.3)
- hooks (0.4.1)
- uber (~> 0.0.14)
+ hamster (3.0.0)
+ concurrent-ruby (~> 1.0)
+ hashie (3.4.3)
htmlcompressor (0.2.0)
http_parser.rb (0.6.0)
i18n (0.7.0)
@@ -77,64 +72,64 @@ GEM
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9.7)
map (6.6.0)
- middleman (3.4.1)
+ middleman (4.1.7)
coffee-script (~> 2.2)
- compass (>= 1.0.0, < 2.0.0)
compass-import-once (= 1.0.5)
- execjs (~> 2.0)
haml (>= 4.0.5)
kramdown (~> 1.2)
- middleman-core (= 3.4.1)
- middleman-sprockets (>= 3.1.2)
+ middleman-cli (= 4.1.7)
+ middleman-core (= 4.1.7)
sass (>= 3.4.0, < 4.0)
- uglifier (~> 2.5)
- middleman-blog (3.5.3)
- addressable (~> 2.3.5)
- middleman-core (~> 3.2)
+ middleman-blog (4.0.1)
+ addressable (~> 2.3)
+ middleman-core (>= 4.0.0)
tzinfo (>= 0.3.0)
- middleman-core (3.4.1)
- activesupport (~> 4.1)
+ middleman-cli (4.1.7)
+ thor (>= 0.17.0, < 2.0)
+ middleman-core (4.1.7)
+ activesupport (~> 4.2)
+ addressable (~> 2.3)
+ backports (~> 3.6)
bundler (~> 1.1)
- capybara (~> 2.4.4)
+ capybara (~> 2.5.0)
+ contracts (~> 0.13.0)
erubis
- hooks (~> 0.3)
+ execjs (~> 2.0)
+ fast_blank
+ fastimage (~> 2.0)
+ hamster (~> 3.0)
+ hashie (~> 3.4)
i18n (~> 0.7.0)
- listen (~> 3.0.3)
- padrino-helpers (~> 0.12.3)
+ listen (~> 3.0)
+ padrino-helpers (~> 0.13.0)
+ parallel
rack (>= 1.4.5, < 2.0)
- thor (>= 0.15.2, < 2.0)
- tilt (~> 1.4.1, < 2.0)
- middleman-deploy (1.0.0)
- middleman-core (>= 3.2)
- net-sftp
- ptools
- middleman-favicon-maker (3.7)
- favicon_maker (~> 1.3)
- middleman-core (>= 3.0.0)
- middleman-inliner (1.0.1)
+ sass (>= 3.4)
+ servolux
+ tilt (~> 1.4.1)
+ uglifier (~> 3.0)
+ middleman-favicon-maker (4.0.3)
+ favicon_maker (~> 1.3, >= 1.3.1)
+ middleman-core (~> 4.0)
middleman-livereload (3.4.6)
em-websocket (~> 0.5.1)
middleman-core (>= 3.3)
rack-livereload (~> 0.3.15)
middleman-minify-html (3.4.1)
htmlcompressor (~> 0.2.0)
middleman-core (>= 3.2)
- middleman-s3_sync (3.3.9)
+ middleman-s3_sync (4.0.2)
ansi (~> 1.5.0)
- fog-aws (>= 0.7.0)
+ fog-aws (>= 0.1.1)
map
- middleman-core (~> 3.3)
- mime-types (>= 3.0)
+ middleman-cli
+ middleman-core (>= 4.0.0)
parallel
ruby-progressbar
unf
- middleman-sitemap (0.0.13)
- middleman-core (>= 3.2.2)
- middleman-sprockets (3.4.2)
- middleman-core (>= 3.3)
- sprockets (~> 2.12.1)
- sprockets-helpers (~> 1.1.0)
- sprockets-sass (~> 1.3.0)
+ middleman-search_engine_sitemap (1.4.0)
+ builder
+ middleman-core (~> 4.0)
middleman-syntax (2.1.0)
middleman-core (>= 3.2)
rouge (~> 1.0)
@@ -144,19 +139,15 @@ GEM
mini_portile2 (2.0.0)
minitest (5.8.4)
multi_json (1.11.2)
- net-sftp (2.1.2)
- net-ssh (>= 2.6.5)
- net-ssh (3.1.1)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
- padrino-helpers (0.12.5)
+ padrino-helpers (0.13.1)
i18n (~> 0.6, >= 0.6.7)
- padrino-support (= 0.12.5)
+ padrino-support (= 0.13.1)
tilt (~> 1.4.1)
- padrino-support (0.12.5)
+ padrino-support (0.13.1)
activesupport (>= 3.1)
parallel (1.8.0)
- ptools (1.3.3)
rack (1.6.4)
rack-livereload (0.3.16)
rack
@@ -169,25 +160,14 @@ GEM
rouge (1.10.1)
ruby-progressbar (1.7.5)
sass (3.4.22)
- sprockets (2.12.4)
- hike (~> 1.2)
- multi_json (~> 1.0)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- sprockets-helpers (1.1.0)
- sprockets (~> 2.0)
- sprockets-sass (1.3.1)
- sprockets (~> 2.0)
- tilt (~> 1.1)
+ servolux (0.12.0)
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
- uber (0.0.15)
- uglifier (2.7.2)
- execjs (>= 0.3.0)
- json (>= 1.8.0)
+ uglifier (3.0.0)
+ execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
@@ -200,15 +180,13 @@ PLATFORMS
DEPENDENCIES
builder
font-awesome-middleman
- middleman (~> 3.4.1)
+ middleman
middleman-blog
- middleman-deploy
middleman-favicon-maker
- middleman-inliner
middleman-livereload
middleman-minify-html
- middleman-s3_sync (~> 3.0)
- middleman-sitemap
+ middleman-s3_sync
+ middleman-search_engine_sitemap
middleman-syntax
nokogiri
redcarpet
View
@@ -121,12 +121,6 @@
}
end
-activate :deploy do |deploy|
- deploy.method = :git
- deploy.branch = "old-on-testtube"
- deploy.build_before = true
-end
-
activate :directory_indexes
activate :syntax
@@ -135,15 +129,13 @@
set :markdown_engine, :redcarpet # not kramdown
set :markdown, :fenced_code_blocks => true, :smartypants => true, :autolink => true
-activate :sitemap, :hostname => $base_url
+set :url_root, $base_url
+activate :search_engine_sitemap
## imageoptim is disabled because of the bug.
## please minify manually
# activate :imageoptim, :pngout => false, :svgo => false
-# css and javascript inliner
-activate :inliner
-
activate :s3_sync do |s3_sync|
s3_sync.region = "ap-northeast-1"
s3_sync.index_document = 'index.html'
@@ -1,6 +1,8 @@
+<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-51407961-5', 'auto');
ga('send', 'pageview');
+</script>
View
@@ -1,12 +1,7 @@
<% [
- '//yui.yahooapis.com/combo?pure/0.6.0/pure-min.css&pure/0.6.0/grids-responsive-min.css'
-].each do |css| %>
- <%= stylesheet_link_tag css %>
-<% end %>
-
-<% [
+ '//yui.yahooapis.com/combo?pure/0.6.0/pure-min.css&pure/0.6.0/grids-responsive-min.css',
'layout'
].each do |css| %>
-<%= stylesheet_inline_tag css %>
+ <%= stylesheet_link_tag css %>
<% end %>
View
@@ -7,12 +7,12 @@
<%= feed_tag :atom, "#{blog.options.prefix.to_s}/feed.xml", title: "Atom Feed" %>
<%= partial 'head_css' %>
<!-- lazyloaded css -->
+
+ <%= partial 'ga_tracking_code' %>
</head>
<body>
-<!-- Google Analytics Tracking Code -->
-<%= inline_javascript 'ga_tracking_code' %>
<div id="layout" class="pure-g">

0 comments on commit e7d0024

Please sign in to comment.