rubysl-pty 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e45c272bab13b32a67ff684e47892397576b895
-  data.tar.gz: 75c93df9034041b5b527c06d782239e93cddb4f8
+  metadata.gz: da964a021b41c3d8908cc6d09a82b39f2a05166f
+  data.tar.gz: 2547e6607b59d30e5e38052595a6f3bc9f0f7ad2
 SHA512:
-  metadata.gz: 5cde05155c951165a7d9631d9f91aa38a7314cc3d77b10d7e3b2faea37814c5a84f1b55b21c52ffde87d35bec55b0e0c4d3ac5dbf711d6730ceb33912f83d139
-  data.tar.gz: 63d5cf4a30dc53bd7c95ea4afdb681374285b6e4909fa2fe6e4373afbfd4c97980f0f999ea29724ff96cdd65c5e0ea9e8412ffc13728dc75340f857ae544bda1
+  metadata.gz: 9dc482d93408011b66b2e559118df48541c2c00c15f6efa9b257c52c4731228641c0f2ad7526506677ffc4a680d277569b06b05d1b6c25d3ce9edd80d13cafcc
+  data.tar.gz: 492d65972f7c6664692c12d70fcdd3622a80814999b64c1ad522fd7414cdd63a6585fae8d7b8e2ce1aaf3ac27e22f3d6a65cbadd186b8451422920e251a9d36c

data/.travis.yml

@@ -1,9 +1,12 @@
 language: ruby
-before_install:
-  - rvm use $RVM --install --binary --fuzzy
-  - gem update --system
-  - gem --version
-  - gem install rubysl-bundler
 env:
-  - RVM=rbx-nightly-d21 RUBYLIB=lib
-script: bundle exec mspec spec
+  - RUBYLIB=lib:.
+script: mspec spec
+branches:
+  only:
+    - 1.0
+    - 2.0
+rvm:
+  - 2.1.0
+  - rbx-2
+

data/ext/rubysl/pty/pty.c

@@ -315,6 +315,9 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
   if (ioctl(slavefd, I_PUSH, "ttcompat") == -1) goto error;
 #endif
 
+  rb_fd_fix_cloexec(masterfd);
+  rb_fd_fix_cloexec(slavefd);
+
   *master = masterfd;
   *slave = slavefd;
   strlcpy(SlaveName, slavedevice, DEVICELEN);
@@ -339,6 +342,10 @@ error:
     if (!fail) return -1;
       rb_raise(rb_eRuntimeError, "openpty() failed");
   }
+
+  rb_fd_fix_cloexec(*master);
+  rb_fd_fix_cloexec(*slave);
+
   if (no_mesg(SlaveName, nomesg) == -1) {
     if (!fail) return -1;
     rb_raise(rb_eRuntimeError, "can't chmod slave pty");
@@ -356,6 +363,10 @@ error:
   }
 
   *slave = open(name, O_RDWR);
+
+  rb_fd_fix_cloexec(*master);
+  rb_fd_fix_cloexec(*slave);
+
   /* error check? */
   strlcpy(SlaveName, name, DEVICELEN);
 
@@ -382,6 +393,10 @@ error:
   if(ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error;
   ioctl(slavefd, I_PUSH, "ttcompat");
 #endif
+
+  rb_fd_fix_cloexec(masterfd);
+  rb_fd_fix_cloexec(slavefd);
+
   *master = masterfd;
   *slave = slavefd;
   strlcpy(SlaveName, slavedevice, DEVICELEN);
@@ -401,9 +416,11 @@ error:
     snprintf(MasterName, sizeof MasterName, MasterDevice, *p);
     if ((masterfd = open(MasterName,O_RDWR,0)) >= 0) {
       *master = masterfd;
+      rb_fd_fix_cloexec(*master);
       snprintf(SlaveName, DEVICELEN, SlaveDevice, *p);
       if ((slavefd = open(SlaveName,O_RDWR,0)) >= 0) {
         *slave = slavefd;
+        rb_fd_fix_cloexec(*slave);
         if (chown(SlaveName, getuid(), getgid()) != 0) goto error;
         if (chmod(SlaveName, nomesg ? 0600 : 0622) != 0) goto error;
         return 0;
@@ -489,7 +506,7 @@ pty_getpty(int argc, VALUE *argv, VALUE self)
   rb_ivar_set(rport, rb_intern("@path"), rb_str_new2(SlaveName));
 
   wport = rb_funcall(rb_cFile, rb_intern("new"), 2, INT2FIX(dup(info.fd)),
-      rb_str_new2("r"));
+      rb_str_new2("w"));
 
   rb_ivar_set(wport, rb_intern("@path"), rb_str_new2(SlaveName));
   rb_funcall(wport, rb_intern("sync="), 1, Qtrue);
@@ -503,6 +520,51 @@ pty_getpty(int argc, VALUE *argv, VALUE self)
   return res;
 }
 
+static VALUE
+pty_close_pty(VALUE assoc)
+{
+  VALUE io;
+  int i;
+
+  for (i = 0; i < 2; i++) {
+    io = rb_ary_entry(assoc, i);
+    if (RB_TYPE_P(io, T_FILE) && 0 <= RFILE(io)->fptr->fd) {
+      rb_io_close(io);
+    }
+  }
+  return Qnil;
+}
+
+static VALUE
+pty_open(VALUE klass) {
+  int master_fd, slave_fd;
+  char slavename[DEVICELEN];
+  VALUE master_io, slave_file;
+  rb_io_t *master_fptr, *slave_fptr;
+  VALUE assoc;
+
+  getDevice(&master_fd, &slave_fd, slavename, 1);
+
+  master_io = rb_funcall(rb_cIO, rb_intern("new"), 2, INT2FIX(master_fd),
+      rb_str_new2("r+"));
+
+  rb_funcall(master_io, rb_intern("sync="), 1, Qtrue);
+
+  slave_file = rb_funcall(rb_cFile, rb_intern("new"), 2, INT2FIX(slave_fd),
+      rb_str_new2("r+"));
+
+  rb_ivar_set(slave_file, rb_intern("@path"),
+      rb_obj_freeze(rb_str_new2(slavename)));
+  rb_funcall(slave_file, rb_intern("sync="), 1, Qtrue);
+
+  assoc = rb_assoc_new(master_io, slave_file);
+
+  if (rb_block_given_p()) {
+    return rb_ensure(rb_yield, assoc, pty_close_pty, assoc);
+  }
+  return assoc;
+}
+
 /*
  * Document-class: PTY::ChildExited
  *
@@ -523,6 +585,7 @@ Init_pty()
   VALUE cPTY = rb_define_module("PTY");
   rb_define_module_function(cPTY, "getpty", pty_getpty, -1);
   rb_define_module_function(cPTY, "spawn", pty_getpty, -1);
+  rb_define_singleton_method(cPTY, "open", pty_open, 0);
   rb_define_singleton_method(cPTY, "__get_device__", pty_get_device, 0);
 
   eChildExited = rb_define_class_under(cPTY, "ChildExited", rb_eRuntimeError);

data/lib/rubysl/pty/version.rb

@@ -1,5 +1,5 @@
 module RubySL
   module PTY
-    VERSION = "2.0.2"
+    VERSION = "2.0.3"
   end
 end

data/spec/open_spec.rb

@@ -0,0 +1,50 @@
+require "pty"
+
+describe "PTY.open" do
+  before(:each) do
+    @master, @slave = PTY.open
+  end
+
+  after(:each) do
+    @master.close
+    @slave.close
+  end
+
+  it "returns master as an IO object" do
+    @master.class.should == IO
+  end
+
+  it "returns slave as a File object" do
+    @slave.class.should == File
+  end
+
+  it "returns master and slave as ttys" do
+    @master.tty?.should == true
+    @slave.tty?.should == true
+  end
+
+  it "returns slave as a device file" do
+    @slave.stat.chardev?.should == true
+  end
+
+  it "syncs master and slave" do
+    @master.sync.should == true
+    @slave.sync.should == true
+  end
+
+  it "allows writing to master, and reading from slave" do
+    @master.puts "sshao was here"
+    @slave.gets.should == "sshao was here\n"
+  end
+
+  it "sets master and slave fd flags to 2" do
+    require "fcntl"
+    @master.fcntl(Fcntl::F_GETFL).should == 2
+    @slave.fcntl(Fcntl::F_GETFL).should == 2
+  end
+
+  it "sets master and slave to close on exec" do
+    @master.close_on_exec?.should == true
+    @slave.close_on_exec?.should == true
+  end
+end

data/spec/spawn_spec.rb

@@ -0,0 +1,12 @@
+require "pty"
+
+describe "PTY.spawn" do
+  before(:each) do
+    @read, @write, @pid = PTY.spawn
+  end
+
+  it "allows reading from the first IO, and writing from the second IO" do
+    @write.puts "sshao was here"
+    @read.gets.should == "sshao was here\r\n"
+  end
+end

metadata

@@ -1,67 +1,67 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-pty
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: mspec
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rubysl-prettyprint
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -86,6 +86,8 @@ files:
 - lib/rubysl/pty.rb
 - lib/rubysl/pty/version.rb
 - rubysl-pty.gemspec
+- spec/open_spec.rb
+- spec/spawn_spec.rb
 homepage: https://github.com/rubysl/rubysl-pty
 licenses:
 - BSD
@@ -106,9 +108,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby standard library pty.
-test_files: []
-has_rdoc: 
+test_files:
+- spec/open_spec.rb
+- spec/spawn_spec.rb