[DRE-commits] [SCM] ruby-gruff.git branch, master, updated. upstream/0.3.6-4-g3e1ebdb

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit beed064fe6a6d28cbdb87e1dbbb4eec7b4bf4e9a
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Fri Aug 12 17:09:34 2011 -0500

    Sorting the elements is required for parts of test_scene - patch

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0ec2f5a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+sort_needed_for_test_scene
diff --git a/debian/patches/sort_needed_for_test_scene b/debian/patches/sort_needed_for_test_scene
new file mode 100644
index 0000000..398f5be
--- /dev/null
+++ b/debian/patches/sort_needed_for_test_scene
@@ -0,0 +1,26 @@
+Index: ruby-gruff/lib/gruff/scene.rb
+===================================================================
+--- ruby-gruff.orig/lib/gruff/scene.rb	2011-08-12 17:07:46.000000000 -0500
++++ ruby-gruff/lib/gruff/scene.rb	2011-08-12 17:08:02.000000000 -0500
+@@ -133,7 +133,7 @@
+   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
+   
+Index: ruby-gruff/test/test_scene.rb
+===================================================================
+--- ruby-gruff.orig/test/test_scene.rb	2011-08-12 17:07:46.000000000 -0500
++++ ruby-gruff/test/test_scene.rb	2011-08-12 17:08:03.000000000 -0500
+@@ -51,7 +51,7 @@
+ 
+   def test_layer
+     l = LayerStub.new(File.expand_path("../assets/city_scene", File.dirname(__FILE__)), "clouds")
+-    assert_equal %w(cloudy.png partly_cloudy.png stormy.png), l.filenames
++    assert_equal %w(cloudy.png partly_cloudy.png stormy.png), l.filenames.sort
+     
+     l = LayerStub.new(File.expand_path("../assets/city_scene", File.dirname(__FILE__)), "grass")
+     assert_equal 'default.png', l.selected_filename

-- 
ruby-gruff.git