[yast-commit] r40876 - in /trunk/ruby-bindings: examples/ruby/ycp_from_ruby.rb src/ruby/CMakeLists.txt src/ruby/Y2RubyTypeTerm.cc src/ruby/YCP.cc src/ruby/yast.rb

Author: dmacvicar Date: Wed Sep 12 15:02:45 2007 New Revision: 40876 URL: http://svn.opensuse.org/viewcvs/yast?rev=40876&view=rev Log: - make the extension a ruby code lib, and make the ruby lib load the native extension (yastx) - move the term builder to the ruby part - make the ruby library add the plugin path Added: trunk/ruby-bindings/src/ruby/yast.rb Modified: trunk/ruby-bindings/examples/ruby/ycp_from_ruby.rb trunk/ruby-bindings/src/ruby/CMakeLists.txt trunk/ruby-bindings/src/ruby/Y2RubyTypeTerm.cc trunk/ruby-bindings/src/ruby/YCP.cc Modified: trunk/ruby-bindings/examples/ruby/ycp_from_ruby.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/examples/ruby/ycp_from_ruby.rb?rev=40876&r1=40875&r2=40876&view=diff ============================================================================== --- trunk/ruby-bindings/examples/ruby/ycp_from_ruby.rb (original) +++ trunk/ruby-bindings/examples/ruby/ycp_from_ruby.rb Wed Sep 12 15:02:45 2007 @@ -1,5 +1,23 @@ require 'yast' +ui = YaST::Module.new("UI") + + +t = YaST::Builder.new do + VBox do + Label "Now we can call YaST UI from other languages!", "wooho" + PushButton "&So What?", "So what*** what" + end +end +puts t.to_s +exit + +dialog = nil + +puts dialog.class +ui.OpenDialog(dialog) + +exit m = YaST::Module.new("SCR") m.Read(".proc.modules") Modified: trunk/ruby-bindings/src/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/CMakeLists.txt?rev=40876&r1=40875&r2=40876&view=diff ============================================================================== --- trunk/ruby-bindings/src/ruby/CMakeLists.txt (original) +++ trunk/ruby-bindings/src/ruby/CMakeLists.txt Wed Sep 12 15:02:45 2007 @@ -32,14 +32,16 @@ INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ) INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR} ) -ADD_LIBRARY( yast SHARED ${yast_ruby_module_SRCS}) -SET_TARGET_PROPERTIES( yast PROPERTIES PREFIX "" ) -TARGET_LINK_LIBRARIES( yast ${YAST_LIBRARY} ) -TARGET_LINK_LIBRARIES( yast ${YAST_YCP_LIBRARY} ) -TARGET_LINK_LIBRARIES( yast ${YAST_PLUGIN_WFM_LIBRARY} ) -TARGET_LINK_LIBRARIES( yast ${YAST_PLUGIN_SCR_LIBRARY} ) -TARGET_LINK_LIBRARIES( yast ${RUBY_LIBRARY} ) -INSTALL(TARGETS yast LIBRARY DESTINATION ${RUBY_VENDORARCH_DIR} ) +ADD_LIBRARY( yastx SHARED ${yast_ruby_module_SRCS}) +SET_TARGET_PROPERTIES( yastx PROPERTIES PREFIX "" ) +TARGET_LINK_LIBRARIES( yastx ${YAST_LIBRARY} ) +TARGET_LINK_LIBRARIES( yastx ${YAST_YCP_LIBRARY} ) +TARGET_LINK_LIBRARIES( yastx ${YAST_PLUGIN_WFM_LIBRARY} ) +TARGET_LINK_LIBRARIES( yastx ${YAST_PLUGIN_SCR_LIBRARY} ) +TARGET_LINK_LIBRARIES( yastx ${RUBY_LIBRARY} ) +INSTALL(TARGETS yastx LIBRARY DESTINATION ${RUBY_VENDORARCH_DIR} ) + +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/yast.rb DESTINATION ${RUBY_VENDORLIB_DIR} ) ADD_LIBRARY( py2lang_ruby SHARED ${ruby_yast_plugin_SRCS}) TARGET_LINK_LIBRARIES( py2lang_ruby ${YAST_LIBRARY} ) Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeTerm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyTypeTerm.cc?rev=40876&r1=40875&r2=40876&view=diff ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyTypeTerm.cc (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyTypeTerm.cc Wed Sep 12 15:02:45 2007 @@ -90,6 +90,25 @@ return self; } +static VALUE +ryast_term_add( int argc, VALUE *argv, VALUE self ) +{ + ryast_Term_Wrapper *wrapper; + Data_Get_Struct(self, ryast_Term_Wrapper, wrapper); + + // we should be using rb_scan_args here but I couldn't get it to work. + + // add the remaining YCPTerm arguments + if (argc > 0) + { + int i=0; + for ( ; iterm->add(rbvalue_2_ycpvalue(argv[i])); + } + } + return self; +} static VALUE ryast_term_allocate(VALUE klass) @@ -100,10 +119,22 @@ return Data_Wrap_Struct (klass, ryast_term_mark, ryast_term_free, wrapper); } + +static VALUE +ryast_term_to_s(VALUE klass) +{ + ryast_Term_Wrapper *wrapper; + Data_Get_Struct(self, ryast_Term_Wrapper, wrapper); + + return rb_str_new2(wrapper->term.toString().c_str()); +} + void ryast_term_init( VALUE super ) { ryast_cTerm = rb_define_class_under( super, "Term", rb_cObject ); rb_define_alloc_func( ryast_cTerm, ryast_term_allocate ); rb_define_method( ryast_cTerm, "initialize", RB_METHOD( ryast_term_initialize ), -1 ); + rb_define_method( ryast_cTerm, "add", RB_METHOD( ryast_term_add ), -1 ); + rb_define_method( ryast_cTerm, "to_s", RB_METHOD( ryast_term_to_s ), 0 ); } Modified: trunk/ruby-bindings/src/ruby/YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YCP.cc?rev=40876&r1=40875&r2=40876&view=diff ============================================================================== --- trunk/ruby-bindings/src/ruby/YCP.cc (original) +++ trunk/ruby-bindings/src/ruby/YCP.cc Wed Sep 12 15:02:45 2007 @@ -373,7 +373,7 @@ extern "C" { void - Init_yast() + Init_yastx() { YCPPathSearch::initialize (); Added: trunk/ruby-bindings/src/ruby/yast.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/yast.rb?rev=40876&view=auto ============================================================================== --- trunk/ruby-bindings/src/ruby/yast.rb (added) +++ trunk/ruby-bindings/src/ruby/yast.rb Wed Sep 12 15:02:45 2007 @@ -0,0 +1,68 @@ +# -----------------------------------------------------------------------\ +# | | +# | __ __ ____ _____ ____ | +# | \ \ / /_ _/ ___|_ _|___ \ | +# | \ V / _` \___ \ | | __) | | +# | | | (_| |___) || | / __/ | +# | |_|\__,_|____/ |_| |_____| | +# | | +# | | +# | ruby language support (C) Novell Inc. | +# \----------------------------------------------------------------------/ +# +# Author: Duncan Mac-Vicar +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version +# 2 of the License, or (at your option) any later version. +# + +ENV['LD_LIBRARY_PATH'] = "/usr/lib/YaST2/plugin" + +# Load the native part (.so) +require 'yastx' + +module YaST + + class Builder + # blank slate + instance_methods.each { |m| undef_method m unless (m =~ /^__|instance_eval$/)} + + def initialize(&block) + @buffer = Array.new + @term = nil + instance_eval(&block) + end + + def method_missing(name, *args, &block ) + # puts "hi #{name.to_s} | #{args}" + term = nil + elements = block ? nil : args + @__to_s = nil # invalidate to_s cache + term = YaST::Term(name) + if elements + #puts "here" + @buffer << name << "(" + elements.each do | e | + @buffer << e.to_s + term.add(e) + end + @buffer << ") " + return term + else + # puts "there" + @buffer << name << "(" + r = instance_eval(&block) + term.add(r) if r + @buffer << ") " + end + return term + end + + def to_s + return @buffer.to_s + end + end + +end # module YaST \ No newline at end of file -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org