sup

commit 4ededa5e822e3e48f8280cc9893e90d0c85384a0
parent 8bf369135f331ea14ce1e2faac24c2fd81e363c6
Author: William Morgan <wmorgan-sup@masanjin.net>
Date:   Wed,  5 Nov 2008 10:41:34 -0800

Merge branch 'master' into next

Diffstat:

2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Rakefile b/Rakefile
@@ -3,9 +3,10 @@ require 'hoe'
 $:.unshift 'lib' # force loading from ./lib/ if it exists
 require 'sup'
 
+## remove hoe dependency entirely
 class Hoe
-  def extra_deps; @extra_deps.reject { |x| Array(x).first == "hoe" } end
-end # thanks to "Mike H"
+  def extra_dev_deps; @extra_dev_deps.reject { |x| x[0] == "hoe" } end
+end
 
 ## allow people who use development versions by running "rake gem"
 ## and installing the resulting gem it to be able to do this. (gem
diff --git a/lib/sup/label.rb b/lib/sup/label.rb
@@ -78,7 +78,7 @@ class LabelManager
 
   def save
     return unless @modified
-    File.open(@fn, "w") { |f| f.puts @labels.keys.sort }
+    File.open(@fn, "w") { |f| f.puts @labels.keys.sort_by { |l| l.to_s } }
   end
 end