dbmanager 0.1.7 → 0.2.0

data/.rvmrc

@@ -0,0 +1 @@
+rvm ruby-1.9.3

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.8.7
+branches:
+  only:
+    - master
+    - elia/loadable

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.2.0
+
+* merge pull request from Elia (add loader task)
+* refactoring of the main structure and specs
+
 ## v0.1.7
 
 * merge pull request from Racko (add quotes to file names)

data/README.md

@@ -53,9 +53,19 @@ string 'production' in their name are protected by default, which means you cann
 overwrite them unless you explicitly override this setting in the override file
 (see next section for more info).
 
-#### BEWARE
 
-**the import process is destructive** so be careful on which environment you
+#### Database Loads
+
+```ruby
+rake db:load
+```
+
+This rake task will load the db data from a dump file.
+
+You will be prompted to choose the source file (defaults to *tmp/{db_name}.sql* in the rails
+root) and the target environment.
+
+**Import and load processes are destructive** so be careful on which environment you
 choose to overwite. I take no responsibility for misuse or bugs in the code ;-)
 
 
@@ -115,6 +125,10 @@ run rspec tests: ```rake```
 
 run cucumber tests: ```cucumber```
 
+Cucumber tests require mysql server running. Update spec/dummy/config/database.yml
+with your mysql configuration, if necessary.
+
+
 
 ### TODO
 

data/dbmanager.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'activesupport'
-
-  s.add_development_dependency 'rspec'
+  s.add_dependency 'rails'
+  s.add_development_dependency 'rspec', '~> 2.12'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'mysql2'
   s.add_development_dependency 'cucumber'
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'guard-cucumber'

data/features/readme.md

@@ -53,9 +53,19 @@ string 'production' in their name are protected by default, which means you cann
 overwrite them unless you explicitly override this setting in the override file
 (see next section for more info).
 
-#### BEWARE
 
-**the import process is destructive** so be careful on which environment you
+#### Database Loads
+
+```ruby
+rake db:load
+```
+
+This rake task will load the db data from a dump file.
+
+You will be prompted to choose the source file (defaults to *tmp/{db_name}.sql* in the rails
+root) and the target environment.
+
+**Import and load processes are destructive** so be careful on which environment you
 choose to overwite. I take no responsibility for misuse or bugs in the code ;-)
 
 
@@ -115,6 +125,10 @@ run rspec tests: ```rake```
 
 run cucumber tests: ```cucumber```
 
+Cucumber tests require mysql server running. Update spec/dummy/config/database.yml
+with your mysql configuration, if necessary.
+
+
 
 ### TODO
 

data/features/support/dummy_app_initialization.rb

@@ -8,6 +8,7 @@
 STDIN_STUB = 'STDIN_stub'
 DUMMY_PATH = '../../../spec/dummy'
 Dir.chdir File.expand_path(DUMMY_PATH, __FILE__) do
+  system 'mkdir tmp'
   system 'bundle install'
   system 'rm -f tmp/*sql'
   %w[

data/lib/dbmanager.rb

@@ -1,15 +1,12 @@
-require 'active_support/deprecation'
-require 'active_support/core_ext/module'
-require 'active_support/ordered_hash'
-require 'active_support/core_ext/enumerable'
-require 'active_support/core_ext/object/blank'
+require 'active_support/all'
 
 module Dbmanager
   autoload :Environment, 'dbmanager/environment'
   autoload :YmlParser,   'dbmanager/yml_parser'
   autoload :Runner,      'dbmanager/runner'
-  autoload :Importable,  'dbmanager/importable'
-  autoload :Dumpable,    'dbmanager/dumpable'
+  autoload :Importer,    'dbmanager/importer'
+  autoload :Dumper,      'dbmanager/dumper'
+  autoload :Loader,      'dbmanager/loader'
   autoload :Adapters,    'dbmanager/adapters'
 
   class EnvironmentProtectedError < StandardError

data/lib/dbmanager/adapters/mysql.rb

@@ -40,39 +40,52 @@ module Dbmanager
         end
       end
 
-      class Importer
+      class Loader
         include Connectable
-        attr_reader :source, :target, :tmp_file
+        attr_reader :target, :tmp_file
 
-        def initialize(source, target, tmp_file)
-          @source   = source
+        def initialize(target, tmp_file)
           @target   = target
           @tmp_file = tmp_file
         end
 
         def run
-          Dumper.new(source, tmp_file).run
           Dbmanager.execute! create_db_if_missing_command
-          Dbmanager.execute! import_command
-        ensure
-          remove_tmp_file
+          Dbmanager.execute! load_command
         end
 
-        def import_command
+        def load_command
           "mysql #{params(target)} < '#{tmp_file}'"
         end
 
-        def remove_tmp_file
-          Dbmanager.execute "rm '#{tmp_file}'"
-        end
-
         def create_db_if_missing_command
-          # it is safe to hardcode bundle exec here?
           "#{bundle} rake db:create RAILS_ENV=#{target.name}"
         end
 
         def bundle
-          Dbmanager.execute('which bundle') ? 'bundle exec' : nil
+          Dbmanager.execute('which bundle > /dev/null') ? 'bundle exec' : nil
+        end
+      end
+
+      class Importer
+        include Connectable
+        attr_reader :source, :target, :tmp_file
+
+        def initialize(source, target, tmp_file)
+          @source   = source
+          @target   = target
+          @tmp_file = tmp_file
+        end
+
+        def run
+          Dumper.new(source, tmp_file).run
+          Loader.new(target, tmp_file).run
+        ensure
+          remove_tmp_file
+        end
+
+        def remove_tmp_file
+          Dbmanager.execute "rm '#{tmp_file}'"
         end
       end
     end

data/lib/dbmanager/dumper.rb

@@ -0,0 +1,31 @@
+module Dbmanager
+  class Dumper < Runner
+
+    attr_accessor :filename, :source
+
+    def run
+      get_data
+      dumper.run
+      output.puts "Database successfully dumped in #{filename} file."
+    end
+
+    private
+
+    def get_data
+      self.source = get_env('source')
+      self.filename = get_filename('target', default_filename)
+    end
+
+    def dumper
+      adapter::Dumper.new(source, filename)
+    end
+
+    def adapter
+      Dbmanager::Adapters.const_get source.adapter.capitalize
+    end
+
+    def default_filename
+      Dbmanager.rails_root.join "tmp/#{source.database}.sql"
+    end
+  end
+end

data/lib/dbmanager/importer.rb

@@ -0,0 +1,31 @@
+module Dbmanager
+  class Importer < Runner
+
+    attr_accessor :target, :source
+
+    def run
+      get_data
+      raise EnvironmentProtectedError if target.protected?
+      execute_import
+      output.puts 'Database Import completed.'
+    end
+
+    def get_data
+      self.source = get_env('source')
+      self.target = get_env('target')
+    end
+
+    def execute_import
+      adapter::Importer.new(source, target, tmp_file).run
+    end
+
+    def adapter
+      raise MixedAdapterError if source.adapter != target.adapter
+      Dbmanager::Adapters.const_get source.adapter.capitalize
+    end
+
+    def tmp_file
+      @tmp_file ||= File.join Dbmanager.rails_root, 'tmp', Time.now.strftime('%y%m%d%H%M%S')
+    end
+  end
+end

data/lib/dbmanager/loader.rb

@@ -0,0 +1,31 @@
+module Dbmanager
+  class Loader < Runner
+
+    attr_accessor :filename, :target
+
+    def run
+      get_data
+      loader.run
+      output.puts "Database successfully loaded from #{filename}."
+    end
+
+    private
+
+    def get_data
+      self.target   = get_env('target')
+      self.filename = get_filename('source', default_filename)
+    end
+
+    def loader
+      adapter::Loader.new(target, filename)
+    end
+
+    def adapter
+      Dbmanager::Adapters.const_get target.adapter.capitalize
+    end
+
+    def default_filename
+      Dbmanager.rails_root.join "tmp/#{target.database}.sql"
+    end
+  end
+end

data/lib/dbmanager/runner.rb

@@ -1,47 +1,52 @@
-# The runner main responsibility is to interact with the user in order to gather
-# the information to accomplish the task.
-#
-# The runner object cannot do much when freshly instantiated, so for each kind
-# of available task there is a corresponding module that can extend the runner
-# so that it can accomplish its goal.
-#
-# Extension modules must define the #run method which contains the specific
-# behaviour they provide.
-
 module Dbmanager
   class Runner
-    attr_reader :input, :output, :environments, :source
-
-    def self.run(module_name)
-      runner = new
-      runner.extend Dbmanager.const_get(module_name.capitalize)
-      runner.run
-    end
+    attr_reader :input, :output, :environments
 
     def initialize(input=STDIN, output=STDOUT)
       @input        = input
       @output       = output
       @environments = YmlParser.environments
-      @source       = get_env
     end
 
-    def get_env(type='source')
+    def get_env(type)
       output.puts "\nPlease choose #{type} db:\n\n"
-      get_environment
+      choose_environment
+    end
+
+    def get_filename(type, default_filename)
+      output.print "\nPlease choose #{type} file (defaults to #{default_filename}): "
+      filename = get_input
+      if filename.blank?
+        default_filename
+      else
+        absolute_path(filename)
+      end
     end
 
     private
 
-    def get_environment
+    def absolute_path(filename)
+      if filename.first == '/'
+        filename
+      else
+        Dbmanager.rails_root.join(filename)
+      end
+    end
+
+    def choose_environment
       environments.keys.each_with_index do |name, i|
         output.puts "#{i+1}) #{name}"
       end
       output.puts
       pos = ''
       until (1..environments.size).include? pos
-        pos = input.gets.chomp.to_i
+        pos = get_input.to_i
       end
       environments.values[pos-1]
     end
+
+    def get_input
+      input.gets.to_s.strip
+    end
   end
 end

data/lib/dbmanager/version.rb

@@ -1,3 +1,3 @@
 module Dbmanager
-  VERSION = '0.1.7'
+  VERSION = '0.2.0'
 end

data/lib/tasks/dbmanager.rake

@@ -2,12 +2,18 @@ namespace :db do
   desc 'import specific environment db data into another environment db'
   task :import  do
     require 'dbmanager'
-    Dbmanager::Runner.run('importable')
+    Dbmanager::Importer.new.run
   end
 
-  desc 'dump specific environment db data in tmp directory'
+  desc 'dump specific environment db data to a file'
   task :dump do
     require 'dbmanager'
-    Dbmanager::Runner.run('dumpable')
+    Dbmanager::Dumper.new.run
+  end
+
+  desc 'load specific environment db data from a file'
+  task :load do
+    require 'dbmanager'
+    Dbmanager::Loader.new.run
   end
 end

data/spec/dummy/config/database.yml

@@ -2,10 +2,10 @@ development:
   adapter: mysql2
   database: dbmanager_dummy_dev
   username: root
-  password: root
+  password:
 
 test:
   adapter: mysql2
   database: dbmanager_dummy_test
   username: root
-  password: root
+  password:

data/spec/dummy/rerun.txt

@@ -0,0 +1 @@
+features/dump.feature:12

data/spec/lib/adapters/mysql_spec.rb

@@ -4,6 +4,8 @@ module Dbmanager
   module Adapters
     module Mysql
       describe Dumper do
+        before { Dbmanager.stub :output => STDStub.new }
+
         let :source do
           Environment.new(
             :username     => 'root',
@@ -45,21 +47,23 @@ module Dbmanager
         end
       end
 
-      describe Importer do
+      describe Loader do
+        before { Dbmanager.stub :output => STDStub.new }
+
         describe 'an importer instance' do
           before { Time.stub! :now => Time.parse('2012/03/23 12:30:32') }
           let(:source)   { Environment.new :protected => false, :name => 'development', :username => 'root' }
           let(:target)   { Environment.new :protected => false, :name => 'beta', :username => 'beta_user' }
           let(:tmp_file) { '/some/arbitrary/path' }
-          subject        { Importer.new source, target, tmp_file }
+          subject        { Loader.new target, tmp_file }
 
-          it 'has target, source and tmp_file attribute methods' do
-            %w[source target tmp_file].each { |m| subject.should respond_to m }
+          it 'has target and tmp_file attribute methods' do
+            %w[target tmp_file].each { |m| subject.should respond_to m }
           end
 
-          describe '#import_command' do
+          describe '#load_command' do
             it 'returns expected command' do
-              subject.import_command.should == 'mysql -ubeta_user < \'/some/arbitrary/path\''
+              subject.load_command.should == 'mysql -ubeta_user < \'/some/arbitrary/path\''
             end
           end
 
@@ -69,13 +73,6 @@ module Dbmanager
             end
           end
 
-          describe '#remove_tmp_file' do
-            it 'tries to remove the temporary file' do
-              Dbmanager.should_receive(:execute).with('rm \'/some/arbitrary/path\'')
-              subject.remove_tmp_file
-            end
-          end
-
           describe '#bundle' do
             it 'returns "bundle exec" when bundler is present' do
               Dbmanager.should_receive(:execute).and_return true
@@ -88,6 +85,45 @@ module Dbmanager
             end
           end
 
+          describe '#run' do
+            it 'creates the db if missing and then imports the db' do
+              subject.stub!(:remove_tmp_file => true)
+              Dbmanager.should_receive(:execute!).with(subject.create_db_if_missing_command)
+              Dbmanager.should_receive(:execute!).with(subject.load_command)
+              subject.run
+            end
+          end
+        end
+      end
+
+      describe Importer do
+        def environment(opts={})
+          opts = {:protected => false}.merge(opts)
+          Environment.new opts
+        end
+
+        before { Dbmanager.stub :output => STDStub.new }
+
+        describe 'an importer instance' do
+          before  { Time.stub! :now => Time.parse('2012/03/23 12:30:32') }
+
+          subject { Importer.new source, target, tmp_file }
+
+          let(:source)   { environment(:name => 'development', :username => 'root') }
+          let(:target)   { environment(:name => 'beta', :username => 'beta_user') }
+          let(:tmp_file) { '/some/arbitrary/path' }
+
+          it 'has target, source and tmp_file attribute methods' do
+            %w[source target tmp_file].each { |m| subject.should respond_to m }
+          end
+
+          describe '#remove_tmp_file' do
+            it 'tries to remove the temporary file' do
+              Dbmanager.should_receive(:execute).with('rm \'/some/arbitrary/path\'')
+              subject.remove_tmp_file
+            end
+          end
+
           describe '#run' do
             it 'create ad Dumper that will dump the db' do
               Dbmanager.stub!(:execute! => nil)
@@ -95,11 +131,9 @@ module Dbmanager
               subject.run
             end
 
-            it 'creates the db if missing and then imports the db' do
-              Dumper.stub!(:new => mock.as_null_object)
-              subject.stub!(:remove_tmp_file => true)
-              Dbmanager.should_receive(:execute!).with(subject.create_db_if_missing_command)
-              Dbmanager.should_receive(:execute!).with(subject.import_command)
+            it 'create ad Loader that will dump the db' do
+              Dbmanager.stub!(:execute! => nil)
+              Loader.should_receive(:new).and_return(mock.as_null_object)
               subject.run
             end
           end

data/spec/lib/dbmanager_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Dbmanager do
-  describe '#rails_root' do
+  describe '#rails_root', :skip_stub_rails_root => true do
     it 'wraps Rails.root' do
       Rails = mock unless defined? Rails
       Rails.should_receive :root

data/spec/lib/dumper_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+module Dbmanager
+  describe Dumper do
+    subject { described_class.new(STDStub.new, STDStub.new) }
+
+    describe '#run' do
+      before do
+        subject.stub(
+          :dumper       => mock.as_null_object,
+          :get_env      => mock(:database => 'beta'),
+          :get_filename => 'filename'
+        )
+      end
+
+      it 'sends expected output when successful' do
+        subject.run
+        subject.output.content.should include('Database successfully dumped in filename file.')
+      end
+
+      it 'delegates the actual dumping to the dumper' do
+        dumper = subject.send(:dumper)
+        dumper.should_receive(:run)
+        subject.run
+      end
+    end
+  end
+end

data/spec/lib/{importable_spec.rb → importer_spec.rb}

@@ -1,19 +1,40 @@
 require 'spec_helper'
 
 module Dbmanager
-  describe Importable do
-    subject do
-      Object.new.tap {|o| o.extend Importable}
-    end
+  describe Importer do
+    subject { described_class.new(STDStub.new, STDStub.new) }
+
+    before { subject.stub :get_env => mock(:database => 'beta') }
+
+    it { should respond_to :source }
+    it { should respond_to :target }
+
+    describe '#run' do
+      context 'when target is protected' do
+        before { subject.stub :target => mock(:protected? => true) }
 
-    before do
-      stub_rails_root
-      subject.stub :output => STDStub.new, :input => STDStub.new, :get_env => nil
+        it 'raises EnvironmentProtectedError' do
+          expect { subject.run }.to raise_error(EnvironmentProtectedError)
+        end
+      end
+
+      context 'when target is not protected' do
+        before { subject.stub :target => mock(:protected? => false) }
+
+        it 'successfully complete import' do
+          subject.stub(:execute_import => nil)
+          subject.run
+          message = 'Database Import completed.'
+          subject.output.content.should include(message)
+        end
+      end
     end
 
-    it 'has target attribute reader' do
-      subject.instance_eval { @target = 'something'}
-      subject.target.should == 'something'
+    describe '#tmp_file' do
+      it 'includes expected path' do
+        Time.stub :now => Time.parse('1974/09/20 14:12:33')
+        subject.tmp_file.should =~ Regexp.new('dbmanager/spec/fixtures/rails/tmp/740920141233')
+      end
     end
 
     context 'when source and target have same adapter' do
@@ -47,33 +68,5 @@ module Dbmanager
         expect {subject.adapter}.to raise_error(MixedAdapterError)
       end
     end
-
-    describe '#run' do
-      context 'when target is protected' do
-        before { subject.stub :target => mock(:protected? => true) }
-
-        it 'raises EnvironmentProtectedError' do
-          expect { subject.run }.to raise_error(EnvironmentProtectedError)
-        end
-      end
-
-      context 'when target is not protected' do
-        before { subject.stub :target => mock(:protected? => false) }
-
-        it 'outputs expected messages' do
-          subject.stub(:execute_import => nil)
-          subject.run
-          message = 'Database Import completed.'
-          subject.output.content.should include(message)
-        end
-      end
-    end
-
-    describe '#tmp_file' do
-      it 'includes expected path' do
-        Time.stub :now => Time.parse('1974/09/20 14:12:33')
-        subject.tmp_file.should =~ Regexp.new('dbmanager/spec/fixtures/rails/tmp/740920141233')
-      end
-    end
   end
 end

data/spec/lib/loader_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+module Dbmanager
+  describe Loader do
+
+    subject { described_class.new(STDStub.new, STDStub.new) }
+
+    describe '#run' do
+      before do
+        subject.stub(
+          :loader       => mock.as_null_object,
+          :get_env      => mock(:database => 'beta'),
+          :get_filename => 'filename'
+        )
+      end
+
+      it 'sends expected output' do
+        subject.run
+        subject.output.content.should include('Database successfully loaded from filename.')
+      end
+
+      it 'delegates the actual loading to the loader' do
+        loader = subject.send(:loader)
+        loader.should_receive(:run)
+        subject.run
+      end
+    end
+  end
+end

data/spec/lib/runner_spec.rb

@@ -7,37 +7,69 @@ module Dbmanager
     let(:input)  { STDStub.new }
     let(:output) { STDStub.new }
 
+    subject { Runner.new(input, output) }
+
     before do
       YmlParser.stub!(:environments => envs)
-      Runner.any_instance.stub(:get_environment => envs.first)
+      subject.stub(:choose_environment => envs.first)
     end
 
-    describe '#initialize' do
-      subject { Runner.new(input, output) }
+    it { should respond_to :input }
+    it { should respond_to :output }
+    it { should respond_to :environments }
 
+    describe '#initialize' do
       it 'sets expected attributes' do
-        subject.input.should        == input
-        subject.output.should       == output
+        subject.input.should  == input
+        subject.output.should == output
         subject.environments.should == envs
-        subject.source.should       == envs.first
       end
     end
 
     describe '#get_env' do
-      subject { Runner.new(input, output) }
-
-      it 'outputs default message' do
-        subject.get_env
-        output.content.should include('Please choose source db:')
-      end
-
       it 'outputs expected message' do
         subject.get_env('target')
         output.content.should include('Please choose target db:')
       end
 
       it 'returns the chosen environment' do
-        subject.get_env.should == envs.first
+        subject.get_env('target').should == envs.first
+      end
+    end
+
+    describe '#get_filename' do
+      it 'outputs expected message' do
+        subject.get_filename('target', 'defaultname')
+        output.content.should include('Please choose target file (defaults to defaultname):')
+      end
+
+      context 'when user inputs no filename' do
+        before { subject.stub(:get_input => '') }
+
+        it 'returns the default filename' do
+          subject.get_filename('source', '/default.sql').should == '/default.sql'
+        end
+      end
+
+      context 'when user inputs an absolute path' do
+        before { subject.stub(:get_input => '/some/path.sql') }
+
+        it 'returns the absolute path' do
+          subject.get_filename('source', 'default').should == '/some/path.sql'
+        end
+      end
+
+      context 'when user inputs a relative path' do
+        before { subject.stub(:get_input => 'filename.sql') }
+
+        it 'returns a pathname object' do
+          subject.get_filename('source', 'default').should be_a(Pathname)
+        end
+
+        it 'appends the rails root to the path' do
+          expected = Pathname.new("#{fixture_path}/rails/filename.sql")
+          subject.get_filename('source', 'default').should == expected
+        end
       end
     end
   end

data/spec/lib/yml_parser_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 module Dbmanager
   describe YmlParser do
     before do
-      stub_rails_root
       YmlParser.instance_eval { @config = nil }
     end
 

data/spec/spec_helper.rb

@@ -1,9 +1,24 @@
-require File.expand_path('../../lib/dbmanager', __FILE__)
-require 'support/std_stub'
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'dbmanager'
 
 RSpec.configure do |config|
+  config.order = :random
   config.color_enabled = true
-  config.formatter     = 'documentation'
+  config.formatter = 'documentation'
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+  config.before(:each) do
+    stub_rails_root unless example.metadata[:skip_stub_rails_root]
+  end
+end
+
+
+class STDStub < StringIO
+  def content
+    rewind
+    read
+  end
 end
 
 def fixture_path
@@ -11,5 +26,5 @@ def fixture_path
 end
 
 def stub_rails_root
-  Dbmanager.stub! :rails_root => "#{fixture_path}/rails"
+  Dbmanager.stub :rails_root => Pathname.new("#{fixture_path}/rails")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbmanager
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -29,6 +29,22 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -115,6 +131,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rvmrc
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -133,9 +151,10 @@ files:
 - lib/dbmanager/adapters.rb
 - lib/dbmanager/adapters/mysql.rb
 - lib/dbmanager/adapters/mysql2.rb
-- lib/dbmanager/dumpable.rb
+- lib/dbmanager/dumper.rb
 - lib/dbmanager/environment.rb
-- lib/dbmanager/importable.rb
+- lib/dbmanager/importer.rb
+- lib/dbmanager/loader.rb
 - lib/dbmanager/runner.rb
 - lib/dbmanager/version.rb
 - lib/dbmanager/yml_parser.rb
@@ -182,6 +201,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/index.html
 - spec/dummy/public/robots.txt
+- spec/dummy/rerun.txt
 - spec/dummy/script/rails
 - spec/dummy/test/fixtures/.gitkeep
 - spec/dummy/test/functional/.gitkeep
@@ -197,13 +217,13 @@ files:
 - spec/fixtures/rails/config/dbmanager_override.yml
 - spec/lib/adapters/mysql_spec.rb
 - spec/lib/dbmanager_spec.rb
-- spec/lib/dumpable_spec.rb
+- spec/lib/dumper_spec.rb
 - spec/lib/environment_spec.rb
-- spec/lib/importable_spec.rb
+- spec/lib/importer_spec.rb
+- spec/lib/loader_spec.rb
 - spec/lib/runner_spec.rb
 - spec/lib/yml_parser_spec.rb
 - spec/spec_helper.rb
-- spec/support/std_stub.rb
 homepage: https://github.com/spaghetticode/dbmanager
 licenses: []
 post_install_message: 
@@ -218,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1798185120944994185
+      hash: 3782929993512571637
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,10 +247,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1798185120944994185
+      hash: 3782929993512571637
 requirements: []
 rubyforge_project: dbmanager
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: database manager
@@ -282,6 +302,7 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/index.html
 - spec/dummy/public/robots.txt
+- spec/dummy/rerun.txt
 - spec/dummy/script/rails
 - spec/dummy/test/fixtures/.gitkeep
 - spec/dummy/test/functional/.gitkeep
@@ -297,10 +318,10 @@ test_files:
 - spec/fixtures/rails/config/dbmanager_override.yml
 - spec/lib/adapters/mysql_spec.rb
 - spec/lib/dbmanager_spec.rb
-- spec/lib/dumpable_spec.rb
+- spec/lib/dumper_spec.rb
 - spec/lib/environment_spec.rb
-- spec/lib/importable_spec.rb
+- spec/lib/importer_spec.rb
+- spec/lib/loader_spec.rb
 - spec/lib/runner_spec.rb
 - spec/lib/yml_parser_spec.rb
 - spec/spec_helper.rb
-- spec/support/std_stub.rb

data/lib/dbmanager/dumpable.rb

@@ -1,41 +0,0 @@
-# Extends the runner with database dumping capabilities.
-#
-# The user will be prompted to enter the target filename path, pressing enter
-# will set it to the default which is the value returned by #default_filename.
-#
-# The dump process happens in the #run method, and is eventually delegated to
-# the specific database adapter which must implement the #run method.
-
-module Dbmanager
-  module Dumpable
-    def self.extended(base)
-      class << base; attr_accessor :filename; end
-    end
-
-    def run
-      output.print "\nPlease choose target file (defaults to #{default_filename}): "
-      @filename = get_filename
-      dumper.run
-      output.puts "Database successfully dumped in #{filename} file."
-    end
-
-    private
-
-    def dumper
-      adapter::Dumper.new(source, filename)
-    end
-
-    def adapter
-      Dbmanager::Adapters.const_get source.adapter.capitalize
-    end
-
-    def default_filename
-      Dbmanager.rails_root.join "tmp/#{source.database}.sql"
-    end
-
-    def get_filename
-      filename = input.gets.chomp
-      filename.blank? ? default_filename : Dbmanager.rails_root.join(filename)
-    end
-  end
-end

data/lib/dbmanager/importable.rb

@@ -1,41 +0,0 @@
-# Extends the runner with database importing capabilities.
-#
-# The import process happens in the #run method, and is eventually delegated to
-# the specific database adapter which must implement the #run method. This
-# adapter will receive the source and target environment plus the path for the
-# sql dump file.
-#
-# The source and target environment must use the same adapter, ie you cannot
-# import a mysql database on a sqlite3 database. For that purpose you can use
-# the taps gem.
-
-module Dbmanager
-  module Importable
-    def self.extended(base)
-      class << base; attr_reader :target; end
-    end
-
-    def run
-      @target = get_env('target')
-      if target.protected?
-        raise EnvironmentProtectedError
-      else
-        execute_import
-        output.puts 'Database Import completed.'
-      end
-    end
-
-    def execute_import
-      adapter::Importer.new(source, target, tmp_file).run
-    end
-
-    def adapter
-      raise MixedAdapterError if source.adapter != target.adapter
-      Dbmanager::Adapters.const_get source.adapter.capitalize
-    end
-
-    def tmp_file
-      @tmp_file ||= File.join Dbmanager.rails_root, 'tmp', Time.now.strftime('%y%m%d%H%M%S')
-    end
-  end
-end

data/spec/lib/dumpable_spec.rb

@@ -1,38 +0,0 @@
-require 'spec_helper'
-
-module Dbmanager
-  describe Dumpable do
-    subject do
-      Object.new.tap {|o| o.extend Dumpable}
-    end
-
-    before do
-      subject.stub :output => STDStub.new, :input => STDStub.new
-    end
-
-    describe '#run' do
-      before do
-        subject.stub(
-          :get_filename     => 'filename',
-          :default_filename => 'defaultname',
-          :dumper           => mock.as_null_object
-        )
-      end
-
-      it 'sends expected output' do
-        subject.run
-        [
-          'Please choose target file (defaults to defaultname):',
-          'Database successfully dumped in filename file.'
-        ].each do |message|
-          subject.output.content.should include(message)
-        end
-      end
-
-      it 'delegates the actual dumping to the dumper' do
-        subject.send(:dumper).should_receive(:run)
-        subject.run
-      end
-    end
-  end
-end

data/spec/support/std_stub.rb

@@ -1,6 +0,0 @@
-class STDStub < StringIO
-  def content
-    rewind
-    read
-  end
-end