middleman 2.0.0.1 → 2.0.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -160,6 +160,21 @@ module Middleman
160
160
  sandbox.class_eval(&block) if block_given?
161
161
  sandbox
162
162
  end
163
+
164
+ def self.start_server(options={})
165
+ opts = {
166
+ :Port => options[:port],
167
+ :AccessLog => []
168
+ }
169
+
170
+ app = ::Middleman.server
171
+ app.set :environment, options[:environment].to_sym
172
+ opts[:app] = app.new
173
+ opts[:server] = 'thin'
174
+
175
+ $stderr.puts "== The Middleman is standing watch on port #{opts[:Port]}"
176
+ ::Rack::Server.new(opts).start
177
+ end
163
178
  end
164
179
 
165
180
  require "middleman/version"
@@ -28,37 +28,37 @@ module Middleman::Base
28
28
  app.set :static, false
29
29
 
30
30
  app.set :views, "source"
31
-
31
+
32
32
  # Add Builder Callbacks
33
33
  app.register Middleman::CoreExtensions::Builder
34
34
 
35
35
  # Add Rack::Builder.map to Sinatra
36
36
  app.register Middleman::CoreExtensions::RackMap
37
-
37
+
38
38
  # Activate custom features
39
39
  app.register Middleman::CoreExtensions::Features
40
-
40
+
41
41
  # Setup custom rendering
42
42
  app.register Middleman::CoreExtensions::Rendering
43
-
43
+
44
44
  # Compass framework
45
45
  app.register Middleman::CoreExtensions::Compass
46
-
46
+
47
47
  # Sprockets asset handling
48
48
  app.register Middleman::CoreExtensions::Sprockets
49
-
49
+
50
50
  # Setup asset path pipeline
51
51
  app.register Middleman::CoreExtensions::Assets
52
-
52
+
53
53
  # Activate built-in helpers
54
54
  app.register Middleman::CoreExtensions::DefaultHelpers
55
-
55
+
56
56
  # Activate Yaml Data package
57
57
  app.register Middleman::CoreExtensions::Data
58
-
58
+
59
59
  # with_layout and page routing
60
60
  app.register Middleman::CoreExtensions::Routing
61
-
61
+
62
62
  # Parse YAML from templates
63
63
  app.register Middleman::CoreExtensions::FrontMatter
64
64
 
@@ -37,10 +37,11 @@ module Middleman
37
37
  method_option "livereload-port", :default => "35729", :desc => "The port Livereload will listen on"
38
38
  def server
39
39
  v1_check
40
+
40
41
  if options["livereload"]
41
42
  livereload_options = {:port => options["livereload-port"]}
42
43
  end
43
-
44
+
44
45
  Middleman::Guard.start({
45
46
  :port => options[:port],
46
47
  :environment => options[:environment]
@@ -1,8 +1,12 @@
1
1
  require "guard"
2
2
  require "guard/guard"
3
3
  require "guard/livereload"
4
- require "webrick"
4
+ require "rbconfig"
5
5
 
6
+ if Config::CONFIG['host_os'].downcase =~ %r{mswin|mingw}
7
+ require "win32/process"
8
+ end
9
+
6
10
  module Middleman::Guard
7
11
  def self.start(options={}, livereload={})
8
12
  options_hash = ""
@@ -25,7 +29,7 @@ module Middleman::Guard
25
29
 
26
30
  guardfile_contents << %Q{
27
31
  guard 'livereload'#{livereload_options_hash} do
28
- watch(%r{^source/^[^\.](.*)$})
32
+ watch(%r{^source/([^\.].*)$})
29
33
  end
30
34
  }
31
35
  end
@@ -38,9 +42,7 @@ module Guard
38
42
  class Middleman < Guard
39
43
  def initialize(watchers = [], options = {})
40
44
  super
41
- @options = {
42
- :port => '4567'
43
- }.update(options)
45
+ @options = options
44
46
  end
45
47
 
46
48
  def start
@@ -54,21 +56,9 @@ module Guard
54
56
 
55
57
  private
56
58
  def server_start
57
- @server_options = {
58
- :Port => @options[:port],
59
- :AccessLog => []
60
- # :AccessLog => ::WEBrick::Log.new('/dev/null'),
61
- # :Logger => ::WEBrick::Log.new('/dev/null')
62
- }
63
59
  @server_job = fork do
64
- app = ::Middleman.server
65
- app.set :environment, @options[:environment].to_sym
66
- @server_options[:app] = app.new
67
- @server_options[:server] = 'thin'
68
- ::Rack::Server.new(@server_options).start
60
+ ::Middleman.start_server(@options)
69
61
  end
70
-
71
- puts "== The Middleman is standing watch on port #{@options[:port]}"
72
62
  end
73
63
 
74
64
  def server_stop
@@ -76,7 +66,7 @@ module Guard
76
66
  Process.kill("KILL", @server_job)
77
67
  Process.wait @server_job
78
68
  @server_job = nil
79
- @server_options[:app] = nil
69
+ # @server_options[:app] = nil
80
70
  end
81
71
  end
82
72
  end
@@ -1,3 +1,3 @@
1
1
  module Middleman
2
- VERSION = "2.0.0.1"
2
+ VERSION = "2.0.0.2"
3
3
  end
@@ -1,4 +1,6 @@
1
1
  # -*- encoding: utf-8 -*-
2
+ require "rbconfig"
3
+
2
4
  $:.push File.expand_path("../lib", __FILE__)
3
5
  require "middleman/version"
4
6
 
@@ -40,8 +42,8 @@ eos
40
42
  s.add_runtime_dependency("tilt", ["~> 1.3.1"])
41
43
  s.add_runtime_dependency("maruku", ["~> 0.6.0"])
42
44
  s.add_runtime_dependency("sinatra", ["~> 1.2.6"])
43
- s.add_runtime_dependency("padrino-core", ["~> 0.10.1"])
44
- s.add_runtime_dependency("padrino-helpers", ["~> 0.10.1"])
45
+ s.add_runtime_dependency("padrino-core", ["~> 0.10.0", '< 0.10.1'])
46
+ s.add_runtime_dependency("padrino-helpers", ["~> 0.10.0", '< 0.10.1'])
45
47
  s.add_runtime_dependency("rack-test", ["~> 0.6.1"])
46
48
  s.add_runtime_dependency("uglifier", ["~> 1.0.0"])
47
49
  s.add_runtime_dependency("slim", ["~> 0.9.0"])
@@ -51,8 +53,16 @@ eos
51
53
  s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
52
54
  s.add_runtime_dependency("sprockets", ["2.0.0.beta.13"])
53
55
  s.add_runtime_dependency("httparty", ["~> 0.7.8"])
56
+
57
+ case Config::CONFIG['host_os'].downcase
58
+ when %r{mswin|mingw}
59
+ # s.add_runtime_dependency "windows-api", "= 0.4.0"
60
+ # s.add_runtime_dependency "windows-pr", "= 1.1.2"
61
+ s.add_runtime_dependency("win32-process", ["~> 0.6.5"])
62
+ end
63
+
54
64
  s.add_runtime_dependency("guard", ["~> 0.5.1"])
55
- s.add_runtime_dependency("guard-livereload", ["~> 0.2.1"])
65
+ s.add_runtime_dependency("guard-livereload", ["~> 0.3.0"])
56
66
  s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
57
67
  s.add_development_dependency("cucumber", ["~> 1.0.2"])
58
68
  s.add_development_dependency("rake", ["0.8.7"])
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman
3
3
  version: !ruby/object:Gem::Version
4
- hash: 109
4
+ hash: 107
5
5
  prerelease:
6
6
  segments:
7
7
  - 2
8
8
  - 0
9
9
  - 0
10
- - 1
11
- version: 2.0.0.1
10
+ - 2
11
+ version: 2.0.0.2
12
12
  platform: ruby
13
13
  authors:
14
14
  - Thomas Reynolds
@@ -121,6 +121,14 @@ dependencies:
121
121
  none: false
122
122
  requirements:
123
123
  - - ~>
124
+ - !ruby/object:Gem::Version
125
+ hash: 55
126
+ segments:
127
+ - 0
128
+ - 10
129
+ - 0
130
+ version: 0.10.0
131
+ - - <
124
132
  - !ruby/object:Gem::Version
125
133
  hash: 53
126
134
  segments:
@@ -137,6 +145,14 @@ dependencies:
137
145
  none: false
138
146
  requirements:
139
147
  - - ~>
148
+ - !ruby/object:Gem::Version
149
+ hash: 55
150
+ segments:
151
+ - 0
152
+ - 10
153
+ - 0
154
+ version: 0.10.0
155
+ - - <
140
156
  - !ruby/object:Gem::Version
141
157
  hash: 53
142
158
  segments:
@@ -324,12 +340,12 @@ dependencies:
324
340
  requirements:
325
341
  - - ~>
326
342
  - !ruby/object:Gem::Version
327
- hash: 21
343
+ hash: 19
328
344
  segments:
329
345
  - 0
330
- - 2
331
- - 1
332
- version: 0.2.1
346
+ - 3
347
+ - 0
348
+ version: 0.3.0
333
349
  type: :runtime
334
350
  version_requirements: *id019
335
351
  - !ruby/object:Gem::Dependency