sfcc 0.1.2 → 0.5.0

data/ext/sfcc/sfcc.h

@@ -4,17 +4,11 @@
 
 #include <assert.h>
 
-/*
 #include <cimc/cimc.h>
 #include <cimc/cimcdt.h>
 #include <cimc/cimcft.h>
-*/
-#include <CimClientLib/cmci.h>
-#include <CimClientLib/cmcidt.h>
-#include <CimClientLib/cmcift.h>
-#include <CimClientLib/native.h>
 #include <CimClientLib/cmcimacs.h>
-
+        
 #include "ruby.h"
 
 #include <ruby.h>
@@ -27,34 +21,10 @@
 #include <unistd.h>
 #include <stdlib.h>
 
+extern const char *to_charptr(VALUE v);
 extern VALUE mSfcc;
 extern VALUE mSfccCim;
-
-/*
-#define SFCC_DEC_REFCOUNT(x) \
-  do { \
-    int refc = ((CIMCObject*)x)->refCount; \
-    printf("dec X: %d rf: %d\n", (int)x, refc); \
-    --((CIMCObject*)x)->refCount;          \
-    if (refc <= 0) \
-      x->ft->release(x); \
-    free(x); \
-  } while (0);
-*/
-
-#define SFCC_DEC_REFCOUNT(x) \
-  x->ft->release(x);
-
-/*
-#define SFCC_INC_REFCOUNT(x) \
-  do { \
-    int refc = ((CIMCObject*)x)->refCount; \
-    printf("inc X: %d rf: %d\n", (int) x, refc); \
-    ++((CIMCObject*)x)->refCount;          \
-  } while (0);
-*/
-
-#define SFCC_INC_REFCOUNT(x) (void)(0);
+extern CIMCEnv *cimcEnv;
 
 #define CIMSTR_2_RUBYSTR(x) (x ? (x->ft->getCharPtr(x, NULL) ? rb_str_new2(x->ft->getCharPtr(x, NULL)) : Qnil) : Qnil)
 
@@ -62,7 +32,7 @@ extern VALUE mSfccCim;
  * raises a ruby exception if the status is an error
  * whenever possible, adds the custom message if not null
  */
-void sfcc_rb_raise_if_error(CMPIStatus status, const char *msg, ...);
+void sfcc_rb_raise_if_error(CIMCStatus status, const char *msg, ...);
 
 /**
  * allocates a string array where each string points to the
@@ -73,24 +43,29 @@ void sfcc_rb_raise_if_error(CMPIStatus status, const char *msg, ...);
  */
 inline char ** sfcc_value_array_to_string_array(VALUE array);
 
+/**
+ * converts a CIMCArray to rbArray
+ */
+inline VALUE sfcc_cimcarray_to_rubyarray(CIMCArray *array);
+
 /**
  * converts a ruby hash to a CIM args object
  */
-inline CMPIArgs* sfcc_hash_to_cimargs(VALUE hash);
+inline CIMCArgs* sfcc_hash_to_cimargs(VALUE hash);
 
 /**
  * converts a CIM args object to a hash
  */
-inline VALUE sfcc_cimargs_to_hash(CMPIArgs *args);
+inline VALUE sfcc_cimargs_to_hash(CIMCArgs *args);
 
 /**
- * converts CMPIData to ruby VALUE
+ * converts CIMCData to ruby VALUE
  */
-inline VALUE sfcc_cimdata_to_value(CMPIData data);
+inline VALUE sfcc_cimdata_to_value(CIMCData data);
 
 /**
- * convert ruby VALUE to CMPIData
+ * convert ruby VALUE to CIMCData
  */
-inline CMPIData sfcc_value_to_cimdata(VALUE value);
+inline CIMCData sfcc_value_to_cimdata(VALUE value);
 
 #endif

data/lib/sfcc.rb

@@ -57,19 +57,43 @@ module Sfcc
     class ErrorRcError < RuntimeError; end
     
     class Client
+    private
+      def self.uri_to_params(uri, params)
+        params[:host] ||= uri.host
+        params[:scheme] ||= uri.scheme
+        params[:port] ||= uri.port
+        params[:user] ||= uri.user
+        params[:password] ||= uri.password
+      end
+    public
       # Client.connect(:host => "localhost",
       #                :scheme => "http",
       #                :port => 5988,
       #                :user => "root",
-      #                :password => "foo") do |client|
+      #                :password => "foo"
+      #                :verify => true,
+      #                :trust_store => "/path/to/trust/store",
+      #                :cert_file => "/path/to/cert_file",
+      #                :key_file => "/path/to/key_file") do |client|
       #   # do something with client
       # end
       #
-      # client is both returned and passed to the given block.
+      # client is both returned and passed to a given block.
+      #
+      # :verify, :trust_store, :cert_file, and :key_file are only evaluated
+      # if :scheme is 'https' and verify != false
+      #
+      # If :verify=>false, :trust_store, :cert_file and :key_file are unused
+      # If :verify is ommitted, it defaults to true
       #
       # Alternatively you can pass a uri:
       #
-      # client = Client.connect(uri)
+      #   client = Client.connect(uri)
+      #
+      # or a mix like
+      #
+      #   client = Client.connect(:uri => uri, :verify => false)
+      # Explicit parameters (like :user) always override :uri data
       #
       def self.connect(args={})
         params = {}
@@ -77,21 +101,46 @@ module Sfcc
         case args
         when Hash
           params.merge!(args)
-        when String
-          uri = URI.parse(arg)
+          uri = params[:uri]
+          case uri
+          when URI
+            self.uri_to_params(uri, params)
+          else
+            self.uri_to_params(URI.parse(uri.to_s), params)
+          end
+        when ::String
+          uri = URI.parse(args)
+	  return Client.connect uri
         when URI
-          params[:host] = uri.host
-          params[:scheme] = uri.scheme
-          params[:port] = uri.port
-          params[:user] = uri.user
-          params[:password] = uri.password          
+          self.uri_to_params(args, params)
+	else
+	  raise "Bad argument #{args.inspect}:#{args.class}"
+        end
+
+        verify = params[:verify]
+        trust_store = params[:trust_store]
+        cert_file = params[:cert_file]
+        key_file = params[:key_file]
+
+        case params[:scheme]
+        when "http"
+        when "https"
+          unless verify == false
+            raise "Must either specify :verify=>false or :cert_file for https URLs."
+          end
+        else
+          raise "Unsupported connection scheme #{scheme.inspect}"
         end
 
         native_connect(params[:host],
                        params[:scheme],
-                       params[:port],
+                       params[:port].to_s,
                        params[:user],
-                       params[:password]);
+                       params[:password],
+                       verify,
+                       trust_store,
+                       cert_file,
+                       key_file)
       end
     end
 
@@ -126,6 +175,10 @@ module Sfcc
     end
     
     class Instance
+      def classname
+        self.object_path.classname
+      end
+
       # properties => Hash
       #
       # return a hash with all properties
@@ -158,9 +211,19 @@ module Sfcc
       def to_s
         object_path.to_s
       end
+
+      def method_missing name, *args
+	self.property name
+      end
     end
 
     class ObjectPath
+      def [] name
+	self.key(name)
+      end
+      def method_missing name, *args
+	self[name]
+      end
     end
 
     class Enumeration

data/lib/sfcc/version.rb

@@ -1,3 +1,3 @@
 module Sfcc
-    VERSION = "0.1.2"
+    VERSION = "0.5.0"
 end

metadata

@@ -1,140 +1,113 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sfcc
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+version: !ruby/object:Gem::Version
+  version: 0.5.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Duncan Mac-Vicar
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-19 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake-compiler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &8018900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *8018900
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &8018380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *8018380
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &8017880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        version: "0.5"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *8017880
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &8017380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: ruby-sfcc allows to access a CIMOM either with the WBEM protocol or by using the SfcbLocal interface provided by the sblim-sfcb CIMOM implementation from the sblim project.
-email: 
+  prerelease: false
+  version_requirements: *8017380
+description: ruby-sfcc allows to access a CIMOM either with the WBEM protocol or by
+  using the SfcbLocal interface provided by the sblim-sfcb CIMOM implementation from
+  the sblim project.
+email:
 - dmacvicar@suse.de
 executables: []
-
-extensions: []
-
+extensions:
+- ext/sfcc/extconf.rb
 extra_rdoc_files: []
-
-files: 
-- lib/sfcc.rb
+files:
 - lib/sfcc/version.rb
+- lib/sfcc.rb
 - ext/sfcc/extconf.rb
-- ext/sfcc/cim_client.h
-- ext/sfcc/cim_object_path.h
-- ext/sfcc/cim_instance.h
 - ext/sfcc/cim_enumeration.h
+- ext/sfcc/cim_string.h
 - ext/sfcc/sfcc.h
+- ext/sfcc/cim_object_path.h
 - ext/sfcc/cim_class.h
-- ext/sfcc/cim_string.h
-- ext/sfcc/cim_enumeration.c
+- ext/sfcc/cim_client.h
+- ext/sfcc/cim_instance.h
 - ext/sfcc/cim_client.c
+- ext/sfcc/sfcc.c
+- ext/sfcc/cim_enumeration.c
 - ext/sfcc/cim_object_path.c
+- ext/sfcc/cim_class.c
 - ext/sfcc/cim_string.c
 - ext/sfcc/cim_instance.c
-- ext/sfcc/sfcc.c
-- ext/sfcc/cim_class.c
 - CHANGELOG.rdoc
 - README.rdoc
-has_rdoc: true
 homepage: http://www.github.com/dmacvicar/ruby-sfcc
 licenses: []
-
-post_install_message: "  ____\n\
-  /@    ~-.\n\
-  / __ .- | remember to have fun! \n // //  @  \n\n"
+post_install_message: ! "  ____\n/@    ~-.\n/ __ .- | remember to have fun! \n //
+  //  @  \n\n"
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: WBEM client for ruby based on the sblim-sfcc library
 test_files: []
-
+has_rdoc: