sfcc 0.1.0 → 0.1.1

data/CHANGELOG.rdoc

@@ -1,4 +1,10 @@
 
+== 0.1.1
+
+* fix crash when retrieving non-existing class
+* fix crash when calling reference names
+* fix garbage in exception messages
+
 == 0.1.0
 
 * First public version

data/README.rdoc

@@ -58,3 +58,9 @@ ruby-like API to do CIM based management.
 
 * Duncan Mac-Vicar P. <dmacvicar@suse.de>
 
+
+== Thanks
+
+The following people have contributed patches, fixes and enhancements:
+
+* Klaus Kaempf <kkaempf@suse.de>

data/ext/sfcc/cim_client.c

@@ -32,7 +32,7 @@ static VALUE get_class(int argc, VALUE *argv, VALUE self)
   VALUE flags;
   VALUE properties;
 
-  CMPIStatus status;
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   CMPIObjectPath *op = NULL;
   CMCIClient *client = NULL;
   CMPIConstClass *cimclass = NULL;
@@ -43,7 +43,6 @@ static VALUE get_class(int argc, VALUE *argv, VALUE self)
 
   if (NIL_P(flags)) flags = INT2NUM(0);
 
-  memset(&status, 0, sizeof(CMPIStatus));
   Data_Get_Struct(self, CMCIClient, client);
   Data_Get_Struct(object_path, CMPIObjectPath, op);
 
@@ -51,11 +50,13 @@ static VALUE get_class(int argc, VALUE *argv, VALUE self)
   cimclass = client->ft->getClass(client, op, NUM2INT(flags), props, &status);
   free(props);
 
-  cimclassnew = cimclass->ft->clone(cimclass, NULL);
-  cimclass->ft->release(cimclass);
-
-  sfcc_rb_raise_if_error(status, "Can't get class");
-  return Sfcc_wrap_cim_class(cimclassnew);
+  if (!status.rc) {
+      cimclassnew = cimclass->ft->clone(cimclass, NULL);
+      cimclass->ft->release(cimclass);
+      return Sfcc_wrap_cim_class(cimclassnew);
+  }
+  sfcc_rb_raise_if_error(status, "Can't get class at %s", CMGetCharsPtr(CMObjectPathToString(op, NULL), NULL));
+  return Qnil;
 }
 
 /**
@@ -70,7 +71,7 @@ static VALUE class_names(int argc, VALUE *argv, VALUE self)
   VALUE object_path;
   VALUE flags;
 
-  CMPIStatus status;
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   CMPIObjectPath *op = NULL;
   CMCIClient *client = NULL;
   VALUE rbenm = Qnil;
@@ -78,7 +79,6 @@ static VALUE class_names(int argc, VALUE *argv, VALUE self)
   rb_scan_args(argc, argv, "11", &object_path, &flags);
   if (NIL_P(flags)) flags = INT2NUM(0);
 
-  memset(&status, 0, sizeof(CMPIStatus));
   Data_Get_Struct(self, CMCIClient, client);
   Data_Get_Struct(object_path, CMPIObjectPath, op);
 
@@ -108,7 +108,7 @@ static VALUE classes(int argc, VALUE *argv, VALUE self)
   VALUE object_path;
   VALUE flags;
 
-  CMPIStatus status;
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   CMPIObjectPath *op = NULL;
   CMCIClient *client = NULL;
   VALUE rbenm = Qnil;
@@ -116,7 +116,6 @@ static VALUE classes(int argc, VALUE *argv, VALUE self)
   rb_scan_args(argc, argv, "11", &object_path, &flags);
   if (NIL_P(flags)) flags = INT2NUM(0);
 
-  memset(&status, 0, sizeof(CMPIStatus));
   Data_Get_Struct(self, CMCIClient, client);
   Data_Get_Struct(object_path, CMPIObjectPath, op);
 
@@ -154,7 +153,7 @@ static VALUE get_instance(int argc, VALUE *argv, VALUE self)
   VALUE flags;
   VALUE properties;
 
-  CMPIStatus status;
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   CMPIObjectPath *op = NULL;
   CMCIClient *client = NULL;
   CMPIInstance *ciminstance = NULL;
@@ -163,7 +162,6 @@ static VALUE get_instance(int argc, VALUE *argv, VALUE self)
   rb_scan_args(argc, argv, "12", &object_path, &flags, &properties);
   if (NIL_P(flags)) flags = INT2NUM(0);
 
-  memset(&status, 0, sizeof(CMPIStatus));
   Data_Get_Struct(self, CMCIClient, client);
   Data_Get_Struct(object_path, CMPIObjectPath, op);
 
@@ -193,7 +191,7 @@ static VALUE get_instance(int argc, VALUE *argv, VALUE self)
  */
 static VALUE create_instance(VALUE self, VALUE object_path, VALUE instance)
 {
-  CMPIStatus status;
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   CMCIClient *ptr = NULL;
   CMPIObjectPath *op = NULL;
   CMPIObjectPath *new_op = NULL;
@@ -233,7 +231,7 @@ static VALUE set_instance(int argc, VALUE *argv, VALUE self)
   VALUE flags;
   VALUE properties;
 
-  CMPIStatus status;
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   CMPIObjectPath *op = NULL;
   CMPIInstance *inst = NULL;
   CMCIClient *client = NULL;
@@ -264,7 +262,7 @@ static VALUE set_instance(int argc, VALUE *argv, VALUE self)
  */
 static VALUE delete_instance(VALUE self, VALUE object_path)
 {
-  CMPIStatus status;
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   CMPIObjectPath *op = NULL;
   CMCIClient *client = NULL;
 
@@ -296,11 +294,10 @@ static VALUE query(VALUE self,
                    VALUE query,
                    VALUE lang)
 {
-  CMPIStatus status;
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   CMPIObjectPath *op = NULL;
   CMCIClient *client = NULL;
 
-  memset(&status, 0, sizeof(CMPIStatus));
   Data_Get_Struct(self, CMCIClient, client);
   Data_Get_Struct(object_path, CMPIObjectPath, op);
   VALUE rbenm = Qnil;
@@ -328,12 +325,11 @@ static VALUE query(VALUE self,
  */
 static VALUE instance_names(VALUE self, VALUE object_path)
 {
-  CMPIStatus status;
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   CMPIObjectPath *op = NULL;
   CMCIClient *client = NULL;
   VALUE rbenm = Qnil;
 
-  memset(&status, 0, sizeof(CMPIStatus));
   Data_Get_Struct(self, CMCIClient, client);
   Data_Get_Struct(object_path, CMPIObjectPath, op);
 
@@ -372,7 +368,7 @@ static VALUE instances(int argc, VALUE *argv, VALUE self)
   VALUE flags;
   VALUE properties;
 
-  CMPIStatus status;
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   CMPIObjectPath *op = NULL;
   CMCIClient *client = NULL;
   char **props;
@@ -381,7 +377,6 @@ static VALUE instances(int argc, VALUE *argv, VALUE self)
   rb_scan_args(argc, argv, "12", &object_path, &flags, &properties);
   if (NIL_P(flags)) flags = INT2NUM(0);
 
-  memset(&status, 0, sizeof(CMPIStatus));
   Data_Get_Struct(self, CMCIClient, client);
   Data_Get_Struct(object_path, CMPIObjectPath, op);
 
@@ -455,7 +450,7 @@ static VALUE associators(int argc, VALUE *argv, VALUE self)
   VALUE flags;
   VALUE properties;
 
-  CMPIStatus status;
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   CMPIObjectPath *op = NULL;
   CMCIClient *client = NULL;
   char **props;
@@ -467,7 +462,6 @@ static VALUE associators(int argc, VALUE *argv, VALUE self)
                &role, &result_role, &flags, &properties);
 
   if (NIL_P(flags)) flags = INT2NUM(0);
-  memset(&status, 0, sizeof(CMPIStatus));
   Data_Get_Struct(self, CMCIClient, client);
   Data_Get_Struct(object_path, CMPIObjectPath, op);
 
@@ -537,7 +531,7 @@ static VALUE associator_names(int argc, VALUE *argv, VALUE self)
   VALUE role;
   VALUE result_role;
 
-  CMPIStatus status;
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   CMPIObjectPath *op = NULL;
   CMCIClient *client = NULL;
   CMPIEnumeration *enm = NULL;
@@ -547,7 +541,6 @@ static VALUE associator_names(int argc, VALUE *argv, VALUE self)
                &assoc_class, &result_class,
                &role, &result_role);
 
-  memset(&status, 0, sizeof(CMPIStatus));
   Data_Get_Struct(self, CMCIClient, client);
   Data_Get_Struct(object_path, CMPIObjectPath, op);
 
@@ -605,7 +598,7 @@ static VALUE references(int argc, VALUE *argv, VALUE self)
   VALUE flags;
   VALUE properties;
 
-  CMPIStatus status;
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   CMPIObjectPath *op = NULL;
   CMCIClient *client = NULL;
   char **props;
@@ -617,7 +610,6 @@ static VALUE references(int argc, VALUE *argv, VALUE self)
                &flags, &properties);
 
   if (NIL_P(flags)) flags = INT2NUM(0);
-  memset(&status, 0, sizeof(CMPIStatus));
   Data_Get_Struct(self, CMCIClient, client);
   Data_Get_Struct(object_path, CMPIObjectPath, op);
 
@@ -666,17 +658,16 @@ static VALUE reference_names(int argc, VALUE *argv, VALUE self)
   VALUE object_path = Qnil;
   VALUE result_class = Qnil;
   VALUE role = Qnil;
-
-  CMPIStatus status;
+  
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   CMPIObjectPath *op = NULL;
   CMCIClient *client = NULL;
   CMPIEnumeration *enm = NULL;
   VALUE rbenm = Qnil;
 
-  rb_scan_args(argc, argv, "14", &object_path,
+  rb_scan_args(argc, argv, "12", &object_path,
                &result_class, &role);
 
-  memset(&status, 0, sizeof(CMPIStatus));
   Data_Get_Struct(self, CMCIClient, client);
   Data_Get_Struct(object_path, CMPIObjectPath, op);
 
@@ -714,7 +705,7 @@ static VALUE invoke_method(VALUE self,
                            VALUE argin,
                            VALUE argout)
 {
-  CMPIStatus status;
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   CMCIClient *ptr = NULL;
   CMPIObjectPath *op = NULL;
   CMPIArgs *cmpiargsout;
@@ -722,7 +713,6 @@ static VALUE invoke_method(VALUE self,
   char *method_name_cstr;
   CMPIData ret;
   Check_Type(argin, T_HASH);
-  memset(&status, 0, sizeof(CMPIStatus));
 
   cmpiargsout = newCMPIArgs(NULL);
 
@@ -763,7 +753,7 @@ static VALUE set_property(VALUE self,
                           VALUE name,
                           VALUE value)
 {
-  CMPIStatus status;
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   CMCIClient *ptr = NULL;
   CMPIObjectPath *op = NULL;
   CMPIData data;
@@ -792,9 +782,9 @@ static VALUE property(VALUE self, VALUE object_path, VALUE name)
 {
   CMCIClient *ptr = NULL;
   CMPIObjectPath *op = NULL;
-  CMPIStatus status;
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   CMPIData data;
-  memset(&status, 0, sizeof(CMPIStatus));
+
   Data_Get_Struct(self, CMCIClient, ptr);
   Data_Get_Struct(object_path, CMPIObjectPath, op);
   data = ptr->ft->getProperty(ptr, op, StringValuePtr(name), &status);
@@ -808,7 +798,7 @@ static VALUE property(VALUE self, VALUE object_path, VALUE name)
 static VALUE connect(VALUE klass, VALUE host, VALUE scheme, VALUE port, VALUE user, VALUE pwd)
 {
   CMCIClient *client = NULL;
-  CMPIStatus status;
+  CMPIStatus status = {CMPI_RC_OK, NULL};
   client = cmciConnect(NIL_P(host) ? NULL : StringValuePtr(host),
                        NIL_P(scheme) ? NULL : StringValuePtr(scheme),
                        NIL_P(port) ? NULL : StringValuePtr(port),

data/ext/sfcc/sfcc.c

@@ -88,28 +88,27 @@ static VALUE sfcc_status_exception(CMPIStatus status)
   }
 }
 
+#define MAX_ERROR_BUFFER 255
+
 void sfcc_rb_raise_if_error(CMPIStatus status, const char *msg, ...)
 {
-  static char *error_separator = " : ";
   va_list arg_list;
-  va_start(arg_list, msg);
-  size_t size = 0;
-  char *error = NULL;
+  char orig_error[MAX_ERROR_BUFFER];
+  char error[MAX_ERROR_BUFFER];
 
   if (!status.rc)
     return;
 
-  size = sizeof(msg) + sizeof(error_separator);
+  va_start(arg_list, msg);
+  vsnprintf(orig_error, MAX_ERROR_BUFFER, msg, arg_list);
+  va_end(arg_list);
+
   if (status.msg)
-    size = size + sizeof(status.msg->ft->getCharPtr(status.msg, NULL));
-  error = (char *)malloc(size*sizeof(char *));
-  strcpy(error, msg);
-  if (status.msg) {
-    strcat(error, " : ");
-    strcat(error, status.msg->ft->getCharPtr(status.msg, NULL));
-  }
-  rb_raise(sfcc_status_exception(status), error, arg_list);
-  free(error);
+    snprintf(error, MAX_ERROR_BUFFER, "%s : %s", orig_error, status.msg->ft->getCharPtr(status.msg, NULL));
+  else
+    strcpy(error, orig_error);
+
+  rb_raise(sfcc_status_exception(status), error);
 }
 
 char ** sfcc_value_array_to_string_array(VALUE array)

data/lib/sfcc.rb

@@ -5,7 +5,7 @@ require 'uri'
 
 module Sfcc
 
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 
   module Flags
     LocalOnly          = 1

data/test/test_sfcc_cim_client.rb

@@ -33,6 +33,19 @@ class SfccCimcClient < SfccTestCase
       end
     end
 
+    should "be able to get a class from the object path" do
+      @op = Sfcc::Cim::ObjectPath.new("root/cimv2", "Linux_OperatingSystem")
+      cimclass = @client.get_class(@op)
+      assert_kind_of Sfcc::Cim::Class, cimclass
+    end
+
+    should "report error when getting invalid class" do
+      @op = Sfcc::Cim::ObjectPath.new("root/cimv2", "NotExistingClass")
+      assert_raise Sfcc::Cim::ErrorNotFound do
+        cimclass = @client.get_class(@op)
+      end
+    end
+    
     should "be able to get an instance from the object path" do
       @op = Sfcc::Cim::ObjectPath.new("root/cimv2", "Linux_OperatingSystem")
       instance = @client.query(@op, "select * from Linux_OperatingSystem", "wql").to_a.first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sfcc
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Duncan Mac-Vicar P.
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 +01:00
+date: 2010-01-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.3.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: yard
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe-yard
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.1
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
   type: :development
@@ -119,8 +139,9 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --title
+- Sfcc Documentation
+- --quiet
 require_paths: 
 - lib
 - ext