commit b10ba6d33dc0330c2daf56a2f02e73d35abe3357
parent 69a78db355bb48dbd156faea9c21a24e73cfa726
Author: Whyme.Lyu <callme5long@gmail.com>
Date: Fri, 3 May 2013 05:22:25 -0700
Merge pull request #36 from 5long/depend-on-ncursesw-fork
Depend on our own ncursesw fork
Diffstat:
5 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/Gemfile.ci b/Gemfile.ci
@@ -5,7 +5,7 @@ source :rubygems
# Original runtime deps
gem "xapian-full-alaveteli", "~> 1.2"
-gem "ncursesw"
+gem "ncursesw-sup", "~> 1.3", ">= 1.3.1"
gem "rmail", ">= 0.17"
gem "highline"
gem "trollop", ">= 1.12"
diff --git a/Rakefile b/Rakefile
@@ -62,7 +62,7 @@ spec = Gem::Specification.new do |s|
s.executables = SUP_EXECUTABLES
s.add_dependency "xapian-full-alaveteli", "~> 1.2"
- s.add_dependency "ncursesw"
+ s.add_dependency "ncursesw-sup", "~> 1.3", ">= 1.3.1"
s.add_dependency "rmail", ">= 0.17"
s.add_dependency "highline"
s.add_dependency "trollop", ">= 1.12"
diff --git a/bin/sup b/bin/sup
@@ -2,13 +2,7 @@
require 'rubygems'
-no_ncursesw = false
-begin
- require 'ncursesw'
-rescue LoadError
- require 'ncurses'
- no_ncursesw = true
-end
+require 'ncursesw'
no_gpgme = false
begin
@@ -28,10 +22,6 @@ if ENV['SUP_PROFILE']
RubyProf.start
end
-if no_ncursesw
- info "No 'ncursesw' gem detected. Install it for wide character support."
-end
-
if no_gpgme
info "No 'gpgme' gem detected. Install it for email encryption, decryption and signatures."
end
diff --git a/contrib/colorpicker.rb b/contrib/colorpicker.rb
@@ -1,10 +1,6 @@
require 'rubygems'
-begin
- require 'ncursesw'
-rescue LoadError
- require 'ncurses'
-end
+require 'ncursesw'
Ncurses.initscr
Ncurses.noecho
diff --git a/lib/sup/buffer.rb b/lib/sup/buffer.rb
@@ -1,11 +1,7 @@
require 'etc'
require 'thread'
-begin
- require 'ncursesw'
-rescue LoadError
- require 'ncurses'
-end
+require 'ncursesw'
if defined? Ncurses
module Ncurses