belly 0.3.4 → 0.3.5

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/belly.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{belly}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Wynne"]
@@ -40,15 +40,15 @@ Gem::Specification.new do |s|
      "lib/belly.rb",
      "lib/belly/cli.rb",
      "lib/belly/cli/init.rb",
-     "lib/belly/cli/rerun_cucumber.rb",
+     "lib/belly/cli/rerun.rb",
      "lib/belly/client.rb",
      "lib/belly/client/config.rb",
      "lib/belly/client/default_config.rb",
      "lib/belly/client/fakeweb_hack.rb",
      "lib/belly/client/hub_proxy.rb",
-     "lib/belly/cucumber_rerun.rb",
      "lib/belly/for/cucumber.rb",
      "lib/belly/messages/cucumber_scenario_result_message.rb",
+     "lib/belly/rerun.rb",
      "spec/belly/project_initializer_spec.rb",
      "spec/spec_helper.rb"
   ]

data/bin/belly

@@ -11,7 +11,7 @@ Trollop::options do
 === Commands
 
   init            Initialize this project for use with Belly
-  rerun:cucumber  Show Cucumber scenarios that need to be re-run
+  rerun           Show tests that need to be re-run
   help <command>  Get some help on a particular command
 
 EOS

data/features/support/env.rb

@@ -1,5 +1,8 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
+
 require 'aruba'
+bin_dir = File.expand_path(File.dirname(__FILE__) + '/../../bin/')
+ENV["PATH"] = bin_dir + ":" + ENV["PATH"]
 
 require 'spec/expectations'
 

data/features/support/fake_hub.rb

@@ -18,10 +18,6 @@ module Belly
             @requests ||= []
           end
           
-          def add(data)
-            all << data
-          end
-          
           def clear!
             @requests = []
           end
@@ -34,16 +30,11 @@ module Belly
       end
       
       post '*' do
-        # For some reason env["PATH_INFO"] is blank, so we do this instead
-        host = request.env["HTTP_HOST"]
-        uri = request.env["REQUEST_URI"]
-        path = uri.match(/#{host}(.*)/).captures[0]
-        
-        Requests.add({ 
-          'type' => request.env['REQUEST_METHOD'], 
-          'path' => path,
-          'data' => request.body.read }
-        )
+        Requests.all << { 
+          'type' => env['REQUEST_METHOD'], 
+          'path' => env["PATH_INFO"],
+          'data' => request.body.read 
+        }
         ''
       end
     end

data/lib/belly/cli.rb

@@ -1,5 +1,5 @@
 module Belly
   module Cli
-    COMMANDS = %w(init rerun:cucumber)
+    COMMANDS = %w(init rerun)
   end
 end

data/lib/belly/cli/rerun.rb

@@ -0,0 +1,15 @@
+require 'belly/rerun'
+
+options = Trollop::options do
+  banner <<-EOF
+This is the help for the rerun command. To see all commands availlable, type belly --help
+
+Usage: belly rerun
+
+Show the Cucumber scenarios that need to be rerun
+
+EOF
+  opt :name, "Name of the project", :default => File.basename(Dir.pwd)
+end
+
+Belly::Rerun.new(options).run(Trollop)

data/lib/belly/client/hub_proxy.rb

@@ -1,5 +1,4 @@
-require 'net/http'
-require 'uri'
+require 'rest_client'
 
 module Belly::Client
   class HubProxy
@@ -7,24 +6,50 @@ module Belly::Client
       @config = config
     end
     
-    def post_test_result(data)
-      request = Net::HTTP::Post.new(@config.url + '/test_results', {'Content-Type' =>'application/json'})
-      request.body = data
-      response = Net::HTTP.new(@config.host, @config.port).start do |http| 
-        if @around_request_block
-          block = Proc.new { http.request(request) }
-          @around_request_block.call(block)
-        else
-          http.request(request)
-        end
-      end
-      unless response.code == "200"
-        raise("Failed to talk to belly hub: Response #{response.code} #{response.message}: #{response.body}") 
-      end
+    def post_test_result(json_data)
+      request(:post, '/test_results', json_data, :content_type => :json)
+    end
+    
+    def get_failing_scenarios_for_project_named(project_name)
+      project_id = get_project_id_by_name(project_name)
+      response = request(:get, "/projects/#{project_id}/cucumber_scenarios.json?status=failed")
+      JSON.parse(response)["cucumber_scenarios"]
+    end
+    
+    def get_project_id_by_name(project_name)
+      response = request(:get, "/projects.json?name=#{project_name}")
+      projects = JSON.parse(response)["projects"]
+      raise("Couldn't find a project named #{project_name}") unless projects.any?
+      projects.first["id"].to_i
     end
     
     def around_request(&block)
       @around_request_block = block
     end
+    
+  private
+  
+    def request(method, path, data = nil, options = nil)
+      url = @config.url + path
+      args = [url]
+      args << data if data
+      args << options if options
+      Belly.log("Sending #{method} request to #{url}")
+      request_block = lambda { RestClient.send(method, *args) }
+      
+      response = if @around_request_block
+        @around_request_block.call(request_block)
+      else
+        request_block.call
+      end
+      
+      unless response.code == 200
+        raise("Failed to talk to belly hub: Response #{response.code} #{response.message}: #{response.body}") 
+      end
+      
+      Belly.log("response: #{response}")
+      
+      response
+    end
   end
 end

data/lib/belly/rerun.rb

@@ -0,0 +1,13 @@
+module Belly
+  class Rerun
+    def initialize(options)
+    
+    end
+  
+    def run(ui)
+      Belly.hub.get_failing_scenarios_for_project_named(Belly.config.project).each do |scenario|
+        puts "#{scenario["file_name"]}:#{scenario["line_number"]}"
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: belly
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Matt Wynne
@@ -77,15 +77,15 @@ files:
 - lib/belly.rb
 - lib/belly/cli.rb
 - lib/belly/cli/init.rb
-- lib/belly/cli/rerun_cucumber.rb
+- lib/belly/cli/rerun.rb
 - lib/belly/client.rb
 - lib/belly/client/config.rb
 - lib/belly/client/default_config.rb
 - lib/belly/client/fakeweb_hack.rb
 - lib/belly/client/hub_proxy.rb
-- lib/belly/cucumber_rerun.rb
 - lib/belly/for/cucumber.rb
 - lib/belly/messages/cucumber_scenario_result_message.rb
+- lib/belly/rerun.rb
 - spec/belly/project_initializer_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true

data/lib/belly/cli/rerun_cucumber.rb

@@ -1,15 +0,0 @@
-require 'belly/cucumber_rerun'
-
-options = Trollop::options do
-  banner <<-EOF
-This is the help for the rerun:cucumber command. To see all commands availlable, type belly --help
-
-Usage: belly rerun:cucumber
-
-Show the Cucumber scenarios that need to be rerun
-
-EOF
-  opt :name, "Name of the project", :default => File.basename(Dir.pwd)
-end
-
-Belly::CucumberRerun.new(options).run(Trollop)

data/lib/belly/cucumber_rerun.rb

@@ -1,11 +0,0 @@
-module Belly
-  class CucumberRerun
-    def initialize(options)
-    
-    end
-  
-    def run(ui)
-      ui.die("I lied. I have no idea how to do this yet, sorry")
-    end
-  end
-end