middleman 2.0.0.rc4 → 2.0.0.rc5

data/CHANGELOG

@@ -1,6 +1,8 @@
 2.0.0
 =====
 
+- Guard-powered auto-reloading of config.rb
+- Guard LiveReload
 - Sprockets JS
 - Refactored Dynamically Reloadable Core
 - Combine views/ and public/ into a single source/ folder.

data/bin/mm-build

@@ -4,6 +4,4 @@ ENV['MM_ENV'] = "build"
 
 # Require app
 require File.join(File.dirname(__FILE__), "..", "lib", "middleman")
-
-require 'middleman'
 Middleman::Builder.start

data/bin/mm-migrate

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+`mv public source`
+`ditto views source`
+`rm -rf views`

data/bin/mm-server

@@ -1,75 +1,45 @@
 #!/usr/bin/env ruby
 
-require 'optparse'
+require "thor"
+require "thor/group"
 
 # Require Middleman
 require File.join(File.dirname(__FILE__), '..', 'lib', 'middleman')
 
-sandboxed_server = Middleman.server
-
-env = ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development'
-options = { :Port => 4567, :AccessLog => [] }
-
-# TODO: Switch to Thor
-OptionParser.new { |opts|
-  opts.banner = "Usage: mm-server [rack options]"
-  opts.separator ""
-  opts.separator "Rack options:"
-  opts.on("-p", "--port PORT", "use PORT (default: 4567)") { |port|
-    options[:Port] = port
-  }
-  opts.on("-E", "--env ENVIRONMENT", "use ENVIRONMENT for defaults (default: development)") { |e|
-    env = e
-  }
-  opts.on("--debug", "Debug mode") {
-    sandboxed_server.set :logging, true
-  }
-
-  opts.parse! ARGV
-}
-
-ENV['RACK_ENV'] = env
-
-@current_path = Dir.pwd
-@path_parts = @current_path.split("/")
-@found_root = false
-
-while (!@found_root && (@path_parts.length > 0))
-  @current_path = File.join(*@path_parts)
-  
-  source_folder = File.join(@current_path, "source")
-  
-  if File.exists?(source_folder)
-    @found_root = true
-    next
+module Middleman
+  class GuardServer < ::Thor::Group
+    include Thor::Actions
+    
+    class_option :environment, :aliases => "-e", :default => ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development'
+    
+    class_option :port, :aliases => "-p", :default => "4567"
+    class_option :"livereload-port", :default => "35729"
+    class_option :"livereload", :default => true, :type => :boolean
+    
+    def start_guard
+      if !File.exists?("config.rb")
+        $stderr.puts "== Error: Could not find a Middleman project config, perhaps you are in the wrong folder?"
+        return
+      end
+
+      # If the old directories exists, use it, but issue warning
+      if File.exists?("views") || File.exists?("public")
+        $stderr.puts "== Error: The views and public folders are have been combined. Create a new 'source' folder, add the contents of views and public to it and then remove the empty views and public folders."
+        return
+      end
+
+      ENV['RACK_ENV'] = options[:environment]
+      
+      livereload_options = {
+        :port => options[:"livereload-port"]
+      }
+      livereload_options = nil unless options[:"livereload"] 
+      
+      ::Middleman::Guard.start({
+        :port => options[:port],
+      }, livereload_options)
+    end
   end
-  
-  @path_parts.pop
 end
 
-if !@found_root
-  $stderr.puts "== Error: Could not find a Middleman project structure, perhaps you are in the wrong folder?"
-  exit
-end
-
-# If the old init.rb exists, issue warning
-old_config = File.join(@current_path, "init.rb")
-if File.exists? old_config
-  $stderr.puts "== Error: The init.rb file (deprecated) needs to be be renamed to config.rb"
-  exit
-end
-
-# If the old directories exists, use it, but issue warning
-old_views = File.join(@current_path, "views")
-old_public = File.join(@current_path, "public")
-if File.exists?(old_views) || File.exists?(old_public)
-  $stderr.puts "== Error: The views and public folders are have been combined. Create a new 'source' folder, add the contents of views and public to it and then remove the empty views and public folders."
-  exit
-end
-
-sandboxed_server.set :root, @current_path
-options[:app]    = sandboxed_server.new
-# options[:server] = 'webrick'
-
-puts "== The Middleman is standing watch on port #{options[:Port]}"
-Rack::Server.new(options).start
+Middleman::GuardServer.start

data/lib/middleman.rb

@@ -66,6 +66,7 @@ module Middleman
   # Auto-load modules on-demand
   autoload :Base,      "middleman/base"
   autoload :Builder,   "middleman/builder"
+  autoload :Guard,     "middleman/guard"
   
   # Custom Renderers
   module Renderers
@@ -143,6 +144,9 @@ module Middleman
 
     # Proxy web services requests in dev mode only
     autoload :Proxy,               "middleman/features/proxy"
+    
+    # guard-livereload
+    autoload :LiveReload,          "middleman/features/live_reload"
 
     # Automatically resize images for mobile devises
     # autoload :TinySrc,             "middleman/features/tiny_src"

data/lib/middleman/guard.rb

@@ -0,0 +1,71 @@
+require "guard"
+require "guard/guard"
+require "guard/livereload"
+
+module Middleman::Guard
+  def self.start(options={}, livereload={})
+    options_hash = ""
+    options.each do |k,v|
+      options_hash << ", :#{k} => '#{v}'"
+    end
+    
+    guardfile_contents = %Q{
+      guard 'middleman'#{options_hash} do 
+        watch("config.rb")
+      end
+    }
+    
+    if livereload
+      livereload_options_hash = ""
+      livereload.each do |k,v|
+        livereload_options_hash << ", :#{k} => '#{v}'"
+      end
+      
+      guardfile_contents << %Q{
+        guard 'livereload'#{livereload_options_hash} do 
+          watch(%r{^source/(.*)$})
+        end
+      }
+    end
+    
+    ::Guard.start({ :guardfile_contents => guardfile_contents })
+  end
+end
+
+module Guard
+  class Middleman < Guard
+    def initialize(watchers = [], options = {})
+      super
+      @options = {
+        :port => '4567'
+      }.update(options)
+    end
+    
+    def start
+      server_start
+    end
+  
+    def run_on_change(paths)
+      server_stop
+      server_start
+    end
+
+  private
+    def server_start
+      puts "== The Middleman is standing watch on port #{@options[:port]}"
+      @server_options = { :Port => @options[:port], :AccessLog => [] }
+      @server_job = fork do
+        @server_options[:app] = ::Middleman.server.new
+        ::Rack::Server.new(@server_options).start
+      end
+    end
+  
+    def server_stop
+      puts "== The Middleman is shutting down"
+      Process.kill("KILL", @server_job)
+      Process.wait @server_job
+      @server_job = nil
+      @server_options[:app] = nil
+    end
+  end
+end

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0.rc4"
+  VERSION = "2.0.0.rc5"
 end

data/middleman.gemspec

@@ -34,6 +34,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("compass", ["~> 0.11.3"])
   s.add_runtime_dependency("sprockets", ["2.0.0.beta.10"])
   s.add_runtime_dependency("httparty", ["~> 0.7.0"])
+  s.add_runtime_dependency("guard", [">= 0"])
+  s.add_runtime_dependency("guard-livereload", [">= 0"])
   s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
   s.add_development_dependency("cucumber", ["~> 0.10.0"])
   s.add_development_dependency("rake", ["0.8.7"])

metadata

@@ -2,7 +2,7 @@
 name: middleman
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.rc4
+  version: 2.0.0.rc5
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -190,66 +190,89 @@ dependencies:
   type: :runtime
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: coffee-filter
+  name: guard
   prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: guard-livereload
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  name: coffee-filter
+  prerelease: false
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.1.1
   type: :development
-  version_requirements: *id017
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.10.0
   type: :development
-  version_requirements: *id018
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 0.8.7
   type: :development
-  version_requirements: *id019
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id020
+  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
   name: rocco
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id021
+  version_requirements: *id023
 description: 
 email: 
 - tdreyno@gmail.com
 executables: 
 - mm-build
 - mm-init
+- mm-migrate
 - mm-server
 extensions: []
 
@@ -267,6 +290,7 @@ files:
 - Rakefile
 - bin/mm-build
 - bin/mm-init
+- bin/mm-migrate
 - bin/mm-server
 - features/asset_host.feature
 - features/automatic_image_sizes.feature
@@ -370,6 +394,7 @@ files:
 - lib/middleman/features/proxy.rb
 - lib/middleman/features/relative_assets.rb
 - lib/middleman/features/tiny_src.rb
+- lib/middleman/guard.rb
 - lib/middleman/renderers/coffee_script.rb
 - lib/middleman/renderers/haml.rb
 - lib/middleman/renderers/markdown.rb