Update gitignore and set default ruby version.

Also merged pull requests cardmagic#7, cardmagic#12 and cardmagic#13 from upstream repository.
driv3r · Sep 16, 2013 · dfea096 · dfea096
1 parent b489785
commit dfea096
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,27 @@
+# bundler state
+/.bundle
+/vendor/bundle/
+
+# various artifacts
+**.war
+*.rbc
+/coverage.data
+/coverage/
+
+# scm revert files
+**.orig
+
+# Mac finder artifacts
 .DS_Store
+
+# Netbeans project directory
+/nbproject/
+
+# RubyMine project files
+.idea
+
+# Textmate project files
+/*.tmproj
+
+# vim artifacts
+**.swp
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+2.0.0