belly 0.5.0 → 0.5.1

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/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/belly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{belly}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   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-08-23}
   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,7 +51,6 @@ 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"
   ]

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

@@ -7,29 +7,60 @@ 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.
-
-Here's an example:
+require 'belly/client/default_config'
+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,4 +1,4 @@
-require 'belly/rerun'
+require 'belly/client'
 
 options = Trollop::options do
   banner <<-EOF
@@ -12,4 +12,18 @@ EOF
   opt :name, "Name of the project", :default => File.basename(Dir.pwd)
 end
 
+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
+
 Belly::Rerun.new(options).run(Trollop)

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}"}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Matt Wynne
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-22 00:00:00 +01:00
+date: 2010-08-23 00:00:00 +01:00
 default_executable: belly
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,7 +83,6 @@ 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

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