code_buddy 0.0.7 → 0.0.8

data/.gitignore

@@ -8,3 +8,4 @@ cache
 Gemfile.lock
 example_trace
 tmp
+*.tmproj

data/bin/code_buddy

@@ -2,4 +2,19 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'rubygems'
 require 'code_buddy'
-CodeBuddy::App.run! :host => 'localhost'
+require 'code_buddy/server'
+require 'daemons'
+
+command = ARGV.shift
+
+stdin = STDIN.read unless STDIN.tty?
+if !stdin.nil? && !stdin.empty?
+  CodeBuddy::Server.update(stdin)
+else 
+  case command
+  when "start"
+    CodeBuddy::Server.start
+  when "stop"
+    CodeBuddy::Server.stop
+  end
+end

data/code_buddy.gemspec

@@ -23,12 +23,15 @@ Gem::Specification.new do |s|
   s.add_dependency             'sinatra',       '~> 1.1.0'
   s.add_dependency             'json_pure',     '~> 1.4.6'
   s.add_dependency             'coderay',       '~> 0.9.6'
+  s.add_dependency             'daemons'
+  s.add_dependency             'launchy'
 
   s.add_development_dependency 'rake',          '~> 0.8.7'
-  s.add_development_dependency 'rspec',         '~> 2.2.0'
+  s.add_development_dependency 'rspec',         '~> 2.3.0'
   s.add_development_dependency 'mocha',         '~> 0.9.10'
-  s.add_development_dependency 'cucumber',      '~> 0.9.4'
-  s.add_development_dependency 'aruba',         '~> 0.2.2'
+  s.add_development_dependency 'cucumber',      '~> 0.10.0'
+  s.add_development_dependency 'aruba',         '~> 0.3.2'
+  s.add_development_dependency 'ruby-debug'
   # s.add_development_dependency 'capybara'
   # s.add_development_dependency 'akephalos'
 end

data/features/command_line.feature

@@ -0,0 +1,6 @@
+Feature: Code Buddy command line execution
+
+Scenario: Start code buddy with text from stdin
+  Given I run "cat features/stack-trace | ./bin/code_buddy"
+   When I run "curl http://localhost:9292/stack/0"
+   Then I should see "blahblah"

data/features/rails2_app.feature

@@ -1,8 +1,10 @@
-Feature: Make sure CodeBuddy works with a Rails3 app
+Feature: Make sure CodeBuddy works with a Rails 2 app
 
+@disable-bundler
 @announce
 Scenario: See a stack trace with links
-  Given I have created a new Rails 2 app "new_rails2_app" with code_buddy 
+  Given I'm using a clean gemset "code_buddy_rails2_test"
+    And I have created a new Rails 2 app "new_rails2_app" with code_buddy 
     And I run "script/generate scaffold user"
     And I overwrite "app/views/users/index.html.erb" with:
       """
@@ -10,7 +12,6 @@ Scenario: See a stack trace with links
       """
     And I run "rake db:migrate"
     And I run "cp ../../../features/templates/rails_exception.feature.template features/rails_exception.feature"
-    And I am pending
     And I run "rake cucumber"
     Then it should pass with:
        """

data/features/rails3_app.feature

@@ -1,8 +1,10 @@
 Feature: Make sure CodeBuddy works with a Rails3 app
 
+@disable-bundler
 @announce
 Scenario: See a stack trace with links
-  Given I have created a new Rails 3 app "new_rails3_app" with code_buddy 
+  Given I'm using a clean gemset "code_buddy_rails3_test"
+    And I have created a new Rails 3 app "new_rails3_app" with code_buddy 
     And I run "rails generate scaffold users"
     And I overwrite "app/views/users/index.html.erb" with:
       """

data/features/step_definitions/rails_setup_steps.rb

@@ -1,6 +1,7 @@
 Given /^I have created a new Rails 3 app "([^"]*)" with code_buddy$/ do |app_name|
   steps <<-STEPS
-    Given I successfully run "rails new #{app_name}"
+    Given I run "bundle install --gemfile=../../features/support/Gemfile-rails3"
+    And I successfully run "rails new #{app_name}"
     And I cd to "#{app_name}"
     And I append to "Gemfile" with:
       """
@@ -12,13 +13,18 @@ Given /^I have created a new Rails 3 app "([^"]*)" with code_buddy$/ do |app_nam
       """
     And I run "bundle install"
     And I run "rails generate cucumber:install"
+    And I replace "# Add more mappings here." in "features/support/paths.rb" with:
+      """
+      when "code_buddy"
+        "/code_buddy/stack/0"
+      """
     And I run "rake db:migrate"
   STEPS
 end
 
 Given /^I have created a new Rails 2 app "([^"]*)" with code_buddy$/ do |app_name|
   steps <<-STEPS
-    Given I run "gem install rails --version '=2.3.10'"
+    Given I run "bundle install --gemfile=../../features/support/Gemfile-rails2"
     And I successfully run "rails _2.3.10_ #{app_name}"
     And I cd to "#{app_name}"
     And I replace "# Specify gems that this application depends on and have them installed with rake gems:install" in "config/environment.rb" with:
@@ -26,11 +32,15 @@ Given /^I have created a new Rails 2 app "([^"]*)" with code_buddy$/ do |app_nam
       # Specify gems that this application depends on and have them installed with rake gems:install
       config.gem 'code_buddy' 
       config.middleware.use "CodeBuddy::ShowApp"
-      
       """
     And I run "mkdir vendor/gems"
     And I run "ln -s #{File.expand_path("../../..", __FILE__)} vendor/gems/code_buddy-#{CodeBuddy::VERSION}"
-    And I run "script/generate cucumber"
+    And I run "script/generate cucumber --capybara"
+    And I replace "# Add more mappings here." in "features/support/paths.rb" with:
+      """
+      when "code_buddy"
+        "/code_buddy/stack/0"
+      """
     And I run "rake db:migrate"
   STEPS
 end
@@ -50,7 +60,7 @@ Given /^I enable show_exceptions in "([^"]*)"$/ do |file_name|
   # Given %Q[I replace "config.action_dispatch.show_exceptions = false" in "#{file_name}"], pystring #Cucumber::Ast::PyString.parse('config.action_dispatch.show_exceptions = true')
   cmd = "sed s/'config.action_dispatch.show_exceptions = false'/'config.action_dispatch.show_exceptions = true'/ #{file_name}"
   run_simple(cmd)
-  create_file(file_name, stdout_from(cmd), true)
+  _create_file(file_name, stdout_from(cmd), true)
 end
 
 Given /^I replace "([^"]*)" in "([^"]*)" with:$/ do |marker, file_name, new_text|
@@ -62,7 +72,7 @@ Given /^I replace "([^"]*)" in "([^"]*)" with:$/ do |marker, file_name, new_text
       line
     end
   end
-  create_file(file_name, new_content, true)
+  _create_file(file_name, new_content, true)
 end
 
 

data/features/support/Gemfile-rails2

@@ -0,0 +1,12 @@
+source :rubygems
+
+gem "rake"
+gem "rails", '2.3.10'
+gem "cucumber", "0.10.0"
+gem "cucumber-rails"
+gem "capybara", '~> 0.3.8'
+gem "aruba", "0.3.2"
+gem "rspec", "~> 2.3.0"
+gem "sqlite3-ruby"
+gem "database_cleaner"
+# gem "code_buddy", :path => File.expand_path("../../..", __FILE__)

data/features/support/Gemfile-rails2.lock

@@ -0,0 +1,87 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.10)
+      actionpack (= 2.3.10)
+    actionpack (2.3.10)
+      activesupport (= 2.3.10)
+      rack (~> 1.1.0)
+    activerecord (2.3.10)
+      activesupport (= 2.3.10)
+    activeresource (2.3.10)
+      activesupport (= 2.3.10)
+    activesupport (2.3.10)
+    aruba (0.3.2)
+      childprocess (~> 0.1.6)
+      cucumber (~> 0.10.0)
+      rspec (~> 2.3.0)
+    builder (3.0.0)
+    capybara (0.3.9)
+      culerity (>= 0.2.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (>= 0.0.3)
+    childprocess (0.1.6)
+      ffi (~> 0.6.3)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.3.2)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    cucumber-rails (0.3.2)
+      cucumber (>= 0.8.0)
+    culerity (0.2.14)
+    database_cleaner (0.6.0)
+    diff-lcs (1.1.2)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    gherkin (2.3.3)
+      json (~> 1.4.6)
+    json (1.4.6)
+    json_pure (1.4.6)
+    mime-types (1.16)
+    nokogiri (1.4.4)
+    rack (1.1.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (2.3.10)
+      actionmailer (= 2.3.10)
+      actionpack (= 2.3.10)
+      activerecord (= 2.3.10)
+      activeresource (= 2.3.10)
+      activesupport (= 2.3.10)
+      rake (>= 0.8.3)
+    rake (0.8.7)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.1.2)
+      childprocess (~> 0.1.5)
+      ffi (~> 0.6.3)
+      json_pure
+      rubyzip
+    sqlite3-ruby (1.3.2)
+    term-ansicolor (1.0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba (= 0.3.2)
+  capybara (~> 0.3.8)
+  cucumber (= 0.10.0)
+  cucumber-rails
+  database_cleaner
+  rails (= 2.3.10)
+  rake
+  rspec (~> 2.3.0)
+  sqlite3-ruby

data/features/support/Gemfile-rails3

@@ -0,0 +1,7 @@
+source :rubygems
+
+gem "rake"
+gem "rails", '3.0.3'
+gem "cucumber", "0.10.0"
+gem "aruba", "0.3.2"
+gem "rspec", "~> 2.3.0"

data/features/support/Gemfile-rails3.lock

@@ -0,0 +1,102 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    arel (2.0.6)
+    aruba (0.3.2)
+      childprocess (~> 0.1.6)
+      cucumber (~> 0.10.0)
+      rspec (~> 2.3.0)
+    builder (2.1.2)
+    childprocess (0.1.6)
+      ffi (~> 0.6.3)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.3.2)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    gherkin (2.3.3)
+      json (~> 1.4.6)
+    i18n (0.5.0)
+    json (1.4.6)
+    mail (2.2.14)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+    term-ansicolor (1.0.5)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba (= 0.3.2)
+  cucumber (= 0.10.0)
+  rails (= 3.0.3)
+  rake
+  rspec (~> 2.3.0)

data/features/support/env.rb

@@ -4,6 +4,6 @@ require 'rspec/expectations'
 require 'aruba/cucumber'
 
 Before do
-  unset_bundler_env_vars
+  @aruba_timeout_seconds = 120
 end
 

data/features/templates/rails_exception.feature.template

@@ -4,5 +4,5 @@ Feature: Ensure CodeBuddy creates links in a Rails app
 Scenario: Clicking on a line of a stack trace on the exception page
    When I go to the users page
    Then I should see "app/views/users/index.html.erb:1"
-    And I follow "app/views/users/index.html.erb:1"
+    And I am on code_buddy
    Then I should see "CodeBuddySee your Ruby stack come alive"

data/lib/code_buddy.rb

@@ -8,6 +8,9 @@ require 'code_buddy/stack'
 require 'code_buddy/stack_frame'
 require 'code_buddy/middleware'
 
+module CodeBuddy
+end
+
 begin
   if Rails.env.development? || Rails.env.test?
     case Rails::VERSION::MAJOR
@@ -19,6 +22,4 @@ begin
   end
 rescue NameError
   nil
-end
-
-# CodeBuddy::App.run!
+end

data/lib/code_buddy/app.rb

@@ -1,8 +1,8 @@
 module CodeBuddy
   class App < Sinatra::Base
-    set :views,  File.dirname(__FILE__) + '/views'
-    set :public, File.dirname(__FILE__) + '/public'
-
+    set :views,  File.expand_path(File.dirname(__FILE__) + '/views')
+    set :public, File.expand_path(File.dirname(__FILE__) + '/public')
+    
     class << self
       attr_reader   :stack
       attr_accessor :path_prefix
@@ -44,12 +44,8 @@ module CodeBuddy
 
     def display_stack(selected_param)
       @stack = self.class.stack
-      if @stack
-        @stack.selected = selected_param
-        erb :index
-      else
-        redirect "#{path_prefix}/new"
-      end
+      @stack.selected = selected_param if @stack
+      erb :index
     end
 
     def path_prefix

data/lib/code_buddy/public/javascripts/code_buddy.js

@@ -1,6 +1,4 @@
 var CodeBuddy = {
-  stack     : null,
-  stackView : null,
   backbone  : {}
 }
 
@@ -55,11 +53,11 @@ CodeBuddy.backbone.Stack = Backbone.Model.extend({
   selectionChanged: function(x) {
     this.addresses().at(x.previousAttributes().selected).view.render()
     this.addresses().at(x.changedAttributes().selected).view.render()
-    this.view.render()
+    CodeBuddy.codeView.render()
   },
 
   toggleBookmark: function() {
-    this.selectedAddress().set({bookmarked:!this.get('bookmarked')})
+    this.selectedAddress().set({bookmarked:!this.selectedAddress().get('bookmarked')})
     this.selectedAddress().view.render();
   },
 
@@ -158,33 +156,102 @@ CodeBuddy.backbone.StackView = Backbone.View.extend({
   addOneAddress: function(address, index) {
     var view = new CodeBuddy.backbone.AddressView({model: address});
     this.$("#stack").append(view.render().el);
-  },
+  }
+})
 
+CodeBuddy.backbone.CodeView = Backbone.View.extend({
+  el:$("#code-viewer"),
+  
+  initialize: function() {
+    _.bindAll(this, 'toggleCommands','increaseOpacity', 'decreaseOpacity', 'toggle')
+    this.code = this.$("#code")
+    this.current = this.$("#current")
+    this.opacity = parseFloat(this.el.css("opacity"))
+  },
+  
   render: function() {
-    $('#code').html(this.model.selectedAddress().get('code'))
+    this.current.html('<div>' + CodeBuddy.stack.selectedAddress().get('path') + '</div>')
+    this.code.html(CodeBuddy.stack.selectedAddress().get('code'))
   },
-
-  toggleCodeWindow: function() {
-	$('#code').toggle()
+  
+  toggleCommands: function() {
+    this.$("#legend").toggle()
+  },
+  
+  toggle: function() {
+	  this.el.toggle()
   },
 
   editCode: function() {
-	$.get('../edit/' + CodeBuddy.stack.get('selected'))
+	  $.get('../edit/' + CodeBuddy.stack.get('selected'))
+  },
+  
+  setOpacity: function(newOpacity) {
+    if(newOpacity < 0) newOpacity = 0;
+    if(newOpacity > 1) newOpacity = 1;
+    this.el.css("opacity", newOpacity);
+    this.opacity = newOpacity;
+  },
+  
+  increaseOpacity: function() {
+    this.setOpacity(this.opacity + 0.1)
+  },
+  
+  decreaseOpacity: function() {
+    this.setOpacity(this.opacity - 0.1)
+  }
+})
+
+CodeBuddy.backbone.FormView = Backbone.View.extend({
+  el:$(".form"),
+  
+  initialize: function() {
+    _.bindAll(this, 'show', 'hide')
+    this.el.find('textarea').bind('keydown', 'esc', this.hide)
+  },
+  
+  show: function(){
+    this.el.show();
+    $("#code-viewer").hide()
+    this.el.find("textarea").focus()
+    return false;
+  },
+  
+  hide: function(){
+    this.el.hide();
+    $("#code-viewer").show()
+    return false;
   }
 })
 
-CodeBuddy.setKeyBindings = function(){
-  $(document).bind('keydown', 'up',   CodeBuddy.stackView.selectPrevious)
-  $(document).bind('keydown', 'down', CodeBuddy.stackView.selectNext)
-  $(document).bind('keydown', 'a',    CodeBuddy.stack.toggleBookmark)
-  $(document).bind('keydown', 's',    CodeBuddy.stack.selectNextBookmark)
-  $(document).bind('keydown', 'h',    CodeBuddy.stackView.toggleCodeWindow)
-  $(document).bind('keydown', 'e',    CodeBuddy.stackView.editCode)
+CodeBuddy.setStackKeyBindings = function(){
+  $(document).bind('keydown', 'up',         CodeBuddy.stackView.selectPrevious)
+  $(document).bind('keydown', 'down',       CodeBuddy.stackView.selectNext)
+  $(document).bind('keydown', 'right',      CodeBuddy.codeView.increaseOpacity)
+  $(document).bind('keydown', 'left',       CodeBuddy.codeView.decreaseOpacity)
+  $(document).bind('keydown', 'a',          CodeBuddy.stack.toggleBookmark)
+  $(document).bind('keydown', 's',          CodeBuddy.stack.selectNextBookmark)
+  $(document).bind('keydown', 'h',          CodeBuddy.codeView.toggle)
+  $(document).bind('keydown', 'e',          CodeBuddy.codeView.editCode)
+}
+
+CodeBuddy.setGlobalKeyBindings = function(){
+  $(document).bind('keydown', 'n',   CodeBuddy.form.show)
+  $(document).bind('keydown', 'esc', CodeBuddy.codeView.toggleCommands)
 }
 
 CodeBuddy.setup = function(stackJson) {
-  this.stack = new this.backbone.Stack(stackJson);
-  this.stackView = new this.backbone.StackView({model: this.stack});
-  this.stackView.render();
-  this.setKeyBindings();
+  CodeBuddy.form = new CodeBuddy.backbone.FormView
+  
+  if(stackJson) {
+    this.stack = new this.backbone.Stack(stackJson);
+    this.stackView = new this.backbone.StackView({model: this.stack});
+    this.codeView = new this.backbone.CodeView();
+    this.codeView.render();
+    this.setStackKeyBindings();
+    CodeBuddy.form.hide()
+  } else {
+    CodeBuddy.form.show()
+  }
+  CodeBuddy.setGlobalKeyBindings()
 }

data/lib/code_buddy/public/stylesheets/code_buddy.css

@@ -47,26 +47,46 @@ a {
   font-size:0.85em;
 }
 
-#legend {
-  top:100;
-  font-size: 0.8em;
-  z-index:10;
+#code-viewer {
   position: fixed;
-  padding: 5px;
-  background-color: #222222;
+  top:110;
+  width:80%;
+  opacity:0.9;
+  z-index:10;
+  margin-left:10px;
 }
+
 #code {
   min-height: 340px;
-  border-style: ridge;
-  border-color: #666666;
+  border:2px solid #666;
+  border-radius:5px;
+  -moz-border-radius:5px;
+  padding:5px;
   background-color: black;
-  position: fixed;
-  top:200;
-  width:80%;
-  opacity:0.8;
-  z-index:10;
   white-space: pre;
 }
+
+#legend {
+  top:100;
+  font-size: 0.8em;
+  z-index:10;
+  padding: 5px;
+  background: #222;
+  -webkit-border-bottom-right-radius: 5px;
+  -webkit-border-bottom-left-radius: 5px;
+  -moz-border-radius-bottomright: 5px;
+  -moz-border-radius-bottomleft: 5px;
+  border-bottom-right-radius: 5px;
+  border-bottom-left-radius: 5px;
+}
+#legend ul {
+  margin:0;
+}
+#legend li {
+  padding:0;
+}
+
+
 #selected_line {
   border-style: ridge;
   border-color: #666666;
@@ -105,11 +125,35 @@ li {
   list-style: none;
 }
 
-li:hover {
+#stack li:hover {
   background:#444;
   cursor:pointer;
 }
 
 .bookmarked {
   background:#666;
+}
+
+#opacity {
+  width:25px;
+}
+
+#current {
+  white-space:nowrap;
+  background:#222;
+  color:white;
+  font-weight:bold;
+  text-align:right;
+  overflow:hidden;
+  padding:4px;
+  -webkit-border-top-left-radius: 5px;
+  -webkit-border-top-right-radius: 5px;
+  -moz-border-radius-topleft: 5px;
+  -moz-border-radius-topright: 5px;
+  border-top-left-radius: 5px;
+  border-top-right-radius: 5px;
+}
+
+#current div {
+  float:right;
 }

data/lib/code_buddy/server.rb

@@ -0,0 +1,44 @@
+module CodeBuddy
+  module Server
+    class << self
+      
+      def start
+        if running?
+          puts "Code Buddy is already running."
+          exit
+        else
+          Daemons.daemonize(:app_name => "code_buddy_server")
+          CodeBuddy::App.run! :host => 'localhost'
+        end
+      end
+      
+      def stop
+        if process_line = running?
+          pid = process_line.split[1]
+          Process.kill("TERM", pid.to_i)
+        else
+          puts "Code Buddy is not running."
+          exit
+        end
+      end
+      
+      def update(stack_string)
+        require 'net/http'
+        require 'uri'
+        require 'launchy'
+        
+        if running?
+          Net::HTTP.post_form(URI.parse('http://localhost:4567/new'), {"stack" => stack_string})
+        else
+          CodeBuddy::App.stack_string = stack_string
+          start
+        end
+        Launchy.open("http://localhost:4567/stack/0")
+      end
+      
+      def running?
+        `lsof -i :4567`.split("\n").find{|process_line| process_line =~ /ruby/}
+      end
+    end
+  end
+end

data/lib/code_buddy/version.rb

@@ -1,3 +1,3 @@
 module CodeBuddy
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/lib/code_buddy/views/form.erb

@@ -4,7 +4,7 @@
   <%= erb :banner %>
   <div class="form">
     Paste your stack:
-    <form method="post">
+    <form method="post" action="/new">
       <textarea name="stack" rows="40" cols="130" class="stack_form"></textarea><br/>
       <input type="submit" value="submit"/>
     </form>

data/lib/code_buddy/views/index.erb

@@ -2,19 +2,37 @@
 <html>
 <body>
   <%= erb :banner %>
-  <br/>
-  <div id="legend">
-    commands:<br/>
-    &#8593; move up the stack<br/>
-    &#8595; move down the stack<br/>
-    click to select a stack frame<br/>
+  <div class="form">
+    Paste your stack:
+    <form method="post" action="/new">
+      <textarea name="stack" rows="40" cols="130" class="stack_form"></textarea><br/>
+      <input type="submit" value="submit"/>
+    </form>
+  </div>  
+  <ul id="stack"></ul>
+  <div id="code-viewer">
+    <div id="current"></div>
+    <div id="code"></div>
+    <div id="legend">
+      commands:
+      <ul>
+        <li>&#8593; move up the stack</li>
+        <li>&#8595; move down the stack</li>
+        <li>n new stack trace</li>
+        <li>e open current frame in editor</li>
+        <li>&larr; decrease opacity</li>
+        <li>&rarr; increase opacity</li>
+        <li>h show/hide code window</li>
+        <li>a toggle bookmark</li>
+        <li>s next book mark</li>
+        <li>esc show/hide this legend</li>
+        <li>click to select a stack frame</li>
+      </ul>
+    </div>
   </div>
-</div>
-<ul id="stack"></ul>
-<div id='code'></div>
-<script src="<%= @static_file_prefix  %>javascripts/code_buddy.js" type="text/javascript"></script>
-<script>
-  CodeBuddy.setup(<%= @stack.to_json %>)
-</script>
+  <script src="<%= @static_file_prefix  %>javascripts/code_buddy.js" type="text/javascript"></script>
+  <script>
+    CodeBuddy.setup(<%= @stack.to_json if @stack %>)
+  </script>
 </body>
 </html>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: code_buddy
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Pat Shaughnessy, Alex Rothenberg, Daniel Higginbotham
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 -05:00
+date: 2011-01-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,9 +81,37 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: daemons
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: launchy
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,27 +123,27 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 2
-        - 2
+        - 3
         - 0
-        version: 2.2.0
+        version: 2.3.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -127,39 +155,53 @@ dependencies:
         - 10
         version: 0.9.10
   type: :development
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 55
         segments: 
         - 0
-        - 9
-        - 4
-        version: 0.9.4
+        - 10
+        - 0
+        version: 0.10.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: aruba
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 23
         segments: 
         - 0
+        - 3
         - 2
-        - 2
-        version: 0.2.2
+        version: 0.3.2
   type: :development
-  version_requirements: *id009
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id012
 description: See the Ruby code running in your app.
 email: 
 - pat@patshaughnessy.net, alex@alexrothenberg.com, daniel@flyingmachinestudios.com
@@ -179,10 +221,15 @@ files:
 - Rakefile
 - bin/code_buddy
 - code_buddy.gemspec
+- features/command_line.feature
 - features/rails2_app.feature
 - features/rails3_app.feature
 - features/sinatra.feature
 - features/step_definitions/rails_setup_steps.rb
+- features/support/Gemfile-rails2
+- features/support/Gemfile-rails2.lock
+- features/support/Gemfile-rails3
+- features/support/Gemfile-rails3.lock
 - features/support/env.rb
 - features/templates/rails_exception.feature.template
 - features/templates/sinatra_env.rb.template
@@ -217,6 +264,7 @@ files:
 - lib/code_buddy/rails3/templates/rescues/routing_error.erb
 - lib/code_buddy/rails3/templates/rescues/template_error.erb
 - lib/code_buddy/rails3/templates/rescues/unknown_action.erb
+- lib/code_buddy/server.rb
 - lib/code_buddy/stack.rb
 - lib/code_buddy/stack_frame.rb
 - lib/code_buddy/version.rb
@@ -264,10 +312,15 @@ signing_key:
 specification_version: 3
 summary: See the Ruby code running in your app.
 test_files: 
+- features/command_line.feature
 - features/rails2_app.feature
 - features/rails3_app.feature
 - features/sinatra.feature
 - features/step_definitions/rails_setup_steps.rb
+- features/support/Gemfile-rails2
+- features/support/Gemfile-rails2.lock
+- features/support/Gemfile-rails3
+- features/support/Gemfile-rails3.lock
 - features/support/env.rb
 - features/templates/rails_exception.feature.template
 - features/templates/sinatra_env.rb.template