summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorazul <azul@leap.se>2014-07-03 11:25:28 +0200
committerazul <azul@leap.se>2014-07-03 11:25:28 +0200
commit68d8dfcd78147e8397a4decfac3528c90e5c65eb (patch)
tree3315960eaf5ed4b5849b62923cac3e0e4de1a057
parentc4f89692beeb98afaf61f5da8027236a10f1e440 (diff)
parent96002fcc0d7dacb6e0ff2dc3382787985da42088 (diff)
Merge pull request #18 from azul/feature/recover-from-invalid-seq
Recover from invalid sequence file
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock6
-rw-r--r--tapicero.gemspec2
-rw-r--r--test/integration/actions_test.rb2
4 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index e5709fa..d514230 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,4 +11,4 @@ gemspec
# your gem to rubygems.org.
# To use debugger
-# gem 'ruby-debug'
+# gem 'debugger'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4982088..5690ee8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,7 +3,7 @@ PATH
specs:
tapicero (0.4.0)
couchrest (~> 1.1.3)
- couchrest_changes (~> 0.0.5)
+ couchrest_changes (~> 0.1.0)
daemons
syslog_logger (~> 2.0.0)
yajl-ruby (~> 1.1.0)
@@ -15,7 +15,7 @@ GEM
mime-types (~> 1.15)
multi_json (~> 1.0)
rest-client (~> 1.6.1)
- couchrest_changes (0.0.5)
+ couchrest_changes (0.1.0)
couchrest (~> 1.1.3)
syslog_logger (~> 2.0.0)
yajl-ruby
@@ -26,7 +26,7 @@ GEM
minitest (3.2.0)
mocha (0.14.0)
metaclass (~> 0.0.1)
- multi_json (1.8.4)
+ multi_json (1.10.1)
rake (10.1.0)
rest-client (1.6.7)
mime-types (>= 1.16)
diff --git a/tapicero.gemspec b/tapicero.gemspec
index a112a11..568ece6 100644
--- a/tapicero.gemspec
+++ b/tapicero.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
s.executables << 'tapicero'
s.add_dependency "couchrest", "~> 1.1.3"
- s.add_dependency "couchrest_changes", "~> 0.0.5"
+ s.add_dependency "couchrest_changes", "~> 0.1.0"
s.add_dependency "daemons"
s.add_dependency "yajl-ruby", "~> 1.1.0"
s.add_dependency "syslog_logger", "~> 2.0.0"
diff --git a/test/integration/actions_test.rb b/test/integration/actions_test.rb
index 88e3715..6576b87 100644
--- a/test/integration/actions_test.rb
+++ b/test/integration/actions_test.rb
@@ -1,6 +1,6 @@
require_relative '../test_helper.rb'
-class TapiceroTest < Tapicero::IntegrationTest
+class ActionsTest < Tapicero::IntegrationTest
def setup
create_user