Merge c4bcf4e into 22346e7

iconara · Oct 15, 2013 · 471b295 · 471b295
2 parents 22346e7 + c4bcf4e
commit 471b295
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 111 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 /doc
 /.yardoc
 /pkg
-/coverage
+/coverage
+Gemfile.lock
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.0.0
+2.0.0-p247
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/etcd-rb.gemspec b/etcd-rb.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.bindir        = 'bin'
 
   s.add_dependency 'httpclient', '~> 2.3.0'
-  s.add_dependency 'multi_json', '~> 1.7.0'
+  s.add_dependency 'multi_json', '~> 1.7'
 
   s.platform = Gem::Platform::RUBY
   s.required_ruby_version = '>= 1.9.3'

diff --git a/sh/install-etcd.sh b/sh/install-etcd.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Exit if any error is encountered:
+set -o errexit
+
 # https://go.googlecode.com/files/go1.1.2.linux-386.tar.gz
 # https://go.googlecode.com/files/go1.1.2.darwin-amd64.tar.gz
 # uname -m (x86_64/386)

diff --git a/sh/test b/sh/test
@@ -1 +1 @@
-COVERAGE=no rspec
+COVERAGE=no bundle exec rspec