dumpdb 1.0.2 → 1.0.3

data/.gitignore

@@ -1,11 +1,10 @@
 *.gem
 *.log
 *.rbc
+.rbx/
 .bundle
 .config
 .yardoc
-.rvmrc
-.rbenv-version
 Gemfile.lock
 InstalledFiles
 _yardoc

data/Gemfile

@@ -1,6 +1,6 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec
 
-gem 'bundler', '~>1.1'
-gem 'rake',    '~>0.9.2'
+gem 'rake'
+gem 'pry'

data/{LICENSE → LICENSE.txt}

@@ -1,4 +1,4 @@
-Copyright (c) 2012-Present Kelly Redding
+Copyright (c) 2012-Present Kelly Redding and Collin Redding
 
 MIT License
 

data/README.md

@@ -2,20 +2,6 @@
 
 Dump and restore your databases.
 
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'dumpdb'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install dumpdb
-
 ## Usage
 
 ```ruby
@@ -254,6 +240,20 @@ end
 
 See `examples/` dir. (TODO)
 
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'dumpdb'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install dumpdb
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,8 +1 @@
-#!/usr/bin/env rake
-
-require 'assert/rake_tasks'
-Assert::RakeTasks.install
-
-require 'bundler/gem_tasks'
-
-task :default => :build
+require "bundler/gem_tasks"

data/dumpdb.gemspec

@@ -1,22 +1,24 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/dumpdb/version', __FILE__)
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "dumpdb/version"
 
 Gem::Specification.new do |gem|
   gem.name        = "dumpdb"
   gem.version     = Dumpdb::VERSION
-  gem.description = %q{Dump and restore your databases.}
-  gem.summary     = %q{Dump and restore your databases.}
-
   gem.authors     = ["Kelly Redding", "Collin Redding"]
   gem.email       = ["kelly@kellyredding.com", "collin.redding@me.com"]
+  gem.description = %q{Dump and restore your databases.}
+  gem.summary     = %q{Dump and restore your databases.}
   gem.homepage    = "http://github.com/redding/dumpdb"
 
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert")
+  gem.add_dependency("assert",  ["~> 2.0"])
+
   gem.add_dependency("scmd",       ["~> 2.0"])
   gem.add_dependency("ns-options", ["~> 1.1", ">= 1.1.1"])
 end

data/lib/dumpdb/db.rb

@@ -1,5 +1,3 @@
-require 'ostruct'
-
 module Dumpdb
 
   class Db

data/lib/dumpdb/settings.rb

@@ -1,3 +1,4 @@
+require 'yaml'
 require 'dumpdb/db'
 
 module Dumpdb::Settings

data/lib/dumpdb/version.rb

@@ -1,3 +1,3 @@
 module Dumpdb
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/dumpdb.rb

@@ -1,5 +1,5 @@
 require 'ns-options'
-
+require 'dumpdb/version'
 require 'dumpdb/settings'
 require 'dumpdb/db'
 require 'dumpdb/runner'

data/test/helper.rb

@@ -1,7 +1,10 @@
-# this file is automatically required in when you require 'assert' in your tests
-# put test helpers here
+# this file is automatically required when you run `assert`
+# put any test helpers here
 
-# add root dir to the load path
-$LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
+# add the root dir to the load path
+ROOT_PATH = File.expand_path("../..", __FILE__)
+$LOAD_PATH.unshift(ROOT_PATH)
+
+# require pry for debugging (`binding.pry`)
+require 'pry'
 
-require 'test/support/test_scripts'

data/test/support/test_scripts.rb

@@ -3,7 +3,7 @@ require 'dumpdb'
 class LocalScript
   include Dumpdb
 
-  databases { 'test/support/database.yaml' }
+  databases { File.join(ROOT_PATH, 'test/support/database.yaml') }
   dump_file { "dump.#{type}" }
   source    { db('development', :another => 'value') }
   target    { db('test') }
@@ -15,7 +15,7 @@ class RemoteScript
   include Dumpdb
 
   ssh       { 'user@example.com' }
-  databases { 'test/support/database.yaml' }
+  databases { File.join(ROOT_PATH, 'test/support/database.yaml') }
   dump_file { "dump.#{type}" }
   source    { db('development') }
   target    { db('test') }

data/test/{db_tests.rb → unit/db_tests.rb}

@@ -1,12 +1,12 @@
 require 'assert'
-require 'ostruct'
+require 'dumpdb/db'
 
 module Dumpdb
 
   class DbTests < Assert::Context
     desc "the Db helper class"
     setup do
-      @db = Db.new(nil)#(:host => 'h', :user => 'u', :pw => 'p', :db => 'd')
+      @db = Db.new(nil)
     end
     subject { @db }
 

data/test/{runner_tests.rb → unit/runner_tests.rb}

@@ -1,6 +1,6 @@
 require 'assert'
 require 'test/support/fake_cmd_runner'
-
+require 'test/support/test_scripts'
 require 'dumpdb/runner'
 
 module Dumpdb

data/test/{script_tests.rb → unit/script_tests.rb}

@@ -1,4 +1,6 @@
 require 'assert'
+require 'test/support/fake_cmd_runner'
+require 'test/support/test_scripts'
 
 module Dumpdb
 

data/test/{settings_tests.rb → unit/settings_tests.rb}

@@ -1,5 +1,5 @@
 require 'assert'
-
+require 'test/support/test_scripts'
 require 'dumpdb/settings'
 
 module Dumpdb
@@ -57,7 +57,7 @@ module Dumpdb
     end
 
     should "come from a yaml file" do
-      databases = Settings::Databases.new('test/support/test.yaml')
+      databases = Settings::Databases.new(File.join(ROOT_PATH, 'test/support/test.yaml'))
       assert_equal({
         'db-one' => {'db' => 1},
         'db-two' => {'db' => 2},

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dumpdb
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,25 +16,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-20 00:00:00 Z
+date: 2013-03-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 2
         - 0
-        version: "0"
-  type: :development
-  requirement: *id001
-  prerelease: false
+        version: "2.0"
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: scmd
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,11 +47,11 @@ dependencies:
         - 0
         version: "2.0"
   type: :runtime
-  requirement: *id002
-  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: ns-options
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -68,8 +70,7 @@ dependencies:
         - 1
         version: 1.1.1
   type: :runtime
-  requirement: *id003
-  prerelease: false
+  version_requirements: *id003
 description: Dump and restore your databases.
 email: 
 - kelly@kellyredding.com
@@ -83,7 +84,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - dumpdb.gemspec
@@ -92,16 +93,17 @@ files:
 - lib/dumpdb/runner.rb
 - lib/dumpdb/settings.rb
 - lib/dumpdb/version.rb
-- test/db_tests.rb
+- log/.gitkeep
 - test/helper.rb
-- test/irb.rb
-- test/runner_tests.rb
-- test/script_tests.rb
-- test/settings_tests.rb
 - test/support/database.yaml
 - test/support/fake_cmd_runner.rb
 - test/support/test.yaml
 - test/support/test_scripts.rb
+- test/unit/db_tests.rb
+- test/unit/runner_tests.rb
+- test/unit/script_tests.rb
+- test/unit/settings_tests.rb
+- tmp/.gitkeep
 homepage: http://github.com/redding/dumpdb
 licenses: []
 
@@ -136,13 +138,12 @@ signing_key:
 specification_version: 3
 summary: Dump and restore your databases.
 test_files: 
-- test/db_tests.rb
 - test/helper.rb
-- test/irb.rb
-- test/runner_tests.rb
-- test/script_tests.rb
-- test/settings_tests.rb
 - test/support/database.yaml
 - test/support/fake_cmd_runner.rb
 - test/support/test.yaml
 - test/support/test_scripts.rb
+- test/unit/db_tests.rb
+- test/unit/runner_tests.rb
+- test/unit/script_tests.rb
+- test/unit/settings_tests.rb

data/test/irb.rb

@@ -1,9 +0,0 @@
-require 'assert/setup'
-
-# this file is required in when the 'irb' rake test is run.
-# b/c 'assert/setup' is required above, the test helper will be
-# required in as well.
-
-# put any IRB setup code here
-
-require 'dumpdb'