branston 0.3.2 → 0.3.3

data/lib/branston/coverage/lib-faker_extras_rb.html

@@ -201,7 +201,7 @@
       </tbody>
     </table>
 
-    <p>Generated on Thu Dec 03 16:49:25 +0000 2009 with <a href="http://github.com/relevance/rcov">rcov 0.9.6</a></p>
+    <p>Generated on Wed Dec 09 15:45:09 +0000 2009 with <a href="http://github.com/relevance/rcov">rcov 0.9.2.1</a></p>
 
   </body>
 </html>

data/lib/branston/coverage/lib-story_generator_rb.html

@@ -28,8 +28,8 @@
         <tbody>
           <tr>
             <td class="left_align"><a href="lib-story_generator_rb.html">lib/story_generator.rb</a></td>
-            <td class='right_align'><tt>136</tt></td>
-            <td class='right_align'><tt>113</tt></td>
+            <td class='right_align'><tt>135</tt></td>
+            <td class='right_align'><tt>112</tt></td>
             <td class="left_align"><div class="percent_graph_legend"><tt class=''>100.00%</tt></div>
           <div class="percent_graph">
             <div class="covered" style="width:100px"></div>
@@ -627,253 +627,247 @@
           
           
           <tr class="marked">
-            <td><pre><a name="line96">96</a>         gherkin += &quot;\t@wip\n&quot;</pre></td>
+            <td><pre><a name="line96">96</a>         gherkin += &quot;\tScenario: &quot;</pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line97">97</a>         gherkin += &quot;\tScenario: &quot;</pre></td>
+            <td><pre><a name="line97">97</a>         gherkin += scenario.title</pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line98">98</a>         gherkin += scenario.title</pre></td>
-          </tr>
-        
-          
-          
-          <tr class="marked">
-            <td><pre><a name="line99">99</a>         gherkin += &quot;\n&quot;</pre></td>
+            <td><pre><a name="line98">98</a>         gherkin += &quot;\n&quot;</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line100">100</a> </pre></td>
+            <td><pre><a name="line99">99</a> </pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line101">101</a>         unless scenario.preconditions.empty?</pre></td>
+            <td><pre><a name="line100">100</a>         unless scenario.preconditions.empty?</pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line102">102</a>           scenario.preconditions.each_with_index do |p, i|</pre></td>
+            <td><pre><a name="line101">101</a>           scenario.preconditions.each_with_index do |p, i|</pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line103">103</a>             gherkin += &quot;\t\tGiven #{p.description}\n&quot; if i == 0</pre></td>
+            <td><pre><a name="line102">102</a>             gherkin += &quot;\t\tGiven #{p.description}\n&quot; if i == 0</pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line104">104</a>             gherkin += &quot;\t\t\tAnd #{p.description}\n&quot; unless i == 0</pre></td>
+            <td><pre><a name="line103">103</a>             gherkin += &quot;\t\t\tAnd #{p.description}\n&quot; unless i == 0</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line105">105</a>           end</pre></td>
+            <td><pre><a name="line104">104</a>           end</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line106">106</a>         end</pre></td>
+            <td><pre><a name="line105">105</a>         end</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line107">107</a> </pre></td>
+            <td><pre><a name="line106">106</a> </pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line108">108</a>         unless scenario.outcomes.empty?</pre></td>
+            <td><pre><a name="line107">107</a>         unless scenario.outcomes.empty?</pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line109">109</a>           scenario.outcomes.each_with_index do |o, i|</pre></td>
+            <td><pre><a name="line108">108</a>           scenario.outcomes.each_with_index do |o, i|</pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line110">110</a>             gherkin += &quot;\t\tThen #{o.description}\n&quot; if i==0</pre></td>
+            <td><pre><a name="line109">109</a>             gherkin += &quot;\t\tThen #{o.description}\n&quot; if i==0</pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line111">111</a>             gherkin += &quot;\t\t\tAnd #{o.description}\n&quot; unless i==0</pre></td>
+            <td><pre><a name="line110">110</a>             gherkin += &quot;\t\t\tAnd #{o.description}\n&quot; unless i==0</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line112">112</a>           end</pre></td>
+            <td><pre><a name="line111">111</a>           end</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line113">113</a>         end</pre></td>
+            <td><pre><a name="line112">112</a>         end</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line114">114</a> </pre></td>
+            <td><pre><a name="line113">113</a> </pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line115">115</a>         gherkin += &quot;\n&quot;</pre></td>
+            <td><pre><a name="line114">114</a>         gherkin += &quot;\n&quot;</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line116">116</a>       end</pre></td>
+            <td><pre><a name="line115">115</a>       end</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line117">117</a>     end</pre></td>
+            <td><pre><a name="line116">116</a>     end</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line118">118</a> </pre></td>
+            <td><pre><a name="line117">117</a> </pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line119">119</a>     File.open(FEATURE_PATH + feature_filename, 'w') {|f| f.write(gherkin) }</pre></td>
+            <td><pre><a name="line118">118</a>     File.open(FEATURE_PATH + feature_filename, 'w') {|f| f.write(gherkin) }</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line120">120</a>   end</pre></td>
+            <td><pre><a name="line119">119</a>   end</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line121">121</a> </pre></td>
+            <td><pre><a name="line120">120</a> </pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line122">122</a>   def regexp(string)</pre></td>
+            <td><pre><a name="line121">121</a>   def regexp(string)</pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line123">123</a>     pc = string.gsub(/&quot;([^\&quot;]*)&quot;/, '&quot;([^\&quot;]*)&quot;')</pre></td>
+            <td><pre><a name="line122">122</a>     pc = string.gsub(/&quot;([^\&quot;]*)&quot;/, '&quot;([^\&quot;]*)&quot;')</pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line124">124</a>     &quot;/^#{pc}$/&quot;</pre></td>
+            <td><pre><a name="line123">123</a>     &quot;/^#{pc}$/&quot;</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line125">125</a>   end</pre></td>
+            <td><pre><a name="line124">124</a>   end</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line126">126</a> </pre></td>
+            <td><pre><a name="line125">125</a> </pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line127">127</a>   def variables(string)</pre></td>
+            <td><pre><a name="line126">126</a>   def variables(string)</pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line128">128</a>     variables = string.split(/&quot;([^\&quot;]*)&quot;/)</pre></td>
+            <td><pre><a name="line127">127</a>     variables = string.split(/&quot;([^\&quot;]*)&quot;/)</pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line129">129</a>     variables.each_with_index do |v, i|</pre></td>
+            <td><pre><a name="line128">128</a>     variables.each_with_index do |v, i|</pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line130">130</a>       i % 2 == 0 ? variables[i] = nil : variables[i] = v</pre></td>
+            <td><pre><a name="line129">129</a>       i % 2 == 0 ? variables[i] = nil : variables[i] = v</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line131">131</a>     end</pre></td>
+            <td><pre><a name="line130">130</a>     end</pre></td>
           </tr>
         
           
           
           <tr class="marked">
-            <td><pre><a name="line132">132</a>     variables.compact</pre></td>
+            <td><pre><a name="line131">131</a>     variables.compact</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line133">133</a>   end</pre></td>
+            <td><pre><a name="line132">132</a>   end</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line134">134</a> </pre></td>
+            <td><pre><a name="line133">133</a> </pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line135">135</a> end</pre></td>
+            <td><pre><a name="line134">134</a> end</pre></td>
           </tr>
         
           
           
           <tr class="inferred">
-            <td><pre><a name="line136">136</a> </pre></td>
+            <td><pre><a name="line135">135</a> </pre></td>
           </tr>
         
       </tbody>
     </table>
 
-    <p>Generated on Thu Dec 03 16:49:24 +0000 2009 with <a href="http://github.com/relevance/rcov">rcov 0.9.6</a></p>
+    <p>Generated on Wed Dec 09 15:45:09 +0000 2009 with <a href="http://github.com/relevance/rcov">rcov 0.9.2.1</a></p>
 
   </body>
 </html>

data/lib/branston/lib/branston.rb

@@ -66,7 +66,11 @@ class Branston
     if actions.first == 'server'
       launch_branston_server(options)
     elsif actions.first == 'generator'
-      Client.new(options).generate_story_files
+      client = Client.new(options)
+      client.generate_story_files
+      client.errors.each do |error|
+        puts error
+      end
     elsif actions.first == 'init'
       initialise_branston(options)
     end

data/lib/branston/lib/client.rb

@@ -6,47 +6,65 @@ include StoryGenerator
 
 class Client
   
-  attr_accessor :options
+  attr_accessor :options, :errors
   
   def initialize(options)
     self.options = options
+    self.errors = []
   end
   
   def generate_story_files
+    begin 
+      return process_xml get_xml
+    rescue StandardError => e
+      errors << "Could not connect to Branston server on " + 
+        "#{options[:Host]}:#{options[:Port]}: #{e.message}\n" +
+      "Is Branston running?"
+    end
+  end
+  
+  def process_xml(xml)
+    errors.clear
     
-    @xml = get_xml
-    #puts @xml
-    unless @xml.nil?
-      root = @xml.root
-      story = OpenStruct.new
-      story.description = root.elements["/story/description"].text
-      story.title = root.elements["/story/title"].text
-      story.scenarios = []
-      root.elements.each("/story/scenarios/scenario") { |scenario|
-        s = OpenStruct.new
-        s.preconditions = []
-        s.outcomes = []
-        s.title = scenario.elements["title"].text
-        
-        scenario.elements.each("preconditions/precondition") { |precondition|
-          p = OpenStruct.new
-          p.description = precondition.elements["description"].text
-          s.preconditions << p
-        }
-        
-        scenario.elements.each("outcomes/outcome") { |outcome|          
-          o = OpenStruct.new
-          o.description = outcome.elements["description"].text
-          s.outcomes << o
+    if xml.nil? or xml.root.nil? or xml.root.elements.nil?
+      errors << "Did not recieve XML data for story #{options[:feature]}.\n" +
+      "Is the Branston server running, and have you provided the correct story name?"
+    else
+      
+      begin
+        root = xml.root
+        story = OpenStruct.new
+        story.description = root.elements["/story/description"].text
+        story.title = root.elements["/story/title"].text
+        story.scenarios = []
+        root.elements.each("/story/scenarios/scenario") { |scenario|
+          s = OpenStruct.new
+          s.preconditions = []
+          s.outcomes = []
+          s.title = scenario.elements["title"].text
+          
+          scenario.elements.each("preconditions/precondition") { |precondition|
+            p = OpenStruct.new
+            p.description = precondition.elements["description"].text
+            s.preconditions << p
+          }
+          
+          scenario.elements.each("outcomes/outcome") { |outcome|          
+            o = OpenStruct.new
+            o.description = outcome.elements["description"].text
+            s.outcomes << o
+          }
+          
+          story.scenarios << s
         }
         
-        story.scenarios << s
-      }
-      
-      generate(story)
+        generate(story)
+      rescue StandardError => error
+        errors << "Could not generate feature: " + error
+      end
     end
   end
-   
+  
   def get_xml
     Net::HTTP.start(options[:Host] , options[:Port]) { |http|
       req = Net::HTTP::Get.new("/stories/#{options[:feature]}.xml")

data/lib/branston/test/functional/stories_controller_test.rb

@@ -1,129 +1,143 @@
 require 'test_helper'
 
 class StoriesControllerTest < ActionController::TestCase
-
+  
   context "The StoriesController" do
-    setup do     
-      login_as(User.make)
+    setup do
       @story = Factory.make_story
     end
-
-    teardown do
-      feature_file = FEATURE_PATH + @story.feature_filename
-      FileUtils.rm feature_file if File.exists? feature_file
-      step_file = FEATURE_PATH + @story.step_filename
-      FileUtils.rm step_file if File.exists? step_file
-    end
-
-    should "show a list of all the stories" do
-      get :index
-      assert_response :success
-      assert_not_nil assigns(:backlog_stories)
-    end
-
-    should "show a form to edit stories" do
-      get :edit, :id => @story.to_param
-      assert_response :success
-      assert assigns(:iterations)
-    end
-
-    should "show a form to add stories" do
-      get :new
-      assert_response :success
-      assert assigns(:iterations)
-    end
-
-    should "show details about a story" do
-      get :show, :id => @story.to_param
-      assert_response :success
-    end
-
-    should "delete a story" do
-      assert_difference('Story.count', -1) do
-        delete :destroy, :id => @story.to_param
+    
+    context "with a logged-in user" do
+      setup do     
+        login_as(User.make)   
       end
-
-      assert_redirected_to stories_path
-    end
-
-    should "generate the cucumber feature file for a story" do
-      get :generate_feature, :id => @story.to_param, :path => 'test/features/'
-      assert_response :success
-      assert File.exists? FEATURE_PATH + @story.feature_filename
-      assert File.exists? FEATURE_PATH + @story.step_filename
-    end
-
-    context "creating a story" do
-
-      context "with valid params" do
-        setup do
-          assert_difference("Story.count") do
-            post :create, :story => Story.plan
-          end
-        end
-
-        should "redirect to show" do
-          assert_redirected_to stories_path
-        end
-
-        should "not be associated with an iteration" do
-          assert !assigns(:story).iteration
+      
+      teardown do
+        feature_file = FEATURE_PATH + @story.feature_filename
+        FileUtils.rm feature_file if File.exists? feature_file
+        step_file = FEATURE_PATH + @story.step_filename
+        FileUtils.rm step_file if File.exists? step_file
+      end
+      
+      should "show a list of all the stories" do
+        get :index
+        assert_response :success
+        assert_not_nil assigns(:backlog_stories)
+      end
+      
+      should "show a form to edit stories" do
+        get :edit, :id => @story.to_param
+        assert_response :success
+        assert assigns(:iterations)
+      end
+      
+      should "show a form to add stories" do
+        get :new
+        assert_response :success
+        assert assigns(:iterations)
+      end
+      
+      
+      
+      should "delete a story" do
+        assert_difference('Story.count', -1) do
+          delete :destroy, :id => @story.to_param
         end
-
-        context "including an iteration id" do
+        
+        assert_redirected_to stories_path
+      end
+      
+      should "generate the cucumber feature file for a story" do
+        get :generate_feature, :id => @story.to_param, :path => 'test/features/'
+        assert_response :success
+        assert File.exists? FEATURE_PATH + @story.feature_filename
+        assert File.exists? FEATURE_PATH + @story.step_filename
+      end
+      
+      context "creating a story" do
+        
+        context "with valid params" do
           setup do
             assert_difference("Story.count") do
-              post :create, :story => Story.plan(:in_progress)
+              post :create, :story => Story.plan
             end
           end
-
-          should "be associated with an iteration" do
-            assert assigns(:story).iteration
+          
+          should "redirect to show" do
+            assert_redirected_to stories_path
           end
-        end
-      end
-
-      context "with invalid params" do
-        setup do
-          assert_no_difference("Story.count") do
-            post :create, :story => {}
+          
+          should "not be associated with an iteration" do
+            assert !assigns(:story).iteration
           end
-        end
-
-        should "redisplay" do
-          assert_template 'new'
-          assert assigns(:iterations)
-        end
-      end
-    end
-
-    context "updating a story" do
-      context "with valid parameters" do
-        setup do
-          assert_no_difference("Story.count") do
-            put :update,{ :id => @story.to_param,  :story => {:description => "bar"}}
+          
+          context "including an iteration id" do
+            setup do
+              assert_difference("Story.count") do
+                post :create, :story => Story.plan(:in_progress)
+              end
+            end
+            
+            should "be associated with an iteration" do
+              assert assigns(:story).iteration
+            end
           end
         end
-
-        should "redirect to show" do
-          assert_redirected_to story_url(assigns(:story))
+        
+        context "with invalid params" do
+          setup do
+            assert_no_difference("Story.count") do
+              post :create, :story => {}
+            end
+          end
+          
+          should "redisplay" do
+            assert_template 'new'
+            assert assigns(:iterations)
+          end
         end
-
       end
-
-      context "with invalid parameters" do
-        setup do
-          put :update, :id => @story.to_param, :story => {:description => ""}
+      
+      context "updating a story" do
+        context "with valid parameters" do
+          setup do
+            assert_no_difference("Story.count") do
+              put :update,{ :id => @story.to_param,  :story => {:description => "bar"}}
+            end
+          end
+          
+          should "redirect to show" do
+            assert_redirected_to story_url(assigns(:story))
+          end
+          
         end
-
-        should "redisplay the edit template" do
-          assert_template "edit"
-          assert assigns(:iterations)
+        
+        context "with invalid parameters" do
+          setup do
+            put :update, :id => @story.to_param, :story => {:description => ""}
+          end
+          
+          should "redisplay the edit template" do
+            assert_template "edit"
+            assert assigns(:iterations)
+          end
         end
       end
+      
     end
-
+    
+    context "Without logging in, the StoriesController" do
+      
+      should "show details about a story" do
+        get :show, :id => @story.to_param
+        assert_response :success
+      end
+      
+      should "fail gracefully if the slug is not found" do
+        get :show, :id => 'none-such-story'
+        assert_response 404
+      end
+    end 
+    
   end
-
 end
-