taps 0.3.23 → 0.3.24

data/VERSION.yml

@@ -2,4 +2,4 @@
 :build:
 :major: 0
 :minor: 3
-:patch: 23
+:patch: 24

data/lib/taps/cli.rb

@@ -7,6 +7,7 @@ require 'vendor/okjson'
 
 Taps::Config.taps_database_url = ENV['TAPS_DATABASE_URL'] || begin
   # this is dirty but it solves a weird problem where the tempfile disappears mid-process
+  require 'sqlite3'
   $__taps_database = Tempfile.new('taps.db')
   $__taps_database.open()
   "sqlite://#{$__taps_database.path}"

data/lib/taps/config.rb

@@ -1,5 +1,4 @@
 require 'sequel'
-require 'sqlite3'
 require 'taps/version'
 
 Sequel.datetime_class = DateTime

data/lib/taps/server.rb

@@ -38,12 +38,19 @@ class Server < Sinatra::Base
   end
 
   before do
-    major, minor, patch = request.env['HTTP_TAPS_VERSION'].split('.') rescue []
-    unless "#{major}.#{minor}" == Taps.compatible_version && patch.to_i >= 22
-      halt 417, "Taps >= v#{Taps.compatible_version}.22 is required for this server"
+    unless request.path_info == '/health'
+      major, minor, patch = request.env['HTTP_TAPS_VERSION'].split('.') rescue []
+      unless "#{major}.#{minor}" == Taps.compatible_version && patch.to_i >= 23
+        halt 417, "Taps >= v#{Taps.compatible_version}.22 is required for this server"
+      end
     end
   end
 
+  get '/health' do
+    content_type 'application/json'
+    OkJson.encode({ :ok => true })
+  end
+
   get '/' do
     "hello"
   end

data/spec/server_spec.rb

@@ -31,5 +31,10 @@ describe Taps::Server do
     get('/', { }, { 'HTTP_AUTHORIZATION' => @auth_header, 'HTTP_TAPS_VERSION' => '0.0.1' })
     last_response.status.should == 417
   end
+
+  it "allows healthcheck to be accessed w/o HTTP_TAPS_VERSION" do
+    get('/health', { }, { 'HTTP_AUTHORIZATION' => @auth_header })
+    last_response.status.should == 200
+  end
 end
 

metadata

@@ -1,196 +1,188 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: taps
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.24
   prerelease: 
-  version: 0.3.23
 platform: ruby
-authors: 
+authors:
 - Ricardo Chimal, Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-07 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &11641340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *11641340
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &11640820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.0
     - - <
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sequel
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *11640820
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: &11716480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.20.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *11716480
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &11716020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *11716020
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &11715560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.2"
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: bacon
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *11715560
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: &11715180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *11715180
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &11714720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *11714720
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &11714300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *11714300
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &11713880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *11713880
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &11713460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-description: A simple database agnostic import/export app to transfer data to/from a remote database.
+  prerelease: false
+  version_requirements: *11713460
+description: A simple database agnostic import/export app to transfer data to/from
+  a remote database.
 email: ricardo@heroku.com
-executables: 
+executables:
 - taps
 - schema
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- bin/taps
 - bin/schema
 - bin/schema.cmd
-- bin/taps
-- lib/taps/chunksize.rb
-- lib/taps/cli.rb
-- lib/taps/config.rb
-- lib/taps/data_stream.rb
-- lib/taps/db_session.rb
-- lib/taps/errors.rb
-- lib/taps/log.rb
+- spec/chunksize_spec.rb
+- spec/operation_spec.rb
+- spec/server_spec.rb
+- spec/cli_spec.rb
+- spec/data_stream_spec.rb
+- spec/base.rb
+- spec/utils_spec.rb
+- README.rdoc
 - lib/taps/monkey.rb
-- lib/taps/multipart.rb
+- lib/taps/utils.rb
 - lib/taps/operation.rb
-- lib/taps/progress_bar.rb
+- lib/taps/chunksize.rb
+- lib/taps/data_stream.rb
+- lib/taps/cli.rb
 - lib/taps/schema.rb
+- lib/taps/log.rb
+- lib/taps/db_session.rb
 - lib/taps/server.rb
-- lib/taps/utils.rb
+- lib/taps/progress_bar.rb
+- lib/taps/multipart.rb
+- lib/taps/errors.rb
+- lib/taps/config.rb
 - lib/taps/version.rb
 - lib/vendor/okjson.rb
-- README.rdoc
-- spec/base.rb
-- spec/chunksize_spec.rb
-- spec/cli_spec.rb
-- spec/data_stream_spec.rb
-- spec/operation_spec.rb
-- spec/server_spec.rb
-- spec/utils_spec.rb
 - VERSION.yml
-has_rdoc: true
 homepage: http://github.com/ricardochimal/taps
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: simple database import/export app
 test_files: []
-