Author: dmacvicar Date: Wed Sep 19 17:50:57 2007 New Revision: 40969 URL: http://svn.opensuse.org/viewcvs/yast?rev=40969&view=rev Log: - Lot of fixes and support for the UI!!! Added: trunk/ruby-bindings/examples/ruby/libycp.rb trunk/ruby-bindings/examples/ruby/module-arch.rb trunk/ruby-bindings/examples/ruby/module-storage.rb trunk/ruby-bindings/examples/ruby/module-timezone.rb Modified: trunk/ruby-bindings/VERSION.cmake trunk/ruby-bindings/examples/ruby/ui.rb trunk/ruby-bindings/package/yast2-ruby-bindings.changes trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc trunk/ruby-bindings/src/ruby/Y2RubyTypeTerm.cc trunk/ruby-bindings/src/ruby/YCP.cc trunk/ruby-bindings/src/ruby/yast.rb Modified: trunk/ruby-bindings/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/VERSION.cmake?rev=40969&r1=40968&r2=40969&view=diff ============================================================================== --- trunk/ruby-bindings/VERSION.cmake (original) +++ trunk/ruby-bindings/VERSION.cmake Wed Sep 19 17:50:57 2007 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "0") -SET(VERSION_MINOR "1") +SET(VERSION_MINOR "2") SET(VERSION_PATCH "0") \ No newline at end of file Added: trunk/ruby-bindings/examples/ruby/libycp.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/examples/ruby/libycp.rb?rev=40969&view=auto ============================================================================== --- trunk/ruby-bindings/examples/ruby/libycp.rb (added) +++ trunk/ruby-bindings/examples/ruby/libycp.rb Wed Sep 19 17:50:57 2007 @@ -0,0 +1,45 @@ +require 'ryast' +include Ryast + +def get_ns(name) + import = Import.new(name) + ns = import.name_space + puts ns.filename + #ns.initialize + + return ns +end + +component = Y2ComponentBroker.get_namespace_component("Arch"); +#puts component.methods +#Y2Namespace *ns = c->import(RSTRING (namespace_name)->ptr); +nsname = "Arch" +fncname = "sparc32" +ns = get_ns(nsname) +#/**/ +#t = Type.from_signature("bool()") +#puts t +sym = ns.table.find(fncname); +puts sym.class +if (sym.nil?) + raise ("No such symbol #{nsname}::#{fncname}") +elsif (sym.sentry.is_variable or sym.sentry.reference? ) + # set the variable + #ret_yv = YCP_getset_variable (aTHX_ ns_name, sym_te->sentry (), args); +else + fnccall = ns.create_function_call(fncname, nil) + if fnccall.nil? + raise("No such function #{nsname}::#{fncname}") + end +end +exit + +h = ns.lookup_symbol("sparc32") +puts h.class +exit +function = ns.create_function_call("sparc32",0) +#call->appendParameter (v); +function.finish_parameters +res = function.evaluate_call +puts res +exit Added: trunk/ruby-bindings/examples/ruby/module-arch.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/examples/ruby/module-arch.rb?rev=40969&view=auto ============================================================================== --- trunk/ruby-bindings/examples/ruby/module-arch.rb (added) +++ trunk/ruby-bindings/examples/ruby/module-arch.rb Wed Sep 19 17:50:57 2007 @@ -0,0 +1,6 @@ +require 'yast' + +m = YaST::Module.new("Arch") +puts m.sparc32 +puts m.arch_short +puts m.is_xen Added: trunk/ruby-bindings/examples/ruby/module-storage.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/examples/ruby/module-storage.rb?rev=40969&view=auto ============================================================================== --- trunk/ruby-bindings/examples/ruby/module-storage.rb (added) +++ trunk/ruby-bindings/examples/ruby/module-storage.rb Wed Sep 19 17:50:57 2007 @@ -0,0 +1,7 @@ +require 'yast' + +m = YaST::Module.new("Storage") +dp = m.GetDiskPartition("/dev/sda1") +dp.each do | key, value | + puts "#{key} #{value}" +end \ No newline at end of file Added: trunk/ruby-bindings/examples/ruby/module-timezone.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/examples/ruby/module-timezone.rb?rev=40969&view=auto ============================================================================== --- trunk/ruby-bindings/examples/ruby/module-timezone.rb (added) +++ trunk/ruby-bindings/examples/ruby/module-timezone.rb Wed Sep 19 17:50:57 2007 @@ -0,0 +1,12 @@ +require 'yast' + +m = YaST::Module.new("Timezone") +zonemap = m.get_zonemap() +puts zonemap.class +zonemap.each do | element | + element.each do | key, value | + value.each do | k, v | + puts "#{k} #{v}" + end + end +end Modified: trunk/ruby-bindings/examples/ruby/ui.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/examples/ruby/ui.rb?rev=40969&r1=40968&r2=40969&view=diff ============================================================================== --- trunk/ruby-bindings/examples/ruby/ui.rb (original) +++ trunk/ruby-bindings/examples/ruby/ui.rb Wed Sep 19 17:50:57 2007 @@ -1,6 +1,6 @@ require 'yast' ui = YaST::Module.new("UI") - +YaST::Ui::init("qt") include YaST::Ui t = HBox( Label("Welcome to Ruby!"), PushButton("Push me") ) Modified: trunk/ruby-bindings/package/yast2-ruby-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/package/yast2-ruby-bindings.changes?rev=40969&r1=40968&r2=40969&view=diff ============================================================================== --- trunk/ruby-bindings/package/yast2-ruby-bindings.changes (original) +++ trunk/ruby-bindings/package/yast2-ruby-bindings.changes Wed Sep 19 17:50:57 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Sep 19 16:42:35 CEST 2007 - dmacvicar@suse.de + +- Lot of improvements, examples and + support for the YaST UI +- 0.2.0 + +------------------------------------------------------------------- Thu Aug 9 12:01:39 CEST 2007 - dmacvicar@suse.de - Fix build on 64 bits Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc?rev=40969&r1=40968&r2=40969&view=diff ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc Wed Sep 19 17:50:57 2007 @@ -40,6 +40,8 @@ #include "Y2RubyTypeConv.h" +#define IS_A(obj,klass) ((rb_obj_is_kind_of((obj),(klass))==Qtrue)?1:0) + static YCPMap rbhash_2_ycpmap( VALUE value ) { YCPMap map; @@ -138,7 +140,7 @@ YCPSymbol symbol = ycpval->asSymbol(); return rb_intern(symbol->symbol_cstr()); } - rb_raise( rb_eRuntimeError, "Conversion of YCP type %s not supported", ycpval->toString().c_str() ); + rb_raise( rb_eTypeError, "Conversion of YCP type %s not supported", ycpval->toString().c_str() ); return Qnil; } @@ -147,7 +149,7 @@ rbvalue_2_ycpvalue( VALUE value ) { VALUE klass = rb_funcall( value, rb_intern("class"), 0); - std::cout << RSTRING( rb_funcall( klass, rb_intern("to_s"), 0))->ptr << " | " << RSTRING(rb_funcall( value, rb_intern("inspect"), 0))->ptr << std::endl; + //std::cout << RSTRING( rb_funcall( klass, rb_intern("to_s"), 0))->ptr << " | " << RSTRING(rb_funcall( value, rb_intern("inspect"), 0))->ptr << std::endl; //y2internal("type: '%d'", TYPE(value)); // TODO conver integers, and add support for lists, ah, and boleans! switch (TYPE(value)) @@ -177,23 +179,17 @@ break; case T_SYMBOL: return YCPSymbol(rb_id2name(rb_to_id(value))); - case T_DATA: - rb_raise( rb_eRuntimeError, "Object"); + //case T_DATA: + // rb_raise( rb_eRuntimeError, "Object"); break; default: + string class_name(RSTRING(rb_funcall(rb_funcall(value, rb_intern("class"), 0), rb_intern("to_s"), 0))->ptr); /* get the Term class object */ - VALUE cTerm = rb_funcall( rb_mKernel, rb_intern("const_get"), 1, rb_str_new2("YaST::Term") ); - VALUE is_term = rb_funcall(value, rb_intern("is_a?"), cTerm); - if ( TYPE(is_term) == T_TRUE ) + if ( class_name == "YaST::Term" ) { return ryast_yterm_from_rterm(value); } - else - { - std::cout << "no term" << std::endl; - } - std::cout << TYPE(value) << std::endl; - rb_raise( rb_eRuntimeError, "Conversion of Ruby type not supported"); + rb_raise( rb_eTypeError, "Conversion of Ruby type not supported"); return YCPValue(); } } Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeTerm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyTypeTerm.cc?rev=40969&r1=40968&r2=40969&view=diff ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyTypeTerm.cc (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyTypeTerm.cc Wed Sep 19 17:50:57 2007 @@ -112,7 +112,7 @@ int i=0; for ( ; iterm->add(value); } @@ -137,7 +137,26 @@ Data_Get_Struct(self, ryast_Term_Wrapper, wrapper); return rb_str_new2(wrapper->term.toString().c_str()); } - + +static VALUE +ryast_term_name(VALUE self) +{ + ryast_Term_Wrapper *wrapper; + Data_Get_Struct(self, ryast_Term_Wrapper, wrapper); + return rb_str_new2(wrapper->term.name().c_str()); +} + +// static VALUE +// ryast_term_set_name(VALUE self, VALUE name) +// { +// Check_Type(name, T_STRING); +// ryast_Term_Wrapper *wrapper; +// Data_Get_Struct(self, ryast_Term_Wrapper, wrapper); +// +// wrapper->term->setName(RSTRING(name)->ptr); +// return self; +// } + void ryast_term_init( VALUE super ) { @@ -146,5 +165,7 @@ 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, "name=", RB_METHOD( ryast_term_set_name ), 1 ); + rb_define_method( ryast_cTerm, "name", RB_METHOD( ryast_term_name ), 0 ); 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=40969&r1=40968&r2=40969&view=diff ============================================================================== --- trunk/ruby-bindings/src/ruby/YCP.cc (original) +++ trunk/ruby-bindings/src/ruby/YCP.cc Wed Sep 19 17:50:57 2007 @@ -57,6 +57,7 @@ #include "YRuby.h" static VALUE rb_mYaST; +static VALUE rb_mUi; static VALUE rb_cBroker; // make the compiler happy when @@ -91,7 +92,7 @@ return ns; } -void init_wfm () +void init_wfm() { y2milestone("init_wfm"); // if (Y2WFMComponent::instance () == 0) @@ -105,6 +106,53 @@ // } } +static VALUE +rb_init_ui( int argc, VALUE *argv, VALUE self ) +{ + const char *ui_name = "ncurses"; + + if (argc == 1) + { + Check_Type(argv[0], T_STRING); + ui_name = RSTRING(argv[0])->ptr; + } + else if (argc != 0) + { + y2error ("Zero or one arguments required (ui name, default %s", ui_name); + return Qnil; + } + + Y2Component *c = YUIComponent::uiComponent (); + if (c == 0) + { + y2debug ("UI component not created yet, creating %s", ui_name); + + c = Y2ComponentBroker::createServer (ui_name); + if (c == 0) + { + y2error ("Cannot create component %s", ui_name); + return Qnil; + } + + if (YUIComponent::uiComponent () == 0) + { + y2error ("Component %s is not a UI", ui_name); + return Qnil; + } + else + { + // got it - initialize, remember + c->setServerOptions (0, NULL); + owned_uic = c; + } + } + else + { + y2debug ("UI component already present: %s", c->name ().c_str ()); + } + return Qnil; +} + typedef struct brokerinfo { Y2Component *component; @@ -139,7 +187,7 @@ { Check_Type(param_ns_name, T_STRING); rb_iv_set(self, "@namespace_name", param_ns_name); - init_wfm (); + init_wfm(); return self; } @@ -370,6 +418,30 @@ return ret_yv; } + + +//y2_logger_helper + +//y2_logger (level, comp, file, line, function, "%s", message); + +static VALUE +rb_y2_logger( int argc, VALUE *argv, VALUE self ) +{ + Check_Type(argv[0], T_FIXNUM); + Check_Type(argv[1], T_STRING); + Check_Type(argv[2], T_STRING); + Check_Type(argv[3], T_FIXNUM); + Check_Type(argv[4], T_STRING); + + int i; + for ( i = 5; i < argc; i++) + { + Check_Type(argv[i], T_STRING); + } + y2_logger((loglevel_t)NUM2INT(argv[0]),RSTRING(argv[1])->ptr,RSTRING(argv[2])->ptr,NUM2INT(argv[3]),"",RSTRING(argv[5])->ptr); + return Qnil; +} + extern "C" { void @@ -383,7 +455,11 @@ } rb_mYaST = rb_define_module("YaST"); - + rb_mUi = rb_define_module_under(rb_mYaST, "Ui"); + rb_define_singleton_method( rb_mUi, "init", RB_METHOD(rb_init_ui), -1); + + rb_define_method( rb_mYaST, "y2_logger", RB_METHOD(rb_y2_logger), -1); + rb_cBroker = rb_define_class_under( rb_mYaST, "Module", rb_cObject); //rb_define_singleton_method( rb_cBroker, "new", RB_METHOD(module_new), 1); rb_define_alloc_func(rb_cBroker, yast_module_allocate); Modified: trunk/ruby-bindings/src/ruby/yast.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/yast.rb?rev=40969&r1=40968&r2=40969&view=diff ============================================================================== --- trunk/ruby-bindings/src/ruby/yast.rb (original) +++ trunk/ruby-bindings/src/ruby/yast.rb Wed Sep 19 17:50:57 2007 @@ -24,13 +24,56 @@ require 'yastx' module YaST + module Ui + #my @e_logging = qw(y2debug y2milestone y2warning y2error y2security y2internal); + + # Define symbols for the UI + ui_terms = [ :BarGraph, :Bottom, :CheckBox, :ColoredLabel, :ComboBox, :Date, + :DownloadProgress, :DumbTab, :DummySpecialWidget, :Empty, :Frame, :HBox, :HBoxvHCenter, + :HMultiProgressMeter, :HSpacing, :HSquash, :HStretch, :HVCenter, :HVSquash, + :HVStretch, :HWeight, :Heading, :IconButton, :Image, :IntField, :Label, :Left, :LogView, + :MarginBox, :MenuButton, :MinHeight, :MinSize, :MinWidth, :MultiLineEdit, + :MultiSelectionBox, :PackageSelector, :PatternSelector, :PartitionSplitter, + :Password, :PkgSpecial, :ProgressBar, :PushButton, :RadioButton, + :RadioButtonGroup, :ReplacePoint, :RichText, :Right, :SelectionBox, :Slider, :Table, + :TextEntry, :Time, :Top, :Tree, :VBox, :VCenter, :VMultiProgressMeter, :VSpacing, + :VSquash, :VStretch, :VWeight, :Wizard, + :id, :opt ] + +# buffer = String.new +# buffer << "[" +# ui_terms.each do |t| +# buffer << " :" << t.to_s.downcase << "," +# end +# buffer << " ]" +# puts buffer + # If the method name contains underscores, convert to camel case +# while method =~ /([^_]*)_(.)(.*)/ +# method = $1 + $2.upcase + $3 +# end + + # for each symbol define a util function that will create a term + ui_terms.each do | term_name | + define_method(term_name) do | *args | + t = YaST::Term.new(term_name.to_s) + args.each do |arg| + t.add(arg) + end + return t + end + alias_method term_name.to_s.downcase, term_name + end + + end # end Ui module +end - class Builder +module YaST + + class TermBuilder # blank slate instance_methods.each { |m| undef_method m unless (m =~ /^__|instance_eval$/)} def initialize(&block) - @buffer = Array.new @term = nil @term = instance_eval(&block) end @@ -42,21 +85,14 @@ @__to_s = nil # invalidate to_s cache term = YaST::Term.new(name.to_s) if not elements.nil? - #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) puts term.class term.add(r) if not r.nil? - @buffer << ") " end return term end @@ -64,6 +100,42 @@ def to_s return @term.to_s end + + def term + return @term + end + end + def y2_logger_helper(*args) + level = args.shift + + caller[0] =~ /(.+):(\d+):in `([^']+)'/ + y2_logger(level,"Ruby",$1,$2.to_i,"",args[0]) + end + + def y2debug(*args) + y2_logger_helper(0, args) + end + + def y2milestone(*args) + y2_logger_helper(1, args) + end + + def y2warning(*args) + y2_logger_helper(2, args) + end + + def y2error(*args) + y2_logger_helper(3, args) + end + + def y2security(*args) + y2_logger_helper(4, args) + end + + def y2internal(*args) + y2_logger_helper(5, args) + 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