wyrm 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c67007e35f84f5542da888c17fc91f6e1fe03cb
-  data.tar.gz: 7434160ebe9385f72d04546b69480d457a13e315
+  metadata.gz: 2353cb241637c8a85c0f105bb190dd8edd4a5324
+  data.tar.gz: eb33c310f9030aeb682f310857f13d3dd8ff209d
 SHA512:
-  metadata.gz: 11ccf21e5c471e7c06a2a0c27739875d1197570d3c2049a27d284327bd748a0411f3280ab9c89bb865c2c882aa1019a371ecff5105b86baab81c01ce9be8520c
-  data.tar.gz: 96f35474f2770b85b277b5b1cdb64798b4cba183d9ad6b7753d2ded403f878bd7130c4ca634b69262ee812160147a4c674466ca4347fef42c71c2e99e87f9934
+  metadata.gz: e71ad3b6bac9fdf802ec232885b7f28af657bf9a2eb819e5386bebd990f0e705ee4d7ddd54bbb401c4b134581a6bde4c2baf81380bfd4ad49c1a601e37633e31
+  data.tar.gz: af05ca3f7371d87955cf7de056c93f79567d98b27e17718e6471d0b56ae3017e541a555b666c47e0f1daccbecc0c8a09bd89eb128a923c1039eebe911e5976a2

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.0
+  - 2.1.1
+script: bundle exec rspec spec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 John Anderson
+Copyright (c) 2013,2014 John Anderson
 
 MIT License
 

data/README.md

@@ -1,6 +1,4 @@
-# Wyrm
-
-[![Gem Version](https://badge.fury.io/rb/wyrm.png)](http://badge.fury.io/rb/wyrm)
+# Wyrm [![Gem Version](https://badge.fury.io/rb/wyrm.png)](http://badge.fury.io/rb/wyrm) [![Build Status](https://travis-ci.org/djellemah/wyrm.png?branch=master)](https://travis-ci.org/djellemah/wyrm)
 
 Transfer a database from one rdbms to another (eg mysql to postgres). Either via
 a set of files, or direct from one db server to another.

data/lib/wyrm/dump.rb

@@ -11,8 +11,8 @@ require 'wyrm/logger'
 #  ds.call
 # TODO possibly use Gem::Package::TarWriter to write tar files
 class Wyrm::Dump
-  include PumpMaker
-  include SchemaTools
+  include Wyrm::PumpMaker
+  include Wyrm::SchemaTools
   include Wyrm::Logger
 
   def initialize( src_db, container = nil, pump: nil )

data/lib/wyrm/hole.rb

@@ -56,8 +56,7 @@ module Wyrm
       def queue
         @queue ||=
         if RUBY_VERSION == '2.1.0'
-          logger.warn "SizedQueue broken in 2.1.0 (https://bugs.ruby-lang.org/issues/9302). Falling back to Queue, which may run out of memory."
-          Queue.new
+          raise "Queue broken in 2.1.0 possibly related to https://bugs.ruby-lang.org/issues/9302"
         else
           SizedQueue.new 5000
         end

data/lib/wyrm/pump.rb

@@ -49,11 +49,12 @@ class Wyrm::Pump
     @db.extension :pagination
 
     # turn on postgres streaming if available
-    if defined?( Sequel::Postgres ) && defined?(Sequel::Postgres.supports_streaming?) && Sequel::Postgres.supports_streaming?
-      logger.debug "Streaming for postgres"
+    # also gets called for non-postgres dbs, but that seems to be fine.
+    if defined?( Sequel::Postgres ) && @db.is_a?(Sequel::Postgres::Database) && defined?(Sequel::Postgres.supports_streaming?) && Sequel::Postgres.supports_streaming?
       @db.extension :pg_streaming
+      logger.info "Streaming for #{@db.uri}"
     else
-      logger.info "No streaming for postgres"
+      logger.info "No streaming for #{@db.uri}"
     end
   end
 

data/lib/wyrm/restore.rb

@@ -16,8 +16,8 @@ require 'wyrm/schema_tools'
 # end of they probably lengthy table restore process.
 # TODO check if table has been restored already, and has the correct rows,
 class Wyrm::Restore
-  include PumpMaker
-  include SchemaTools
+  include Wyrm::PumpMaker
+  include Wyrm::SchemaTools
   include Wyrm::Logger
 
   def initialize( container, dst_db, pump: nil, drop_tables: false )

data/lib/wyrm/version.rb

@@ -1,3 +1,3 @@
 module Wyrm
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/wyrm.rb

@@ -2,5 +2,6 @@ require 'wyrm/module'
 
 require "wyrm/version"
 require "wyrm/pump.rb"
-require "wyrm/restore_schema.rb"
-require "wyrm/dump_schema.rb"
+require "wyrm/restore.rb"
+require "wyrm/dump.rb"
+require "wyrm/hole.rb"

data/spec/hole_mouth_spec.rb

@@ -2,7 +2,11 @@ require 'rspec'
 
 require Pathname(__dir__) + '../lib/wyrm/hole.rb'
 
+
 describe Wyrm::Hole::Mouth do
+if RUBY_VERSION == '2.1.0'
+  it 'Queue broken on 2.1.0'
+else
   describe '#flush' do
     it 'calls poison_queue' do
       subject.should_receive(:poison_queue)
@@ -168,9 +172,9 @@ describe Wyrm::Hole::Mouth do
     # has a logger which nothing else uses
     it 'works' do
       Wyrm::Hole::Mouth::RUBY_VERSION = '2.1.0'
-      subject.should_receive(:logger).and_call_original
-      subject.queue
+      ->{subject.queue}.should raise_error(/broken in 2.1.0/)
       Wyrm::Hole::Mouth.send :remove_const, :RUBY_VERSION
     end
   end
+end #unless RUBY_VERSION == '2.1.0'
 end

data/spec/pump_spec.rb

@@ -18,11 +18,41 @@ describe Pump do
   end
 
   describe '#table_name=' do
-    it 'invalidates caches'
+    it 'invalidates caches' do
+      subject.should_receive(:invalidate_cached_members)
+      subject.table_name = :big_face
+    end
   end
 
   describe '#db=' do
-    it 'invalidates caches'
+    it 'invalidates caches' do
+      subject.should_receive(:invalidate_cached_members)
+      subject.db = Sequel.sqlite
+    end
+
+    it 'handles nil db' do
+      ->{subject.db = nil}.should_not raise_error
+    end
+
+    it 'adds pagination extension' do
+      db = Sequel.sqlite
+      db.should_receive(:extension).with(:pagination)
+      subject.db = db
+    end
+
+    it 'turns on streaming for postgres' do
+      db = Sequel.postgres
+      db.should_receive(:extension).with(:pagination)
+      db.should_receive(:extension).with(:pg_streaming)
+      subject.db = db
+    end
+
+    it 'no streaming for non-postgres' do
+      db = Sequel.sqlite
+      db.should_receive(:extension).with(:pagination)
+      db.should_not_receive(:extension).with(:pg_streaming)
+      subject.db = db
+    end
   end
 
   describe '#codec=' do

data/spec/wyrm_spec.rb

@@ -0,0 +1,13 @@
+require 'rspec'
+
+# include this here because at least once I forgot to update this
+# when file names changed
+require Pathname(__dir__) + '../lib/wyrm.rb'
+
+include Wyrm
+
+describe Wyrm do
+  it 'has the right constants' do
+    Wyrm.constants.sort.should == [:Dump, :Hole, :Logger, :Pump, :PumpMaker, :Restore, :SchemaTools, :VERSION].sort
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wyrm
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - John Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -175,6 +175,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rvmrc"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -198,6 +199,7 @@ files:
 - spec/hole_mouth_spec.rb
 - spec/pump_spec.rb
 - spec/schema_tools_spec.rb
+- spec/wyrm_spec.rb
 - wyrm.gemspec
 homepage: https://github.com/djellemah/wyrm
 licenses:
@@ -219,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Transfer from one SQL rdbms to another
@@ -228,3 +230,4 @@ test_files:
 - spec/hole_mouth_spec.rb
 - spec/pump_spec.rb
 - spec/schema_tools_spec.rb
+- spec/wyrm_spec.rb