belly 0.1.0 → 0.3.2

data/.belly

@@ -0,0 +1,2 @@
+hub: localhost:3000
+project: belly-gem

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.3.0

data/belly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{belly}
-  s.version = "0.1.0"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Wynne"]
-  s.date = %q{2010-07-21}
+  s.date = %q{2010-08-16}
   s.default_executable = %q{belly}
   s.description = %q{Client app for the incredible new belly web service, coming soon.}
   s.email = %q{matt@mattwynne.net}
@@ -20,7 +20,8 @@ Gem::Specification.new do |s|
      "TODO"
   ]
   s.files = [
-    ".document",
+    ".belly",
+     ".document",
      ".gitignore",
      "LICENSE",
      "README.rdoc",
@@ -29,9 +30,11 @@ Gem::Specification.new do |s|
      "VERSION",
      "belly.gemspec",
      "bin/belly",
+     "features/fakeweb.feature",
      "features/publish_scenario_results.feature",
      "features/step_definitions/belly_steps.rb",
      "features/step_definitions/cucumber_steps.rb",
+     "features/support/belly.rb",
      "features/support/env.rb",
      "features/support/fake_hub.rb",
      "lib/belly.rb",
@@ -39,9 +42,11 @@ Gem::Specification.new do |s|
      "lib/belly/cli/init.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/for/cucumber.rb",
-     "lib/belly/project_initializer.rb",
-     "lib/belly/user_credentials.rb",
+     "lib/belly/messages/cucumber_scenario_result_message.rb",
      "spec/belly/project_initializer_spec.rb",
      "spec/spec_helper.rb"
   ]

data/bin/belly

@@ -10,7 +10,8 @@ Trollop::options do
   banner <<-EOS
 === Commands
 
-  init            Create a new project for the current folder
+  init            Initialize this project for use with Belly
+  rerun:cucumber  Show Cucumber scenarios that need to be re-run
   help <command>  Get some help on a particular command
 
 EOS
@@ -25,4 +26,4 @@ unless Belly::Cli::COMMANDS.include?(command)
   Trollop.die("Don't know that command, sorry")
 end
 
-require "belly/cli/#{command}"
+require "belly/cli/#{command.gsub(':','_')}"

data/features/fakeweb.feature

@@ -0,0 +1,17 @@
+@announce
+Feature: Fakeweb
+  In order to work on a codebase that uses Fakeweb, 
+  belly needs to disable Fakeweb during it's own net communication
+
+  Scenario: Features have FakeWeb enabled with allow_net_connect = false
+    Given a Cucumber test suite with a single passing scenario
+    And Belly has been installed in the features
+    And a file named "features/support/fake_web.rb" with:
+      """
+      require 'fake_web'
+      FakeWeb.allow_net_connect = false
+      
+      """
+    When I run the features
+    Then it should pass
+    And the hub should have received a test result

data/features/publish_scenario_results.feature

@@ -7,53 +7,75 @@ Feature: Publish scenario results
     Given a standard Cucumber project directory structure
     And a file named "features/support/belly.rb" with:
       """
-      require 'belly' rescue puts("Could not load belly - do you need to install the gem?")
+      require 'belly/for/cucumber'
       
       """
       
     And a file named "features/step_definitions/foo_steps.rb" with:
       """
-      Given /^I am a rock$/ do
+      When /pass/ do
       end
 
-      Given /^I am thin ice$/ do
-        raise("yikes")
+      When /fail/ do
+        raise("FAIL")
       end
       
       """
     And a file named ".belly" with:
       """
       hub: localhost:12345
+      project: test-project
       
       """
-    And there is a belly-hub running on localhost:12345
+    And there is a hub running on localhost:12345
 
+  @announce
   Scenario: Run a test with a scenario that passes
     Given a file named "features/foo.feature" with:
       """
-      Feature: Test
-        Scenario: Solid
-          Given I am a rock
+      Feature: Passing Feature
+        Scenario: Passing Scenario
+          When I pass
     
       """
-    When I run cucumber -r belly -r features -v
-    And the belly-hub should have received the following requests:
-      | type | path       | data                                                           |
-      | POST | /scenarios | {"status":"passed","id":{"scenario":"Solid","feature":"Test"}} |
+    When I run cucumber features
+    Then the hub should have received a POST to "/test_results" with:
+      """
+      {
+        "id": {
+          "feature":"Passing Feature",
+          "line":"2",
+          "feature_file":"features/foo.feature",
+          "scenario":"Passing Scenario"
+        },
+        "project":"test-project",
+        "type":"Belly::Messages::CucumberScenarioResultMessage"
+      }
+      """
 
   Scenario: Run a test with a scenario that fails
   And a file named "features/foo.feature" with:
     """
-    Feature: Test
-      Scenario: Solid
-        Given I am a rock
+    Feature: Passing Feature
+      Scenario: Passing Scenario
+        When I pass
     
-      Scenario: Shaky
-        Given I am thin ice
+      Scenario: Failing Scenario
+        When I fail
     
     """
     When I run cucumber -r belly -r features -v
-    And the belly-hub should have received the following requests:
-      | type | path       | data                                                           |
-      | POST | /scenarios | {"status":"passed","id":{"scenario":"Solid","feature":"Test"}} |
-      | POST | /scenarios | {"status":"failed","id":{"scenario":"Shaky","feature":"Test"}} |
+    Then the hub should have received a POST to "/test_results" with:
+      """
+      {
+        "project":"test-project",
+        "status":"passed"
+      }
+      """
+    And the hub should have received a POST to "/test_results" with:
+      """
+      {
+        "project":"test-project",
+        "status":"failed"
+      }
+      """

data/features/step_definitions/belly_steps.rb

@@ -1,19 +1,61 @@
 require 'aruba'
 
-Given /^there is a belly\-hub running on localhost:12345$/ do
-  @hub = Belly::FakeHub.run(12345)
+module RequestsHelper
+  def requests
+    @hub.requests.map do |r|
+      result = r.dup
+      result["data"] = JSON.parse(r["data"])
+      result
+    end
+  end
+  
+  def start_hub!
+    @hub = Belly::FakeHub.run(12345)
+  end
+end
+
+World(RequestsHelper)
+
+Given /^there is a hub running on localhost:12345$/ do
+  start_hub!
+end
+
+Given /^Belly has been installed in the features$/ do
+  start_hub!
+  create_file "features/support/belly.rb", <<-EOF
+require 'belly/for/cucumber'
+EOF
+  create_file ".belly", <<-EOF
+hub: localhost:12345
+project: test-project
+EOF
 end
 
-Then /^the belly\-hub should have received the following requests:$/ do |table|
-  requests = @hub.requests.map do |r|
-    result = r.dup
-    result["data"] = JSON.parse(r["data"])
-    result
+Then /^the hub should have received a POST to "([^"]*)" with:$/ do |path, expected_json|
+  expected_data = JSON.parse(expected_json)
+  match = false
+  candidates = requests.select do |request|
+    request["type"] == "POST" && request["path"] == path
   end
   
-  table.map_column!('data') do |raw_data|
-    JSON.parse(raw_data)
+  unless candidates.any?
+    raise("Couldn't find any POST requests to #{path} in: \n\n #{requests.inspect}")
   end
   
-  table.diff! requests
-end
+  candidates.each do |request|
+    match = expected_data.keys.all? do |key|
+      request["data"][key] == expected_data[key]
+    end
+    break if match
+  end
+
+  unless match
+    raise("Couldn't find any suitable requests in:\n\n #{candidates.inspect}")
+  end
+end
+
+Then /^the hub should have received a test result$/ do
+  unless(requests.any? { |r| r["type"] == "POST" && r["path"] == "/test_results" })
+    raise("Couldn't find any test_results POST requests in:\n\n #{requests.inspect}")
+  end
+end

data/features/step_definitions/cucumber_steps.rb

@@ -10,3 +10,26 @@ When /^I run cucumber (.*)$/ do |cucumber_opts|
   cmd = "#{Cucumber::RUBY_BINARY} -I#{belly_lib_path} #{Cucumber::BINARY} --no-color #{cucumber_opts}"
   run(cmd, false)
 end
+
+Given /^a Cucumber test suite with a single passing scenario$/ do
+  FileUtils.mkdir_p 'features/support'
+  FileUtils.mkdir_p 'features/step_definitions'
+  create_file 'features/step_definitions/steps.rb', <<-EOF
+When /pass/ do
+end
+EOF
+
+  create_file "features/pass.feature", <<-EOF
+Feature: Passing Feature
+  Scenario: Passing Scenario
+    When I pass
+EOF
+end
+
+When /^I run the features$/ do
+  When "I run cucumber features"
+end
+
+Then /^it should pass$/ do
+  Then "the exit status should be 0"
+end

data/features/support/belly.rb

@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../lib/belly/for/cucumber'

data/features/support/fake_hub.rb

@@ -34,9 +34,14 @@ 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' => '/scenarios', 
+          'path' => path,
           'data' => request.body.read }
         )
         ''

data/lib/belly.rb

@@ -1,44 +1,12 @@
 $:.push(File.expand_path(File.dirname(__FILE__)))
 
-require 'belly/client'
-require 'belly/client/config'
-require 'json'
-
 module Belly
   class << self
     def log(message)
       return unless ENV['BELLY_LOG']
       puts "* [Belly] #{message}"
     end
-  
-    def publish(scenario)
-      feature_name = scenario.feature.name.split("\n").first # TODO: only needed for older cucumbers
-      data = { 
-        :type => :cucumber_scenario_result,
-        :id => { :feature => feature_name, :scenario => scenario.name }, 
-        :status => scenario.status, 
-        :project => config.project 
-      }.to_json
-      
-      Belly.log("publishing #{data}")
-
-      # Break out a thread so we don't slow down the tests
-      thread = Thread.new { hub.post_test_result(data) }
-      
-      # Make sure the thread gets a chance to finish before the process exits
-      at_exit { thread.join }
-    end
-  
-    def config
-      @config ||= Config.new
-    end
-    
-    def user_credentials
-      @user_credentials ||= UserCredentials.new(config)
-    end
-    
-    def hub
-      @hub ||= Belly::Client.new(config)
-    end
   end
-end
+end
+
+require 'belly/client'

data/lib/belly/cli.rb

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

data/lib/belly/cli/init.rb

@@ -1,15 +1,35 @@
-require 'belly/project_initializer'
-
 options = Trollop::options do
   banner <<-EOF
 This is the help for the init command. To see all commands availlable, type belly --help
 
-Usage: belly init <args>
+Usage: belly init
 
-Initialize your project for use with the belly web service
+Initialize your project for use with the belly service
 
 EOF
-  opt :name, "Name of the project", :default => File.basename(Dir.pwd)
 end
 
-Belly::ProjectInitializer.new(options).run(Trollop)
+if File.exists?('features/support')
+  target = 'features/support/belly.rb'
+  if File.exists?(target)
+    Trollop.die("There's already a #{target} which I was going to create. Not much for me to do")
+  end
+  File.open(target, 'w') do |f|
+    f.puts "require 'belly/for/cucumber'"
+  end
+  puts "Created #{target}"
+  puts <<-EOF
+
+Your project is now initialized for working with Belly.
+
+You can configure Belly's settings by creating a .belly file in root of your project.
+If you don't create one, I'll just use some defaults.
+
+Here's an example:
+
+project: #{Belly.config.project}
+user:
+  name: #{Belly.config.user[:name]}
+  email: #{Belly.config.user[:email]}
+EOF
+end

data/lib/belly/client.rb

@@ -1,23 +1,63 @@
-require 'net/http'
-require 'uri'
-
 module Belly
-  class Client
-    def initialize(config)
-      @config = config
-    end
-    
-    def get(uri)
+  module Client
+    def publish(scenario)
+      return if offline?
       
-    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 {|http| http.request(request) }
-      unless response.code == "200"
-        raise("Failed to talk to belly hub: Response #{response.code} #{response.message}: #{response.body}") 
+      feature_name = scenario.feature.name.split("\n").first # TODO: only needed for older cucumbers
+      feature_file, line = scenario.file_colon_line.split(':')
+
+      data = Messages::CucumberScenarioResultMessage.new(
+        feature_name, 
+        scenario.name, 
+        scenario.status,
+        config.user,
+        config.project,
+        feature_file,
+        line).to_json
+
+      Belly.log("publishing #{data}")
+
+      # Break out a thread so we don't slow down the tests
+      thread = Thread.new { hub.post_test_result(data) }
+
+      # Make sure the thread gets a chance to finish before the process exits
+      at_exit do
+        begin
+          thread.join
+        rescue SocketError, Errno::ECONNREFUSED => exception
+          # TODO: test this
+          unless offline?
+            warn("Belly couldn't send your results to the server (#{Belly.config.url}).")
+            offline!
+          end
+        end
       end
     end
+
+    def config
+      @config ||= Config.new
+    end
+
+    def hub
+      @hub ||= HubProxy.new(config)
+    end
+
+  private
+
+    def offline?
+      @offline
+    end
+
+    def offline!
+      @offline = true
+    end
   end
-end
+end
+
+Belly.extend(Belly::Client)
+
+require 'json'
+require 'belly/client/hub_proxy'
+require 'belly/client/config'
+require 'belly/messages/cucumber_scenario_result_message'
+require 'belly/client/fakeweb_hack'

data/lib/belly/client/config.rb

@@ -1,13 +1,12 @@
-module Belly
+require 'belly/client/default_config'
+
+module Belly::Client
   class Config
-    class NoConfig
-    end
-    
     attr_reader :host, :port
     
     class << self
       def new(*args)
-        return NoConfig.new unless File.exists?(path)
+        return DefaultConfig.new unless File.exists?(path)
         super
       end
       
@@ -17,6 +16,7 @@ module Belly
     end
     
     def initialize
+      @default = DefaultConfig.new
       @host, @port = config_file['hub'].split(':')
     end
     
@@ -25,7 +25,11 @@ module Belly
     end
     
     def project
-      config_file['project']
+      config_file['project'] || @default.project
+    end
+    
+    def user
+      config_file['user'] || @default.user
     end
     
     private

data/lib/belly/client/default_config.rb

@@ -0,0 +1,32 @@
+module Belly::Client
+  class DefaultConfig
+    def project
+      File.basename(Dir.pwd)
+    end
+    
+    def url
+      "http://#{host}:#{port}"
+    end
+    
+    def host
+      "belly.heroku.com"
+    end
+    
+    def port
+      80
+    end
+    
+    def user
+      {
+        :name  => git_config('user.name'),
+        :email => git_config('user.email')
+      }
+    end
+    
+  private
+  
+    def git_config(value)
+      `git config --get #{value}`.strip
+    end
+  end
+end

data/lib/belly/client/fakeweb_hack.rb

@@ -0,0 +1,30 @@
+module Belly
+  class << self
+    def install_fakeweb_hack_if_necessary
+      return if @fakeweb_hack_installed
+      
+      FakeWeb.class_eval do
+        def self.allow_net_connect?
+          return true if Thread.current == @overriding_thread
+          @allow_net_connect
+        end
+
+        def self.allowing_net_connect_in_this_thread
+          @overriding_thread = Thread.current
+          result = yield
+          @overriding_thread = nil
+          result
+        end
+      end
+    end
+  end
+end
+
+Belly.hub.around_request do |block|
+  if defined?(FakeWeb)
+    Belly.install_fakeweb_hack_if_necessary
+    FakeWeb.allowing_net_connect_in_this_thread(&block)
+  else
+    block.call
+  end
+end

data/lib/belly/client/hub_proxy.rb

@@ -0,0 +1,30 @@
+require 'net/http'
+require 'uri'
+
+module Belly::Client
+  class HubProxy
+    def initialize(config)
+      @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
+    end
+    
+    def around_request(&block)
+      @around_request_block = block
+    end
+  end
+end

data/lib/belly/messages/cucumber_scenario_result_message.rb

@@ -0,0 +1,24 @@
+module Belly
+  module Messages
+    class CucumberScenarioResultMessage
+      def initialize(feature_name, scenario_name, status, user, project_name, feature_file, line)
+        @data = {
+          :type => self.class.name,
+          :id => {
+            :feature => feature_name,
+            :scenario => scenario_name,
+            :feature_file => feature_file,
+            :line => line
+          },
+          :status => status,
+          :user => user,
+          :project => project_name
+        }
+      end
+      
+      def to_json
+        @data.to_json
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: belly
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 0
-  version: 0.1.0
+  - 3
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Matt Wynne
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 +01:00
+date: 2010-08-16 00:00:00 +01:00
 default_executable: belly
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,7 @@ extra_rdoc_files:
 - README.rdoc
 - TODO
 files: 
+- .belly
 - .document
 - .gitignore
 - LICENSE
@@ -66,9 +67,11 @@ files:
 - VERSION
 - belly.gemspec
 - bin/belly
+- features/fakeweb.feature
 - features/publish_scenario_results.feature
 - features/step_definitions/belly_steps.rb
 - features/step_definitions/cucumber_steps.rb
+- features/support/belly.rb
 - features/support/env.rb
 - features/support/fake_hub.rb
 - lib/belly.rb
@@ -76,9 +79,11 @@ files:
 - lib/belly/cli/init.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/for/cucumber.rb
-- lib/belly/project_initializer.rb
-- lib/belly/user_credentials.rb
+- lib/belly/messages/cucumber_scenario_result_message.rb
 - spec/belly/project_initializer_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true

data/lib/belly/project_initializer.rb

@@ -1,30 +0,0 @@
-require 'belly/user_credentials'
-require 'belly/client'
-
-module Belly
-  class ProjectInitializer
-    def initialize(options, ui)
-      project_name = options[:name] or raise("Need a :name in the options")
-      @uri = "/projects/#{project_name}"
-      @ui = ui
-    end
-    
-    def run
-      client.get(@uri, self)
-    end
-    
-    def not_found
-      client.put(@uri)
-    end
-    
-    def not_authorized
-      @ui.die("You don't have access to this project. You'll need to contact one of the project's collaborators and ask them to give you access.")
-    end
-    
-    private
-    
-    def client
-      @client ||= Client.new(Belly.user_credentials)
-    end
-  end
-end

data/lib/belly/user_credentials.rb

@@ -1,7 +0,0 @@
-module Belly
-  class UserCredentials
-    def initialize(config)
-      
-    end
-  end
-end