ruby-lxc 1.2.0 → 1.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3ba5a64fe4b7b98f040795b91c9fda9da327999c
+  data.tar.gz: c53c4ce45db4ab47dac83892f677cc5411c3b8c6
+SHA512:
+  metadata.gz: 133dd82ad145c563d785a16b08863b808fe026f1fc80c41e4504337214e9f6577d7e97a622a96a9ebb9fdac63415395ec6f40aad64ea99621bf51840c7cd4435
+  data.tar.gz: 9f21506154f0c2ca00e2c05c0e99a5107ceb7187922d53abce8a45d1ded25b473b41e05352141498955354fa1d7502384dcc028c30f93835606065476b7b75d9

data/ext/lxc/lxc.c

@@ -546,10 +546,10 @@ is_string_array(VALUE v)
 }
 
 static int
-is_io(VALUE v)
+has_file_descriptor(VALUE v)
 {
-    return rb_respond_to(v, rb_intern("sysread")) &&
-           rb_respond_to(v, rb_intern("syswrite"));
+    return rb_respond_to(v, rb_intern("fileno")) &&
+           rb_funcall(v, rb_intern("fileno"), 0) != Qnil;
 }
 
 static void
@@ -569,11 +569,12 @@ lxc_attach_free_options(lxc_attach_options_t *opts)
 static lxc_attach_options_t *
 lxc_attach_parse_options(VALUE rb_opts)
 {
+    char *error = NULL;
     lxc_attach_options_t default_opts = LXC_ATTACH_OPTIONS_DEFAULT;
     lxc_attach_options_t *opts;
     VALUE rb_attach_flags, rb_namespaces, rb_personality, rb_initial_cwd;
     VALUE rb_uid, rb_gid, rb_env_policy, rb_extra_env_vars, rb_extra_keep_env;
-    VALUE rb_stdin, rb_stdout, rb_stderr;
+    VALUE rb_stdin_opt, rb_stdout_opt, rb_stderr_opt;
 
     opts = malloc(sizeof(*opts));
     if (opts == NULL)
@@ -583,96 +584,125 @@ lxc_attach_parse_options(VALUE rb_opts)
     if (NIL_P(rb_opts))
         return opts;
 
+    error = NULL;
+
     rb_attach_flags = rb_hash_aref(rb_opts, SYMBOL("flags"));
     if (!NIL_P(rb_attach_flags)) {
-        if (is_integer(rb_attach_flags))
+        if (is_integer(rb_attach_flags)) {
             opts->attach_flags = NUM2INT(rb_attach_flags);
-        else
+        } else {
+            error = "flags must be an integer";
             goto err;
+        }
     }
     rb_namespaces = rb_hash_aref(rb_opts, SYMBOL("namespaces"));
     if (!NIL_P(rb_namespaces)) {
-        if (is_integer(rb_namespaces))
+        if (is_integer(rb_namespaces)) {
             opts->namespaces = NUM2INT(rb_namespaces);
-        else
+        } else {
+            error = "namespaces must be an integer";
             goto err;
+        }
     }
     rb_personality = rb_hash_aref(rb_opts, SYMBOL("personality"));
     if (!NIL_P(rb_personality)) {
-        if (is_integer(rb_personality))
+        if (is_integer(rb_personality)) {
             opts->personality = NUM2INT(rb_personality);
-        else
+        } else {
+            error = "personality must be an integer";
             goto err;
+        }
     }
     rb_initial_cwd = rb_hash_aref(rb_opts, SYMBOL("initial_cwd"));
     if (!NIL_P(rb_initial_cwd)) {
-        if (is_string(rb_initial_cwd))
+        if (is_string(rb_initial_cwd)) {
             opts->initial_cwd = StringValuePtr(rb_initial_cwd);
-        else
+        } else {
+            error = "initial_cwd must be a string";
             goto err;
+        }
     }
     rb_uid = rb_hash_aref(rb_opts, SYMBOL("uid"));
     if (!NIL_P(rb_uid)) {
-        if (is_integer(rb_uid))
+        if (is_integer(rb_uid)) {
             opts->uid = NUM2INT(rb_uid);
-        else
+        } else {
+            error = "uid must be an integer";
             goto err;
+        }
     }
     rb_gid = rb_hash_aref(rb_opts, SYMBOL("gid"));
     if (!NIL_P(rb_gid)) {
-        if (is_integer(rb_gid))
+        if (is_integer(rb_gid)) {
             opts->gid = NUM2INT(rb_gid);
-        else
+        } else {
+            error = "gid must be an integer";
             goto err;
+        }
     }
     rb_env_policy = rb_hash_aref(rb_opts, SYMBOL("env_policy"));
     if (!NIL_P(rb_env_policy)) {
-        if (is_integer(rb_env_policy))
+        if (is_integer(rb_env_policy)) {
             opts->env_policy = NUM2INT(rb_env_policy);
-        else
+        } else {
+            error = "env_policy must be an integer";
             goto err;
+        }
     }
     rb_extra_env_vars = rb_hash_aref(rb_opts, SYMBOL("extra_env_vars"));
     if (!NIL_P(rb_extra_env_vars)) {
-        if (is_string_array(rb_extra_env_vars))
+        if (is_string_array(rb_extra_env_vars)) {
             opts->extra_env_vars = ruby_to_c_string_array(rb_extra_env_vars);
-        else
+        } else {
+            error = "extra_env_vars must be a array of strings";
             goto err;
+        }
     }
     rb_extra_keep_env = rb_hash_aref(rb_opts, SYMBOL("extra_keep_env"));
     if (!NIL_P(rb_extra_keep_env)) {
-        if (is_string_array(rb_extra_keep_env))
+        if (is_string_array(rb_extra_keep_env)) {
             opts->extra_keep_env = ruby_to_c_string_array(rb_extra_keep_env);
-        else
+        } else {
+            error = "extra_keep_env must be a array of strings";
             goto err;
+        }
     }
-    rb_stdin = rb_hash_aref(rb_opts, SYMBOL("stdin"));
-    if (!NIL_P(rb_stdin)) {
-        if (is_io(rb_stdin))
-            opts->stdin_fd = io_fileno(rb_stdin);
-        else
+    rb_stdin_opt = rb_hash_aref(rb_opts, SYMBOL("stdin"));
+    if (!NIL_P(rb_stdin_opt)) {
+        if (has_file_descriptor(rb_stdin_opt)) {
+            opts->stdin_fd = io_fileno(rb_stdin_opt);
+        } else {
+            error = "stdin object must have a file descriptor";
             goto err;
+        }
     }
-    rb_stdout = rb_hash_aref(rb_opts, SYMBOL("stdout"));
-    if (!NIL_P(rb_stdout)) {
-        if (is_io(rb_stdout))
-            opts->stdout_fd = io_fileno(rb_stdout);
-        else
+    rb_stdout_opt = rb_hash_aref(rb_opts, SYMBOL("stdout"));
+    if (!NIL_P(rb_stdout_opt)) {
+        if (has_file_descriptor(rb_stdout_opt)) {
+            opts->stdout_fd = io_fileno(rb_stdout_opt);
+        } else {
+            error = "stdout object must have a file descriptor";
             goto err;
+        }
     }
-    rb_stderr = rb_hash_aref(rb_opts, SYMBOL("stderr"));
-    if (!NIL_P(rb_stderr)) {
-        if (is_io(rb_stderr))
-            opts->stderr_fd = io_fileno(rb_stderr);
-        else
+    rb_stderr_opt = rb_hash_aref(rb_opts, SYMBOL("stderr"));
+    if (!NIL_P(rb_stderr_opt)) {
+        if (has_file_descriptor(rb_stderr_opt)) {
+            opts->stderr_fd = io_fileno(rb_stderr_opt);
+        } else {
+            error = "stderr object must have a file descriptor";
             goto err;
+        }
     }
 
     return opts;
 
 err:
     lxc_attach_free_options(opts);
-    return NULL;
+    if (error != NULL)
+        rb_raise(rb_eArgError, "%s", error);
+    else
+        return NULL;
 }
 
 static RETURN_WITHOUT_GVL_TYPE

data/lib/lxc/version.rb

@@ -1,3 +1,3 @@
 module LXC
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,98 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lxc
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 1.2.1
 platform: ruby
 authors:
 - Andre Nathan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc-data
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "    Ruby-LXC is a Ruby binding for the liblxc library, allowing\n
-  \   Ruby scripts to create and manage Linux containers.\n"
+description: |2
+      Ruby-LXC is a Ruby binding for the liblxc library, allowing
+      Ruby scripts to create and manage Linux containers.
 email: andre@digirati.com.br
 executables: []
 extensions:
 - ext/lxc/extconf.rb
 extra_rdoc_files: []
 files:
-- ext/lxc/lxc.c
 - ext/lxc/extconf.rb
+- ext/lxc/lxc.c
 - lib/lxc.rb
 - lib/lxc/version.rb
 homepage: https://github.com/lxc/ruby-lxc
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby bindings for liblxc
 test_files: []