[gentoo-commits] gentoo-x86 commit in dev-ruby/gruff/files: gruff-0.3.6-sort-filenames.patch gruff-0.3.6-fix-tests.patch gruff-0.3.6-spider.patch

[Hans de Graaff (graaff)]

graaff      10/01/07 07:28:49

  Added:                gruff-0.3.6-sort-filenames.patch
                        gruff-0.3.6-fix-tests.patch
                        gruff-0.3.6-spider.patch
  Log:
  Move here from ruby-ng testbed, including two patches. Add additional patch for broken spider graph label.
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-ruby/gruff/files/gruff-0.3.6-sort-filenames.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/gruff/files/gruff-0.3.6-sort-filenames.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/gruff/files/gruff-0.3.6-sort-filenames.patch?rev=1.1&content-type=text/plain

Index: gruff-0.3.6-sort-filenames.patch
===================================================================
From 60d0bcc1de340d29c5bad3c707b49be7195e119b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@×××××.com>
Date: Sat, 5 Sep 2009 21:52:18 +0200
Subject: [PATCH 1/2] Make sure the Gruff::Layer::filenames array is sorted when creating.

If the array is not sorted, the rest of the class fails to work as intended
and the tests fail:

  2) Failure:
test_layer(TestGruffScene) [./test/test_scene.rb:54]:
<["cloudy.png", "partly_cloudy.png", "stormy.png"]> expected but was
<["stormy.png", "partly_cloudy.png", "cloudy.png"]>.

and

  2) Failure:
test_layer(TestGruffScene) [./test/test_scene.rb:61]:
<"1200.png"> expected but was
<"0600.png">.
---
 lib/gruff/scene.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/gruff/scene.rb b/lib/gruff/scene.rb
index 47943db..ef93656 100644
--- a/lib/gruff/scene.rb
+++ b/lib/gruff/scene.rb
@@ -133,7 +133,7 @@ class Gruff::Layer
   def initialize(base_dir, folder_name)
     @base_dir = base_dir.to_s
     @name = folder_name.to_s
-    @filenames = Dir.open(File.join(base_dir, folder_name)).entries.select { |file| file =~ /^[^.]+\.png$/ }
+    @filenames = Dir.open(File.join(base_dir, folder_name)).entries.select { |file| file =~ /^[^.]+\.png$/ }.sort
     @selected_filename = select_default
   end
   
-- 
1.6.4.2




1.1                  dev-ruby/gruff/files/gruff-0.3.6-fix-tests.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/gruff/files/gruff-0.3.6-fix-tests.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/gruff/files/gruff-0.3.6-fix-tests.patch?rev=1.1&content-type=text/plain

Index: gruff-0.3.6-fix-tests.patch
===================================================================
From 83c3ce9b01311dd18da0eff717d46734d5e96b83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@×××××.com>
Date: Sat, 5 Sep 2009 21:54:24 +0200
Subject: [PATCH 2/2] Remove a call to set label_max_decimals on Gruff::Line that doesn't exist.

---
 test/test_line.rb |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/test/test_line.rb b/test/test_line.rb
index 4135b1e..1531931 100644
--- a/test/test_line.rb
+++ b/test/test_line.rb
@@ -462,7 +462,6 @@ class TestGruffLine < GruffTestCase
     g.legend_font_size = 12
     g.marker_font_size = 16
     g.hide_dots = false
-    g.label_max_decimals = 1
 
     g.write('test/output/line_jruby_error.png')
   end
-- 
1.6.4.2




1.1                  dev-ruby/gruff/files/gruff-0.3.6-spider.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/gruff/files/gruff-0.3.6-spider.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/gruff/files/gruff-0.3.6-spider.patch?rev=1.1&content-type=text/plain

Index: gruff-0.3.6-spider.patch
===================================================================
--- lib/gruff/spider.rb.orig	2007-03-08 10:22:36.000000000 +0100
+++ lib/gruff/spider.rb	2007-03-08 10:38:50.000000000 +0100
@@ -34,8 +34,8 @@
     return unless @has_data
 
     # Setup basic positioning
-    diameter = @graph_height
-    radius = @graph_height / 2.0
+    diameter = @graph_height - 50
+    radius = diameter / 2.0
     top_x = @graph_left + (@graph_width - diameter) / 2.0
     center_x = @graph_left + (@graph_width / 2.0)
     center_y = @graph_top + (@graph_height / 2.0) - 25 # Move graph up a bit