curses 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3dc6c1993c3ebe20eb4e46e30773476f8644a174cc438eb5518113d5b67f816
-  data.tar.gz: 24f0c4505ce46d75e45d26003920b6cd03809e29d3d8384b5f243cd1ec15c473
+  metadata.gz: ab24f57e39b3e38b5b9833d34f9bf5d6c2d55337f59693c628e30aa1f4f7324e
+  data.tar.gz: a91a892d3c975670cccda3d99a5d7b7a9b0ff8e708aedaf87a2d57cc505d6338
 SHA512:
-  metadata.gz: ea5cf9b18d0dbb6d95f7695dda34f7ebc47eb3385d5c0501a2adbccc67a3151c79777712b0dee96e1985077c1feb8d68ba2ba570addd507ca2356830f431bf49
-  data.tar.gz: e13765a7885c62940a4d0579e5b3c41dd9be710d84208e848cbea7b4f6b3270e2518eeb0be202f6728d4d7c311ab4dabcbc61a6da32b3b402fed61fa75dad784
+  metadata.gz: eff7ca406eeb081d6dcac3fe394e44577fdfdfa41428ecfb2068fd7de5288204df78081ff1e5bc41f5594c43194e8b20797ae6361cf7ffa028faf7301b085dd9
+  data.tar.gz: d06b2e6d23e5eaac2b5c42cc9b433ef6e5ea25961e28dbe760d51b3fee5aadb2d5f68e76e1a7b1b066ecbcdc129b079c00e7e8427d7e31f4fe65950239eae9b5

data/.github/workflows/macos.yml

@@ -0,0 +1,19 @@
+name: macos
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install dependencies
+      run: |
+        gem install bundler --no-document
+        bundle install
+    - name: Build package
+      run: bundle exec rake build
+    - name: Install package
+      run: |
+        gem install pkg/curses-*.gem
+        ruby -r curses -e 'puts Curses::VERSION'

data/.github/workflows/ubuntu.yml

@@ -0,0 +1,26 @@
+name: ubuntu
+
+on: [push]
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        ruby: [ head, 2.7, 2.6, 2.5 ]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: |
+        sudo apt install libncursesw5-dev
+        gem install bundler --no-document
+        bundle install
+    - name: Build package
+      run: bundle exec rake build
+    - name: Install package
+      run: |
+        gem install pkg/curses-*.gem
+        ruby -r curses -e 'puts Curses::VERSION'

data/.github/workflows/windows.yml

@@ -0,0 +1,28 @@
+name: windows
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        ruby: [ '2.7.x', '2.6.x', '2.5.x' ]
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Set up Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: |
+        gem install bundler --no-document
+        bundle install
+    - name: Build package
+      run: bundle exec rake build
+    - name: Install package
+      run: |
+        gem install pkg/curses-*.gem
+        ruby -r curses -e 'puts Curses::VERSION'

data/History.md

@@ -1,3 +1,9 @@
+### 1.4.0 / 2020-12-10
+
+New features:
+
+* Remove fat binary support for newer versions of Ruby
+
 ### 1.3.2 / 2019-12-20
 
 Bug fixes:

data/README.md

@@ -18,7 +18,7 @@ with the release of Ruby 2.1.0. (see [ruby/ruby@9c5b2fd][2])
 ## Install
 
     $ gem install curses
-        
+
 Requires ncurses or ncursesw (with wide character support).
 On Debian based distributions, you can install it with apt:
 
@@ -28,6 +28,9 @@ Or
 
     $ apt install libncursesw5-dev
 
+On mingw, `gem install curses` will install pre-built PDCurses, so you
+don't need to install extra libraries.
+
 ## Documentation
 
 See [https://www.rubydoc.info/gems/curses](https://www.rubydoc.info/gems/curses).

data/Rakefile

@@ -1,89 +1,3 @@
 require "bundler"
 
 Bundler::GemHelper.install_tasks
-
-begin
-  require 'rake/extensiontask'
-rescue LoadError => e
-  warn "\nmissing #{e.path} (for rake-compiler)" if e.respond_to? :path
-  warn "run: bundle install\n\n"
-end
-
-$mswin = /mswin/ =~ RUBY_PLATFORM
-
-CLOBBER.include("vendor/#{RUBY_PLATFORM}") if $mswin
-CLOBBER.include("vendor/x86-mingw32")
-CLOBBER.include("vendor/x64-mingw32")
-CLOBBER.include("lib/2.*")
-CLOBBER.include("pkg")
-
-namespace :build do
-  desc "Build PDCurses"
-  task :pdcurses do
-    mkdir_p "vendor/#{RUBY_PLATFORM}/PDCurses" if $mswin
-    mkdir_p "vendor/x86-mingw32/PDCurses"
-    mkdir_p "vendor/x64-mingw32/PDCurses"
-    chdir "vendor/PDCurses/wincon" do
-      if $mswin
-        sh "nmake -f Makefile.vc clean all WIDE=Y DLL=Y"
-        cp %w[pdcurses.dll pdcurses.lib], "../../#{RUBY_PLATFORM}/PDCurses"
-      else
-        sh "make -f Makefile.mng clean all WIDE=Y DLL=N"
-        cp "pdcurses.a", "../../x86-mingw32/PDCurses/libpdcurses.a"
-
-        sh "make -f Makefile.mng clean all _w64=1 WIDE=Y DLL=N"
-        cp "pdcurses.a", "../../x64-mingw32/PDCurses/libpdcurses.a"
-      end
-    end
-  end
-end
-
-namespace :clean do
-  desc "Clean PDCurses"
-  task :pdcurses do
-    chdir "vendor/PDCurses/wincon" do
-      if $mswin
-        sh "nmake -f Makefile.vc clean"
-      else
-        sh "make -f Makefile.mng clean _linux_w64=1"
-      end
-    end
-  end
-end
-
-spec = eval(File.read(File.expand_path("curses.gemspec", __dir__)))
-Rake::ExtensionTask.new(spec.name, spec) do |ext|
-  if $mswin
-    ext.config_options << '--with-curses-include=' + 
-      File.expand_path("vendor/PDCurses", __dir__) +
-      ' --with-curses-version=function --enable-pdcurses-wide' +
-      ' --enable-pdcurses-dll' +
-      ' --with-curses-lib=' +
-      File.expand_path("vendor/#{RUBY_PLATFORM}/PDCurses", __dir__)
-    spec.files += ["vendor/#{RUBY_PLATFORM}/PDCurses/pdcurses.dll"]
-  end
-
-  ext.cross_compile = true
-  ext.cross_platform = ["x86-mingw32", "x64-mingw32"]
-  ext.cross_config_options << '--with-curses-include=' + 
-    File.expand_path("vendor/PDCurses", __dir__) +
-    ' --with-curses-version=function --enable-pdcurses-wide'
-  ext.cross_config_options << {
-    'x86-mingw32' => '--with-curses-lib=' +
-      File.expand_path("vendor/x86-mingw32/PDCurses", __dir__),
-    'x64-mingw32' => '--with-curses-lib=' +
-      File.expand_path("vendor/x64-mingw32/PDCurses", __dir__)
-  }
-  if $mswin
-    ext.cross_compiling do |_spec|
-      bin_file = "vendor/#{_spec.platform}/PDCurses/pdcurses.dll"
-      _spec.files += [bin_file]
-      stage_file = "#{ext.tmp_dir}/#{_spec.platform}/stage/#{bin_file}"
-      stage_dir = File.dirname(stage_file)
-      directory stage_dir
-      file stage_file => [stage_dir, bin_file] do
-        cp bin_file, stage_file
-      end
-    end
-  end
-end

data/curses.gemspec

@@ -1,17 +1,16 @@
 Gem::Specification.new { |s|
   s.name = "curses"
-  s.version = "1.3.2"
+  s.version = "1.4.0"
   s.author = ["Shugo Maeda", 'Eric Hodel']
   s.email = ["shugo@ruby-lang.org", 'drbrain@segment7.net']
   s.homepage = "https://github.com/ruby/curses"
   s.platform = Gem::Platform::RUBY
   s.summary = "A Ruby binding for curses, ncurses, and PDCurses. curses is an extension library for text UI applications. Formerly part of the Ruby standard library, [curses was removed and placed in this gem][1] with the release of Ruby 2.1.0. (see [ruby/ruby@9c5b2fd][2])"
-  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(vendor)/}) }
+  s.files = `git ls-files --recurse-submodules -z`.split("\x0")
   s.extensions = ["ext/curses/extconf.rb"]
   s.require_path = "lib"
   s.required_ruby_version = Gem::Requirement.new('>= 2.1.0')
   s.licenses = ['Ruby', 'BSD-2-Clause']
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rake-compiler'
 }

data/ext/curses/curses.c

@@ -20,7 +20,9 @@
 #include "ruby/io.h"
 #include "ruby/thread.h"
 
-#if defined(HAVE_NCURSESW_CURSES_H)
+#if defined(HAVE_PDCURSES_H)
+# include <pdcurses.h>
+#elif defined(HAVE_NCURSESW_CURSES_H)
 # include <ncursesw/curses.h>
 #elif defined(HAVE_NCURSES_CURSES_H)
 # include <ncurses/curses.h>

data/ext/curses/extconf.rb

@@ -1,5 +1,6 @@
 require 'mkmf'
 require 'shellwords'
+require 'fileutils'
 
 def have_all(*args)
   old_libs = $libs.dup
@@ -22,7 +23,68 @@ def have_all(*args)
   end
 end
 
-dir_config('curses')
+def exec_command(cmd)
+  puts "> #{cmd}"
+  if !system(cmd)
+    STDERR.puts("External command failed")
+    exit 1
+  end
+end
+
+$library_candidates = [
+  ["ncursesw/curses.h", ["ncursesw"]],
+  ["ncurses.h", ["ncursesw", "ncurses"]],
+  ["ncurses/curses.h", ["ncurses"]],
+  ["curses_colr/curses.h", ["cur_colr"]],
+  ["curses.h", ["curses", "pdcurses"]],
+  # ["xcurses.h", ["XCurses"]], # XCurses (PDCurses for X11)
+]
+
+$mingw = /mingw/ =~ RUBY_PLATFORM
+$mswin = /mswin/ =~ RUBY_PLATFORM
+$windows = $mingw || $mswin
+$x64 = /x64/ =~ RUBY_PLATFORM
+$use_system_libs = arg_config('--use-system-libraries',
+                              ENV.key?("CURSES_USE_SYSTEM_LIBRARIES"))
+$idefault = nil
+$ldefault = nil
+$pdcurses_wide_default = nil
+$pdcurses_dll_default = nil
+$curses_version_default = nil
+$use_bundled_pdcurses = !$use_system_libs && /mingw|mswin/ =~ RUBY_PLATFORM
+if $use_bundled_pdcurses
+  $pdcurses_wide_default = true
+  $curses_version_default = "function"
+  pdcurses_dir = File.expand_path("../../vendor/PDCurses", __dir__)
+  $idefault = $ldefault = pdcurses_dir
+  wincon_dir = File.expand_path("wincon", pdcurses_dir)
+  old_dir = Dir.pwd
+  Dir.chdir(wincon_dir)
+  begin
+    if $mswin
+      exec_command "nmake -f Makefile.vc clean all WIDE=Y DLL=Y"
+      FileUtils.cp("pdcurses.dll", pdcurses_dir)
+      FileUtils.cp("pdcurses.lib", pdcurses_dir)
+      $pdcurses_dll_default = true
+    else
+      if $x64
+        exec_command "make -f Makefile.mng clean all _w64=1 WIDE=Y DLL=N"
+      else
+        exec_command "make -f Makefile.mng clean all WIDE=Y DLL=N"
+      end
+      FileUtils.cp("pdcurses.a", File.expand_path("libpdcurses.a", pdcurses_dir))
+    end
+  ensure
+    Dir.chdir(old_dir)
+  end
+  FileUtils.cp(File.expand_path("curses.h", pdcurses_dir),
+               File.expand_path("pdcurses.h", pdcurses_dir))
+  $library_candidates = [
+    ["pdcurses.h", ["pdcurses"]]
+  ]
+end
+
+dir_config('curses', $idefault, $ldefault)
 dir_config('ncurses')
 dir_config('termcap')
 
@@ -32,14 +94,7 @@ have_library("tinfow", "tgetent") ||
   have_library("termcap", "tgetent")
 
 header_library = nil
-[
-  ["ncursesw/curses.h", ["ncursesw"]],
-  ["ncurses.h", ["ncursesw", "ncurses"]],
-  ["ncurses/curses.h", ["ncurses"]],
-  ["curses_colr/curses.h", ["cur_colr"]],
-  ["curses.h", ["curses", "pdcurses"]],
-  # ["xcurses.h", ["XCurses"]], # XCurses (PDCurses for X11)
-].each {|hdr, libs|
+$library_candidates.each {|hdr, libs|
   header_library = have_all(
     lambda { have_header(hdr) && hdr },
     lambda {|h| libs.find {|lib| have_library(lib, "initscr", h) } })
@@ -89,8 +144,8 @@ if header_library
   #   --with-curses-version=function    for SVR4
   #   --with-curses-version=variable    for ncurses and PDcurses
   #   (not given)                       automatically determined
-
-  case with_curses_version = with_config("curses-version")
+  with_curses_version = with_config("curses-version", $curses_version_default)
+  case with_curses_version
   when "function"
     $defs << '-DHAVE_FUNC_CURSES_VERSION'
   when "variable"
@@ -136,27 +191,29 @@ if header_library
     warn "unexpected value for --with-curses-version: #{with_curses_version}"
   end
 
-  if enable_config("pdcurses-wide")
+  if enable_config("pdcurses-wide", $pdcurses_wide_default)
     $defs << '-DPDC_WIDE'
   end
 
-  if enable_config("pdcurses-dll")
+  if enable_config("pdcurses-dll", $pdcurses_dll_default)
     $defs << '-DPDC_DLL_BUILD'
   end
 
-  if (have_header("ncursesw/menu.h") ||
-      have_header("ncurses/menu.h") ||
-      have_header("curses/menu.h") ||
-      have_header("menu.h")) &&
+  if !$use_bundled_pdcurses &&
+      (have_header("ncursesw/menu.h") ||
+       have_header("ncurses/menu.h") ||
+       have_header("curses/menu.h") ||
+       have_header("menu.h")) &&
       (have_library("menuw", "new_menu") ||
        have_library("menu", "new_menu"))
     $defs << '-DHAVE_MENU'
   end
 
-  if (have_header("ncursesw/form.h") ||
-      have_header("ncurses/form.h") ||
-      have_header("curses/form.h") ||
-      have_header("form.h")) &&
+  if !$use_bundled_pdcurses &&
+      (have_header("ncursesw/form.h") ||
+       have_header("ncurses/form.h") ||
+       have_header("curses/form.h") ||
+       have_header("form.h")) &&
       (have_library("formw", "new_form") ||
        have_library("form", "new_form"))
     $defs << '-DHAVE_FORM'
@@ -166,7 +223,9 @@ if header_library
   ["WINDOW", "MEVENT", "ITEM", "MENU", "FIELD", "FORM"].each do |type|
     checking_for("sizeof(#{type}) is available") {
       if try_compile(<<EOF, Shellwords.join($defs))
-#if defined(HAVE_NCURSESW_CURSES_H)
+#if defined(HAVE_PDCURSES_H)
+# include <pdcurses.h>
+#elif defined(HAVE_NCURSESW_CURSES_H)
 # include <ncursesw/curses.h>
 #elif defined(HAVE_NCURSES_CURSES_H)
 # include <ncurses/curses.h>

data/lib/curses.rb

@@ -1,24 +1,17 @@
-platform = RUBY_PLATFORM.sub(/i[3-7]86/, "x86")
-pdcurses_path = File.expand_path("../vendor/#{platform}/PDCurses", __dir__)
-pdcurses_bundled = File.directory?(pdcurses_path)
-if pdcurses_bundled
+pdcurses_dll = File.expand_path("../vendor/PDCurses/pdcurses.dll", __dir__)
+if File.exist?(pdcurses_dll)
   path = ENV["PATH"]
   dir = File::ALT_SEPARATOR ?
-    pdcurses_path.tr("/", File::ALT_SEPARATOR) : dir
+    File.dirname(pdcurses_dll).tr("/", File::ALT_SEPARATOR) : dir
   dirs = path.split(File::PATH_SEPARATOR)
   if !dirs.include?(dir)
     ENV["PATH"] = [dir, *dirs].join(File::PATH_SEPARATOR)
   end
 end
 
-begin
-  major, minor, _ = RUBY_VERSION.split(/\./)
-  require "#{major}.#{minor}/curses.so"
-rescue LoadError
-  require "curses.so"
-end
+require "curses.so"
 
-if pdcurses_bundled
+if /mingw|mswin/ =~ RUBY_PLATFORM
   Curses.keyboard_encoding = Encoding::UTF_8
 end
 

data/vendor/PDCurses/.gitignore

@@ -0,0 +1,47 @@
+*.[oa]
+*.exe
+firework
+manext
+libXCurses.so
+ozdemo
+newtest
+ptest
+rain
+sdltest
+testcurs
+tuidemo
+worm
+xmas
+*.sho
+Makefile
+config.h
+config.log
+config.status
+PDCurses.md
+xcurses-config
+*.dll
+wingui.gif
+wingui.htm
+*.bat
+clock.c
+clock1.c
+fullscrn.c
+hello
+hello.c
+wingui/wcr*
+wingui/wct*
+wingui/wc_*
+wingui/wcw*
+wingui/z*
+wingui/scr2html.c
+wingui/newtest*
+wingui/*.sav
+wingui/*.def
+wincon/*.def
+*.obj
+*.bak
+*.map
+*.lib
+m
+.vscode
+build