ricardochimal · joelvh · Oct 21, 2013 · Jul 12, 2013 · Oct 21, 2013 · Oct 21, 2013
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,7 @@
 *.db
 .bundle
 pkg
-taps-*.gem
+taps*.gem
+Gemfile.lock
+*.dat
+rdoc/
diff --git a/Gemfile b/Gemfile
@@ -1,15 +1,8 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 # load the gem's dependencies
 gemspec
 
-# server-specific dependencies
-group :server do
-  gem "hoptoad_notifier"
-  gem "extlib", "0.9.15"
-  gem "mysql",  "2.8.1"
-  gem "mysql2", "0.2.6"
-  gem "pg",     "0.9.0"
-  gem "thin",   "> 1.2.0"
-end
-
+# gem 'mysql',  '>= 2.8.1'
+gem 'mysql2', '>= 0.2.6'
+gem 'pg',     '>= 0.9.0'
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/README.md b/README.md
@@ -0,0 +1,105 @@
+# Taps (2) -- simple database import/export app
+
+A simple database agnostic import/export app to transfer data to/from a remote database.
+
+*Forked and updated* with fixes and improvements. Integrates fixes and updates from [taps-taps](https://github.com/wijet/taps) and [tapsicle](https://github.com/jiffyondemand/tapsicle) forks.
+
+## Installation
+
+Renamed gem
+
+    $ gem install taps2
+
+By default, Taps will attempt to create a SQLite3 database for sessions. Unless you specify a different database type, you'll need to install SQLite3. (See _Environment Variables_ for alternative session databases.)
+
+    $ gem install sqlite3
+
+Install the gems to support databases you want to work with, such as MySQL or PostgreSQL.
+
+    $ gem install mysql2
+    $ gem install pg
+
+## Configuration: Environment Variables
+
+_All environment variables are optional._
+
+The `TAPS_DATABASE_URL` variable specifies the database URI where session data is stored on CLI or Server.
+The `DATABASE_URL` variable is a fallback (and compatible with Heroku) if `TAPS_DATABASE_URL` is not specified.
+By default, Taps will create a SQLite3 database.
+
+The `TAPS_LOGIN` and `TAPS_PASSWORD` variables are used for default Basic Authentication.
+
+The `TAPS_YAML_ENGINE` variable lets you specify a YAML engine such as "psych".
+
+The `NO_DEFAULT_DATABASE_URL` variable allows you to require a database URI be sent in the `body` of the request that initiates a Taps session. (Default behavior will use the database URI specified when starting the server.)
+
+The `NO_DUMP_MARSHAL_ERRORS` variable allows you to disable dumping of marshalled data that caused an error.
+
+The `NO_DEFLATE` variable allows you to disable gzip compression (`Rack::Deflater`) on the server.
+
+## Usage: Server
+
+Here's how you start a taps server
+
+    $ taps2 server postgres://localdbuser:localdbpass@localhost/dbname httpuser httppassword
+
+You can also specify an encoding in the database url
+
+    $ taps2 server mysql://localdbuser:localdbpass@localhost/dbname?encoding=latin1 httpuser httppassword
+
+## Usage: Client
+
+When you want to pull down a database from a taps server
+
+    $ taps2 pull postgres://dbuser:dbpassword@localhost/dbname http://httpuser:httppassword@example.com:5000
+
+or when you want to push a local database to a taps server
+
+    $ taps2 push postgres://dbuser:dbpassword@localhost/dbname http://httpuser:httppassword@example.com:5000
+
+or when you want to transfer a list of tables
+
+    $ taps2 push postgres://dbuser:dbpassword@localhost/dbname http://httpuser:httppassword@example.com:5000 --tables logs,tags
+
+or when you want to transfer tables that start with a word
+
+    $ taps2 push postgres://dbuser:dbpassword@localhost/dbname http://httpuser:httppassword@example.com:5000 --filter '^log_'
+
+## Troubleshooting
+
+* "Error: invalid byte sequence for encoding" can be resolved by adding `encoding` to database URI (https://github.com/ricardochimal/taps/issues/110)
+  * *Example:* `taps2 server mysql://root@localhost/example_database?encoding=UTF8 httpuser httppassword`
+* SQLite3 database URI may require three slashes (e.g. `sqlite3:///path/to/file.db`)
+  * Make sure to use an absolute/full path to the file on the server
+
+## Known Issues
+
+* Foreign key constraints get lost in the schema transfer
+* Indexes may drop the "order" (https://github.com/ricardochimal/taps/issues/111)
+* String fields with only numbers may get parsed as a number and lose leading zeros or add decimals (https://github.com/ricardochimal/taps/issues/106)
+* Tables without primary keys will be incredibly slow to transfer. This is due to it being inefficient having large offset values in queries.
+* Multiple schemas are currently not supported (https://github.com/ricardochimal/taps/issues/97)
+* Taps does not drop tables when overwriting database (https://github.com/ricardochimal/taps/issues/94)
+* Oracle database classes not fully supported (https://github.com/ricardochimal/taps/issues/89)
+* Some blank default values may be converted to NULL in MySQL table schemas (https://github.com/ricardochimal/taps/issues/88)
+* Conversion of column data types can cause side effects when going from one database type to another
+  * MySQL `bigint` converts to PostgreSQL `string` (https://github.com/ricardochimal/taps/issues/77)
+* Passwords in database URI can cause issues with special characters (https://github.com/ricardochimal/taps/issues/74)
+
+## Feature Requests
+
+* Allow a single Taps server to serve data from different databases (https://github.com/ricardochimal/taps/issues/103)
+
+## Meta
+
+Maintained by [Joel Van Horn](http://github.com/joelvh)
+
+Written by Ricardo Chimal, Jr. (ricardo at heroku dot com) and Adam Wiggins (adam at heroku dot com)
+
+Early research and inspiration by Blake Mizerany
+
+Released under the MIT License: http://www.opensource.org/licenses/mit-license.php
+
+http://github.com/ricardochimal/taps
+
+Special Thanks to Sequel for making this tool possible http://sequel.rubyforge.org/
diff --git a/README.rdoc b/README.rdoc
diff --git a/Rakefile b/Rakefile
@@ -1,14 +1,7 @@
-task :build do
-  gemspec = Gem::Specification.load("taps.gemspec")
-  target  = "pkg/#{gemspec.file_name}"
-
-  FileUtils.mkdir_p File.dirname(target)
-  Gem::Builder.new(gemspec).build
-  FileUtils.mv gemspec.file_name, target
-end
+require 'simplecov'
 
 begin
-  require 'rake/rdoctask'
+  require 'rdoc/task'
   Rake::RDocTask.new do |rdoc|
     rdoc.rdoc_dir = 'rdoc'
     rdoc.title = 'taps'
@@ -17,33 +10,23 @@ begin
     rdoc.rdoc_files.include('lib/**/*.rb')
   end
 rescue LoadError
-   puts "Rdoc is not available"
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |t|
-    t.libs << 'spec'
-    t.test_files = FileList['spec/*_spec.rb']
-    t.verbose = true
-  end
-rescue LoadError
-  puts "RCov is not available. In order to run rcov, you must: sudo gem install rcov"
+  puts 'Rdoc is not available'
 end
 
-desc "Run all specs; requires the bacon gem"
+desc 'Run all specs; requires the bacon gem'
 task :spec do
+  SimpleCov.start if ENV['COVERAGE']
   if `which bacon`.empty?
-    puts "bacon is not available. In order to run the specs, you must: sudo gem install bacon."
+    puts 'bacon is not available. In order to run the specs, you must: sudo gem install bacon.'
   else
     system "bacon #{File.dirname(__FILE__)}/spec/*_spec.rb"
   end
 end
 
-desc "copy/paste env vars for dev testing"
+desc 'copy/paste env vars for dev testing'
 task :env do
   puts "export RUBYLIB='#{File.dirname(__FILE__) + '/lib'}'"
   puts "export RUBYOPT='-rrubygems'"
 end
 
-task :default => :spec
+task default: :spec
diff --git a/TODO → TODO.md b/TODO → TODO.md
diff --git a/VERSION.yml b/VERSION.yml
diff --git a/bin/schema → bin/schema2 b/bin/schema → bin/schema2
@@ -1,14 +1,16 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-gem 'sequel', '~> 3.20.0'
+require_relative '../lib/taps/version'
 
-$:.unshift File.dirname(__FILE__) + '/../lib'
+gem 'sequel', Taps::Version.sequel_version
+
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
 require 'taps/schema'
 
-cmd = ARGV.shift.strip rescue ''
-database_url = ARGV.shift.strip rescue ''
+cmd = ARGV.shift.to_s.strip
+database_url = ARGV.shift.to_s.strip
 
 def show_usage_and_exit
   puts <<EOTXT
@@ -35,12 +37,20 @@ when 'indexes'
 when 'indexes_individual'
   puts Taps::Schema.indexes_individual(database_url)
 when 'load_indexes'
-  filename = ARGV.shift.strip rescue ''
-  indexes = File.read(filename) rescue show_usage_and_exit
+  filename = ARGV.shift.to_s.strip
+  indexes = begin
+              File.read(filename)
+            rescue StandardError
+              show_usage_and_exit
+            end
   Taps::Schema.load_indexes(database_url, indexes)
 when 'load'
-  filename = ARGV.shift.strip rescue ''
-  schema = File.read(filename) rescue show_usage_and_exit
+  filename = ARGV.shift.to_s.strip
+  schema = begin
+             File.read(filename)
+           rescue StandardError
+             show_usage_and_exit
+           end
   Taps::Schema.load(database_url, schema)
 when 'reset_db_sequences'
   Taps::Schema.reset_db_sequences(database_url)

diff --git a/bin/schema.cmd → bin/schema2.cmd b/bin/schema.cmd → bin/schema2.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 IF NOT "%~f0" == "~f0" GOTO :WinNT
-@"ruby.exe" "./schema" %1 %2 %3 %4 %5 %6 %7 %8 %9
+@"ruby.exe" "./schema2" %1 %2 %3 %4 %5 %6 %7 %8 %9
 GOTO :EOF
 :WinNT
 @"ruby.exe" "%~dpn0" %*
diff --git a/bin/taps → bin/taps2 b/bin/taps → bin/taps2
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.dirname(__FILE__) + '/../lib'
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 require 'taps/cli'
 
 Taps::Cli.new(ARGV.dup).run
diff --git a/config.ru b/config.ru
@@ -2,10 +2,10 @@ require 'rubygems'
 require 'bundler/setup'
 require 'extlib'
 
-$:.unshift File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require 'taps/config'
 
-Taps::Config.taps_database_url = ENV['DATABASE_URL']
+Taps::Config.taps_database_url = ENV['TAPS_DATABASE_URL'] || ENV['DATABASE_URL']
 Taps::Config.login = ENV['TAPS_LOGIN']
 Taps::Config.password = ENV['TAPS_PASSWORD']