Author: dmacvicar
Date: Mon Nov 2 11:11:26 2009
New Revision: 59262
URL: http://svn.opensuse.org/viewcvs/yast?rev=59262&view=rev
Log:
merge trunk fixes
Modified:
branches/SuSE-Linux-11_2-Branch/ruby-bindings/VERSION.cmake
branches/SuSE-Linux-11_2-Branch/ruby-bindings/examples/ruby/Foo.rb
branches/SuSE-Linux-11_2-Branch/ruby-bindings/examples/ruby/ruby_from_ycp.ycp
branches/SuSE-Linux-11_2-Branch/ruby-bindings/package/yast2-ruby-bindings.changes
branches/SuSE-Linux-11_2-Branch/ruby-bindings/src/ruby/Y2RubyTypeConv.cc
branches/SuSE-Linux-11_2-Branch/ruby-bindings/yast2-ruby-bindings.spec.in
Modified: branches/SuSE-Linux-11_2-Branch/ruby-bindings/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/ruby-bindings/VERSION.cmake?rev=59262&r1=59261&r2=59262&view=diff
==============================================================================
--- branches/SuSE-Linux-11_2-Branch/ruby-bindings/VERSION.cmake (original)
+++ branches/SuSE-Linux-11_2-Branch/ruby-bindings/VERSION.cmake Mon Nov 2 11:11:26 2009
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "3")
-SET(VERSION_PATCH "3")
+SET(VERSION_PATCH "4")
Modified: branches/SuSE-Linux-11_2-Branch/ruby-bindings/examples/ruby/Foo.rb
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/ruby-bindings/examples/ruby/Foo.rb?rev=59262&r1=59261&r2=59262&view=diff
==============================================================================
--- branches/SuSE-Linux-11_2-Branch/ruby-bindings/examples/ruby/Foo.rb (original)
+++ branches/SuSE-Linux-11_2-Branch/ruby-bindings/examples/ruby/Foo.rb Mon Nov 2 11:11:26 2009
@@ -0,0 +1,5 @@
+module Foo
+ def self.multiply_by_eight(n)
+ n * 8
+ end
+end
Modified: branches/SuSE-Linux-11_2-Branch/ruby-bindings/examples/ruby/ruby_from_ycp.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/ruby-bindings/examples/ruby/ruby_from_ycp.ycp?rev=59262&r1=59261&r2=59262&view=diff
==============================================================================
--- branches/SuSE-Linux-11_2-Branch/ruby-bindings/examples/ruby/ruby_from_ycp.ycp (original)
+++ branches/SuSE-Linux-11_2-Branch/ruby-bindings/examples/ruby/ruby_from_ycp.ycp Mon Nov 2 11:11:26 2009
@@ -1,7 +1,7 @@
{
import "Foo";
- string result = (string) multiply_by_eight(10);
+ string result = tostring(Foo::multiply_by_eight(10));
UI::OpenDialog(
`VBox(
`Label(result),
@@ -10,4 +10,4 @@
);
UI::UserInput();
UI::CloseDialog();
-}
\ No newline at end of file
+}
Modified: branches/SuSE-Linux-11_2-Branch/ruby-bindings/package/yast2-ruby-bindings.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/ruby-bindings/package/yast2-ruby-bindings.changes?rev=59262&r1=59261&r2=59262&view=diff
==============================================================================
--- branches/SuSE-Linux-11_2-Branch/ruby-bindings/package/yast2-ruby-bindings.changes (original)
+++ branches/SuSE-Linux-11_2-Branch/ruby-bindings/package/yast2-ruby-bindings.changes Mon Nov 2 11:11:26 2009
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Nov 2 09:59:47 UTC 2009 - dmacvicar@suse.de
+
+- fix convertion of ruby hashes to ycp maps
+- 0.3.4
+
+-------------------------------------------------------------------
Thu Apr 9 15:15:09 CEST 2009 - kkaempf@suse.de
- add and enable CTest
Modified: branches/SuSE-Linux-11_2-Branch/ruby-bindings/src/ruby/Y2RubyTypeConv.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/ruby-bindings/src/ruby/Y2RubyTypeConv.cc?rev=59262&r1=59261&r2=59262&view=diff
==============================================================================
--- branches/SuSE-Linux-11_2-Branch/ruby-bindings/src/ruby/Y2RubyTypeConv.cc (original)
+++ branches/SuSE-Linux-11_2-Branch/ruby-bindings/src/ruby/Y2RubyTypeConv.cc Mon Nov 2 11:11:26 2009
@@ -66,7 +66,7 @@
int n = NUM2LONG(rb_funcall(keys, rb_intern("size"), 0));
for ( int i=0; i