Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,10 @@ source 'http://rubygems.org'

gem 'rake'
gem 'rspec'
gem 'superfight', github: "RubyoffRails/superfight"
gem 'superfight', github: "var114/superfight"
gem 'abtvar', "~>0.1", github: "var114/abtvar"
gem 'adventure', "~>0.1", github: "var114/adventure"
gem 'pg'

gem 'sinatra'
gem 'sinatra-contrib'
61 changes: 49 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,27 +1,64 @@
GIT
remote: git://github.com/RubyoffRails/superfight.git
revision: 75a5c4f724284ade4132f0a84acf3b2a8e126fcd
remote: git://github.com/var114/abtvar.git
revision: b837e35cfbbe7aa0a57e15443dadc72e7bfe6b9d
specs:
abtvar (0.1.0)

GIT
remote: git://github.com/var114/adventure.git
revision: 2e850eabf0602b4987b36b8dcba3ab91a0d4992d
specs:
adventure (0.1.0)

GIT
remote: git://github.com/var114/superfight.git
revision: 46e886c42da216d8b3fa0478a499428d0ae7c9c1
specs:
superfight (0.0.1)

GEM
remote: http://rubygems.org/
specs:
diff-lcs (1.1.3)
rake (0.9.2.2)
rspec (2.10.0)
rspec-core (~> 2.10.0)
rspec-expectations (~> 2.10.0)
rspec-mocks (~> 2.10.0)
rspec-core (2.10.0)
rspec-expectations (2.10.0)
diff-lcs (~> 1.1.3)
rspec-mocks (2.10.1)
backports (3.3.5)
diff-lcs (1.2.5)
multi_json (1.8.2)
pg (0.17.0)
rack (1.5.2)
rack-protection (1.5.1)
rack
rack-test (0.6.2)
rack (>= 1.0)
rake (10.1.0)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.7)
rspec-expectations (2.14.4)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.4)
sinatra (1.4.4)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
sinatra-contrib (1.4.2)
backports (>= 2.0)
multi_json
rack-protection
rack-test
sinatra (~> 1.4.0)
tilt (~> 1.3)
tilt (1.4.1)

PLATFORMS
ruby

DEPENDENCIES
abtvar (~> 0.1)!
adventure (~> 0.1)!
pg
rake
rspec
sinatra
sinatra-contrib
superfight!
29 changes: 16 additions & 13 deletions niner.rb
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
require 'rubygems'
require 'bundler/setup'

Bundler.require
require 'sinatra'
require 'sinatra/reloader'

Bundler.require

enable :session

x = Abtvar::Bio.new
puts x.awesome_reply


get '/' do
session[:about] = Abtvar::Bio.new
@random_answer = session[:about].awesome_reply
erb :about
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think this will work? I don't see the about.erb anywhere for this to render thoughts?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry jesse,
the holidays are making me clumsy…I forgot to do a last repo update. now I have a layout.erb and about.erb in my views folder.
On Jan 2, 2014, at 10:28 AM, Jesse Wolgamott [email protected] wrote:

In niner.rb:

-Bundler.require
+require 'sinatra'
+require 'sinatra/reloader'
+
+Bundler.require
+
+enable :session
+
+x = Abtvar::Bio.new
+puts x.awesome_reply
+
+

  • get '/' do
  • session[:about] = Abtvar::Bio.new
  • @random_answer = session[:about].awesome_reply
  • erb :about
    Do you think this will work? I don't see the about.erb anywhere for this to render thoughts?


Reply to this email directly or view it on GitHub.

end

puts "--------------------------------"
puts "welcome to the superfight"
puts "--------------------------------"
puts ""
puts ""
puts ""

puts "What is your first fighter's name?"
fighter_a = $stdin.gets
puts "What is your second fighter's name?"
fighter_b = $stdin.gets

match = Match.new(Fighter.new(fighter_a), Fighter.new(fighter_b))

puts "The winner of match is ....... #{match.winner.name}"
6 changes: 3 additions & 3 deletions spec/sanity_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
describe "Sanity" do
it "should be false" do

it "should be false" do
false.should be_false
end

end
end