belly 0.5.5 → 0.5.7

data/.belly

@@ -1,2 +1,5 @@
 hub: belly.heroku.com:80
-project: belly-gem
+project: belly-gem
+user:
+  name: Matt Wynne
+  email: matt@mattwynne.net

data/Gemfile.lock

@@ -0,0 +1,32 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    aruba (0.2.1)
+    diff-lcs (1.1.2)
+    json (1.4.6)
+    mime-types (1.16)
+    rack (1.2.1)
+    rest-client (1.6.1)
+      mime-types (>= 1.16)
+    rspec (2.0.0.beta.22)
+      rspec-core (= 2.0.0.beta.22)
+      rspec-expectations (= 2.0.0.beta.22)
+      rspec-mocks (= 2.0.0.beta.22)
+    rspec-core (2.0.0.beta.22)
+    rspec-expectations (2.0.0.beta.22)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.22)
+      rspec-core (= 2.0.0.beta.22)
+      rspec-expectations (= 2.0.0.beta.22)
+    sinatra (1.0)
+      rack (>= 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba
+  json
+  rest-client
+  rspec (>= 2.0.0.beta.19)
+  sinatra

data/Rakefile

@@ -10,6 +10,8 @@ begin
     gem.email = "matt@mattwynne.net"
     gem.homepage = "http://belly.heroku.com"
     gem.authors = ["Matt Wynne"]
+    gem.add_dependency "trollop"
+    gem.add_dependency "rest-client"
     gem.add_development_dependency "rspec"
     gem.add_development_dependency "cucumber"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.6

data/belly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{belly}
-  s.version = "0.5.5"
+  s.version = "0.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Wynne"]
-  s.date = %q{2010-08-22}
+  s.date = %q{2010-09-27}
   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}
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      ".document",
      ".gitignore",
      "Gemfile",
+     "Gemfile.lock",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -44,6 +45,7 @@ Gem::Specification.new do |s|
      "lib/belly/cli.rb",
      "lib/belly/cli/init.rb",
      "lib/belly/cli/rerun.rb",
+     "lib/belly/cli/steps.rb",
      "lib/belly/client.rb",
      "lib/belly/client/config.rb",
      "lib/belly/client/default_config.rb",
@@ -51,14 +53,14 @@ Gem::Specification.new do |s|
      "lib/belly/client/hub_proxy.rb",
      "lib/belly/for/cucumber.rb",
      "lib/belly/messages/cucumber_scenario_result_message.rb",
-     "lib/belly/rerun.rb",
+     "lib/belly/steps_command.rb",
      "spec/belly/project_initializer_spec.rb",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://belly.heroku.com}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Client app for the incredible new belly web service, coming soon.}
   s.test_files = [
     "spec/belly/project_initializer_spec.rb",
@@ -69,14 +71,20 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<trollop>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
     else
+      s.add_dependency(%q<trollop>, [">= 0"])
+      s.add_dependency(%q<rest-client>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
     end
   else
+    s.add_dependency(%q<trollop>, [">= 0"])
+    s.add_dependency(%q<rest-client>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
   end

data/features/support/belly.rb

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

data/lib/belly.rb

@@ -14,5 +14,3 @@ module Belly
 end
 
 Belly.log "Belly version #{Belly.version} starting in #{File.expand_path(File.dirname(__FILE__))}"
-
-require 'belly/client'

data/lib/belly/cli/init.rb

@@ -1,35 +1,68 @@
 options = Trollop::options do
   banner <<-EOF
-This is the help for the init command. To see all commands availlable, type belly --help
+This is the help for the init command. To see all commands available, type belly --help
 
 Usage: belly init
 
 Initialize your project for use with the belly service
 
 EOF
+  opt :force, 'Overwite files even if they already exist', :default => false
 end
 
-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.
+require 'belly/client/default_config'
+require 'fileutils'
 
-Here's an example:
+module Belly
+  class Init
+    
+    def initialize(options)
+      @options = options
+    end
+    
+    def run(ui)
+      unless File.exists?('features/support')
+        ui.die("It doesn't look like you are in a project with Cucumber features")
+      end
 
-project: #{Belly.config.project}
+      create_file('features/support/belly.rb') do
+        <<-EOF
+require 'belly/for/cucumber'
+EOF
+      end
+      
+      create_file('.belly') do
+        <<-EOF
+hub: #{default_config.host}:#{default_config.port}
+project: #{default_config.project}
 user:
-  name: #{Belly.config.user[:name]}
-  email: #{Belly.config.user[:email]}
+  name: #{default_config.user[:name]}
+  email: #{default_config.user[:email]}
 EOF
-end
+      end
+    
+      puts
+      puts "Lovely. Your project is now initialized for use with Belly."
+      puts "You can edit your project's settings by editing the .belly file in this folder."
+    end
+  
+    private
+    
+    def default_config
+      @default_config ||= Belly::Client::DefaultConfig.new
+    end
+  
+    def create_file(target)
+      FileUtils.rm_rf(target) if @options[:force]
+      if File.exists?(target)
+        Trollop.die("#{target} already exists. Use --force to make me overwrite it")
+      end
+      File.open(target, 'w') do |f|
+        f.puts yield
+      end
+      puts "Created #{target}"
+    end
+  end
+end
+
+Belly::Init.new(options).run(Trollop)

data/lib/belly/cli/rerun.rb

@@ -1,8 +1,8 @@
-require 'belly/rerun'
+require 'belly/client'
 
 options = Trollop::options do
   banner <<-EOF
-This is the help for the rerun command. To see all commands availlable, type belly --help
+This is the help for the rerun command. To see all commands available, type belly --help
 
 Usage: belly rerun
 
@@ -12,4 +12,21 @@ EOF
   opt :name, "Name of the project", :default => File.basename(Dir.pwd)
 end
 
+module Belly
+  class Rerun
+    def initialize(options)
+    
+    end
+  
+    def run(ui)
+      scenarios = Belly.hub.get_failing_scenarios_for_project_named(Belly.config.project)
+      todos = scenarios.map {  |scenario| "#{scenario["file_name"]}:#{scenario["line_number"]}" }
+      todos.sort.each { |todo| puts todo }
+      
+    rescue Client::NoSuchProjectError
+      ui.die("Belly doesn't know enough about this project yet. Please run some tests, then try again.")
+    end
+  end
+end
+
 Belly::Rerun.new(options).run(Trollop)

data/lib/belly/cli/steps.rb

@@ -0,0 +1,14 @@
+require 'belly/steps_command'
+
+options = Trollop::options do
+  banner <<-EOF
+This is the help for the steps command. To see all commands availlable, type belly --help
+
+Usage: belly steps
+
+Format your Cucumber step definitions as JSON
+
+EOF
+end
+
+Belly::StepsCommand.new(options).run(Trollop)

data/lib/belly/client/config.rb

@@ -1,5 +1,4 @@
 require 'belly/client/default_config'
-require 'belly/credentials'
 require 'yaml'
 
 module Belly::Client
@@ -34,21 +33,8 @@ module Belly::Client
       config_file['user'] || @default.user
     end
     
-    def username
-      credentials.username
-    end
-    
-    def password
-      credentials.password
-    end
-    
     private
     
-    def credentials
-      return @credenitals if @credenitals
-      @credenitals = Belly::Credentials.new
-    end
-    
     def config_file
       return @file if @file
       Belly.log("pwd is #{`pwd`}")

data/lib/belly/client/hub_proxy.rb

@@ -1,11 +1,11 @@
 require 'rest_client'
 
 module Belly::Client
+  class NoSuchProjectError < StandardError; end
   class HubProxy
+    
     def initialize(config)
       @config = config
-      @username = @config.username
-      @password = @config.password
     end
     
     def post_test_result(json_data)
@@ -14,14 +14,16 @@ module Belly::Client
     
     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=todo")
+      rerun_statuses = [:pending, :undefined, :failed]
+      status_querystring = rerun_statuses.map { |s| "status[]=#{s}"}.join("&")
+      response = request(:get, "/projects/#{project_id}/cucumber_scenarios.json?#{status_querystring}")
       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?
+      raise NoSuchProjectError unless projects.any?
       projects.first["id"].to_i
     end
     
@@ -33,12 +35,11 @@ module Belly::Client
   
     def request(method, path, data = nil, options = nil)
       url = @config.url + path
-      args = [method]
+      args = [url]
       args << data if data
       args << options if options
       Belly.log("Sending #{method} request to #{url}")
-      p @username, @password
-      request_block = lambda { RestClient::Resource.new(url, @username, @password).send(*args) }
+      request_block = lambda { RestClient.send(method, *args) }
       
       response = if @around_request_block
         @around_request_block.call(request_block)

data/lib/belly/for/cucumber.rb

@@ -1,4 +1,5 @@
 require 'belly'
+require 'belly/client'
 
 Before do |scenario|
   Belly.log %{about to run scenario "#{scenario.name}"}

data/lib/belly/steps_command.rb

@@ -0,0 +1,12 @@
+require 'cucumber'
+
+module Belly
+  class StepsCommand
+    def initialize(options)
+    end
+  
+    def run(ui)
+      puts Cucumber::StepDefinitions.new.to_json
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: belly
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - Matt Wynne
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-22 00:00:00 +01:00
+date: 2010-09-27 00:00:00 +01:00
 default_executable: belly
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: trollop
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -30,10 +30,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: rest-client
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,8 +44,36 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Client app for the incredible new belly web service, coming soon.
 email: matt@mattwynne.net
 executables: 
@@ -61,6 +89,7 @@ files:
 - .document
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -81,6 +110,7 @@ files:
 - lib/belly/cli.rb
 - lib/belly/cli/init.rb
 - lib/belly/cli/rerun.rb
+- lib/belly/cli/steps.rb
 - lib/belly/client.rb
 - lib/belly/client/config.rb
 - lib/belly/client/default_config.rb
@@ -88,7 +118,7 @@ files:
 - lib/belly/client/hub_proxy.rb
 - lib/belly/for/cucumber.rb
 - lib/belly/messages/cucumber_scenario_result_message.rb
-- lib/belly/rerun.rb
+- lib/belly/steps_command.rb
 - spec/belly/project_initializer_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true

data/lib/belly/rerun.rb

@@ -1,13 +0,0 @@
-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