[Sugar-devel] Git introductory material (Fwd: git top links: 2011-1)
Hi! The need for introductory material on git comes up regularly (e.g. [2] - that's why I CCed you, Art). It would be nice if someone not quite as familiar with git as I am would check whether any of the guides mentioned below is a good fit for Sugar Labs and adjust the wiki accordingly. Thanks in advance! Sascha [2] http://lists.sugarlabs.org/archive/sugar-devel/2010-December/029304.html --- Begin forwarded message from Felipe Contreras --- From: Felipe Contreras felipe.contre...@gmail.com To: git g...@vger.kernel.org Date: Mon, 17 Jan 2011 00:09:04 +0100 Subject: git top links: 2011-1 Hi, git top links is my attempt to gather all the links people have been tagging as git in delicious.com[1] (these are not chosen by me). Here are four months into one. The fancier blog version is here: http://gitlog.wordpress.com/2011/01/16/git-top-links-2010-1-2/ = New = 1. Tower, the most powerful Git client for Mac (89) Interesting new and powerful git client http://www.git-tower.com/ 2. Introductory Guide to Git Version Control System (51) Thorough indoductory guide http://sixrevisions.com/web-development/introductory-guide-to-git-version-control-system/ 3. A collection of useful .gitignore templates (45) C, C++, Python, every language has different common .gitignore templates https://github.com/github/gitignore 4. The Designer’s Guide to Git or: How I Learned to Stop Worrying and Love the Repository. (24) http://blogs.sitepoint.com/2010/10/23/the-designers-guide-to-git-or-how-i-learned-to-stop-worrying-and-love-the-repository/ 5. Git info in your ZSH Prompt (21) http://briancarper.net/blog/570/git-info-in-your-zsh-prompt 6. Git Supervisual Cheatsheet (16) Simple and colorful cheatsheet http://panela.blog-city.com/git_supervisual_cheatsheet.htm 7. Classy Git (15) Another great presentation from Scott Chacon http://git-tips.heroku.com/#1 8. Get Started with Git (14) Very nice article introducing Git and DSCM in general by Al Shaw http://www.alistapart.com/articles/get-started-with-git/ 9. Gitifier; Git commit notifier for MacOSX (14) http://psionides.github.com/gitifier/ 10. Getting Good with Git! (28) http://rockablepress.com/books/getting-good-with-git/ 11. git-achievements: Earn geeky merit badges while learning Git (13) http://thechangelog.com/post/1200486354/git-achievements-aquire-achievements-while-using-git 12. RubyDrop (12) RubyDrop is my first ever Ruby project that aims to be an open-source, roll-your-own, Dropbox clone. It uses Git as the backend for file tracking and remote syncing. https://github.com/meltingice/RubyDrop 13. gitmodel (12) An ActiveModel-compliant persistence framework for Ruby that uses Git for versioning and remote syncing. https://github.com/pauldowman/gitmodel 14. Slaying dragons with git, bash, and ruby (11) Tricks to use git hooks to prevent bad commits http://rubypond.com/blog/slaying-dragons-git-bash-ruby 15. libgit2 (11) libgit2 is a portable, pure C implementation of the Git core methods provided as a re-entrant linkable library with a solid API, allowing you to write native speed custom Git applications in any language which supports C bindings. http://libgit2.github.com/ 16. Version Control for Designers (10) http://hoth.entp.com/output/git_for_designers.html = Japanese = 1. (23) http://d.hatena.ne.jp/yuroyoro/20101008/1286531851 2. (11) http://d.hatena.ne.jp/mzp/20101118/hooks 3. (9) http://d.hatena.ne.jp/bleis-tift/20100922/1285140344 [1] http://delicious.com/tag/git --- End forwarded message --- -- http://sascha.silbe.org/ http://www.infra-silbe.de/ signature.asc Description: PGP signature ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Activities not compatible with Sugar-0.90
On 18 January 2011 22:46, Bernie Innocenti ber...@codewiz.org wrote: Originally, there was no way to pin particular versions in collections. One would always get the latest version flagged to work on your browser. Which is exactly what you're asking for. I'm not sure what's currently missing server-side, but it shouldn't be hard to do. We already have that, in a different format, which works fine: http://activities.sugarlabs.org/services/update-aslo.php?id=ACTIVITYappVersion=0.90 And it sounds like this (plus pestering of activity authors and/or use of admin power to correct compatibility info) is the best thing we have right now, even though both you and Aleksey don't fully see it as within the role of activities.sugarlabs.org (which I can understand too, but am left without somewhere else to turn). Daniel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Activities not compatible with Sugar-0.90
Daniel, Why not use the wiki like in http://wiki.laptop.org/go/Activities/G1G1/10.1.3 ? I know is more work maintain the version for every activity, but we can help with this. Gonzalo On Wed, Jan 19, 2011 at 9:52 AM, Daniel Drake d...@laptop.org wrote: On 18 January 2011 22:46, Bernie Innocenti ber...@codewiz.org wrote: Originally, there was no way to pin particular versions in collections. One would always get the latest version flagged to work on your browser. Which is exactly what you're asking for. I'm not sure what's currently missing server-side, but it shouldn't be hard to do. We already have that, in a different format, which works fine: http://activities.sugarlabs.org/services/update-aslo.php?id=ACTIVITYappVersion=0.90 And it sounds like this (plus pestering of activity authors and/or use of admin power to correct compatibility info) is the best thing we have right now, even though both you and Aleksey don't fully see it as within the role of activities.sugarlabs.org (which I can understand too, but am left without somewhere else to turn). Daniel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] acti-plications: write once, run anywhere?
Let's assume delivery of the activity-application is via a usb stick. Let's also assume the video game has 200mb of assets. The goal is to make it as easy as possible to install the activity-application once, from either side, and to put the assets in one place. For sugar, this would be a ~200mb xo bundle on the usb stick. For gnome, this might be a ~200mb rpm on the usb stick. Do all activity and application developers have write access to any part of the system where they can add the libraries that they need to the system from either gnome or sugar side and then access if from either side? Where and how should assets be installed? The best practice I am concocting is that a developer put all assets into ~/Actitivities/MyCoolActivity/ The xo bundle will obviously install and point there. Gnome .rpm installations should point there too. Hopefully it is straightforward to make the gnome rpm installation point and run from this location. Is there anything I should look out for before going down this path? ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] Software Update and HTTP proxies
Can Software Update as seen in Sugar 0.84 on OLPC OS be made to work through HTTP proxies? Can it pick up the same proxy setting as Browse? The problem we have is that the Internet at all the schools in Australia have HTTP proxies, so Software Update won't work on its own. Thanks, Sridhar Sridhar Dhanapalan Technical Manager One Laptop per Child Australia M: +61 425 239 701 E: srid...@laptop.org.au A: G.P.O. Box 731 Sydney, NSW 2001 W: www.laptop.org.au ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] Fwd: Cron pootle@pootle /var/lib/pootle/maintenance/helpers/potupdater/check_unmerged_translations.sh
Today I have found a new problem in Pootle: The script checking unmerged translations say: -- Forwarded message -- From: Cron Daemon r...@pootle.sugarlabs.org Date: Wed, Jan 19, 2011 at 2:50 AM Subject: Cron pootle@pootle /var/lib/pootle/maintenance/helpers/potupdater/check_unmerged_translations.sh To: godi...@sugarlabs.org One or more checkouts have merge or pull conflicts. --- /var/lib/pootle/checkouts/fructose/pippy-activity: # Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded. I go to the directory and try: root@pootle:/var/lib/pootle/checkouts/fructose/pippy-activity# sudo -u pootle git pull Updating 2a44705..c0b9a64 error: Entry 'po/da.po' not uptodate. Cannot merge. 1!root@pootle:/var/lib/pootle/checkouts/fructose/pippy-activity# sudo -u pootle git log po/da.po commit 5f866ced3a490a3b18f81e433d96a1a196a3d811 Author: Pootle daemon poo...@sugarlabs.org Date: Thu Sep 3 10:06:44 2009 -0400 Adding language da via Pootle git log in Pootle server show only commit translations, in my machine is completely different. Is like we have two different repositories. In the Pootle server, the url in .git/config is url = git+ssh://dev.laptop.org/git/projects/pippy-activity in my machine (with sugar-jhbuild instalation) is url = git://git.sugarlabs.org/pippy/mainline.git Anybody knows what happen here? The activity changed the repository and Pootle was not updated? Is on purpose? Thanks Gonzalo ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [ASLO] Release Paint-31
Activity Homepage: http://activities.sugarlabs.org/addon/4082 Sugar Platform: 0.82 - 0.90 Download Now: http://activities.sugarlabs.org/downloads/file/27178/paint-31.xo Release notes: Sugar Labs Activities http://activities.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Activities not compatible with Sugar-0.90
On Wed, Jan 19, 2011 at 7:56 AM, Gonzalo Odiard gonz...@laptop.org wrote: Daniel, Why not use the wiki like in http://wiki.laptop.org/go/Activities/G1G1/10.1.3 ? I know is more work maintain the version for every activity, but we can help with this. This is not the best way to go, due to various reasons, one of them is that actvities.sugarlabs.org has filters of edition, wikis are designed to be fully open, but in our case could be dangerous, there are examples like doom, these violent games with the availability to be downloaded as activities generate controversy among teachers and parents (and also high the alarms between education officials of countries). Also people can put non-free activities there which we cannot distribute. Other advantage is that ASLO is controlled by the same activity authors not by third parties. regards, Gonzalo On Wed, Jan 19, 2011 at 9:52 AM, Daniel Drake d...@laptop.org wrote: On 18 January 2011 22:46, Bernie Innocenti ber...@codewiz.org wrote: Originally, there was no way to pin particular versions in collections. One would always get the latest version flagged to work on your browser. Which is exactly what you're asking for. I'm not sure what's currently missing server-side, but it shouldn't be hard to do. We already have that, in a different format, which works fine: http://activities.sugarlabs.org/services/update-aslo.php?id=ACTIVITYappVersion=0.90 And it sounds like this (plus pestering of activity authors and/or use of admin power to correct compatibility info) is the best thing we have right now, even though both you and Aleksey don't fully see it as within the role of activities.sugarlabs.org (which I can understand too, but am left without somewhere else to turn). Daniel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Activities not compatible with Sugar-0.90
On Wed, Jan 19, 2011 at 11:29 AM, Rafael Enrique Ortiz Guerrero raf...@sugarlabs.org wrote: On Wed, Jan 19, 2011 at 7:56 AM, Gonzalo Odiard gonz...@laptop.orgwrote: Daniel, Why not use the wiki like in http://wiki.laptop.org/go/Activities/G1G1/10.1.3 ? I know is more work maintain the version for every activity, but we can help with this. This is not the best way to go, due to various reasons, one of them is that actvities.sugarlabs.org has filters of edition, wikis are designed to be fully open, but in our case could be dangerous, there are examples like doom, these violent games with the availability to be downloaded as activities generate controversy among teachers and parents (and also high the alarms between education officials of countries). Also people can put non-free activities there which we cannot distribute. Other advantage is that ASLO is controlled by the same activity authors not by third parties. The wiki have permissions too. Gonzalo ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Activities not compatible with Sugar-0.90
The wiki approach has been tried with http://wiki.laptop.org/go/Activities (which probably needs a bit of a legal/deadlink/does not work with newer OSes/etc. cleanup) but ended up a bit of a mess. I'm not certain if permissions would help much. To split this page up properly in a wiki would require using the wiki as its own database with categories, supported Sugar versions, etc., some of which you might want to eventually change with bulk modifications. And while my wiki skills are not the best, the self-referencing wiki storage of OLPC test cases left me confused about how I could modify them without breaking anything going back. IMHO you basically would have to re-invent activity.sugarlabs.org to put it in a wiki, and I'm not certain if that is necessary at this time. On 01/19/11 09:31, Gonzalo Odiard wrote: On Wed, Jan 19, 2011 at 11:29 AM, Rafael Enrique Ortiz Guerrero raf...@sugarlabs.org mailto:raf...@sugarlabs.org wrote: On Wed, Jan 19, 2011 at 7:56 AM, Gonzalo Odiard gonz...@laptop.org mailto:gonz...@laptop.org wrote: Daniel, Why not use the wiki like in http://wiki.laptop.org/go/Activities/G1G1/10.1.3 ? I know is more work maintain the version for every activity, but we can help with this. This is not the best way to go, due to various reasons, one of them is that actvities.sugarlabs.org http://actvities.sugarlabs.org has filters of edition, wikis are designed to be fully open, but in our case could be dangerous, there are examples like doom, these violent games with the availability to be downloaded as activities generate controversy among teachers and parents (and also high the alarms between education officials of countries). Also people can put non-free activities there which we cannot distribute. Other advantage is that ASLO is controlled by the same activity authors not by third parties. The wiki have permissions too. Gonzalo ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Git introductory material (Fwd: git top links: 2011-1)
Sascha, The FLOSS Manual Make Your Own Sugar Activities! has a chapter on using Git for Activity development. The chapter has extensive screen shots and covers material like setting up SSH. Unfortunately, the FLOSS Manuals website seems to be having issues this morning, but when it comes back up you should be able to find the chapter and link to it. James Simmons On Wed, Jan 19, 2011 at 3:11 AM, Sascha Silbe sascha-ml-reply-to-201...@silbe.org wrote: Hi! The need for introductory material on git comes up regularly (e.g. [2] - that's why I CCed you, Art). It would be nice if someone not quite as familiar with git as I am would check whether any of the guides mentioned below is a good fit for Sugar Labs and adjust the wiki accordingly. Thanks in advance! Sascha [2] http://lists.sugarlabs.org/archive/sugar-devel/2010-December/029304.html --- Begin forwarded message from Felipe Contreras --- From: Felipe Contreras felipe.contre...@gmail.com To: git g...@vger.kernel.org Date: Mon, 17 Jan 2011 00:09:04 +0100 Subject: git top links: 2011-1 Hi, git top links is my attempt to gather all the links people have been tagging as git in delicious.com[1] (these are not chosen by me). Here are four months into one. The fancier blog version is here: http://gitlog.wordpress.com/2011/01/16/git-top-links-2010-1-2/ = New = 1. Tower, the most powerful Git client for Mac (89) Interesting new and powerful git client http://www.git-tower.com/ 2. Introductory Guide to Git Version Control System (51) Thorough indoductory guide http://sixrevisions.com/web-development/introductory-guide-to-git-version-control-system/ 3. A collection of useful .gitignore templates (45) C, C++, Python, every language has different common .gitignore templates https://github.com/github/gitignore 4. The Designer’s Guide to Git or: How I Learned to Stop Worrying and Love the Repository. (24) http://blogs.sitepoint.com/2010/10/23/the-designers-guide-to-git-or-how-i-learned-to-stop-worrying-and-love-the-repository/ 5. Git info in your ZSH Prompt (21) http://briancarper.net/blog/570/git-info-in-your-zsh-prompt 6. Git Supervisual Cheatsheet (16) Simple and colorful cheatsheet http://panela.blog-city.com/git_supervisual_cheatsheet.htm 7. Classy Git (15) Another great presentation from Scott Chacon http://git-tips.heroku.com/#1 8. Get Started with Git (14) Very nice article introducing Git and DSCM in general by Al Shaw http://www.alistapart.com/articles/get-started-with-git/ 9. Gitifier; Git commit notifier for MacOSX (14) http://psionides.github.com/gitifier/ 10. Getting Good with Git! (28) http://rockablepress.com/books/getting-good-with-git/ 11. git-achievements: Earn geeky merit badges while learning Git (13) http://thechangelog.com/post/1200486354/git-achievements-aquire-achievements-while-using-git 12. RubyDrop (12) RubyDrop is my first ever Ruby project that aims to be an open-source, roll-your-own, Dropbox clone. It uses Git as the backend for file tracking and remote syncing. https://github.com/meltingice/RubyDrop 13. gitmodel (12) An ActiveModel-compliant persistence framework for Ruby that uses Git for versioning and remote syncing. https://github.com/pauldowman/gitmodel 14. Slaying dragons with git, bash, and ruby (11) Tricks to use git hooks to prevent bad commits http://rubypond.com/blog/slaying-dragons-git-bash-ruby 15. libgit2 (11) libgit2 is a portable, pure C implementation of the Git core methods provided as a re-entrant linkable library with a solid API, allowing you to write native speed custom Git applications in any language which supports C bindings. http://libgit2.github.com/ 16. Version Control for Designers (10) http://hoth.entp.com/output/git_for_designers.html = Japanese = 1. (23) http://d.hatena.ne.jp/yuroyoro/20101008/1286531851 2. (11) http://d.hatena.ne.jp/mzp/20101118/hooks 3. (9) http://d.hatena.ne.jp/bleis-tift/20100922/1285140344 [1] http://delicious.com/tag/git --- End forwarded message --- -- http://sascha.silbe.org/ http://www.infra-silbe.de/ ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [PATCH Sugar] Extend sugar-launch with more options
Add activity_id, object_id and uri options. This patch is necessary in order to use Browse as the default http uri handler in sugar. --- bin/sugar-launch | 10 +- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/bin/sugar-launch b/bin/sugar-launch index 7297a8e..18c0bb7 100644 --- a/bin/sugar-launch +++ b/bin/sugar-launch @@ -28,6 +28,13 @@ usage = usage: %prog [options] activity parser = OptionParser(usage) parser.add_option(-d, --debug, action=store_true, dest=debug, help=launch activity inside gdb) +parser.add_option(-a, --activity_id, action=store, dest=activity_id, + help=unique id for the activity to be launched) +parser.add_option(-o, --object_id, action=store, dest=object_id, + help=identity of the journal object associated with \ + the activity) +parser.add_option(-u, --uri, action=store, dest=uri, + help=URI associated with the activity) (options, args) = parser.parse_args() if len(args) == 0: @@ -42,7 +49,8 @@ if not path: sys.exit(1) activity = ActivityBundle(path) -cmd_args = activityfactory.get_command(activity) +cmd_args = activityfactory.get_command(activity, options.activity_id, +options.object_id, options.uri) def _which(exec_file): if 'PATH' in os.environ: -- 1.7.3.1 ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] testing OS860 - Activity browse
2011/1/17 Bernie Innocenti ber...@codewiz.org On Sat, 2011-01-15 at 11:24 -0500, Rafael Enrique Ortiz Guerrero wrote: ..I've been making some testing with os860.img.. i made a test with browse and it seems that i cannot reproduce youtube videos?? what would be the cause?? browse verison is 108 Gnash needs additional gstreamer codecs in order to reproduce modern .flv files. This should work out of the box with Dextrose 2. codecs then need to be considered so that you can see copies of these videos ?? -- // Bernie Innocenti - http://codewiz.org/ \X/ Sugar Labs - http://sugarlabs.org/ -- *Ing. Kevin Mauricio Benavides Castro Soporte Técnico | Proyecto XO | AMCHAM http://www.amcham.org.ni/ Nicaragua.** === * ** ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [Dextrose] [PATCH Sugar] Extend sugar-launch with more options
Reviewed-by: Aleksey Lim alsr...@member.fsf.org -- Aleksey ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH Sugar] Extend sugar-launch with more options
Excerpts from Martin Abente's message of Wed Jan 19 16:20:35 +0100 2011: Add activity_id, object_id and uri options. This patch is necessary in order to use Browse as the default http uri handler in sugar. Can you give a bit more detail about why it is needed and what it's used for, please? Who would invoke the default http uri handler and when / why? Sascha -- http://sascha.silbe.org/ http://www.infra-silbe.de/ signature.asc Description: PGP signature ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Git introductory material (Fwd: git top links: 2011-1)
Nice links, these should be also in the wiki somewhere. Rafael Ortiz On Wed, Jan 19, 2011 at 10:11 AM, James Simmons nices...@gmail.com wrote: Sascha, The FLOSS Manual Make Your Own Sugar Activities! has a chapter on using Git for Activity development. The chapter has extensive screen shots and covers material like setting up SSH. Unfortunately, the FLOSS Manuals website seems to be having issues this morning, but when it comes back up you should be able to find the chapter and link to it. James Simmons On Wed, Jan 19, 2011 at 3:11 AM, Sascha Silbe sascha-ml-reply-to-201...@silbe.org wrote: Hi! The need for introductory material on git comes up regularly (e.g. [2] - that's why I CCed you, Art). It would be nice if someone not quite as familiar with git as I am would check whether any of the guides mentioned below is a good fit for Sugar Labs and adjust the wiki accordingly. Thanks in advance! Sascha [2] http://lists.sugarlabs.org/archive/sugar-devel/2010-December/029304.html --- Begin forwarded message from Felipe Contreras --- From: Felipe Contreras felipe.contre...@gmail.com To: git g...@vger.kernel.org Date: Mon, 17 Jan 2011 00:09:04 +0100 Subject: git top links: 2011-1 Hi, git top links is my attempt to gather all the links people have been tagging as git in delicious.com[1] (these are not chosen by me). Here are four months into one. The fancier blog version is here: http://gitlog.wordpress.com/2011/01/16/git-top-links-2010-1-2/ = New = 1. Tower, the most powerful Git client for Mac (89) Interesting new and powerful git client http://www.git-tower.com/ 2. Introductory Guide to Git Version Control System (51) Thorough indoductory guide http://sixrevisions.com/web-development/introductory-guide-to-git-version-control-system/ 3. A collection of useful .gitignore templates (45) C, C++, Python, every language has different common .gitignore templates https://github.com/github/gitignore 4. The Designer’s Guide to Git or: How I Learned to Stop Worrying and Love the Repository. (24) http://blogs.sitepoint.com/2010/10/23/the-designers-guide-to-git-or-how-i-learned-to-stop-worrying-and-love-the-repository/ 5. Git info in your ZSH Prompt (21) http://briancarper.net/blog/570/git-info-in-your-zsh-prompt 6. Git Supervisual Cheatsheet (16) Simple and colorful cheatsheet http://panela.blog-city.com/git_supervisual_cheatsheet.htm 7. Classy Git (15) Another great presentation from Scott Chacon http://git-tips.heroku.com/#1 8. Get Started with Git (14) Very nice article introducing Git and DSCM in general by Al Shaw http://www.alistapart.com/articles/get-started-with-git/ 9. Gitifier; Git commit notifier for MacOSX (14) http://psionides.github.com/gitifier/ 10. Getting Good with Git! (28) http://rockablepress.com/books/getting-good-with-git/ 11. git-achievements: Earn geeky merit badges while learning Git (13) http://thechangelog.com/post/1200486354/git-achievements-aquire-achievements-while-using-git 12. RubyDrop (12) RubyDrop is my first ever Ruby project that aims to be an open-source, roll-your-own, Dropbox clone. It uses Git as the backend for file tracking and remote syncing. https://github.com/meltingice/RubyDrop 13. gitmodel (12) An ActiveModel-compliant persistence framework for Ruby that uses Git for versioning and remote syncing. https://github.com/pauldowman/gitmodel 14. Slaying dragons with git, bash, and ruby (11) Tricks to use git hooks to prevent bad commits http://rubypond.com/blog/slaying-dragons-git-bash-ruby 15. libgit2 (11) libgit2 is a portable, pure C implementation of the Git core methods provided as a re-entrant linkable library with a solid API, allowing you to write native speed custom Git applications in any language which supports C bindings. http://libgit2.github.com/ 16. Version Control for Designers (10) http://hoth.entp.com/output/git_for_designers.html = Japanese = 1. (23) http://d.hatena.ne.jp/yuroyoro/20101008/1286531851 2. (11) http://d.hatena.ne.jp/mzp/20101118/hooks 3. (9) http://d.hatena.ne.jp/bleis-tift/20100922/1285140344 [1] http://delicious.com/tag/git --- End forwarded message --- -- http://sascha.silbe.org/ http://www.infra-silbe.de/ ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH Sugar] Extend sugar-launch with more options
On Wed, Jan 19, 2011 at 1:18 PM, Sascha Silbe
sascha-ml-reply-to-201...@silbe.org wrote:
Excerpts from Martin Abente's message of Wed Jan 19 16:20:35 +0100 2011:
Add activity_id, object_id and uri options.
This patch is necessary in order to use Browse
as the default http uri handler in sugar.
Can you give a bit more detail about why it is needed and what it's
used for, please?
It is needed because is a common feature in many activities, so there will
be no need to re-write this on each activity.
Who would invoke the default http uri handler and when / why?
When you right-click on any link, and use the open link option,
gtk.show_uri will be called, internally this calls to
gio.app_info_get_default_for_uri_scheme('http'), and its internal
implementation takes the arguments from the gconf (harcoded) value path:
/desktop/gnome/uri-handlers/http/command.
Then all we need to do is to replacing the gconf value for sugar-launch
org.laptop.WebActivity --uri %s and voila!
Even though this method is problematic in sugar+gnome builds, we can still
use sugar-launch (with this patch) to open custom links with browse (or any
other sugarized browser) passing the --uri argument.
I am sure other activities can benefit from this patch too.
Sascha
--
http://sascha.silbe.org/
http://www.infra-silbe.de/
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Activities not compatible with Sugar-0.90
On Wed, 2011-01-19 at 12:52 +, Daniel Drake wrote: We already have that, in a different format, which works fine: http://activities.sugarlabs.org/services/update-aslo.php?id=ACTIVITYappVersion=0.90 And it sounds like this (plus pestering of activity authors and/or use of admin power to correct compatibility info) is the best thing we have right now, even though both you and Aleksey don't fully see it as within the role of activities.sugarlabs.org (which I can understand too, but am left without somewhere else to turn). I don't think we're going to phase out the RDF updater anytime soon, since all versions of Sugar shipped with Linux distros depend on it, including SoaS and USR. *However*, it would be nice if we could provide equivalent functionality with the microformat updater as well, so that the same olpc-os-builder module would work with both aslo and the wiki. -- // Bernie Innocenti - http://codewiz.org/ \X/ Sugar Labs - http://sugarlabs.org/ ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [PATCH sugar-datastore 1/2] find(): fix sort order in ambiguous cases
Consistent results are important for the test suite.
Signed-off-by: Sascha Silbe sascha-...@silbe.org
diff --git a/src/carquinyol/indexstore.py b/src/carquinyol/indexstore.py
index dc721e7..80a1ade 100644
--- a/src/carquinyol/indexstore.py
+++ b/src/carquinyol/indexstore.py
@@ -301,8 +301,10 @@ class IndexStore(object):
if order_by == '+timestamp':
enquire.set_sort_by_value(_VALUE_TIMESTAMP, True)
+enquire.set_docid_order(False)
elif order_by == '-timestamp':
enquire.set_sort_by_value(_VALUE_TIMESTAMP, False)
+enquire.set_docid_order(True)
elif order_by == '+title':
enquire.set_sort_by_value(_VALUE_TITLE, True)
elif order_by == '-title':
@@ -317,6 +319,7 @@ class IndexStore(object):
enquire.set_sort_by_value(_VALUE_CREATION_TIME, False)
else:
logging.warning('Unsupported property for sorting: %s', order_by)
+order_by = '+timestamp'
query_result = enquire.get_mset(offset, limit, check_at_least)
total_count = query_result.get_matches_estimated()
--
1.7.2.3
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [PATCH sugar-datastore 0/2] Add test suite
I've finally fixed the style issues, so it's ready for a round of review. It has detected several data store bugs in the past, both in mainline and in my version support branch. Sascha Silbe (2): find(): fix sort order in ambiguous cases add (minimal) test suite (SL#1438) Makefile.am |6 +- src/carquinyol/indexstore.py |3 + tests/.gitignore |1 + tests/Makefile| 20 +++ tests/__init__.py |1 + tests/basic_api_v2.txt| 135 +++ tests/runalltests.py | 360 + tests/test_massops.py | 175 tests/test_migration_v1_v2.py | 170 +++ 9 files changed, 866 insertions(+), 5 deletions(-) create mode 100644 tests/.gitignore create mode 100644 tests/Makefile create mode 100644 tests/__init__.py create mode 100644 tests/basic_api_v2.txt create mode 100755 tests/runalltests.py create mode 100644 tests/test_massops.py create mode 100644 tests/test_migration_v1_v2.py -- 1.7.2.3 ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [PATCH sugar-datastore 2/2] add (minimal) test suite (SL#1438)
Add a minimal test suite for the data store operating on public DBus API
level. Checks all public API calls, including some simple performance
measurements.
Signed-off-by: Sascha Silbe sascha-...@silbe.org
create mode 100644 tests/.gitignore
create mode 100644 tests/Makefile
create mode 100644 tests/__init__.py
create mode 100644 tests/basic_api_v2.txt
create mode 100755 tests/runalltests.py
create mode 100644 tests/test_massops.py
create mode 100644 tests/test_migration_v1_v2.py
diff --git a/Makefile.am b/Makefile.am
index bfebefe..d450f24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,3 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = bin etc src
-
-test:
- @cd tests
- $(MAKE) -C tests test
+SUBDIRS = bin etc src tests
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 000..2460008
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1 @@
+!Makefile
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644
index 000..cf9ac60
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,20 @@
+all:
+install:
+uninstall:
+
+check:
+ @./runalltests.py
+
+valgrind:
+ @echo Profiling the process. Run kcachegrind on the output
+ valgrind --tool=callgrind --suppressions=valgrind-python.supp python
runalltests.py
+
+distclean: clean
+clean:
+ @find . -name *.pyc -exec rm {} \;
+ @find . -name *.pyo -exec rm {} \;
+ @find . -name *~ -exec rm {} \;
+ @find . -name callgrind.out* -exec rm {} \;
+
+tags:
+
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 000..5b3912c
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1 @@
+# testing package
diff --git a/tests/basic_api_v2.txt b/tests/basic_api_v2.txt
new file mode 100644
index 000..15d4cd6
--- /dev/null
+++ b/tests/basic_api_v2.txt
@@ -0,0 +1,135 @@
+ import os
+ import tempfile
+ import time
+
+Define some helper functions
+ def test_unique(items):
+... return not [True for e in items if items.count(e) 1]
+ def to_native(value):
+... if isinstance(value, list):
+... return [to_native(e) for e in value]
+... elif isinstance(value, dict):
+... return dict([(to_native(k), to_native(v)) for k, v in
value.items()])
+... elif isinstance(value, unicode):
+... return unicode(value)
+... elif isinstance(value, str):
+... return str(value)
+... return value
+
+
+Connect to datastore using DBus and wait for it to get ready:
+ import dbus
+ DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore'
+ DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore'
+ DS_DBUS_PATH = '/org/laptop/sugar/DataStore'
+ bus = dbus.SessionBus()
+ ds = dbus.Interface(bus.get_object(DS_DBUS_SERVICE, DS_DBUS_PATH),
DS_DBUS_INTERFACE)
+
+
+Make sure we're starting from an empty datastore:
+ assert ds.find({}, [], byte_arrays=True) == ([], 0)
+
+
+Create something to play with:
+ o1_uid = ds.create({'title': 'DS test object 1', 'mime_type':
'text/plain', 'activity': 'org.sugarlabs.DataStoreTest1'}, '', False)
+ assert isinstance(o1_uid, basestring)
+ o2_uid = ds.create({'title': 'DS test object 2', 'mime_type':
'text/plain', 'activity': 'org.sugarlabs.DataStoreTest2'}, '', False)
+ assert isinstance(o2_uid, basestring)
+ o3_uid = ds.create({'title': 'DS test object 3', 'mime_type':
'text/plain', 'activity': 'org.sugarlabs.DataStoreTest2'}, '', False)
+ assert isinstance(o3_uid, basestring)
+ assert test_unique([o1_uid, o2_uid, o3_uid])
+
+
+Check everything is there:
+ assert sorted(to_native(ds.find({}, ['title', 'activity'],
byte_arrays=True)[0])) == \
+... [{u'title': 'DS test object 1', u'activity':
'org.sugarlabs.DataStoreTest1'},
+... {u'title': 'DS test object 2', u'activity':
'org.sugarlabs.DataStoreTest2'},
+... {u'title': 'DS test object 3', u'activity':
'org.sugarlabs.DataStoreTest2'}]
+ ds.get_filename(o1_uid, byte_arrays=True)
+dbus.String(u'')
+ ds.get_filename(o2_uid, byte_arrays=True)
+dbus.String(u'')
+ ds.get_filename(o3_uid, byte_arrays=True)
+dbus.String(u'')
+
+
+
+Test get_uniquevaluesfor().
+ sorted(ds.get_uniquevaluesfor('activity', {}))
+[dbus.String(u'org.sugarlabs.DataStoreTest1'),
dbus.String(u'org.sugarlabs.DataStoreTest2')]
+
+
+Change some entries:
+ ds.update(o1_uid, {'title': 'DS test object 1 updated', 'mime_type':
'text/plain', 'activity': 'org.sugarlabs.DataStoreTest1', 'tags': 'foo'}, '',
False)
+ ds.update(o2_uid, {'title': 'DS test object 2', 'mime_type': 'text/plain',
'activity': 'org.sugarlabs.DataStoreTest1', 'tags': 'bar baz'}, '', False)
+ ds.update(o3_uid, {'title': 'DS test object 2', 'mime_type': 'text/html',
'activity': 'org.sugarlabs.DataStoreTest3', 'timestamp': 1}, '', False)
+ assert sorted(to_native(ds.find({}, ['title', 'activity'],
byte_arrays=True)[0])) == \
+... [{u'activity': 'org.sugarlabs.DataStoreTest1', u'title': 'DS test object 1
updated'},
+... {u'activity': 'org.sugarlabs.DataStoreTest1', u'title': 'DS test object
2'},
+... {u'activity':
Re: [Sugar-devel] [PATCH Sugar] Extend sugar-launch with more options
Excerpts from Martin Abente's message of Wed Jan 19 18:05:47 +0100 2011:
When you right-click on any link, and use the open link option,
gtk.show_uri will be called, internally this calls to
gio.app_info_get_default_for_uri_scheme('http'), and its internal
implementation takes the arguments from the gconf (harcoded) value path:
/desktop/gnome/uri-handlers/http/command.
Then all we need to do is to replacing the gconf value for sugar-launch
org.laptop.WebActivity --uri %s and voila!
So you want to launch an activity from within another activity?
That's going to fail with Rainbow (which is exactly the reason we don't
do that yet). This topic keeps cropping up; you can check the mailing
list archive for details (usually in the context of in-activity
documentation).
What we could do, however, is to offer a simple HTML widget in
sugar-toolkit (internally using either xulrunner or WebKit, whichever is
available) that activities could embed.
Sascha
--
http://sascha.silbe.org/
http://www.infra-silbe.de/
signature.asc
Description: PGP signature
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Software Update and HTTP proxies
On Thu, Jan 20, 2011 at 12:53:15AM +1100, Sridhar Dhanapalan wrote: Can Software Update as seen in Sugar 0.84 on OLPC OS be made to work through HTTP proxies? Yes. It uses the http_proxy environment variable if that is defined. I was able to add that to .sugar/debug and as a result tcpdump showed me that Software update was using the proxy. If the proxy requires authentication, then the authentication tokens should be included in the http_proxy value. The school can provide a proxy account that (a) only works with the addresses desired, (b) blocks particular activities, and (c) helps to isolate normal Browse use of the laptop from Software update. export http_proxy=http://$USER:$PASS@$PROXY:$PORT/ or export http_proxy=http://$PROXY:$PORT/ where $USER is the username for authentication, $PASS is the password for authentication, $PROXY is the host name or IP address of the proxy server, $PORT is the TCP port number to connect to on the proxy server. Can it pick up the same proxy setting as Browse? Browse does not use the http_proxy environment variable, so I guess not. The problem we have is that the Internet at all the schools in Australia have HTTP proxies, so Software Update won't work on its own. The problem we have is that Sugar, unlike GNOME, does not have a desktop configuration item for HTTP proxy? I can't imagine primary school children getting that right. ;-) In environments with the XS School Server, a transparent proxy can be configured. That's one of the main benefits, in my opinion. -- James Cameron http://quozl.linux.org.au/ ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] testing OS860 - Activity browse
On Wed, 2011-01-19 at 09:28 -0600, Kevin Mauricio Benavides Castro wrote: Gnash needs additional gstreamer codecs in order to reproduce modern .flv files. This should work out of the box with Dextrose 2. codecs then need to be considered so that you can see copies of these videos?? Sorry, the word reproduce was an italianism of mine. What I meant to say is playback. -- // Bernie Innocenti - http://codewiz.org/ \X/ Sugar Labs - http://sugarlabs.org/ ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Git introductory material (Fwd: git top links: 2011-1)
On Wed, Jan 19, 2011 at 09:11:26AM -0600, James Simmons wrote: Unfortunately, the FLOSS Manuals website seems to be having issues this morning, but when it comes back up you should be able to find the chapter and link to it. Perhaps a copy of this book could be held on Sugar Labs infrastructure? -- James Cameron http://quozl.linux.org.au/ ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH Sugar] Extend sugar-launch with more options
On Wed, Jan 19, 2011 at 10:15:05PM +0100, Sascha Silbe wrote: So you want to launch an activity from within another activity? That's going to fail with Rainbow (which is exactly the reason we don't do that yet). Which platforms use Rainbow? OLPC OS 10.x doesn't. Does SoaS? -- James Cameron http://quozl.linux.org.au/ ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Git introductory material (Fwd: git top links: 2011-1)
James Cameron wrote: On Wed, Jan 19, 2011 at 09:11:26AM -0600, James Simmons wrote: Unfortunately, the FLOSS Manuals website seems to be having issues this morning, but when it comes back up you should be able to find the chapter and link to it. Perhaps a copy of this book could be held on Sugar Labs infrastructure? I have a CD of the Sugar related .pdf's from this site. I did download today after the site came back up. (I was going to incorporate the .pdf files in a revised Sugar Creation Kit DVD I am working on) I could upload it. if needed and appropriate. to a subdirectory of http://download.sugarlabs.org/images/ ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [OLPC-AU] Software Update and HTTP proxies
On 20 January 2011 09:44, Jerry Vonau jvo...@shaw.ca wrote: On Thu, 2011-01-20 at 08:51 +1100, James Cameron wrote: On Thu, Jan 20, 2011 at 12:53:15AM +1100, Sridhar Dhanapalan wrote: Ok, you can define the proxy in .gconf/system/http_proxy with gnome or gconftool-2 but the variables don't enter sugar's environment. Thinking aloud: maybe we could have a script that reads the gconf value and duplicates it as an environment variable? In environments with the XS School Server, a transparent proxy can be configured. That's one of the main benefits, in my opinion. That is true. However, most schools don't have an XS. We want this to change, but it'll take time. Sridhar ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH Sugar] Extend sugar-launch with more options
Anyways this patch does not change what sugar-launch already does (right?),
just gives it more options that can be useful even though we don't use it
for what i need in upstream (whenever rainbow is back).
Any good reason to not include it? :)
On Wed, Jan 19, 2011 at 3:36 PM, Sascha Silbe
sascha-ml-reply-to-201...@silbe.org wrote:
Excerpts from Martin Abente's message of Wed Jan 19 18:05:47 +0100 2011:
When you right-click on any link, and use the open link option,
gtk.show_uri will be called, internally this calls to
gio.app_info_get_default_for_uri_scheme('http'), and its internal
implementation takes the arguments from the gconf (harcoded) value path:
/desktop/gnome/uri-handlers/http/command.
Then all we need to do is to replacing the gconf value for sugar-launch
org.laptop.WebActivity --uri %s and voila!
So you want to launch an activity from within another activity?
That's going to fail with Rainbow (which is exactly the reason we don't
do that yet). This topic keeps cropping up; you can check the mailing
list archive for details (usually in the context of in-activity
documentation).
What we could do, however, is to offer a simple HTML widget in
sugar-toolkit (internally using either xulrunner or WebKit, whichever is
available) that activities could embed.
Sascha
--
http://sascha.silbe.org/
http://www.infra-silbe.de/
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [OLPC-AU] Software Update and HTTP proxies
On Thu, Jan 20, 2011 at 12:31:29PM +1100, Sridhar Dhanapalan wrote: On 20 January 2011 09:44, Jerry Vonau jvo...@shaw.ca wrote: On Thu, 2011-01-20 at 08:51 +1100, James Cameron wrote: On Thu, Jan 20, 2011 at 12:53:15AM +1100, Sridhar Dhanapalan wrote: Ok, you can define the proxy in .gconf/system/http_proxy with gnome or gconftool-2 but the variables don't enter sugar's environment. Thinking aloud: maybe we could have a script that reads the gconf value and duplicates it as an environment variable? As Jerry says, yes. In environments with the XS School Server, a transparent proxy can be configured. ?That's one of the main benefits, in my opinion. That is true. However, most schools don't have an XS. We want this to change, but it'll take time. My response was background information for why Sugar doesn't bother with proxies. The other OLPC deployments either have unfettered internet or transparent proxies. Opaque proxies are kinda rare, and a sign of late adoption of recent technology by the school systems you serve. NSW TAFE suffers the same, FWIW. -- James Cameron http://quozl.linux.org.au/ ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] Sugar TOAST instructions
Hi friends, I want to build a Trisquel Toast like we had in 3.0. I know others are working on it, so perhaps we can sync. I'd like to setup for myself a development environment where I can: 01 Build Sugar packages from source and test them 02 Build a TOAST 4.0 or 4.5 from said packages into ISO for booting from USB This way we'll be able to customize a TOAST for regional use, add content/activities, which we plan to distribute to children in rural parts, starting here in Colombia. For 0: Seems to me this is exactly what http://wiki.sugarlabs.org/go/Platform_Team/Guide/Core_development is for, but when I run sweets --deep clone sugar i get: /Gtk-Message: Failed to load module pk-gtk-module: libpk-gtk-module.so: cannot open shared object file: No such file or directory WARNING:root:Trying mirror server for feed http://sweets.sugarlabs.org/sweets / followed by a dialog box saying: /Unknown scheme in download URL 'git://git.sugarlabs.org/0sugar/sweets.git' / Aleksey, I can you help me on how to build these packages from sources? for 1: There must be a way to build a special selection of packages into an ISO. Ruben could you or somebody point me to something to start, a Doc maybe? Thanks in advance to both of you or the charitable soul that will help our endeavor... Should I be doing 4.5 or 4.0? I'll share as soon as I manage to build something. Peace. Sebastian ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
