listpager 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d70bf27f951f700d53cc6fb25c3c62d652ae150
-  data.tar.gz: 8483fcf02b0b1373a10c4d1f5ef0585ef202cc60
+  metadata.gz: 99c5f337edc88d63d288790ab7b3d3340a07c8ff
+  data.tar.gz: e0258e3a5820063c7458fb5fab6f1bbc742cd0a5
 SHA512:
-  metadata.gz: 25c7f7684495706aad4efe72393af0228c02c2a00a258b5c00fdcc1a4b1740a40fe8f7a5e841c9fa2ddc6b7fc6521cfd001e2e5f9ffafe3ca4e9d8fbeabf2027
-  data.tar.gz: 22e83c69890005484f1e75cac5332965f24992c646bdddab4b81aa5d2ccbcce2392515266fa10b924763ec5cd14578b2c20f45a06c6c0ec8f846155369491bdd
+  metadata.gz: a3dc50e4c96303c00c64a860ddbf7756b399f963d23935d65bf8b27aaa74360d15b9d552c979d060c1a29ac150467480709a3761a88831a57be973464118f696
+  data.tar.gz: a632c1124f1e3257dac52afd9f25ce76d32ca7bf2e7f4226a51c83906a8a8e1a24b43e5d1fd45958caaa2070351ed4092b16b2c4a3d9959bf7b51758797cae6a

data/ext/mkrf_conf.rb

@@ -0,0 +1,23 @@
+require 'rubygems'
+require 'rubygems/command.rb'
+require 'rubygems/dependency_installer.rb'
+
+begin
+  Gem::Command.build_args = ARGV
+rescue NoMethodError
+  # We're good
+end
+
+inst = Gem::DependencyInstaller.new
+begin
+  if RUBY_PLATFORM =~ /\bdarwin/i
+    inst.install "ruby-ncurses", "~> 1.2.4"
+  else
+    inst.install "ncursesw", "~> 1.4.9"
+  end
+rescue
+  exit 1
+end
+
+# create dummy rakefile to indicate success
+File.write(__dir__("Rakefile"), "task: default\n")

data/lib/listpager/client_terminal.rb

@@ -1,4 +1,4 @@
-require 'ncurses'
+require 'listpager/ncurses'
 require 'shellwords'
 require 'optparse'
 require 'io/console'

data/lib/listpager/color.rb

@@ -1,4 +1,4 @@
-require 'ncurses'
+require 'listpager/ncurses'
 
 module Listpager
   class Color

data/lib/listpager/list.rb

@@ -1,4 +1,4 @@
-require 'ncurses'
+require 'listpager/ncurses'
 
 require 'listpager/color'
 require 'listpager/scrollbar'

data/lib/listpager/ncurses.rb

@@ -0,0 +1,8 @@
+# Note: This is a hack to work around ncursesw not building on macOS.
+# Hopefully it can go away soon.
+
+if RUBY_PLATFORM =~ /\bdarwin/i
+  require 'ncurses'
+else
+  require 'ncursesw'
+end

data/lib/listpager/scrollbar.rb

@@ -1,3 +1,5 @@
+require 'listpager/ncurses'
+
 require 'listpager/color'
 
 module Listpager

data/lib/listpager/version.rb

@@ -1,3 +1,3 @@
 module Listpager
-  VERSION = "1.0"
+  VERSION = "1.0.1"
 end

data/listpager.gemspec

@@ -27,7 +27,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "ncurses-ruby", "~> 1.2.4"
+  # Check out the hack in ext/mkrf_conf.rb, which is effectively:
+  #
+  # if RUBY_PLATFORM =~ /\bdarwin/
+  #   spec.add_runtime_dependency 'ncurses-ruby'
+  # else
+  #   # Doesn't build on newer macOS...
+  #   spec.add_runtime_dependency 'ncursesw'
+  # end
+  #
+  # A PR has been submitted to ncursesw, so hopefully this can go away soon.
+
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: listpager
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - Mike Owens
@@ -10,20 +10,6 @@ bindir: exe
 cert_chain: []
 date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ncurses-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -69,10 +55,12 @@ files:
 - bin/setup
 - doc/screenshot.png
 - exe/listpager
+- ext/mkrf_conf.rb
 - lib/listpager.rb
 - lib/listpager/client_terminal.rb
 - lib/listpager/color.rb
 - lib/listpager/list.rb
+- lib/listpager/ncurses.rb
 - lib/listpager/scrollbar.rb
 - lib/listpager/version.rb
 - listpager.gemspec