taps2 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9180fa16a2a3559b6ac1469d8f0b13d8b316bf6
-  data.tar.gz: 22fb069d469aa11a6eacbfa5393500eaefadc54a
+  metadata.gz: 3270e6af8e2dc53e576280f136c8770739cea503
+  data.tar.gz: 19c20c887792004a6d912a0dcf2381f7f5f4283d
 SHA512:
-  metadata.gz: 2831c2f6d2a7014c4e880c7dc2c0ddad48fbbfb068766d1ab8d3458e374f54d491168b4305816df9b6ec1898408e805aae5b20282badd0195834c9850078e447
-  data.tar.gz: ae762f9e63281d8418341de24a1db33c937ce24fad41c09d507bfc7849745cc569860fc7e0fbb7deed5b3c2e63c9266890449a445f6ca9b835899debc2ef1b74
+  metadata.gz: 2437f76336492e0e4b94ca7bed79f86198d80fad72688acf96490061caa5095820980bce4ac7136b4d4919b59087d64202fdaac8e9ed10cc1e3e245553f98a67
+  data.tar.gz: 16c2b38ddb8a6e7ae3dfe9b44456a588f7a4cd1f2dc616f142bd87adf2f446767137791835899a8e0e22a6341e7960825a360b6333f4d5f50ce6247c2c3bce0d

data/README.rdoc

@@ -10,6 +10,31 @@ 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 SQLite 3. (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 `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

data/VERSION.yml

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

data/lib/taps/cli.rb

@@ -5,7 +5,7 @@ require 'taps/config'
 require 'taps/log'
 require 'vendor/okjson'
 
-Taps::Config.taps_database_url = ENV['TAPS_DATABASE_URL'] || begin
+Taps::Config.taps_database_url = ENV['TAPS_DATABASE_URL'] || ENV['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')
@@ -73,15 +73,15 @@ module Taps
 
     def help
       puts <<EOHELP
-  Options
-  =======
-  server    Start a taps database import/export server
-  pull      Pull a database from a taps server
-  push      Push a database to a taps server
-  version   Taps version
-
-  Add '-h' to any command to see their usage
-  EOHELP
+Options
+=======
+server    Start a taps database import/export server
+pull      Pull a database from a taps server
+push      Push a database to a taps server
+version   Taps version
+
+Add '-h' to any command to see their usage
+EOHELP
     end
 
     def serveroptparse
@@ -95,8 +95,8 @@ module Taps
         o.parse!(argv)
 
         opts[:database_url] = argv.shift
-        opts[:login] = argv.shift
-        opts[:password] = argv.shift
+        opts[:login] = argv.shift || ENV['TAPS_LOGIN']
+        opts[:password] = argv.shift || ENV['TAPS_PASSWORD']
 
         if opts[:database_url].nil?
           $stderr.puts "Missing Database URL"

data/lib/taps/data_stream.rb

@@ -209,7 +209,7 @@ class DataStream
 \nDetected integer data that exceeds the maximum allowable size for an integer type.
 This generally occurs when importing from SQLite due to the fact that SQLite does
 not enforce maximum values on integer types.
-      ERROR
+ERROR
     else raise ex
     end
   end

data/lib/taps/progress_bar.rb

@@ -115,7 +115,7 @@ class ProgressBar
     if @total.zero?
       100
     else
-      @current  * 100 / @total
+      @current * 100 / @total
     end
   end
 
@@ -137,10 +137,11 @@ class ProgressBar
   end
 
   def show
-    arguments = @format_arguments.map {|method|
+    arguments = @format_arguments.map do |method|
       method = sprintf("fmt_%s", method)
       send(method)
-    }
+    end
+
     line = sprintf(@format, *arguments)
 
     width = get_width
@@ -173,7 +174,8 @@ class ProgressBar
     end
   end
 
-  public
+public
+
   def clear
     @out.print "\r"
     @out.print(" " * (get_width - 1))

data/lib/taps/schema.rb

@@ -13,19 +13,18 @@ module Taps
     end
 
     def dump_table(database_url, table)
-      table = table.to_sym
       Sequel.connect(database_url) do |db|
         <<END_MIG
-  Class.new(Sequel::Migration) do
-    def up
-      #{db.extension(:schema_dumper).dump_table_schema(Sequel.identifier(table), :indexes => false)}
-    end
+Class.new(Sequel::Migration) do
+  def up
+    #{db.extension(:schema_dumper).dump_table_schema(Sequel.identifier(table.to_sym), :indexes => false)}
+  end
 
-    def down
-      drop_table("#{table}") if @db.table_exists?("#{table}")
-    end
+  def down
+    drop_table("#{table}") if @db.table_exists?("#{table}")
   end
-  END_MIG
+end
+END_MIG
       end
     end
 
@@ -37,8 +36,7 @@ module Taps
     def indexes_individual(database_url)
       idxs = {}
       Sequel.connect(database_url) do |db|
-        tables = db.tables
-        tables.each do |table|
+        db.tables.each do |table|
           idxs[table] = db.extension(:schema_dumper).send(:dump_table_indexes, table, :add_index, {}).split("\n")
         end
       end
@@ -46,12 +44,12 @@ module Taps
       idxs.each do |table, indexes|
         idxs[table] = indexes.map do |idx|
           <<END_MIG
-  Class.new(Sequel::Migration) do
-    def up
-      #{idx}
-    end
+Class.new(Sequel::Migration) do
+  def up
+    #{idx}
   end
-  END_MIG
+end
+END_MIG
         end
       end
       ::OkJson.encode(idxs)

data/lib/taps/utils.rb

@@ -57,14 +57,14 @@ module Taps
         row.each do |column, value|
           if value.to_s.length > (max_lengths[column] || value.to_s.length)
             raise Taps::InvalidData.new(<<-ERROR)
-  Detected value that exceeds the length limitation of its column. This is
-  generally due to the fact that SQLite does not enforce length restrictions.
-
-  Table  : #{table}
-  Column : #{column}
-  Type   : #{schema.detect{|s| s.first == column}.last[:db_type]}
-  Value  : #{value}
-            ERROR
+Detected value that exceeds the length limitation of its column. This is
+generally due to the fact that SQLite does not enforce length restrictions.
+
+Table  : #{table}
+Column : #{column}
+Type   : #{schema.detect{|s| s.first == column}.last[:db_type]}
+Value  : #{value}
+ERROR
           end
         end
         header.collect { |h| row[h] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taps2
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Ricardo Chimal, Jr.
@@ -68,33 +68,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.4
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: extlib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: extlib
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 1.3.8
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.8
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement