<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -5,10 +5,15 @@
 	&lt;key&gt;beforeRunningCommand&lt;/key&gt;
 	&lt;string&gt;nop&lt;/string&gt;
 	&lt;key&gt;command&lt;/key&gt;
-	&lt;string&gt;#!/usr/bin/env ruby
+	&lt;string&gt;#!/usr/bin/env sh
+cat &amp;lt;&amp;lt;'RUBYEOF' &amp;gt; /tmp/textmate-command-$$.rb
 
 require ENV['TM_BUNDLE_SUPPORT'] + &quot;/lib/spec/mate/story/story_helper&quot;
-Spec::Mate::Story::StoryHelper.new(ENV['TM_FILEPATH']).create_all_undefined_steps&lt;/string&gt;
+Spec::Mate::Story::StoryHelper.new(ENV['TM_FILEPATH']).create_all_undefined_steps
+RUBYEOF
+
+${TM_RUBY:-ruby} /tmp/textmate-command-$$.rb; exit_status=$?; rm /tmp/textmate-command-$$.rb; exit $exit_status
+&lt;/string&gt;
 	&lt;key&gt;input&lt;/key&gt;
 	&lt;string&gt;none&lt;/string&gt;
 	&lt;key&gt;keyEquivalent&lt;/key&gt;</diff>
      <filename>Commands/Create Unimplemented Steps.tmCommand</filename>
    </modified>
    <modified>
      <diff>@@ -5,10 +5,15 @@
 	&lt;key&gt;beforeRunningCommand&lt;/key&gt;
 	&lt;string&gt;nop&lt;/string&gt;
 	&lt;key&gt;command&lt;/key&gt;
-	&lt;string&gt;#!/usr/bin/env ruby
+	&lt;string&gt;#!/usr/bin/env sh
+cat &amp;lt;&amp;lt;'RUBYEOF' &amp;gt; /tmp/textmate-command-$$.rb
 
 require ENV['TM_BUNDLE_SUPPORT'] + &quot;/lib/spec/mate/story/story_helper&quot;
-Spec::Mate::Story::StoryHelper.new(ENV['TM_FILEPATH']).goto_current_step(ENV['TM_LINE_NUMBER'])&lt;/string&gt;
+Spec::Mate::Story::StoryHelper.new(ENV['TM_FILEPATH']).goto_current_step(ENV['TM_LINE_NUMBER'])
+RUBYEOF
+
+${TM_RUBY:-ruby} /tmp/textmate-command-$$.rb; exit_status=$?; rm /tmp/textmate-command-$$.rb; exit $exit_status
+&lt;/string&gt;
 	&lt;key&gt;fallbackInput&lt;/key&gt;
 	&lt;string&gt;document&lt;/string&gt;
 	&lt;key&gt;input&lt;/key&gt;</diff>
      <filename>Commands/Goto Current Step.tmCommand</filename>
    </modified>
    <modified>
      <diff>@@ -5,10 +5,15 @@
 	&lt;key&gt;beforeRunningCommand&lt;/key&gt;
 	&lt;string&gt;nop&lt;/string&gt;
 	&lt;key&gt;command&lt;/key&gt;
-	&lt;string&gt;#!/usr/bin/env ruby
+	&lt;string&gt;#!/usr/bin/env sh
+cat &amp;lt;&amp;lt;'RUBYEOF' &amp;gt; /tmp/textmate-command-$$.rb
 
 require ENV['TM_BUNDLE_SUPPORT'] + &quot;/lib/spec/mate/story/story_helper&quot;
-Spec::Mate::Story::StoryHelper.new(ENV['TM_FILEPATH']).choose_alternate_file&lt;/string&gt;
+Spec::Mate::Story::StoryHelper.new(ENV['TM_FILEPATH']).choose_alternate_file
+RUBYEOF
+
+${TM_RUBY:-ruby} /tmp/textmate-command-$$.rb; exit_status=$?; rm /tmp/textmate-command-$$.rb; exit $exit_status
+&lt;/string&gt;
 	&lt;key&gt;input&lt;/key&gt;
 	&lt;string&gt;none&lt;/string&gt;
 	&lt;key&gt;keyEquivalent&lt;/key&gt;</diff>
      <filename>Commands/List included step files.tmCommand</filename>
    </modified>
    <modified>
      <diff>@@ -5,11 +5,15 @@
 	&lt;key&gt;beforeRunningCommand&lt;/key&gt;
 	&lt;string&gt;saveActiveFile&lt;/string&gt;
 	&lt;key&gt;command&lt;/key&gt;
-	&lt;string&gt;#!/usr/bin/env ruby
+	&lt;string&gt;#!/usr/bin/env sh
+cat &amp;lt;&amp;lt;'RUBYEOF' &amp;gt; /tmp/textmate-command-$$.rb
 
 require ENV['TM_BUNDLE_SUPPORT'] + &quot;/lib/spec/mate/story/story_helper&quot;
 Spec::Mate::Story::StoryHelper.new(ENV['TM_FILEPATH']).run_story
 
+RUBYEOF
+
+${TM_RUBY:-ruby} /tmp/textmate-command-$$.rb; exit_status=$?; rm /tmp/textmate-command-$$.rb; exit $exit_status
 &lt;/string&gt;
 	&lt;key&gt;fallbackInput&lt;/key&gt;
 	&lt;string&gt;document&lt;/string&gt;</diff>
      <filename>Commands/Run Story.tmCommand</filename>
    </modified>
    <modified>
      <diff>@@ -1,9 +1,20 @@
 Textmate Bundle for RSpec plain text stories
 
+
+How to install:
+mkdir -p ~/Library/Application\ Support/TextMate/Bundles/
+cd ~/Library/Application\ Support/TextMate/Bundles
+git clone git://github.com/bmabey/rspec-story-tmbundle.git RSpec\ Story.tmbundle
+In TextMate:
+From your drop down menu, select Bundles -&gt; Bundle Editor -&gt; Reload Bundles
+
+If you are doing ruby development with webrat you may also want the webrat bundle:
+http://github.com/bmabey/webrat-tmbundle/
+
 Features:
   * Color highlighting for plain text stories
     * Themes that have been modified to take advantage of this can be found in color_themes/
-  * Snippets for plain text stories and step files.  Include story keywords plus webrat snippets.
+  * Snippets for plain text stories and step files.
   * Predefined completions (escape key) for common story keywords.
   * Spellchecking turned on by default for the plaintext stories.
   * Run the current plain text story and display in HTML.  Clickable backtrace and all.</diff>
      <filename>README</filename>
    </modified>
    <modified>
      <diff>@@ -80,10 +80,10 @@ module Spec
           def parse_options
             return {} unless File.file?(full_file_path)
             first_line = File.open(full_file_path) {|f| f.readline unless f.eof} || ''
-            return {} unless first_line.match(/\s*#\s*(.*)/)
+            return {} unless first_line.match(/\s*#\s*(.+:.+)/)
             $1.split(',').inject({}) do |hash, pair|
               k,v = pair.split(':')
-              hash[k.strip.to_sym] = v.strip
+              hash[k.strip.to_sym] = v.strip if k &amp;&amp; v
               hash
             end
           end</diff>
      <filename>Support/lib/spec/mate/story/files/base.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,5 @@
 require 'spec/mate/story/html_formatter'
-#require 'cgi'
+require 'cgi'
 
 module Spec
   module Mate</diff>
      <filename>Support/lib/spec/mate/story/text_mate_formatter.rb</filename>
    </modified>
    <modified>
      <diff>@@ -203,6 +203,7 @@ module Spec
                 end
                 
                 it &quot;should tell textmate to goto the story's step file and to insert the step&quot; do
+                  pending &quot;JohnnyT...&quot;
                   # expects
                   TextMateHelper.should_receive('goto_file').with('/path/to/steps/file', {:line =&gt; 2, :column =&gt; 1})
                   TextMateHelper.should_receive('insert_text')</diff>
      <filename>Support/spec/spec/mate/story/story_helper_spec.rb</filename>
    </modified>
    <modified>
      <diff>@@ -25,7 +25,7 @@ module Spec
 
           @reporter.scenario_started('story_title', 'failed_scenario_name')
           @reporter.step_failed('then', 'failed_step', 'en', 'to')
-          @reporter.scenario_failed('story_title', 'failed_scenario_name', NameError.new('sup'))
+          @reporter.scenario_failed('story_title', 'failed_scenario_name', mock('exception',:backtrace =&gt; [&quot;1..&quot;,&quot;2...&quot;], :message =&gt; &quot;FAIL&quot;))
           
           @reporter.scenario_started('story_title', 'scenario_with_given_scenario_name')
           @reporter.found_scenario('given scenario', 'succeeded_scenario_name')</diff>
      <filename>Support/spec/spec/mate/story/text_mate_formatter_spec.rb</filename>
    </modified>
    <modified>
      <diff>@@ -5,32 +5,6 @@ module Spec
   module Mate
   
     describe TextMateHelper do
-      describe &quot;.open_or_prompt&quot; do
-        it &quot;should open the file if the file exists&quot; do
-          #expects
-          TextMate.should_receive(:go_to).with(:file =&gt; &quot;#{project_root}/stories/stories/basic.story&quot;)
-          #when
-          TextMateHelper.open_or_prompt(&quot;#{project_root}/stories/stories/basic.story&quot;)
-        end
-        
-        describe &quot;when the file does not exist&quot; do
-          it &quot;should prompt if the file should be created&quot; do
-            #expects
-            TextMate.should_receive(:request_confirmation)
-            #when
-            TextMateHelper.open_or_prompt(&quot;#{project_root}/stories/stories/new.story&quot;)
-          end
-          
-          # it &quot;should create the file if user chooses to&quot; do
-          #   TextMate.should_receive(:request_confirmation).and_return(true)
-          #   
-          #   #expects
-          #   File.should_receive(:create)
-          #   #when
-          #   TextMateHelper.open_or_prompt(&quot;#{project_root}/stories/stories/new.story&quot;)
-          # end
-        end
-      end
     end
 
   end</diff>
      <filename>Support/spec/spec/mate/text_mate_helper_spec.rb</filename>
    </modified>
    <modified>
      <diff>@@ -7,7 +7,7 @@
 		&lt;string&gt;.rb&lt;/string&gt;
 	&lt;/array&gt;
 	&lt;key&gt;firstLineMatch&lt;/key&gt;
-	&lt;string&gt;\s*#\s*Story|.*&quot;stories&quot;.*&quot;helper&quot;&lt;/string&gt;
+	&lt;string&gt;\s*#\s*Story|.*&quot;stories&quot;.*&quot;helper&quot;|^require .+__FILE__.+\bhelper\b&lt;/string&gt;
 	&lt;key&gt;keyEquivalent&lt;/key&gt;
 	&lt;string&gt;^~R&lt;/string&gt;
 	&lt;key&gt;name&lt;/key&gt;</diff>
      <filename>Syntaxes/RSpec Story Runner File.tmLanguage</filename>
    </modified>
    <modified>
      <diff>@@ -25,21 +25,6 @@
 		&lt;string&gt;75E08730-A1D7-4D0F-B594-EAFD9DD49B4D&lt;/string&gt;
 		&lt;string&gt;8B547854-6A6A-4E45-B51E-9324F0E9D364&lt;/string&gt;
 		&lt;string&gt;E6FBAE52-8B70-47EE-8F22-3A58D4A088F9&lt;/string&gt;
-		&lt;string&gt;FB0865CE-4426-4894-BEFB-C2E4F1B3F8EE&lt;/string&gt;
-		&lt;string&gt;D52608F7-0949-4DA9-A6D1-1B153A8FF189&lt;/string&gt;
-		&lt;string&gt;A7AB1D2B-E64F-459B-AD8B-10CC203F73CB&lt;/string&gt;
-		&lt;string&gt;0DC18EAD-E756-464C-BE97-3829821E9E58&lt;/string&gt;
-		&lt;string&gt;50635128-C1C2-4D88-A853-9F6E5C2C42F2&lt;/string&gt;
-		&lt;string&gt;AB1573AF-37ED-49C6-8D4C-1E59B36AEEA4&lt;/string&gt;
-		&lt;string&gt;BABBB3BF-0366-4612-86F9-BEC60D927303&lt;/string&gt;
-		&lt;string&gt;FDB00A55-5FB7-4BEB-B027-0A50CECB7EE6&lt;/string&gt;
-		&lt;string&gt;1C6CA323-A600-458E-943B-BC3030A302B2&lt;/string&gt;
-		&lt;string&gt;81CF9D6F-12C7-4D64-9B9D-8923BC9AC6BE&lt;/string&gt;
-		&lt;string&gt;0D2CF916-899F-478D-BE6D-031A8AB94E44&lt;/string&gt;
-		&lt;string&gt;D188BE63-7E67-4FDF-AB95-0EC6E007E583&lt;/string&gt;
-		&lt;string&gt;01AE3FEA-B16B-47C7-BA36-A430BC64F443&lt;/string&gt;
-		&lt;string&gt;0F7FB1AF-BF0F-4427-A886-1BAECFC09FB7&lt;/string&gt;
-		&lt;string&gt;18E3A4FD-1B21-4776-A8CB-8908FB296630&lt;/string&gt;
 		&lt;string&gt;FEB590E8-C0CB-4DF2-95C9-3E7B56C7758E&lt;/string&gt;
 		&lt;string&gt;40F55EDF-4743-4055-89BE-11A25A0A59D7&lt;/string&gt;
 		&lt;string&gt;6AD6154B-3EE8-43D0-B87F-6261C859AD07&lt;/string&gt;</diff>
      <filename>info.plist</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>Snippets/attaches_file.tmSnippet</filename>
    </removed>
    <removed>
      <filename>Snippets/checks.tmSnippet</filename>
    </removed>
    <removed>
      <filename>Snippets/chooses.tmSnippet</filename>
    </removed>
    <removed>
      <filename>Snippets/clicks_button.tmSnippet</filename>
    </removed>
    <removed>
      <filename>Snippets/clicks_delete_link.tmSnippet</filename>
    </removed>
    <removed>
      <filename>Snippets/clicks_get_link.tmSnippet</filename>
    </removed>
    <removed>
      <filename>Snippets/clicks_link.tmSnippet</filename>
    </removed>
    <removed>
      <filename>Snippets/clicks_link_within.tmSnippet</filename>
    </removed>
    <removed>
      <filename>Snippets/clicks_post_link.tmSnippet</filename>
    </removed>
    <removed>
      <filename>Snippets/clicks_put_link.tmSnippet</filename>
    </removed>
    <removed>
      <filename>Snippets/fills_in.tmSnippet</filename>
    </removed>
    <removed>
      <filename>Snippets/save_and_open.tmSnippet</filename>
    </removed>
    <removed>
      <filename>Snippets/selects.tmSnippet</filename>
    </removed>
    <removed>
      <filename>Snippets/unchecks.tmSnippet</filename>
    </removed>
    <removed>
      <filename>Snippets/visits.tmSnippet</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>36c03c5833547c7ed64d727de0b41d4811f56bbd</id>
    </parent>
    <parent>
      <id>aa2acacd06bfa20fea20540d300ececa2e540413</id>
    </parent>
  </parents>
  <author>
    <name>Ben Mabey</name>
    <email>ben@benmabey.com</email>
  </author>
  <url>http://github.com/bmabey/rspec-story-tmbundle/commit/a51b8b9117f764fe086c3807e8c0e337f2c5d388</url>
  <id>a51b8b9117f764fe086c3807e8c0e337f2c5d388</id>
  <committed-date>2008-10-19T13:33:37-07:00</committed-date>
  <authored-date>2008-10-19T13:33:37-07:00</authored-date>
  <message>Merge branch 'master' of git://github.com/timcharper/rspec-story-tmbundle into timcharper/master</message>
  <tree>10c878ae535572d11cb12645e73f15c95c605859</tree>
  <committer>
    <name>Ben Mabey</name>
    <email>ben@benmabey.com</email>
  </committer>
</commit>
