openwsman 2.4.14 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fed348cccfb060ad6c03e0ea8d377b35e282583
-  data.tar.gz: 25763c25772cfa8cb3a96d78d2fa7f8024d13d96
+  metadata.gz: 863a157db8977112dd862c430f9f8ae8348fa448
+  data.tar.gz: 7d78155cf5883a0bdc1f4d83a14f4c20dbe94a9b
 SHA512:
-  metadata.gz: 28dd065e34e533b994c08d9bf853324a9a0710a78db390726c41d68af1c0683c82db16070a25968f11ad81d17e496cfefb7efd078910f07875a9bab851352ae5
-  data.tar.gz: e700d27eb3a456c83b53d50e5489f60c34ff71c9b2d02d6aa9ec65e1f8268fc92e6ce5eb0d830ea0fd00b7f0444e8eecca9ab21d54f390fef297152541ed6ecb
+  metadata.gz: 87a91cb1af88c6a4cb74f6367791a8bcf7c863aa49ab5f9fc06044fe0345ecce65a7b87a58514c98cf8dad6e9dfafaf396822d9ddd6adeec5663ab2f9e79b081
+  data.tar.gz: 103cbaf1914d50d0693232cba422ba9880e2db2860d0c8c2977ff8117e392034e185d4802c047063246e945459f66da5ef0bd9c54e823f93ddac5221e3856949

data/ext/openwsman/openwsman.i

@@ -182,6 +182,9 @@ SWIGINTERNINLINE SV *SWIG_From_double  SWIG_PERL_DECL_ARGS_1(double value);
 
 #if defined(SWIGPYTHON)
 %module pywsman
+/* Wrap file operations, as Python's native ones are incompatible */
+FILE *fopen(char *, char *);
+void fclose(FILE *f);
 #endif
 
 #if defined(SWIGPERL)
@@ -419,6 +422,27 @@ static epr_t *my_epr_deserialize(WsXmlNodeH node) {
   /* else search the WSA_EPR node */
   return epr_deserialize(node, XML_NS_ADDRESSING, WSA_EPR, 1);
 }
+
+static VALUE kv_list_to_hash(list_t *list)
+{
+  VALUE v = Qnil;
+  if (!list_isempty(list)) {
+  v = rb_hash_new();
+  lnode_t *node = list_first(list);
+  while (node) {
+    key_value_t *kv = (key_value_t *)node->list_data;
+    if (kv->type == 0) {
+      rb_hash_aset( v, makestring(kv->key), makestring(kv->v.text));
+    }
+    else {
+      VALUE epr = SWIG_NewPointerObj((void*)kv->v.epr, SWIGTYPE_p_epr_t, 0);
+      rb_hash_aset( v, makestring(kv->key), epr);
+    }
+    node = list_next(list, node);
+    }
+  }
+  return v;
+}
 #endif
 
 static char *epr_prefix(const char *uri);

data/ext/openwsman/version.i

@@ -5,7 +5,7 @@
  */
 
 #define OPENWSMAN_MAJOR 2
-#define OPENWSMAN_MINOR 4
-#define OPENWSMAN_PATCH 14
-#define OPENWSMAN_VERSION "2.4.14"
+#define OPENWSMAN_MINOR 5
+#define OPENWSMAN_PATCH 2
+#define OPENWSMAN_VERSION "2.5.2"
 			

data/ext/openwsman/wsman-client_opt.i

@@ -368,42 +368,36 @@ typedef struct {} client_opt_t;
    * Add a selector as key/value pair
    *
    * NOTE:
-   * the value must be properly escaped (replace & with &, etc.)
+   * the string value must be properly escaped (replace & with &, etc.)
    * in Ruby use CGI::escapeHTML()
    *
    * call-seq:
    *   options.add_selector "Key", "Value"
+   *   options.add_selector "Key", end_point_reference
    *
    */
   void add_selector(VALUE k, VALUE v)
   {
     const char *key = as_string(k);
-    const char *value = as_string(v);
+    KLASS_DECL(SwigClassEndPointReference,SWIGTYPE_p_epr_t);
+    if (CLASS_OF(v) == KLASS_OF(SwigClassEndPointReference)) {
+      epr_t *epr;
+      SWIG_ConvertPtr(v, (void **)&epr, SWIGTYPE_p_epr_t, 0);
+      wsmc_add_selector_epr($self, key, epr);
+    }
+    else {
+      const char *value = as_string(v);
+      wsmc_add_selector($self, key, value);
+    }
+  }
 #else
   void add_selector(const char *key, const char *value)
   {
-#endif
     wsmc_add_selector($self, key, value);
   }
+#endif
 
 #if defined(SWIGRUBY)
-  %rename( "selectors=" ) set_selectors(VALUE hash);
-  /*
-   * Set selectors from Hash
-   *
-   * NOTE:
-   * the values must be properly escaped (replace & with &, etc.)
-   * in Ruby use CGI::escapeHTML()
-   *
-   * call-seq:
-   *   options.selectors = { "Key" => "Value", ... }
-   *
-   */
-  void set_selectors(VALUE hash)
-  {
-    $self->selectors = value2hash(NULL, hash, 0);
-  }
-
   %rename( "selectors" ) get_selectors(void);
   /*
    * Get selectors as Hash
@@ -414,7 +408,7 @@ typedef struct {} client_opt_t;
    */
   VALUE get_selectors(void)
   {
-    return hash2value($self->selectors);
+    return kv_list_to_hash($self->selectors);
   }
 #endif
 
@@ -485,22 +479,7 @@ typedef struct {} client_opt_t;
    */
   VALUE get_properties(void)
   {
-    VALUE v = Qnil;
-    if (!list_isempty($self->properties)) {
-      v = rb_hash_new();
-      lnode_t *node = list_first($self->properties);
-      while (node) {
-        client_property_t *property = (client_property_t *)node->list_data;
-        if (property->value.type == 0) {
-	  rb_hash_aset( v, makestring(property->key), makestring(property->value.entry.text));
-        }
-        else {
-          rb_hash_aset( v, makestring(property->key), makestring(epr_to_string(property->value.entry.eprp)));
-        }
-        node = list_next($self->properties, node);
-      }
-    }
-    return v;
+    return kv_list_to_hash($self->properties);
   }
 #endif
 

data/ext/openwsman/wsman-epr.i

@@ -193,9 +193,9 @@ typedef struct {} epr_t;
 #endif
     int i;
     Target_Type ary = Target_SizedArray($self->refparams.selectorset.count);
-    Selector *p = $self->refparams.selectorset.selectors;
+    key_value_t *p = $self->refparams.selectorset.selectors;
     for (i = 0; i < $self->refparams.selectorset.count; i++) {
-      Target_ListSet(ary, i, SWIG_FromCharPtr(p->name));
+      Target_ListSet(ary, i, SWIG_FromCharPtr(p->key));
       ++p;
     }
 #if defined(SWIGPERL)
@@ -216,18 +216,16 @@ typedef struct {} epr_t;
    */
   void each() {
     int i;
-    Selector *p = NULL;
+    key_value_t *p = NULL;
     VALUE value, ary;
     p = $self->refparams.selectorset.selectors;
     for (i = 0; i < $self->refparams.selectorset.count; i++) {
       ary = rb_ary_new2(2);
-      rb_ary_store(ary, 0, SWIG_FromCharPtr(p->name));
+      rb_ary_store(ary, 0, SWIG_FromCharPtr(p->key));
       if (p->type == 0) {
-        value = SWIG_FromCharPtr(p->value);
+        value = SWIG_FromCharPtr(p->v.text);
       } else {
-        char *epr_value = epr_to_string((const epr_t *)p->value);
-        value = SWIG_FromCharPtr(epr_value);
-        u_free(epr_value);
+        value = SWIG_NewPointerObj((void*) p->v.epr, SWIGTYPE_p_epr_t, 0);
       }
       rb_ary_store(ary, 1, value);
       rb_yield(ary);

data/ext/ruby/helpers.h

@@ -125,26 +125,34 @@ _add_str( VALUE key, VALUE value, hash_t *h )
 }
 
 
-/* add key,value VALUE pair to hash_t* as selector_entry*
+/* add key,value VALUE pair to hash_t* as key_value_t*
  *  (used as callback for value2hash)
  */
 static int
-_add_selector( VALUE key, VALUE value, hash_t *h )
+_add_kv( VALUE key, VALUE value, hash_t *h )
 {
     if (key != Qundef) {
-	const char *k = strdup( as_string( key ) );
+	const char *k = as_string( key );
 	if (!hash_lookup( h, k ) ) {
-            selector_entry *entry = u_malloc(sizeof(selector_entry));
-            entry->type = 0;
-            if (TYPE(value) == T_ARRAY) {
-              rb_raise( rb_eException, "Passing array parameter via invoke() still unsupported" );
-            }
-            else {
-              entry->entry.text = strdup(as_string( value ));
-            }
-	    if ( !hash_alloc_insert( h, k, entry ) ) {
-		rb_raise( rb_eException, "hash_alloc_insert failed" );
-            }
+          epr_t *epr;
+          const char *text;
+          key_value_t *entry;
+          KLASS_DECL(SwigClassEndPointReference,SWIGTYPE_p_epr_t);
+          if (CLASS_OF(value) == KLASS_OF(SwigClassEndPointReference)) {
+            SWIG_ConvertPtr(value, (void **)&epr, SWIGTYPE_p_epr_t, 0);
+            text = NULL;
+          }
+          else if (TYPE(value) == T_ARRAY) {
+            rb_raise( rb_eException, "Passing array parameter via invoke() still unsupported" );
+          }
+          else {
+            text = as_string(value);
+            epr = NULL;
+          }
+          entry = key_value_create(k, text, epr, NULL);
+          if ( !hash_alloc_insert( h, k, entry ) ) {
+            rb_raise( rb_eException, "hash_alloc_insert failed" );
+          }
 	}
     }
     return 0;
@@ -158,7 +166,7 @@ _add_selector( VALUE key, VALUE value, hash_t *h )
  *
  * valuetype - type of hash values
  *   0 - values are string (char *)
- *   1 - values are selector_entry *
+ *   1 - values are key_value_t *
  * 
  */
 static hash_t *
@@ -170,7 +178,7 @@ value2hash( hash_t *h, VALUE v, int valuetype )
 
     if (!h) h = hash_create3(HASHCOUNT_T_MAX, 0, 0);
 
-    rb_hash_foreach( v, (valuetype==0)?_add_str:_add_selector, (unsigned long)h );
+    rb_hash_foreach( v, (valuetype==0)?_add_str:_add_kv, (unsigned long)h );
 
     return h;
 }

data/lib/openwsman/openwsman.rb

@@ -38,14 +38,26 @@ require 'openwsman/xmldoc'
 # response and dig down through its XmlNode and XmlAttr objects.
 
 module Openwsman
-  class ClientOption
+  #
+  # ClientOptions
+  #
+  class ClientOptions
     # assign hash to properties
     def properties= value
       value.each do |k,v|
-        self.add_property k.to_s, v.to_s
+        self.add_property k.to_s, v
+      end
+    end
+    # assign hash to selectors
+    def selectors= value
+      value.each do |k,v|
+        self.add_selector k.to_s, v
       end
     end
   end
+  #
+  # Transport
+  #
   class Transport
     # called when authentication credentials missing or wrong
     def Transport.auth_request_callback client, auth_type
@@ -85,10 +97,30 @@ module Openwsman
     raise "Classname must not be nil" unless classname
     epr = epr_prefix_for(classname,namespace) + "/#{classname}"
   end
-  
+  #
+  # EndPointReference
+  #
   class EndPointReference
     def method_missing name, *args # :nodoc:
-      selector(name)
+      selector(name.to_s)
+    end
+    def to_s
+      s = "#{classname}"
+      first = true
+      self.each do |k,v|
+        s << ((first)?"?":"&")
+        first = false
+        s << "#{k}=#{v.inspect}"
+      end
+      s
+    end
+  end
+  #
+  # Fault
+  #
+  class Fault
+    def to_s
+      "Fault #{code}.#{subcode}: #{detail} - #{reason}"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openwsman
 version: !ruby/object:Gem::Version
-  version: 2.4.14
+  version: 2.5.2
 platform: ruby
 authors:
 - Klaus Kämpf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler