Move FFI console under lib

Having the separate dir makes testing difficult and doesn't reflect the structure the gem will eventually have. We can filter these files out if necessary when building the CRuby gem.

Author: headius

Rakefile

@@ -7,7 +7,6 @@ helper = Bundler::GemHelper.instance
 Rake::TestTask.new(:test) do |t|
  t.libs << "test" << "test/lib"
  t.libs << "lib"
- t.libs << "jruby" if RUBY_ENGINE == 'jruby'
  t.ruby_opts << "-rhelper"
  t.test_files = FileList["test/**/test_*.rb"]
 end

io-console.gemspec

@@ -25,15 +25,15 @@ Gem::Specification.new do |s|
  if Gem::Platform === s.platform and s.platform =~ 'java'
  s.files.delete_if {|f| f.start_with?("ext/")}
  s.extensions.clear
- s.require_paths.unshift("jruby")
  s.files.concat(%w[
- jruby/io/console.rb
- jruby/io/console/bsd_console.rb
- jruby/io/console/common.rb
- jruby/io/console/linux_console.rb
- jruby/io/console/native_console.rb
- jruby/io/console/stty_console.rb
- jruby/io/console/stub_console.rb
+ lib/io/console.rb
+ lib/io/console/ffi/bsd_console.rb
+ lib/io/console/ffi/common.rb
+ lib/io/console/ffi/console.rb
+ lib/io/console/ffi/linux_console.rb
+ lib/io/console/ffi/native_console.rb
+ lib/io/console/ffi/stty_console.rb
+ lib/io/console/ffi/stub_console.rb
  ])
  end
 

lib/io/console.rb

@@ -0,0 +1,5 @@
+if RUBY_ENGINE == 'ruby'
+ require_relative 'console.so'
+else
+ require_relative 'console/ffi/console'
+end

jruby/io/console/bsd_console.rb renamed to lib/io/console/ffi/bsd_console.rb

@@ -21,19 +21,19 @@
 
 require 'rbconfig'
 
-require_relative 'console/common'
+require_relative 'common'
 
 # If Windows, always use the stub version
 if RbConfig::CONFIG['host_os'] =~ /(mswin)|(win32)|(ming)/
- require_relative 'console/stub_console'
+ require_relative 'stub_console'
 else
 
  # If Linux or BSD, try to load the native version
  if RbConfig::CONFIG['host_os'].downcase =~ /darwin|openbsd|freebsd|netbsd|linux/
  begin
 
  # Attempt to load the native Linux and BSD console logic
- require_relative 'console/native_console'
+ require_relative 'native_console'
  ready = true
 
  rescue Exception => ex
@@ -48,7 +48,7 @@
  if !ready
  begin
 
- require_relative 'console/stty_console'
+ require_relative 'stty_console'
  ready = true
 
  rescue Exception
@@ -61,7 +61,7 @@
 
  # If still not ready, just use stubbed version
  if !ready
- require_relative 'console/stub_console'
+ require_relative 'stub_console'
  end
 
 end