September 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r58850 - /trunk/gtk/package/yast2-gtk.changes
by rpmcruz＠svn.opensuse.org 30 Sep '09

30 Sep '09

Author: rpmcruz Date: Wed Sep 30 18:27:02 2009 New Revision: 58850 URL: http://svn.opensuse.org/viewcvs/yast?rev=58850&view=rev Log: update changes. Modified: trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Wed Sep 30 18:27:02 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 30 00:00:00 GMT 2009 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.19.11 +- bug fix: package details box now respond to scroll keys. + +------------------------------------------------------------------- Thu Sep 24 00:00:00 GMT 2009 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.19.10 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58849 - in /trunk/gtk: ChangeLog src/ygtkzyppview.cc src/ygtkzyppview.h
by rpmcruz＠svn.opensuse.org 30 Sep '09

30 Sep '09

Author: rpmcruz Date: Wed Sep 30 18:26:05 2009 New Revision: 58849 URL: http://svn.opensuse.org/viewcvs/yast?rev=58849&view=rev Log: * src/ygtkzyppview.h/cc: map package text-view details scrolling to the view-port they are installed on. Modified: trunk/gtk/ChangeLog trunk/gtk/src/ygtkzyppview.cc trunk/gtk/src/ygtkzyppview.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=58849&r1=58848… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Sep 30 18:26:05 2009 @@ -1,3 +1,8 @@ +2009-09-30 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkzyppview.h/cc: map package text-view details + scrolling to the view-port they are installed on. + 2009-09-24 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/yzyppwrapper.cc: made compilable for 11.1 libzypp Modified: trunk/gtk/src/ygtkzyppview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkzyppview.cc?rev=5884… ============================================================================== --- trunk/gtk/src/ygtkzyppview.cc (original) +++ trunk/gtk/src/ygtkzyppview.cc Wed Sep 30 18:26:05 2009 @@ -10,7 +10,6 @@ */ #define YUILogComponent "gtk" #include <config.h> -#include <gtk/gtk.h> #include "ygtkzyppview.h" #include "ygtktreeview.h" #include "ygtktreemodel.h" @@ -22,6 +21,8 @@ #include <stdlib.h> #include <string.h> #include <list> +#include <gtk/gtk.h> +#include <gdk/gdkkeysyms.h> //** Utilities @@ -1610,6 +1611,8 @@ gtk_widget_show_all (hbox); g_signal_connect (G_OBJECT (scroll), "hierarchy-changed", G_CALLBACK (hierarchy_changed_cb), this); + g_signal_connect (G_OBJECT (scroll), "realize", + G_CALLBACK (realize_cb), this); } ~Impl() @@ -1806,6 +1809,53 @@ pThis->setVerticalMode (vertical); } } + + static void move_cursor_cb (GtkTextView *view, GtkMovementStep step, gint count, + gboolean extend_selection, Impl *pThis) + { + GtkScrolledWindow *scroll = GTK_SCROLLED_WINDOW (pThis->m_scroll); + GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment (scroll); + int height = pThis->m_scroll->allocation.height; + gdouble increment; + switch (step) { + case GTK_MOVEMENT_DISPLAY_LINES: + increment = height / 10.0; + break; + case GTK_MOVEMENT_PAGES: + increment = height * 0.9; + break; + case GTK_MOVEMENT_DISPLAY_LINE_ENDS: + increment = adj->upper - adj->lower; + break; + default: + increment = 0.0; + break; + } + + gdouble value = adj->value + (count * increment); + value = MIN (value, adj->upper - adj->page_size); + value = MAX (value, adj->lower); + if (value != adj->value) + gtk_adjustment_set_value (adj, value); + } + + static inline void fix_keybindings (Impl *pThis, GtkWidget *widget) + { + if (widget) + g_signal_connect (G_OBJECT (widget), "move-cursor", + G_CALLBACK (move_cursor_cb), pThis); + } + + static void realize_cb (GtkWidget *widget, Impl *pThis) + { + fix_keybindings (pThis, pThis->m_description); + fix_keybindings (pThis, pThis->m_filelist); + fix_keybindings (pThis, pThis->m_changelog); + fix_keybindings (pThis, pThis->m_authors); + fix_keybindings (pThis, pThis->m_support); + fix_keybindings (pThis, pThis->m_requires); + fix_keybindings (pThis, pThis->m_provides); + } }; G_DEFINE_TYPE (YGtkDetailView, ygtk_detail_view, GTK_TYPE_SCROLLED_WINDOW) Modified: trunk/gtk/src/ygtkzyppview.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkzyppview.h?rev=58849… ============================================================================== --- trunk/gtk/src/ygtkzyppview.h (original) +++ trunk/gtk/src/ygtkzyppview.h Wed Sep 30 18:26:05 2009 @@ -10,6 +10,7 @@ #include "yzyppwrapper.h" #include <gtk/gtkscrolledwindow.h> +#include <gtk/gtktreemodel.h> namespace ZyppModel { enum Columns { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : - fixed SLE11 package dependency
by Ladislav Slezak 30 Sep '09

30 Sep '09

ref: refs/heads/master commit 9238f99f9990862d498e0011e9210bc36dde5a6d Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Sep 30 18:24:26 2009 +0200 - fixed SLE11 package dependency --- .../package/yast2-webservice-services.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/services/package/yast2-webservice-services.spec b/plugins/services/package/yast2-webservice-services.spec index 864a6ee..e3028b3 100644 --- a/plugins/services/package/yast2-webservice-services.spec +++ b/plugins/services/package/yast2-webservice-services.spec @@ -29,7 +29,7 @@ BuildArch: noarch Requires: yast2 >= 2.18.24 %else # 11.1 or SLES11 -Requires: yast2 >= 2.17.10.2 +Requires: yast2 >= 2.17.71 %endif -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> network : - fixed SLE11 package dependency
by Ladislav Slezak 30 Sep '09

30 Sep '09

ref: refs/heads/network commit 9238f99f9990862d498e0011e9210bc36dde5a6d Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Sep 30 18:24:26 2009 +0200 - fixed SLE11 package dependency --- .../package/yast2-webservice-services.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/services/package/yast2-webservice-services.spec b/plugins/services/package/yast2-webservice-services.spec index 864a6ee..e3028b3 100644 --- a/plugins/services/package/yast2-webservice-services.spec +++ b/plugins/services/package/yast2-webservice-services.spec @@ -29,7 +29,7 @@ BuildArch: noarch Requires: yast2 >= 2.18.24 %else # 11.1 or SLES11 -Requires: yast2 >= 2.17.10.2 +Requires: yast2 >= 2.17.71 %endif -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> eula : - fixed SLE11 package dependency
by Ladislav Slezak 30 Sep '09

30 Sep '09

ref: refs/heads/eula commit 9238f99f9990862d498e0011e9210bc36dde5a6d Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Sep 30 18:24:26 2009 +0200 - fixed SLE11 package dependency --- .../package/yast2-webservice-services.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/services/package/yast2-webservice-services.spec b/plugins/services/package/yast2-webservice-services.spec index 864a6ee..e3028b3 100644 --- a/plugins/services/package/yast2-webservice-services.spec +++ b/plugins/services/package/yast2-webservice-services.spec @@ -29,7 +29,7 @@ BuildArch: noarch Requires: yast2 >= 2.18.24 %else # 11.1 or SLES11 -Requires: yast2 >= 2.17.10.2 +Requires: yast2 >= 2.17.71 %endif -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : yast2-webservice.spec - fixed yast2-core requires
by Ladislav Slezak 30 Sep '09

30 Sep '09

ref: refs/heads/master commit f7da8445fb1e5e934ce6d88e12f9a5b9e6f714f1 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Sep 30 18:10:41 2009 +0200 yast2-webservice.spec - fixed yast2-core requires - requires yast2-core >= 2.18.10 in Factory and yast2-core >= 2.17.31 in SLE11 --- webservice/package/yast2-webservice.spec | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/webservice/package/yast2-webservice.spec b/webservice/package/yast2-webservice.spec index b018153..b67d1a8 100644 --- a/webservice/package/yast2-webservice.spec +++ b/webservice/package/yast2-webservice.spec @@ -10,7 +10,16 @@ Name: yast2-webservice -Requires: yast2-core >= 2.18.10, lighttpd-mod_magnet, ruby-fcgi, ruby-dbus, sqlite + +%if 0%{?suse_version} == 0 || %suse_version > 1110 +# 11.2 or newer +Requires: yast2-core >= 2.18.10 +%else +# 11.1 or SLES11 +Requires: yast2-core >= 2.17.31 +%endif + +Requires: lighttpd-mod_magnet, ruby-fcgi, ruby-dbus, sqlite Requires: rubygem-yast2-webservice-tasks Recommends: avahi-utils Requires: yast2-dbus-server -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> network : yast2-webservice.spec - fixed yast2-core requires
by Ladislav Slezak 30 Sep '09

30 Sep '09

ref: refs/heads/network commit f7da8445fb1e5e934ce6d88e12f9a5b9e6f714f1 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Sep 30 18:10:41 2009 +0200 yast2-webservice.spec - fixed yast2-core requires - requires yast2-core >= 2.18.10 in Factory and yast2-core >= 2.17.31 in SLE11 --- webservice/package/yast2-webservice.spec | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/webservice/package/yast2-webservice.spec b/webservice/package/yast2-webservice.spec index b018153..b67d1a8 100644 --- a/webservice/package/yast2-webservice.spec +++ b/webservice/package/yast2-webservice.spec @@ -10,7 +10,16 @@ Name: yast2-webservice -Requires: yast2-core >= 2.18.10, lighttpd-mod_magnet, ruby-fcgi, ruby-dbus, sqlite + +%if 0%{?suse_version} == 0 || %suse_version > 1110 +# 11.2 or newer +Requires: yast2-core >= 2.18.10 +%else +# 11.1 or SLES11 +Requires: yast2-core >= 2.17.31 +%endif + +Requires: lighttpd-mod_magnet, ruby-fcgi, ruby-dbus, sqlite Requires: rubygem-yast2-webservice-tasks Recommends: avahi-utils Requires: yast2-dbus-server -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> eula : yast2-webservice.spec - fixed yast2-core requires
by Ladislav Slezak 30 Sep '09

30 Sep '09

ref: refs/heads/eula commit f7da8445fb1e5e934ce6d88e12f9a5b9e6f714f1 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Sep 30 18:10:41 2009 +0200 yast2-webservice.spec - fixed yast2-core requires - requires yast2-core >= 2.18.10 in Factory and yast2-core >= 2.17.31 in SLE11 --- webservice/package/yast2-webservice.spec | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/webservice/package/yast2-webservice.spec b/webservice/package/yast2-webservice.spec index b018153..b67d1a8 100644 --- a/webservice/package/yast2-webservice.spec +++ b/webservice/package/yast2-webservice.spec @@ -10,7 +10,16 @@ Name: yast2-webservice -Requires: yast2-core >= 2.18.10, lighttpd-mod_magnet, ruby-fcgi, ruby-dbus, sqlite + +%if 0%{?suse_version} == 0 || %suse_version > 1110 +# 11.2 or newer +Requires: yast2-core >= 2.18.10 +%else +# 11.1 or SLES11 +Requires: yast2-core >= 2.17.31 +%endif + +Requires: lighttpd-mod_magnet, ruby-fcgi, ruby-dbus, sqlite Requires: rubygem-yast2-webservice-tasks Recommends: avahi-utils Requires: yast2-dbus-server -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : Initial structure of eula plugin
by Martin Kudlvasr 30 Sep '09

30 Sep '09

ref: refs/heads/master commit 3be1dbdfe54ebf8bcbda04bf8b4079eb873438b2 Author: Martin Kudlvasr <mkudlvasr(a)suse.cz> Date: Wed Sep 30 18:08:00 2009 +0200 Initial structure of eula plugin --- plugins/eula/MIT-LICENSE | 20 ++ plugins/eula/README | 243 ++++++++++++++++++++ plugins/eula/Rakefile | 10 + plugins/eula/config/rails_parent.rb | 15 ++ plugins/eula/doc/README_FOR_APP | 8 + plugins/eula/init.rb | 1 + plugins/eula/install.rb | 1 + plugins/eula/package/eula.yml | 4 + plugins/eula/package/yast2-webservice-eula.changes | 5 + plugins/eula/package/yast2-webservice-eula.spec | 84 +++++++ plugins/eula/test/test_helper.rb | 42 ++++ plugins/eula/uninstall.rb | 1 + 12 files changed, 434 insertions(+), 0 deletions(-) diff --git a/plugins/eula/MIT-LICENSE b/plugins/eula/MIT-LICENSE new file mode 100644 index 0000000..9376605 --- /dev/null +++ b/plugins/eula/MIT-LICENSE @@ -0,0 +1,20 @@ +Copyright (c) 2009 [name of plugin creator] + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/plugins/eula/README b/plugins/eula/README new file mode 100644 index 0000000..37ec8ea --- /dev/null +++ b/plugins/eula/README @@ -0,0 +1,243 @@ +== Welcome to Rails + +Rails is a web-application framework that includes everything needed to create +database-backed web applications according to the Model-View-Control pattern. + +This pattern splits the view (also called the presentation) into "dumb" templates +that are primarily responsible for inserting pre-built data in between HTML tags. +The model contains the "smart" domain objects (such as Account, Product, Person, +Post) that holds all the business logic and knows how to persist themselves to +a database. The controller handles the incoming requests (such as Save New Account, +Update Product, Show Post) by manipulating the model and directing data to the view. + +In Rails, the model is handled by what's called an object-relational mapping +layer entitled Active Record. This layer allows you to present the data from +database rows as objects and embellish these data objects with business logic +methods. You can read more about Active Record in +link:files/vendor/rails/activerecord/README.html. + +The controller and view are handled by the Action Pack, which handles both +layers by its two parts: Action View and Action Controller. These two layers +are bundled in a single package due to their heavy interdependence. This is +unlike the relationship between the Active Record and Action Pack that is much +more separate. Each of these packages can be used independently outside of +Rails. You can read more about Action Pack in +link:files/vendor/rails/actionpack/README.html. + + +== Getting Started + +1. At the command prompt, start a new Rails application using the <tt>rails</tt> command + and your application name. Ex: rails myapp +2. Change directory into myapp and start the web server: <tt>script/server</tt> (run with --help for options) +3. Go to http://localhost:3000/ and get "Welcome aboard: You're riding the Rails!" +4. Follow the guidelines to start developing your application + + +== Web Servers + +By default, Rails will try to use Mongrel if it's are installed when started with script/server, otherwise Rails will use WEBrick, the webserver that ships with Ruby. But you can also use Rails +with a variety of other web servers. + +Mongrel is a Ruby-based webserver with a C component (which requires compilation) that is +suitable for development and deployment of Rails applications. If you have Ruby Gems installed, +getting up and running with mongrel is as easy as: <tt>gem install mongrel</tt>. +More info at: http://mongrel.rubyforge.org + +Say other Ruby web servers like Thin and Ebb or regular web servers like Apache or LiteSpeed or +Lighttpd or IIS. The Ruby web servers are run through Rack and the latter can either be setup to use +FCGI or proxy to a pack of Mongrels/Thin/Ebb servers. + +== Apache .htaccess example for FCGI/CGI + +# General Apache options +AddHandler fastcgi-script .fcgi +AddHandler cgi-script .cgi +Options +FollowSymLinks +ExecCGI + +# If you don't want Rails to look in certain directories, +# use the following rewrite rules so that Apache won't rewrite certain requests +# +# Example: +# RewriteCond %{REQUEST_URI} ^/notrails.* +# RewriteRule .* - [L] + +# Redirect all requests not available on the filesystem to Rails +# By default the cgi dispatcher is used which is very slow +# +# For better performance replace the dispatcher with the fastcgi one +# +# Example: +# RewriteRule ^(.*)$ dispatch.fcgi [QSA,L] +RewriteEngine On + +# If your Rails application is accessed via an Alias directive, +# then you MUST also set the RewriteBase in this htaccess file. +# +# Example: +# Alias /myrailsapp /path/to/myrailsapp/public +# RewriteBase /myrailsapp + +RewriteRule ^$ index.html [QSA] +RewriteRule ^([^.]+)$ $1.html [QSA] +RewriteCond %{REQUEST_FILENAME} !-f +RewriteRule ^(.*)$ dispatch.cgi [QSA,L] + +# In case Rails experiences terminal errors +# Instead of displaying this message you can supply a file here which will be rendered instead +# +# Example: +# ErrorDocument 500 /500.html + +ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly" + + +== Debugging Rails + +Sometimes your application goes wrong. Fortunately there are a lot of tools that +will help you debug it and get it back on the rails. + +First area to check is the application log files. Have "tail -f" commands running +on the server.log and development.log. Rails will automatically display debugging +and runtime information to these files. Debugging info will also be shown in the +browser on requests from 127.0.0.1. + +You can also log your own messages directly into the log file from your code using +the Ruby logger class from inside your controllers. Example: + + class WeblogController < ActionController::Base + def destroy + @weblog = Weblog.find(params[:id]) + @weblog.destroy + logger.info("#{Time.now} Destroyed Weblog ID ##{(a)weblog.id}!") + end + end + +The result will be a message in your log file along the lines of: + + Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1 + +More information on how to use the logger is at http://www.ruby-doc.org/core/ + +Also, Ruby documentation can be found at http://www.ruby-lang.org/ including: + +* The Learning Ruby (Pickaxe) Book: http://www.ruby-doc.org/docs/ProgrammingRuby/ +* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide) + +These two online (and free) books will bring you up to speed on the Ruby language +and also on programming in general. + + +== Debugger + +Debugger support is available through the debugger command when you start your Mongrel or +Webrick server with --debugger. This means that you can break out of execution at any point +in the code, investigate and change the model, AND then resume execution! +You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug' +Example: + + class WeblogController < ActionController::Base + def index + @posts = Post.find(:all) + debugger + end + end + +So the controller will accept the action, run the first line, then present you +with a IRB prompt in the server window. Here you can do things like: + + >> @posts.inspect + => "[#<Post:0x14a6be8 @attributes={\"title\"=>nil, \"body\"=>nil, \"id\"=>\"1\"}>, + #<Post:0x14a6620 @attributes={\"title\"=>\"Rails you know!\", \"body\"=>\"Only ten..\", \"id\"=>\"2\"}>]" + >> @posts.first.title = "hello from a debugger" + => "hello from a debugger" + +...and even better is that you can examine how your runtime objects actually work: + + >> f = @posts.first + => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}> + >> f. + Display all 152 possibilities? (y or n) + +Finally, when you're ready to resume execution, you enter "cont" + + +== Console + +You can interact with the domain model by starting the console through <tt>script/console</tt>. +Here you'll have all parts of the application configured, just like it is when the +application is running. You can inspect domain models, change values, and save to the +database. Starting the script without arguments will launch it in the development environment. +Passing an argument will specify a different environment, like <tt>script/console production</tt>. + +To reload your controllers and models after launching the console run <tt>reload!</tt> + +== dbconsole + +You can go to the command line of your database directly through <tt>script/dbconsole</tt>. +You would be connected to the database with the credentials defined in database.yml. +Starting the script without arguments will connect you to the development database. Passing an +argument will connect you to a different database, like <tt>script/dbconsole production</tt>. +Currently works for mysql, postgresql and sqlite. + +== Description of Contents + +app + Holds all the code that's specific to this particular application. + +app/controllers + Holds controllers that should be named like weblogs_controller.rb for + automated URL mapping. All controllers should descend from ApplicationController + which itself descends from ActionController::Base. + +app/models + Holds models that should be named like post.rb. + Most models will descend from ActiveRecord::Base. + +app/views + Holds the template files for the view that should be named like + weblogs/index.html.erb for the WeblogsController#index action. All views use eRuby + syntax. + +app/views/layouts + Holds the template files for layouts to be used with views. This models the common + header/footer method of wrapping views. In your views, define a layout using the + <tt>layout :default</tt> and create a file named default.html.erb. Inside default.html.erb, + call <% yield %> to render the view using this layout. + +app/helpers + Holds view helpers that should be named like weblogs_helper.rb. These are generated + for you automatically when using script/generate for controllers. Helpers can be used to + wrap functionality for your views into methods. + +config + Configuration files for the Rails environment, the routing map, the database, and other dependencies. + +db + Contains the database schema in schema.rb. db/migrate contains all + the sequence of Migrations for your schema. + +doc + This directory is where your application documentation will be stored when generated + using <tt>rake doc:app</tt> + +lib + Application specific libraries. Basically, any kind of custom code that doesn't + belong under controllers, models, or helpers. This directory is in the load path. + +public + The directory available for the web server. Contains subdirectories for images, stylesheets, + and javascripts. Also contains the dispatchers and the default HTML files. This should be + set as the DOCUMENT_ROOT of your web server. + +script + Helper scripts for automation and generation. + +test + Unit and functional tests along with fixtures. When using the script/generate scripts, template + test files will be generated for you and placed in this directory. + +vendor + External libraries that the application depends on. Also includes the plugins subdirectory. + If the app has frozen rails, those gems also go here, under vendor/rails/. + This directory is in the load path. diff --git a/plugins/eula/Rakefile b/plugins/eula/Rakefile new file mode 100644 index 0000000..8f4c2f2 --- /dev/null +++ b/plugins/eula/Rakefile @@ -0,0 +1,10 @@ +require 'rake' +require 'rake/testtask' +require 'rake/rdoctask' +require 'rake/packagetask' +require File.join(File.dirname(__FILE__), 'config', 'rails_parent') +require File.join(RailsParent.parent, 'config', 'boot') +require 'tasks/rails' + +desc 'Default: run unit tests.' +task :default => :test diff --git a/plugins/eula/config/rails_parent.rb b/plugins/eula/config/rails_parent.rb new file mode 100644 index 0000000..b869908 --- /dev/null +++ b/plugins/eula/config/rails_parent.rb @@ -0,0 +1,15 @@ +class RailsParent + + def RailsParent.parent + parent = ENV["RAILS_PARENT"] + unless parent + parent = File.expand_path(File.join('..','..','..', 'webservice'), File.dirname(__FILE__)) + unless File.directory?( parent || "" ) + $stderr.puts "Nope: #{parent}\nPlease set RAILS_PARENT environment" + exit 1 + end + end + parent + end + +end diff --git a/plugins/eula/doc/README_FOR_APP b/plugins/eula/doc/README_FOR_APP new file mode 100644 index 0000000..a1eeaba --- /dev/null +++ b/plugins/eula/doc/README_FOR_APP @@ -0,0 +1,8 @@ +Eula +==== + +Plugin cares for licenses and serves them to web-client on demand. +It handles locale, order of the licenses, checks and sets whether licenses +were accepted. + +Copyright (c) 2009 Novell, released under the GPL2 license diff --git a/plugins/eula/init.rb b/plugins/eula/init.rb new file mode 100644 index 0000000..3c19a74 --- /dev/null +++ b/plugins/eula/init.rb @@ -0,0 +1 @@ +# Include hook code here diff --git a/plugins/eula/install.rb b/plugins/eula/install.rb new file mode 100644 index 0000000..f7732d3 --- /dev/null +++ b/plugins/eula/install.rb @@ -0,0 +1 @@ +# Install hook code here diff --git a/plugins/eula/package/eula.yml b/plugins/eula/package/eula.yml new file mode 100644 index 0000000..a6b8cf6 --- /dev/null +++ b/plugins/eula/package/eula.yml @@ -0,0 +1,4 @@ +steps: + - controller: systemtime + - controller: language + action: index diff --git a/plugins/eula/package/yast2-webservice-eula.changes b/plugins/eula/package/yast2-webservice-eula.changes new file mode 100644 index 0000000..595c470 --- /dev/null +++ b/plugins/eula/package/yast2-webservice-eula.changes @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Wed Sep 30 17:34:07 CEST 2009 - mkudlvasr(a)novell.com + +- initial version 0.0.1 + diff --git a/plugins/eula/package/yast2-webservice-eula.spec b/plugins/eula/package/yast2-webservice-eula.spec new file mode 100644 index 0000000..f99ba57 --- /dev/null +++ b/plugins/eula/package/yast2-webservice-eula.spec @@ -0,0 +1,84 @@ +# +# spec file for package yast2-webservice-eula (Version 0.0.1) +# +# Copyright (c) 2008-09 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: yast2-webservice-eula +PreReq: yast2-webservice +Provides: yast2-webservice:/srv/www/yastws/app/controllers/basesystem_controller.rb +License: MIT +Group: Productivity/Networking/Web/Utilities +Autoreqprov: on +Version: 0.0.2 +Release: 0 +Summary: YaST2 - Webservice - EULA +Source: www.tar.bz2 +Source1: eula.yml +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch +BuildRequires: rubygem-mocha +Requires: yast2-core > 2.18.14 +Requires: yast2-country >= 2.18.9 + +# +%define pkg_user yastws +%define plugin_name eula +# + + +%description +YaST2 - Webservice - REST based interface of YaST in order to handle user acceptation of EULAs. + +Authors: +-------- + Martin Kudlvasr <mkudlvasr(a)suse.cz> + Josef Reidinger <jreidinger(a)suse.cz> + +%prep +%setup -q -n www + +%build + +%install + +# +# Install all web and frontend parts. +# +mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} +cp -a * $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} +#FIXME maybe location change in future + +mkdir -p $RPM_BUILD_ROOT/etc/YaST2/ +cp %SOURCE1 $RPM_BUILD_ROOT/etc/YaST2/ + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root) +%dir /srv/www/%{pkg_user} +%dir /srv/www/%{pkg_user}/vendor +%dir /srv/www/%{pkg_user}/vendor/plugins +%dir /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} +%dir /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/doc +%dir /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/var +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/MIT-LICENSE +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/README +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/Rakefile +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/init.rb +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/install.rb +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/uninstall.rb +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/app +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/config +#/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/tasks +#/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/test +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/doc/README_FOR_APP +%config /etc/YaST2/eula.yml + diff --git a/plugins/eula/test/test_helper.rb b/plugins/eula/test/test_helper.rb new file mode 100644 index 0000000..0d099c3 --- /dev/null +++ b/plugins/eula/test/test_helper.rb @@ -0,0 +1,42 @@ +ENV["RAILS_ENV"] = "test" +# find the rails parent +require File.join(File.dirname(__FILE__), '..', 'config', 'rails_parent') +# first config rails +require File.expand_path( File.join("config","environment"), RailsParent.parent ) +# then enable testing, this will get the routing right +require 'test_help' + +class ActiveSupport::TestCase + # Transactional fixtures accelerate your tests by wrapping each test method + # in a transaction that's rolled back on completion. This ensures that the + # test database remains unchanged so your fixtures don't have to be reloaded + # between every test method. Fewer database queries means faster tests. + # + # Read Mike Clark's excellent walkthrough at + # http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting + # + # Every Active Record database supports transactions except MyISAM tables + # in MySQL. Turn off transactional fixtures in this case; however, if you + # don't care one way or the other, switching from MyISAM to InnoDB tables + # is recommended. + # + # The only drawback to using transactional fixtures is when you actually + # need to test transactions. Since your test is bracketed by a transaction, + # any transactions started in your code will be automatically rolled back. + self.use_transactional_fixtures = true + + # Instantiated fixtures are slow, but give you @david where otherwise you + # would need people(:david). If you don't want to migrate your existing + # test cases which use the @david style and don't mind the speed hit (each + # instantiated fixtures translates to a database query per test method), + # then set this back to true. + self.use_instantiated_fixtures = false + + # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order. + # + # Note: You'll currently still have to declare fixtures explicitly in integration tests + # -- they do not yet inherit this setting + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/plugins/eula/uninstall.rb b/plugins/eula/uninstall.rb new file mode 100644 index 0000000..9738333 --- /dev/null +++ b/plugins/eula/uninstall.rb @@ -0,0 +1 @@ +# Uninstall hook code here -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58848 - in /trunk/ldap-server/src: LdapDatabase.ycp agent/SlapdConfigAgent.cc
by rhafer＠svn.opensuse.org 30 Sep '09

30 Sep '09

Author: rhafer Date: Wed Sep 30 17:38:45 2009 New Revision: 58848 URL: http://svn.opensuse.org/viewcvs/yast?rev=58848&view=rev Log: Workaround empty suffix from configdb Modified: trunk/ldap-server/src/LdapDatabase.ycp trunk/ldap-server/src/agent/SlapdConfigAgent.cc Modified: trunk/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp… ============================================================================== --- trunk/ldap-server/src/LdapDatabase.ycp (original) +++ trunk/ldap-server/src/LdapDatabase.ycp Wed Sep 30 17:38:45 2009 @@ -1298,11 +1298,12 @@ global boolean DbAclInput( symbol handler_cmd, integer dbindex ) { map db = $[]; - if ( dbindex > 0 ) + if ( dbindex >= 0 ) { db = LdapServer::ReadDatabase(dbindex); } string suffix = db["suffix"]:""; + y2milestone("suffix: %1", suffix); boolean updateTable = false; integer selected = (integer)UI::QueryWidget( `id( `tab_acl ), `CurrentItem ); Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Wed Sep 30 17:38:45 2009 @@ -544,10 +544,15 @@ if ( path->length() == 1 ) { std::string dbtype = (*i)->getType(); + std::string suffix = (*i)->getStringValue("olcSuffix"); + y2milestone("suffix %s, dbtype %s\n", suffix.c_str(), dbtype.c_str() ); + if ( suffix.empty() && dbtype == "config" ) + { + suffix = "cn=config"; + } + resMap.add( YCPString("suffix"), YCPString(suffix) ); resMap.add( YCPString( "type" ), YCPString( dbtype ) ); - resMap.add( YCPString("suffix"), - YCPString( (*i)->getStringValue("olcSuffix") )); resMap.add( YCPString("rootdn"), YCPString( (*i)->getStringValue("olcRootDn") )); resMap.add( YCPString("rootpw"), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0