wyrm 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2353cb241637c8a85c0f105bb190dd8edd4a5324
-  data.tar.gz: eb33c310f9030aeb682f310857f13d3dd8ff209d
+  metadata.gz: 110e92d0b4e9b47f86444d239b11f9592ad39221
+  data.tar.gz: ebc8111aa344dccdabe1291eef825d940e683cba
 SHA512:
-  metadata.gz: e71ad3b6bac9fdf802ec232885b7f28af657bf9a2eb819e5386bebd990f0e705ee4d7ddd54bbb401c4b134581a6bde4c2baf81380bfd4ad49c1a601e37633e31
-  data.tar.gz: af05ca3f7371d87955cf7de056c93f79567d98b27e17718e6471d0b56ae3017e541a555b666c47e0f1daccbecc0c8a09bd89eb128a923c1039eebe911e5976a2
+  metadata.gz: 7dbf3e13f13bc8aa384583fc29000ff82803ffe47389b06fa3093254490005e961d30f6f1797fccbe50ca4b3baf95f29a33ba45fecd552e38a76313a17d179e8
+  data.tar.gz: 95e4ab50e865fa38aec23c935eb393ce20996d41000ca2879a4272e37e826d6e348a0a8afe7cb9ff7be77b0d37732e5717c84f5439c483feebb6c5ace4bf6796

data/.ruby-gemset

@@ -0,0 +1 @@
+wyrm

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.1

data/.travis.yml

@@ -3,4 +3,5 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.1.1
+  - 2.1.2
 script: bundle exec rspec spec

data/Gemfile

@@ -22,3 +22,8 @@ preferred_sources.each{|src| source src}
 
 # Specify your gem's dependencies in wyrm.gemspec
 gemspec
+
+if Pathname('/usr/include/mysql').exist?
+  # version is for mysql streaming result sets
+  gem "mysql2", '>= 0.3.12'
+end

data/History.txt

@@ -0,0 +1,2 @@
+== 0.3.2
+* update for >=sequel-4.10.0 internal syntax (Dataset#clause_sql removed)

data/lib/wyrm/pump.rb

@@ -269,7 +269,9 @@ class Wyrm::Pump
             # to generate the
             #   insert into (field1,field2) values (value1,value2)
             # statement as quickly as possible.
-            sql = table_dataset.clone( columns: columns, values: row_enum.next ).send( :clause_sql, :insert )
+            #
+            # Uses a private method so it will need to be updated repeatedly.
+            sql = table_dataset.clone( columns: columns, values: row_enum.next ).send(:_insert_sql)
             db.execute sql unless dry_run?
             rows_restored += 1
           end

data/lib/wyrm/restore.rb

@@ -22,6 +22,8 @@ class Wyrm::Restore
 
   def initialize( container, dst_db, pump: nil, drop_tables: false )
     @container = Pathname.new container
+    fail "#{@container} does not exist" unless @container.exist?
+
     @dst_db = maybe_deebe dst_db
     @pump = make_pump( @dst_db, pump )
 

data/lib/wyrm/version.rb

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

data/spec/core_extensions_spec.rb

@@ -1,4 +1,4 @@
-require 'rspec'
+require 'rspec_syntax'
 
 require Pathname(__dir__) + '../lib/wyrm/core_extensions.rb'
 

data/spec/hole_mouth_spec.rb

@@ -1,8 +1,7 @@
-require 'rspec'
+require 'rspec_syntax'
 
 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'

data/spec/pump_spec.rb

@@ -1,4 +1,4 @@
-require 'rspec'
+require 'rspec_syntax'
 
 require Pathname(__dir__) + '../lib/wyrm/pump.rb'
 
@@ -8,12 +8,12 @@ describe Pump do
   describe '.quacks_like' do
     it 'recognises method' do
       threequal = Pump.quacks_like( :tap )
-      (threequal === Object.new).should be_true
+      (threequal === Object.new).should == true
     end
 
     it 'recognises two methods' do
       threequal = Pump.quacks_like( :tap, :instance_eval )
-      (threequal === Object.new).should be_true
+      (threequal === Object.new).should == true
     end
   end
 

data/spec/rspec_syntax.rb

@@ -0,0 +1,12 @@
+require 'rspec'
+
+# turn off the "old syntax" warnings
+RSpec.configure do |config|
+  config.mock_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+end

data/spec/schema_tools_spec.rb

@@ -1,4 +1,4 @@
-require 'rspec'
+require 'rspec_syntax'
 require 'sequel'
 require 'sqlite3'
 
@@ -42,11 +42,11 @@ describe SchemaTools do
 
   describe '#same_db' do
     it 'for same db' do
-      src_dst.same_db.should be_true
+      src_dst.same_db.should == true
     end
 
     it 'for different db' do
-      src_dst( dst_db: Sequel.postgres ).same_db.should be_false
+      src_dst( dst_db: Sequel.postgres ).same_db.should == false
     end
   end
 

data/wyrm.gemspec

@@ -18,18 +18,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'sequel'
+  # need this version because clause_sql was moved to _insert_sql, used by pump
+  spec.add_runtime_dependency 'sequel', '>= 4.10.0'
   spec.add_runtime_dependency "fastandand"
 
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "pry-debugger"
+  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "bundler", ">= 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pg"
   spec.add_development_dependency "sequel_pg"
   spec.add_development_dependency "sqlite3"
-
-  # version is for mysql streaming result sets
-  spec.add_development_dependency "mysql2", '>= 0.3.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wyrm
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - John Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.10.0
 - !ruby/object:Gem::Dependency
   name: fastandand
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-debugger
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.12
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.12
 description: Compressed cross-rdbms data transfer
 email:
 - panic@semiosix.com
@@ -174,9 +160,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rvmrc"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
+- History.txt
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -198,6 +186,7 @@ files:
 - spec/core_extensions_spec.rb
 - spec/hole_mouth_spec.rb
 - spec/pump_spec.rb
+- spec/rspec_syntax.rb
 - spec/schema_tools_spec.rb
 - spec/wyrm_spec.rb
 - wyrm.gemspec
@@ -229,5 +218,6 @@ test_files:
 - spec/core_extensions_spec.rb
 - spec/hole_mouth_spec.rb
 - spec/pump_spec.rb
+- spec/rspec_syntax.rb
 - spec/schema_tools_spec.rb
 - spec/wyrm_spec.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm 2.1.1@wyrm --create