#TB-40 Middleman updates and improvements

- Middleman gems were updated - HAML layout structures were updated - Bootstrap-sass was updated - Middleman-deploy plugin was enabled and rakefile was removed - .gitignore file was updated
lixiansky · Jun 6, 2014 · 03ca365 · 03ca365
1 parent 066dc2e
commit 03ca365
Show file tree

Hide file tree

Showing 17 changed files with 172 additions and 556 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,24 +1,20 @@
-*.gem
-*.rbc
-.bundle
-.config
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+# git config --global core.excludesfile ~/.gitignore_global
 
-# IDE
-.idea
+# Ignore bundler config
+/.bundle
 
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
-*.psd
+# Ignore the build directory
+/build
 
-build/
+# Ignore caches
+/.sass-cache
+.cache/
+
+# Ignore .DS_store file
+.DS_Store
+
+.idea/
diff --git a/.nojekyll b/.nojekyll
diff --git a/Gemfile b/Gemfile
@@ -2,19 +2,25 @@
 # the following line to use "https"
 source 'http://rubygems.org'
 
-gem 'middleman', '~>3.2.0'
+gem 'middleman', '~>3.3.3'
 
 # Live-reloading plugin
 gem 'middleman-livereload', '~> 3.1.0'
 
+# Middleman-sprockets
 gem 'middleman-sprockets', '3.3.2'
 
+# Middleman-deploy
+gem 'middleman-deploy', '~> 0.2.4'
+
 # For faster file watcher updates on Windows:
 gem 'wdm', '~> 0.1.0', :platforms => [:mswin, :mingw]
 
+# Windows does not come with time zone data
+gem 'tzinfo-data', platforms: [:mswin, :mingw]
+
 # Compass
-gem 'compass', '~> 0.12.2'
+gem 'compass', '~> 0.12.6'
 
-# Bootstrap sass
-gem 'bootstrap-sass', '~> 3.0.3.0'
-gem 'middleman-gh-pages'
+# Twitter Bootstrap
+gem 'bootstrap-sass', '~> 3.1.1.1'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,105 +1,135 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.15)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    bootstrap-sass (3.0.3.0)
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    bootstrap-sass (3.1.1.1)
       sass (~> 3.2)
-    chunky_png (1.2.9)
+    chunky_png (1.3.1)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
-    compass (0.12.2)
+    coffee-script-source (1.7.0)
+    compass (0.12.6)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
-      sass (~> 3.1)
-    em-websocket (0.5.0)
+      sass (~> 3.2.19)
+    compass-import-once (1.0.4)
+      sass (>= 3.2, < 3.5)
+    em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.5.3)
+      http_parser.rb (~> 0.6.0)
+    erubis (2.7.0)
     eventmachine (1.0.3)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.1.0)
     ffi (1.9.3)
     fssm (0.2.10)
-    haml (4.0.4)
+    haml (4.0.5)
       tilt
     hike (1.2.3)
-    http_parser.rb (0.5.3)
-    i18n (0.6.5)
-    kramdown (1.2.0)
+    hooks (0.4.0)
+      uber (~> 0.0.4)
+    http_parser.rb (0.6.0)
+    i18n (0.6.9)
+    json (1.8.1)
+    kramdown (1.3.3)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    middleman (3.2.0)
+    middleman (3.3.3)
       coffee-script (~> 2.2.0)
-      compass (>= 0.12.2)
-      execjs (~> 1.4.0)
-      haml (>= 3.1.6)
+      compass (>= 0.12.4)
+      compass-import-once (= 1.0.4)
+      execjs (~> 2.0)
+      haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-core (= 3.2.0)
+      middleman-core (= 3.3.3)
       middleman-sprockets (>= 3.1.2)
-      sass (>= 3.1.20)
-      uglifier (~> 2.1.0)
-    middleman-core (3.2.0)
-      activesupport (~> 3.2.6)
+      sass (>= 3.2.17, < 4.0)
+      uglifier (~> 2.5)
+    middleman-core (3.3.3)
+      activesupport (~> 4.1.0)
       bundler (~> 1.1)
-      i18n (~> 0.6.1)
+      erubis
+      hooks (~> 0.3)
+      i18n (~> 0.6.9)
       listen (~> 1.1)
-      rack (>= 1.4.5)
-      rack-test (~> 0.6.1)
+      padrino-helpers (~> 0.12.1)
+      rack (>= 1.4.5, < 2.0)
+      rack-test (~> 0.6.2)
       thor (>= 0.15.2, < 2.0)
-      tilt (~> 1.3.6)
-    middleman-gh-pages (0.0.3)
-      rake (> 0.9.3)
-    middleman-livereload (3.1.0)
+      tilt (~> 1.4.1, < 2.0)
+    middleman-deploy (0.2.4)
+      middleman-core (>= 3.0.0)
+      net-sftp
+      ptools
+    middleman-livereload (3.1.1)
       em-websocket (>= 0.2.0)
       middleman-core (>= 3.0.2)
       multi_json (~> 1.0)
       rack-livereload
-    middleman-sprockets (3.2.0)
-      middleman-core (~> 3.2)
-      sprockets (~> 2.1)
-      sprockets-helpers (~> 1.0.0)
+    middleman-sprockets (3.3.2)
+      middleman-core (>= 3.2)
+      sprockets (~> 2.2)
+      sprockets-helpers (~> 1.1.0)
       sprockets-sass (~> 1.0.0)
-    multi_json (1.8.2)
+    minitest (5.3.4)
+    multi_json (1.10.1)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.1)
+    padrino-helpers (0.12.2)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-support (= 0.12.2)
+      tilt (~> 1.4.1)
+    padrino-support (0.12.2)
+      activesupport (>= 3.1)
+    ptools (1.2.4)
     rack (1.5.2)
     rack-livereload (0.3.15)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.1.1)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.4)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
+    rb-kqueue (0.2.3)
       ffi (>= 0.5.0)
-    sass (3.2.12)
-    sprockets (2.10.1)
+    sass (3.2.19)
+    sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-helpers (1.0.1)
+    sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
-    sprockets-sass (1.0.2)
+    sprockets-sass (1.0.3)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    thor (0.18.1)
-    tilt (1.3.7)
-    uglifier (2.1.2)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
+    uber (0.0.6)
+    uglifier (2.5.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bootstrap-sass (~> 3.0.3.0)
-  compass (~> 0.12.2)
-  middleman (~> 3.2.0)
-  middleman-gh-pages
+  bootstrap-sass (~> 3.1.1.1)
+  compass (~> 0.12.6)
+  middleman (~> 3.3.3)
+  middleman-deploy (~> 0.2.4)
   middleman-livereload (~> 3.1.0)
+  middleman-sprockets (= 3.3.2)
+  tzinfo-data
   wdm (~> 0.1.0)
diff --git a/Rakefile b/Rakefile
diff --git a/config.rb b/config.rb
@@ -2,50 +2,32 @@
 # Compass
 ###
 
-# Bootstrap
-# First: 
-#    gem install sass-rails
-#    gem install bootstrap-sass
-require 'bootstrap-sass'
-
-# Susy grids in Compass
-# First: gem install compass-susy-plugin
-# require 'susy'
-
 # Change Compass configuration
-compass_config do |config|
-  config.output_style = :nested
-  config.http_path = '/'
-  config.images_dir = 'assets/images'
-  config.javascripts_dir = 'assets/javascripts'
-end
-
-# Cache Buster
-#activate :asset_hash
-activate :cache_buster
+# compass_config do |config|
+#   config.output_style = :compact
+# end
 
 ###
 # Page options, layouts, aliases and proxies
 ###
 
 # Per-page layout changes:
-# 
+#
 # With no layout
 # page "/path/to/file.html", :layout => false
-# 
+#
 # With alternative layout
 # page "/path/to/file.html", :layout => :otherlayout
-# 
-# A path which all have the same  layout
+#
+# A path which all have the same layout
 with_layout :login do
-   page '/index.html'
-   page '/forgot_password.html'
+  page '/index.html'
+  page '/forgot_password.html'
 end
 
-# Proxy (fake) files
-# page "/this-page-has-no-template.html", :proxy => "/template-file.html" do
-#   @which_fake_page = "Rendering a fake page with a variable"
-# end
+# Proxy pages (http://middlemanapp.com/basics/dynamic-pages/)
+# proxy "/this-page-has-no-template.html", "/template-file.html", :locals => {
+#  :which_fake_page => "Rendering a fake page with a local variable" }
 
 ###
 # Helpers
@@ -54,8 +36,13 @@
 # Automatic image dimensions on image_tag helper
 activate :automatic_image_sizes
 
-# Live Reload
-activate :livereload
+# Reload the browser automatically whenever files change
+configure :development do
+  activate :livereload
+end
+
+# Pretty URLs
+activate :directory_indexes
 
 # Methods defined in the helpers block are available in templates
 # helpers do
@@ -70,8 +57,9 @@
 set :css_dir, 'assets/stylesheets'
 set :js_dir, 'assets/javascripts'
 set :images_dir, 'assets/images'
+set :fonts_dir, 'assets/fonts'
 
-activate :directory_indexes
+set :haml, format: :html5
 
 # Build-specific configuration
 configure :build do
@@ -82,16 +70,20 @@
   activate :minify_javascript
 
   # Enable cache buster
-  activate :cache_buster
+  activate :asset_hash
 
   # Use relative URLs
   activate :relative_assets
 
-  # Compress PNGs after build
-  # First: gem install middleman-smusher
-  # require "middleman-smusher"
-  # activate :smusher
-
   # Or use a different image path
-  #set :http_path, "/img/"
+  # set :http_prefix, "/Content/images/"
+end
+config[:file_watcher_ignore] += [ /.idea\// ]
+
+# Deployment
+activate :deploy do |deploy|
+  deploy.method = :git
+  # Optional Settings
+  deploy.remote = '[email protected]:lab2023/hierapolis.git'
+  deploy.branch = 'gh-pages'
 end