genprovider 0.2.2 → 0.2.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OGI2NWMzOWIzYjhmNzEzZTdiZTQ0NDg4YmFiNmQ5MzA4YTZjNjc5Yg==
-  data.tar.gz: !binary |-
-    ZTA2MTI3YmE0NGQwNjBkMTJmOTQxNTY4NmNkYTQ0M2Y0OWQzMWM3Mw==
+SHA1:
+  metadata.gz: 4fa4c44513997075cf64f63aaf4e5acc2c834db7
+  data.tar.gz: 5406f61616e8f69a627b533428784a6683969d98
 SHA512:
-  metadata.gz: !binary |-
-    OTJkNzYzODMxOGM1NGFkNzJhODczOTY1NjAyZWMwZmFkZGQ4Mzc1MDAyM2Fh
-    NmExNWUyNjBmZTUzYWMwMDc0ODk5NDExZmQ4YmY2YjU4ZGUyODRiZmI5ZTA4
-    ODlkNzMwNWViZGI1MjMzODY3MDk0MzA5MGU3ZDQyNTlhNzNlYmM=
-  data.tar.gz: !binary |-
-    N2E3YjFlOGYzYzliMTE3ZmEyMmUyM2JiMmY4NWJkOThiODg2MDk5Zjk2MGFh
-    NjdkODM1ZGY3OTFkNzY1ZjE2YjE4NGFjMjQ1ZmMzNzQyNjJmZDIwODJiNzRl
-    MmZiODNjNmRjZjc3OGUwMTIwZTEwZDg0NGYwMDI0YTJkZGQ0MjU=
+  metadata.gz: 778a14155c369fb2debb314965a74882db8844e17c3cce10c365dc41cd7491ed4a169195262ba86e7ef2e234c6ecb3dd16342aa45ffb1a40535e6c5fe6d10ab5
+  data.tar.gz: 3318acd23286630a83d17b0383b1ba2d4ee8cc804e203afa98ad20fcaa90f52c0f702f1f5e5c6c1e56f37ed9cb0317efaede09aa2cfcfa9ddf241118157deaf9

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 0,2.3 2014-06-25
+
+* fix LMI_Embedded test case
+
 === 0.2.2 2013-10-09
 
 * fix method input args

data/LICENSE

@@ -1,4 +1,6 @@
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
+[Ruby License]
+
+Genprovider is copyrighted free software by Klaus Kaempf <kkaempf@suse.de>.
 You can redistribute it and/or modify it under either the terms of the GPL
 (see COPYING.txt file), or the conditions below:
 

data/genprovider.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Klaus Kämpf"]
   s.email       = ["kkaempf@suse.de"]
   s.homepage    = "https://github.com/kkaempf/genprovider"
+  s.licenses    = ["Ruby"]
   s.summary     = %q{A generator for Ruby based CIM providers}
   s.description = %q{Generates Ruby provider templates for use with cmpi-bindings}
 
@@ -29,7 +30,7 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.files.reject! { |fn| fn == '.gitignore' }
-  s.extra_rdoc_files    = Dir['README*', 'TODO*', 'CHANGELOG*', 'LICENSE']
+  s.extra_rdoc_files    = Dir['README.rdoc', 'CHANGELOG', 'LICENSE']
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]

data/lib/genprovider/provider.rb

@@ -609,6 +609,7 @@ module Genprovider
 
 #      @out.puts
 #      @out.def "invoke_method", "context", "result", "reference", "method", "argsin", "argsout"
+#      @out.comment "method names and parameter names are case-insensitive !"
 #      @out.puts "#{LOG} \"invoke_method \#{context}, \#{result}, \#{reference}, \#{method}, \#{argsin}, \#{argsout}\""
 #      @out.end
     end

data/lib/genprovider/version.rb

@@ -1,3 +1,3 @@
 module Genprovider
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/samples/mof/LMI_Embedded.mof

@@ -1,6 +1,6 @@
 class LMI_Embedded
 {
     [Key] string InstanceID;
-    [EmbeddedObject("CIM_ManagedElement")] string Embedded;
+    [EmbeddedObject("LMI_ManagedElement")] string Embedded;
     string Str;
 };

data/samples/mof/LMI_ManagedElement.mof

@@ -0,0 +1,5 @@
+class LMI_ManagedElement
+{
+    [Key] string InstanceID;
+    string Description;
+};

data/samples/provider/lmi_embedded.rb

@@ -7,15 +7,12 @@ require 'cmpi/provider'
 
 module Cmpi
 
-  class CIM_ManagedElement < InstanceProvider
+  class LMI_ManagedElement < InstanceProvider
     # typemap for embedded instance
     def self.typemap
       {
         "InstanceID" => Cmpi::string,
-        "Caption" => Cmpi::string,
-        "Description" => Cmpi::string,
-        "ElementName" => Cmpi::string,
-        "Generation" => Cmpi::uint64,
+        "Description" => Cmpi::string
       }
     end
   end
@@ -50,10 +47,10 @@ module Cmpi
     #
     def each( context, reference, properties = nil, want_instance = false )
       value = "Hello world"
-      
+
       # create embedded instance
       ns = reference.namespace
-      pembedded = Cmpi::CMPIObjectPath.new ns, "CIM_ManagedElement"
+      pembedded = Cmpi::CMPIObjectPath.new ns, "LMI_ManagedElement"
       pembedded.InstanceID = "id"
       @trace_file.puts "pembedded #{pembedded}"
       

data/samples/registration/LMI_ManagedElement.registration

@@ -0,0 +1,7 @@
+#
+# Registration for LMI_ManagedElement, embedded property of class LMI_Embedded
+#
+# Generated by 'genprovider' for use with cmpi-bindings-ruby
+#
+# Classname - Namespace - Providername - Libraryname - Capabilities ...
+LMI_ManagedElement test/test LMI_ManagedElement rbCmpiProvider instance

data/test/sfcb.rb

@@ -49,6 +49,8 @@ class Sfcb
 	"httpPort" => @port,
 	"enableHttps" => false,
 	"enableSlp" => false,
+        "enableInterOp" => false,
+        "providerSampleInterval" => 5,
 	"providerTimeoutInterval" => 10,
 	"registrationDir" => @registration_dir,
 	"localSocketPath" => File.join(@dir, "sfcbLocalSocket"),

data/test/test_lmi_embedded.rb

@@ -35,7 +35,8 @@ class Test_LMI_Embedded < Test::Unit::TestCase
       assert_kind_of String, instance.InstanceID # string
       puts "instance.InstanceID #{instance.InstanceID.inspect}"
       assert instance.Embedded
-      assert_kind_of Sfcc::Cim::Instance, instance.Embedded # string
+#      assert_kind_of Sfcc::Cim::Instance, instance.Embedded # string
+      assert_kind_of String, instance.Embedded # Instance
       puts "instance.Embedded #{instance.Embedded.inspect}"
       assert instance.Str
       assert_kind_of String, instance.Str # string

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: genprovider
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Klaus Kämpf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mof
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sfcc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Generates Ruby provider templates for use with cmpi-bindings
@@ -116,9 +116,7 @@ executables:
 - regprovider
 extensions: []
 extra_rdoc_files:
-- README.rdoc~
 - README.rdoc
-- CHANGELOG~
 - CHANGELOG
 - LICENSE
 files:
@@ -155,6 +153,7 @@ files:
 - lib/genprovider/testcase.rb
 - lib/genprovider/version.rb
 - samples/mof/LMI_Embedded.mof
+- samples/mof/LMI_ManagedElement.mof
 - samples/mof/RCP_ArrayDataTypes.mof
 - samples/mof/RCP_ClassMethod.mof
 - samples/mof/RCP_ComplexMethod.mof
@@ -175,6 +174,7 @@ files:
 - samples/provider/rcp_simple_data_types.rb
 - samples/provider/rcp_simple_method.rb
 - samples/registration/LMI_Embedded.registration
+- samples/registration/LMI_ManagedElement.registration
 - samples/registration/RCP_ArrayDataTypes.registration
 - samples/registration/RCP_ClassMethod.registration
 - samples/registration/RCP_ComplexMethod.registration
@@ -214,10 +214,9 @@ files:
 - test/test_rcp_simple_data_types.rb
 - test/test_rcp_simple_method.rb
 - valgrind
-- README.rdoc~
-- CHANGELOG~
 homepage: https://github.com/kkaempf/genprovider
-licenses: []
+licenses:
+- Ruby
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -225,19 +224,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - sblim-cmpi-base (for provider-register.sh)
 - sblim-sfcb for testing
 rubyforge_project: genprovider
-rubygems_version: 2.1.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A generator for Ruby based CIM providers
@@ -271,4 +270,3 @@ test_files:
 - test/test_rcp_complex_method.rb
 - test/test_rcp_simple_data_types.rb
 - test/test_rcp_simple_method.rb
-has_rdoc: 

data/CHANGELOG~

@@ -1,17 +0,0 @@
-=== 0.2.1 2013-09-18
-
-* support filter (execQuery)
-* fix property filter
-* support methods
-* Ruby 1.9 adaptions
-* Support EmbeddedObject/EmbeddedInstance as string property
-  qualifiers
-              
-=== 0.2.0 2013-04-11
-
-* Bugfix release
-
-=== 0.0.1 2010-10-05
-
-* Initial release of genprovider gem
-  License now 'Ruby'

data/README.rdoc~

@@ -1,60 +0,0 @@
-= genprovider
-
-* http://github.com/kkaempf/genprovider
-
-== DESCRIPTION:
-
-* A generator for Ruby based CIM providers
-  Generates Ruby provider templates for use with cmpi-bindings
-
-== FEATURES/PROBLEMS:
-
-* Generates CIM class and provider templates from MOF files
-
-== SYNOPSIS:
-
-  genprovider.rb [-d] [-h] [-q] [-I <includedir>] [-o <output>] [-n <namespace>] <moffile> [<moffile> ...]
-
-  * -d              debug
-  * -h              this help
-  * -I <dir>        include dir
-  * -f              force, overwrite existing files
-  * -n <namespace>  cim namespace, triggers generating .registration file
-  * -o <output>     output file
-  * -s <style>      syntax style (wmi,cim) of input mof
-  * -q  quiet       no progress output
-  * <moffiles>      file(s) to read (else use $stdin)
-
-== EXAMPLE:
-
-  # generate .registration and .rb file
-  bin/genprovider -n root/cimv2 sample.mof
-  # convert .registration to sfcb .reg file
-  # copy .reg to /var/lib/sfcb/stage/regs
-  # copy .mof to /var/lib/sfcb/mofs/<namespace>/
-  # run sfcbrepos -f
-  sudo provider-register.sh -t sfcb -n root/cimv2 -r generated/sample.registration -m sample.mof
-  # copy provider template
-  cp generated/sample.rb /usr/share/cmpi
-  # reload sfcb to pick up provider information
-  sudo rcsfcb restart
-
-== REQUIREMENTS:
-
-* gems:
-  * cim
-  * mof
-
-* 'cmpi-bindings' (for provider execution)
-
-== INSTALL:
-
-* gem install genprovider
-
-== LICENSE:
-
-(The Ruby License)
-
-Copyright (c) 2010 Klaus Kämpf <kkaempf@suse.de>
-
-See http://www.ruby-lang.org/en/LICENSE.txt for the full text