Merge branch 'master' into joefiorini/master

Conflicts: cucumber.gemspec lib/cucumber/formatter/ansicolor.rb
cucumber · Mar 3, 2012 · 0ca21e8 · 0ca21e8
2 parents bad2318 + 374df2a
commit 0ca21e8
Show file tree

Hide file tree

Showing 160 changed files with 3,855 additions and 1,633 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 .bundle
-Gemfile.lock
 nbproject
 coverage
 pkg
@@ -23,3 +22,6 @@ rerun.txt
 ._*
 .rvmrc
 .sass-cache
+doc/
+*.tgz
+Gemfile.lock
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "features/cucumber-features"]
+	path = features/cucumber-features
+	url = https://github.com/cucumber/cucumber-features
diff --git a/.rspec b/.rspec
@@ -1 +1 @@
---color
+--color --backtrace
diff --git a/.rvmrc b/.rvmrc
@@ -1 +1 @@
-rvm @cucumber --create
+rvm gemset use cucumber
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,13 @@
+rvm: 
+  - 1.9.3
+  - 1.9.2
+# whitelist
+branches:
+  only:
+    - master
+
+notifications:
+  email:
+    - cukes-devs@googlegroups.com
+  irc:
+    - "irc.freenode.org#cucumber"
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,4 @@
 source "http://rubygems.org"
-
-group :development do
-  # gem 'gherkin', :path => '../gherkin'
-end
-
 gemspec
+
+# gem 'gherkin', :path => '../gherkin'