Merge pull request infews#6 from dburkes/master

Ruby 1.9 compatibility
nanzi · Aug 10, 2011 · a67f1c8 · a67f1c8
2 parents de3ccb1 + bdcde6c
commit a67f1c8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/lib/keydown/lib/slide.rb b/lib/keydown/lib/slide.rb
@@ -114,7 +114,7 @@ def highlight_code!
       @codemap.each do |id, code_block|
         lang = code_block[:lang]
         code = code_block[:code]
-        if code.all? { |line| line =~ /\A\r?\n\Z/ || line =~ /^(  |\t)/ }
+        if code.lines.all? { |line| line =~ /\A\r?\n\Z/ || line =~ /^(  |\t)/ }
           code.gsub!(/^(  |\t)/m, '')
         end
 

diff --git a/spec/tasks/generate_spec.rb b/spec/tasks/generate_spec.rb
@@ -13,7 +13,7 @@
     before :each do
       capture_output do
         Dir.chdir @tmp_dir do
-          @thor.invoke Keydown::Tasks, "generate", "sample"
+          @thor.invoke Keydown::Tasks, ["generate", "sample"]
         end
       end
     end

diff --git a/spec/tasks/slides_spec.rb b/spec/tasks/slides_spec.rb
@@ -38,7 +38,7 @@
     before(:each) do
       Dir.chdir @tmp_dir do
         @std_out = capture_output do
-          @thor.invoke Keydown::Tasks, "slides", "with_title.md"
+          @thor.invoke Keydown::Tasks, ["slides", "with_title.md"]
         end
       end
     end
@@ -63,7 +63,7 @@
       before(:each) do
         capture_output do
           Dir.chdir @tmp_dir do
-            @thor.invoke Keydown::Tasks, "slides", "with_title.md"
+            @thor.invoke Keydown::Tasks, ["slides", "with_title.md"]
             @file = File.new('with_title.html')
             @doc = Nokogiri(@file)
           end
@@ -92,7 +92,7 @@
       before(:each) do
         capture_output do
           Dir.chdir @tmp_dir do
-            @thor.invoke Keydown::Tasks, "slides", "with_title"
+            @thor.invoke Keydown::Tasks, ["slides", "with_title"]
             @file = File.new('with_title.html')
             @doc = Nokogiri(@file)
           end
@@ -109,14 +109,14 @@
       capture_output do
 
       Dir.chdir @tmp_dir do
-        @thor.invoke Keydown::Tasks, "generate", "test"
+        @thor.invoke Keydown::Tasks, ["generate", "test"]
 
         Dir.chdir "test" do
           system "cp #{Keydown::Tasks.source_root}/spec/fixtures/with_title.md #{@tmp_dir}/test/with_title.md"
           system "cp #{Keydown::Tasks.source_root}/spec/fixtures/custom.css #{@tmp_dir}/test/css/custom.css"
           system "cp #{Keydown::Tasks.source_root}/spec/fixtures/custom.js #{@tmp_dir}/test/js/custom.js"
 
-          @thor.invoke Keydown::Tasks, "slides", "with_title.md"
+          @thor.invoke Keydown::Tasks, ["slides", "with_title.md"]
 
           @file = File.new('with_title.html')
           @doc = Nokogiri(@file)
@@ -143,12 +143,12 @@
       capture_output do
 
         Dir.chdir @tmp_dir do
-          @thor.invoke Keydown::Tasks, "generate", "test"
+          @thor.invoke Keydown::Tasks, ["generate", "test"]
 
           Dir.chdir "test" do
             system "cp #{Keydown::Tasks.source_root}/spec/fixtures/with_backgrounds.md #{@tmp_dir}/test/with_backgrounds.md"
 
-            @thor.invoke Keydown::Tasks, "slides", "with_backgrounds.md"
+            @thor.invoke Keydown::Tasks, ["slides", "with_backgrounds.md"]
 
             @file = File.new('with_backgrounds.html')
             @doc = Nokogiri(@file)