belly 0.5.4 → 0.5.5

data/.belly

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

data/Gemfile

@@ -1,3 +1,7 @@
+source :gemcutter
+
 gem "rest-client"
-gem "jeweler"
 gem "rspec", ">= 2.0.0.beta.19"
+gem "aruba"
+gem "sinatra"
+gem "json"

data/Rakefile

@@ -10,8 +10,6 @@ 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.4
+0.5.1

data/belly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{belly}
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Wynne"]
-  s.date = %q{2010-08-23}
+  s.date = %q{2010-08-22}
   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}
@@ -51,6 +51,7 @@ 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",
      "spec/belly/project_initializer_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -69,19 +70,13 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= 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 'belly/for/cucumber'
+require File.dirname(__FILE__) + '/../../lib/belly/for/cucumber'

data/lib/belly.rb

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

data/lib/belly/cli.rb

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

data/lib/belly/cli/init.rb

@@ -1,68 +1,35 @@
 options = Trollop::options do
   banner <<-EOF
-This is the help for the init command. To see all commands available, type belly --help
+This is the help for the init command. To see all commands availlable, 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
 
-require 'belly/client/default_config'
-require 'fileutils'
+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
 
-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
+Your project is now initialized for working with Belly.
 
-      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}
+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: #{default_config.user[:name]}
-  email: #{default_config.user[:email]}
+  name: #{Belly.config.user[:name]}
+  email: #{Belly.config.user[:email]}
 EOF
-      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)
+end

data/lib/belly/cli/rerun.rb

@@ -1,8 +1,8 @@
-require 'belly/client'
+require 'belly/rerun'
 
 options = Trollop::options do
   banner <<-EOF
-This is the help for the rerun command. To see all commands available, type belly --help
+This is the help for the rerun command. To see all commands availlable, type belly --help
 
 Usage: belly rerun
 
@@ -12,21 +12,4 @@ 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/client/config.rb

@@ -1,4 +1,5 @@
 require 'belly/client/default_config'
+require 'belly/credentials'
 require 'yaml'
 
 module Belly::Client
@@ -33,8 +34,21 @@ 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,16 +14,14 @@ module Belly::Client
     
     def get_failing_scenarios_for_project_named(project_name)
       project_id = get_project_id_by_name(project_name)
-      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}")
+      response = request(:get, "/projects/#{project_id}/cucumber_scenarios.json?status=todo")
       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 NoSuchProjectError unless projects.any?
+      raise("Couldn't find a project named #{project_name}") unless projects.any?
       projects.first["id"].to_i
     end
     
@@ -35,11 +33,12 @@ module Belly::Client
   
     def request(method, path, data = nil, options = nil)
       url = @config.url + path
-      args = [url]
+      args = [method]
       args << data if data
       args << options if options
       Belly.log("Sending #{method} request to #{url}")
-      request_block = lambda { RestClient.send(method, *args) }
+      p @username, @password
+      request_block = lambda { RestClient::Resource.new(url, @username, @password).send(*args) }
       
       response = if @around_request_block
         @around_request_block.call(request_block)

data/lib/belly/for/cucumber.rb

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

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,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: belly
 version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Matt Wynne
@@ -14,57 +15,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 +01:00
+date: 2010-08-22 00:00:00 +01:00
 default_executable: belly
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: trollop
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id002
 description: Client app for the incredible new belly web service, coming soon.
 email: matt@mattwynne.net
 executables: 
@@ -107,6 +88,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
 - spec/belly/project_initializer_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -119,23 +101,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Client app for the incredible new belly web service, coming soon.