middleman 2.0.0.1 → 2.0.0.2

data/lib/middleman.rb

@@ -160,6 +160,21 @@ module Middleman
     sandbox.class_eval(&block) if block_given?
     sandbox
   end
+  
+  def self.start_server(options={})
+    opts = {
+      :Port      => options[:port],
+      :AccessLog => []
+    }
+    
+    app = ::Middleman.server
+    app.set :environment, options[:environment].to_sym
+    opts[:app] = app.new
+    opts[:server] = 'thin'
+
+    $stderr.puts "== The Middleman is standing watch on port #{opts[:Port]}"
+    ::Rack::Server.new(opts).start
+  end
 end
 
 require "middleman/version"

data/lib/middleman/base.rb

@@ -28,37 +28,37 @@ module Middleman::Base
       app.set :static, false
 
       app.set :views, "source"
-
+      
       # Add Builder Callbacks
       app.register Middleman::CoreExtensions::Builder
       
       # Add Rack::Builder.map to Sinatra
       app.register Middleman::CoreExtensions::RackMap
-
+      
       # Activate custom features
       app.register Middleman::CoreExtensions::Features
-
+      
       # Setup custom rendering
       app.register Middleman::CoreExtensions::Rendering
-
+      
       # Compass framework
       app.register Middleman::CoreExtensions::Compass
-
+      
       # Sprockets asset handling
       app.register Middleman::CoreExtensions::Sprockets
-
+      
       # Setup asset path pipeline
       app.register Middleman::CoreExtensions::Assets
-
+      
       # Activate built-in helpers
       app.register Middleman::CoreExtensions::DefaultHelpers
-
+      
       # Activate Yaml Data package
       app.register Middleman::CoreExtensions::Data
-
+      
       # with_layout and page routing
       app.register Middleman::CoreExtensions::Routing
-
+      
       # Parse YAML from templates
       app.register Middleman::CoreExtensions::FrontMatter
 

data/lib/middleman/cli.rb

@@ -37,10 +37,11 @@ module Middleman
     method_option "livereload-port", :default => "35729", :desc => "The port Livereload will listen on"
     def server
       v1_check
+      
       if options["livereload"]
         livereload_options = {:port => options["livereload-port"]}
       end
-      
+    
       Middleman::Guard.start({
         :port        => options[:port],
         :environment => options[:environment]

data/lib/middleman/guard.rb

@@ -1,8 +1,12 @@
 require "guard"
 require "guard/guard"
 require "guard/livereload"
-require "webrick"
+require "rbconfig"
 
+if Config::CONFIG['host_os'].downcase =~ %r{mswin|mingw}
+  require "win32/process"
+end
+  
 module Middleman::Guard
   def self.start(options={}, livereload={})
     options_hash = ""
@@ -25,7 +29,7 @@ module Middleman::Guard
       
       guardfile_contents << %Q{
         guard 'livereload'#{livereload_options_hash} do 
-          watch(%r{^source/^[^\.](.*)$})
+          watch(%r{^source/([^\.].*)$})
         end
       }
     end
@@ -38,9 +42,7 @@ module Guard
   class Middleman < Guard
     def initialize(watchers = [], options = {})
       super
-      @options = {
-        :port => '4567'
-      }.update(options)
+      @options = options
     end
     
     def start
@@ -54,21 +56,9 @@ module Guard
 
   private
     def server_start
-      @server_options = { 
-        :Port => @options[:port],
-        :AccessLog => []
-        # :AccessLog => ::WEBrick::Log.new('/dev/null'),
-        # :Logger => ::WEBrick::Log.new('/dev/null')
-      }
       @server_job = fork do
-        app = ::Middleman.server
-        app.set :environment, @options[:environment].to_sym
-        @server_options[:app] = app.new
-        @server_options[:server] = 'thin'
-        ::Rack::Server.new(@server_options).start
+        ::Middleman.start_server(@options)
       end
-
-      puts "== The Middleman is standing watch on port #{@options[:port]}"
     end
   
     def server_stop
@@ -76,7 +66,7 @@ module Guard
       Process.kill("KILL", @server_job)
       Process.wait @server_job
       @server_job = nil
-      @server_options[:app] = nil
+      # @server_options[:app] = nil
     end
   end
 end

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0.1"
+  VERSION = "2.0.0.2"
 end

data/middleman.gemspec

@@ -1,4 +1,6 @@
 # -*- encoding: utf-8 -*-
+require "rbconfig"
+
 $:.push File.expand_path("../lib", __FILE__)
 require "middleman/version"
 
@@ -40,8 +42,8 @@ eos
   s.add_runtime_dependency("tilt", ["~> 1.3.1"])
   s.add_runtime_dependency("maruku", ["~> 0.6.0"])
   s.add_runtime_dependency("sinatra", ["~> 1.2.6"])
-  s.add_runtime_dependency("padrino-core", ["~> 0.10.1"])
-  s.add_runtime_dependency("padrino-helpers", ["~> 0.10.1"])
+  s.add_runtime_dependency("padrino-core", ["~> 0.10.0", '< 0.10.1'])
+  s.add_runtime_dependency("padrino-helpers", ["~> 0.10.0", '< 0.10.1'])
   s.add_runtime_dependency("rack-test", ["~> 0.6.1"])
   s.add_runtime_dependency("uglifier", ["~> 1.0.0"])
   s.add_runtime_dependency("slim", ["~> 0.9.0"])
@@ -51,8 +53,16 @@ eos
   s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
   s.add_runtime_dependency("sprockets", ["2.0.0.beta.13"])
   s.add_runtime_dependency("httparty", ["~> 0.7.8"])
+  
+  case Config::CONFIG['host_os'].downcase
+  when %r{mswin|mingw}
+    # s.add_runtime_dependency "windows-api", "= 0.4.0"
+    # s.add_runtime_dependency "windows-pr", "= 1.1.2"
+    s.add_runtime_dependency("win32-process", ["~> 0.6.5"])
+  end
+  
   s.add_runtime_dependency("guard", ["~> 0.5.1"])
-  s.add_runtime_dependency("guard-livereload", ["~> 0.2.1"])
+  s.add_runtime_dependency("guard-livereload", ["~> 0.3.0"])
   s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
   s.add_development_dependency("cucumber", ["~> 1.0.2"])
   s.add_development_dependency("rake", ["0.8.7"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 109
+  hash: 107
   prerelease: 
   segments: 
   - 2
   - 0
   - 0
-  - 1
-  version: 2.0.0.1
+  - 2
+  version: 2.0.0.2
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -121,6 +121,14 @@ dependencies:
     none: false
     requirements: 
     - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
+        version: 0.10.0
+    - - <
       - !ruby/object:Gem::Version 
         hash: 53
         segments: 
@@ -137,6 +145,14 @@ dependencies:
     none: false
     requirements: 
     - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
+        version: 0.10.0
+    - - <
       - !ruby/object:Gem::Version 
         hash: 53
         segments: 
@@ -324,12 +340,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 19
         segments: 
         - 0
-        - 2
-        - 1
-        version: 0.2.1
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id019
 - !ruby/object:Gem::Dependency