From 4f86fcd89fc985ae9ea4a9445a5d9b93596c7d91 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Sun, 11 Sep 2011 10:46:35 -0700 Subject: [PATCH] try the windows gem again --- lib/middleman/guard.rb | 3 +-- lib/middleman/version.rb | 2 +- ...eman-x86-mswin32.gemspec => middleman-x86-mingw32.gemspec | 5 ++--- middleman.gemspec | 3 +-- 4 files changed, 5 insertions(+), 8 deletions(-) rename middleman-x86-mswin32.gemspec => middleman-x86-mingw32.gemspec (96%) diff --git a/lib/middleman/guard.rb b/lib/middleman/guard.rb index 533a0d12..be67a2e1 100644 --- a/lib/middleman/guard.rb +++ b/lib/middleman/guard.rb @@ -2,9 +2,8 @@ require "guard" require "guard/guard" require "rbconfig" -if Config::CONFIG['host_os'].downcase =~ %r{mswin|mingw} +if Config::CONFIG['host_os'].downcase =~ %r{mingw} require "win32/process" - require 'win32console' end module Middleman diff --git a/lib/middleman/version.rb b/lib/middleman/version.rb index df2300a1..f9f155c9 100644 --- a/lib/middleman/version.rb +++ b/lib/middleman/version.rb @@ -1,3 +1,3 @@ module Middleman - VERSION = "2.0.9.pre" + VERSION = "2.0.9.pre.2" end diff --git a/middleman-x86-mswin32.gemspec b/middleman-x86-mingw32.gemspec similarity index 96% rename from middleman-x86-mswin32.gemspec rename to middleman-x86-mingw32.gemspec index 0e72d733..76bc3047 100644 --- a/middleman-x86-mswin32.gemspec +++ b/middleman-x86-mingw32.gemspec @@ -7,7 +7,7 @@ require "middleman/version" Gem::Specification.new do |s| s.name = "middleman" s.version = Middleman::VERSION - s.platform = "x86-mswin32" + s.platform = "x86-mingw32" s.license = "MIT" s.authors = ["Thomas Reynolds"] s.email = ["me@tdreyno.com"] @@ -55,10 +55,9 @@ eos s.add_dependency("padrino-helpers", ["~> 0.10.2"]) # case s.platform.to_s - # when %r{mswin|mingw} + # when %r{mingw} s.add_dependency("eventmachine", ["1.0.0.beta.3"]) s.add_dependency("win32-process", ["~> 0.6.5"]) - s.add_dependency("win32console", ["~> 1.3.0"]) s.add_dependency("rb-fchange") # else # s.add_dependency("rb-fsevent", ["~> 0.4.2"]) diff --git a/middleman.gemspec b/middleman.gemspec index c7aee52d..138d9388 100644 --- a/middleman.gemspec +++ b/middleman.gemspec @@ -55,10 +55,9 @@ eos s.add_dependency("padrino-helpers", ["~> 0.10.2"]) # case s.platform.to_s - # when %r{mswin|mingw} + # when %r{mingw} # s.add_dependency("eventmachine", ["1.0.0.beta.3"]) # s.add_dependency("win32-process", ["~> 0.6.5"]) - # s.add_dependency("win32console", ["~> 1.3.0"]) # s.add_dependency("rb-fchange") # else s.add_dependency("rb-fsevent", ["~> 0.4.2"])