dbmanager 0.0.6 → 0.1.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.1.0
+
+* major code refactoring
+* allow mixed adapters in database.yml
+* import process dumps to rails app tmp directory
+
 ## v0.0.6
 
 * handle mysql2 adapter

data/README.md

@@ -32,9 +32,9 @@ rake db:dump
 ```
 This rake task will dump the requested db to a file on the local machine.
 
-You will be prompted to choose the target dir (defaults to tmp) and the sql file
-name (sql extension will be added automatically). If the file already exists, it
-will be overwritten.
+**You will be prompted to choose the target dir** (defaults to *tmp* in the rails
+root) and the sql file name (sql extension will be added automatically). If the
+file already exists, it will be overwritten.
 
 
 #### Database Imports
@@ -43,25 +43,25 @@ will be overwritten.
 rake db:import
 ```
 
-This task will import a source db to a destination db. Tipical use is to import
-the production db into your development one.
+**You will be prompted to choose the source and the target environment db**, and the
+source db will be imported into the target db.
 
-You will be prompted to choose the source and the target environment db, and the
-source db will be imported into the target db. All environments containing the
+This task will import a source db to a destination db. Tipical use is to import
+the production db into your development one. All environments containing the
 string 'production' in their name are protected by default, which means you cannot
 overwrite them unless you explicitly override this setting in the override file
 (see next section for more info).
 
 #### BEWARE
 
-import process is destructive, be careful on what environment you choose to
-overwite. I take no responsibility for misuse or bugs in the code ;-)
+**the import process is destructive** so be careful on which environment you
+choose to overwite. I take no responsibility for misuse or bugs in the code ;-)
 
 
 #### Override database.yml
 
 Since some settings may be specific to the server environment (ie. host could
-be a private ip not reachable from anywhere) you can overwrite the settings in
+be a private ip not reachable from elsewhere) you can override the settings in
 database.yml by adding a dbmanager_override.yml file in your rails config dir.
 
 You can also use this file to tell the dumper to ignore certain tables with
@@ -74,16 +74,17 @@ the ignoretables directive:
       - prods_view
 ```
 
-Another use is to set some environments as protected, or vice versa allow to
-overwrite production env.
-For example if we want to override the following setting, and make the database
+Another use is to set some environment as protected, or on the other hand allow
+overwriting if it's protected by default (ie. production env).
+
+For example if you want to override the following setting, and make the database
 protected from overwriting:
 
 ```yaml
 beta:
   host: 192.168.0.1
 ```
-we should put in dbmanager_override.yml this:
+you should put this in dbmanager_override.yml:
 
 ```yaml
 beta:
@@ -91,7 +92,7 @@ beta:
   protected: true
 ```
 
-Instead, if we want to make the production env writable we should add this:
+Instead, if you want to make the production env writable you should add this:
 
 ```yaml
 production:

data/lib/dbmanager.rb

@@ -1,5 +1,11 @@
 module Dbmanager
-  class AdapterError < StandardError
+  class EnvironmentProtectedError < StandardError
+    def initialize(message=nil)
+      super message || 'sorry the environment is protected from writing'
+    end
+  end
+
+  class MixedAdapterError < StandardError
     def initialize(message=nil)
       super message || 'You cannot mix different adapters!'
     end
@@ -37,6 +43,6 @@ require 'active_support/ordered_hash'
 require 'active_support/core_ext/enumerable'
 require 'active_support/core_ext/object/blank'
 
-%w[yml_parser adapters/mysql adapters/mysql2 runner importer dumper].each do |string|
+%w[environment yml_parser adapters/mysql adapters/mysql2 runner importable dumpable].each do |string|
   require File.expand_path "../dbmanager/#{string}", __FILE__
 end

data/lib/dbmanager/adapters/mysql.rb

@@ -3,48 +3,19 @@ require 'time'
 module Dbmanager
   module Adapters
     module Mysql
-      class EnvironmentProtectedError < StandardError
-        def initialize(message=nil)
-          super message || 'sorry the environment is protected from writing'
-        end
-      end
-
-      class Connection
-        attr_reader :environment
-
-        delegate :host, :adapter, :database, :username, :password, :ignoretables,
-                 :encoding, :protected, :name, :port , :to => :environment
-
-        def initialize(environment)
-          @environment = environment
-        end
-
-        def params
-          "-u#{username} #{flag :password, :p} #{flag :host, :h} #{flag :port, :P} #{database}"
-        end
-
-        def ignore_tables
-          if ignoretables.present?
-            ignoretables.inject('') do |s, view|
-              s << " --ignore-table=#{database}.#{view}"
-            end
-          end
-        end
-
-        def flag(name, flag)
-          send(name).present? ? "-#{flag}#{send(name)}" : ''
-        end
-
-        def protected?
-          if name =~ /production/
-            protected != false
-          else
-            protected == true
-          end
+      module Connectable
+        def params(environment)
+          [ "-u#{environment.username}",
+            environment.flag(:password, :p),
+            environment.flag(:host, :h),
+            environment.flag(:port, :P),
+            environment.database
+          ].compact.join(' ')
         end
       end
 
       class Dumper
+        include Connectable
         attr_reader :source, :filename
 
         def initialize(source, filename)
@@ -57,38 +28,45 @@ module Dbmanager
         end
 
         def dump_command
-          "mysqldump #{source.params} #{source.ignore_tables} > #{filename}"
+          "mysqldump #{ignoretables} #{params(source)} > #{filename}"
+        end
+
+        def ignoretables
+          if source.ignoretables.present?
+            source.ignoretables.inject [] do |arr, table|
+              arr << "--ignore-table=#{source.database}.#{table}"
+            end.join ' '
+          end
         end
       end
 
       class Importer
-        attr_reader :source, :target
+        include Connectable
+        attr_reader :source, :target, :tmp_file
 
-        def initialize(source, target)
-          @source = source
-          @target = target
+        def initialize(source, target, tmp_file)
+          @source   = source
+          @target   = target
+          @tmp_file = tmp_file
         end
 
         def run
-          Dumper.new(source, temp_file).run
+          Dumper.new(source, tmp_file).run
           Dbmanager.execute! import_command
-          remove_temp_file
+        ensure
+          remove_tmp_file
         end
 
         def import_command
           unless target.protected?
-            "mysql #{target.params} < #{temp_file}"
+            "mysql #{params(target)} < #{tmp_file}"
           else
             raise EnvironmentProtectedError
           end
         end
 
-        def remove_temp_file
-          Dbmanager.execute "rm #{temp_file}"
-        end
-
-        def temp_file
-          @temp_file ||= "/tmp/#{Time.now.strftime '%y%m%d%H%M%S'}"
+        def remove_tmp_file
+          Dbmanager.execute "rm #{tmp_file}"
         end
       end
     end

data/lib/dbmanager/adapters/mysql2.rb

@@ -1,5 +1,4 @@
-# just the same as the mysql adapter, but ready for modifications
-
+# just the same as the mysql adapter, but ready for future modifications
 module Dbmanager
   module Adapters
     module Mysql2

data/lib/dbmanager/dumpable.rb

@@ -0,0 +1,40 @@
+# 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.puts "\nPlease choose target file (defaults to #{default_filename}):\n\n"
+      @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/environment.rb

@@ -0,0 +1,37 @@
+require 'ostruct'
+# An +Environment+ object is created for each environment listed in the
+# database.yml file.
+#
+# Common useful options are:
+# +ignore_tables+: a list of tables that will not be dumped.
+#
+# +protected+: makes the environment protected from overwriting.
+# By default every environment except for the ones that  contain the
+# +production+ string can be overwritten. This is dangerous of course, so you
+# can protect an environment from overwriting adding  +protected: true+ to
+# that environment in the database.yml file.
+# If on the other hand you want to be free to overwrite the production db
+# you need to explicitly set +protected: false+ to that environment in the
+# database.yml file.
+module Dbmanager
+  class Environment < OpenStruct
+
+    # verifies whether the environment is protected from overwriting or not.
+    def protected?
+      if name =~ /production/
+        protected != false
+      else
+        protected == true
+      end
+    end
+
+    # returns the flag formatted for the requested attribute, if present.
+    # env = Environment.new(:password => 'secret')
+    # env.flag('password', 'p') # => -psecret
+    # env.flag('foo', 'f')      # => nil
+    def flag(attribute, flag)
+      value = send attribute
+      "-#{flag}#{value}" if value.present?
+    end
+  end
+end

data/lib/dbmanager/importable.rb

@@ -0,0 +1,36 @@
+# 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')
+      execute_import
+      output.puts 'Database Import completed.'
+    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/runner.rb

@@ -1,34 +1,37 @@
+# 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, :adapter
+    attr_reader :input, :output, :environments, :source
 
-    def self.run
-      new.run
+    def self.run(module_name)
+      runner = new
+      runner.extend Dbmanager.const_get(module_name.capitalize)
+      runner.run
     end
 
-    def initialize(input, output)
+    def initialize(input=STDIN, output=STDOUT)
       @input        = input
       @output       = output
       @environments = YmlParser.environments
-      @adapter      = set_adapter
-      @source       = adapter::Connection.new(set_source)
+      @source       = get_env
     end
 
-    def set_adapter
-      adapters = environments.map {|name, env| env.adapter}.uniq
-      if adapters.size > 1
-        raise AdapterError
-      else
-        Dbmanager::Adapters.const_get adapters.first.capitalize
-      end
+    def get_env(type='source')
+      output.puts "\nPlease choose #{type} db:\n\n"
+      get_environment
     end
 
-    def set_source
-      output.puts "\nPlease choose source db:\n\n"
-      get_env
-    end
+    private
 
-    def get_env
+    def get_environment
       environments.keys.each_with_index do |name, i|
         output.puts "#{i+1}) #{name}"
       end

data/lib/dbmanager/version.rb

@@ -1,3 +1,3 @@
 module Dbmanager
-  VERSION = "0.0.6"
+  VERSION = '0.1.0'
 end

data/lib/dbmanager/yml_parser.rb

@@ -1,12 +1,9 @@
 require 'erb'
 require 'yaml'
-require 'ostruct'
 require 'active_support/core_ext/hash'
 
 module Dbmanager
   module YmlParser
-    class Environment < OpenStruct; end
-
     extend self
     attr_writer :config
 

data/lib/tasks/dbmanager.rake

@@ -1,11 +1,11 @@
 namespace :db do
   desc 'import specific environment db data into another environment db'
   task :import  do
-    Dbmanager::Importer.run
+    Dbmanager::Runner.run('importable')
   end
 
   desc 'dump specific environment db data in tmp directory'
   task :dump do
-    Dbmanager::Dumper.run
+    Dbmanager::Runner.run('dumpable')
   end
 end

data/spec/fixtures/adapter_sample.rb

@@ -1,10 +1,6 @@
 module Dbmanager
   module Adapters
     module SomeAdapter
-      class Connection
-        def initialize(*args); end
-      end
-
       class Dumper
         def initialize(*args); end
 

data/spec/fixtures/config/database.yml

@@ -3,16 +3,13 @@ development:
   database: demo_development
   encoding: utf8
   username: root
-  password: devil
-
-  # ale i tuoi settaggi specifici devi metterli in config/dbloginyml, non qui
-  # socket: /Applications/MAMP/tmp/mysql/mysql.sock
+  password: secret
 
 beta:
   adapter: mysql
   database: demo_beta
-  username: beta_username
-  password: asdasd
+  username: beta_user
+  password: beta_pass
   port: 3306
   host: 123.123.123.123
   encoding: utf8
@@ -20,26 +17,21 @@ beta:
 production:
   adapter: mysql
   database: demo_production
-  username: production_username
-  password: asdasd
+  username: prod_user
+  password: prod_pass
   port: 3306
   host: 123.123.123.123
   encoding: utf8
 
 test:
-  adapter: mysql
+  adapter: sqlite3
   database: demo_test
-  encoding: utf8
-  port: 3306
-  host: 345.345.345.345
-  username: root
-  password: devil
 
 shop:
   adapter: mysql
   database: demo_shop
-  username: demo_username
-  password: asdasd
+  username: demo_user
+  password: demo_pass
   port: 3306
   host: 123.123.123.123
   encoding: utf8

data/spec/fixtures/config/dbmanager_override.yml

@@ -2,12 +2,4 @@ beta:
   host: 345.345.345.345
   protected: true
   ignoretables:
-    - view0
-
-production:
-  protected: false
-
-test:
-  ignoretables:
-    - view0
-    - view1
+    - some_view

data/spec/lib/adapters/mysql_spec.rb

@@ -3,93 +3,64 @@ require 'spec_helper'
 module Dbmanager
   module Adapters
     module Mysql
-      describe Connection do
-        before { stub_rails_root }
-
-        describe 'a mysql adapter instance' do
-          subject { Connection.new Dbmanager::YmlParser.environments['test'] }
-
-          it 'delegates to environment object' do
-            subject.host.should == subject.environment.host
-          end
-
-          describe '#params' do
-            it 'returns expected string' do
-              subject.params.should == '-uroot -pdevil -h345.345.345.345 -P3306 demo_test'
-            end
-          end
+      describe Dumper do
+        let :source do
+          Environment.new(
+            :username     => 'root',
+            :ignoretables => ['a_view', 'another_view'],
+            :database     => 'database',
+            :password     => 'secret',
+            :port         => 42,
+            :host         => '0.0.0.0'
+          )
+        end
 
-          describe '#ignore_tables' do
-            context 'when there are tables to be skipped' do
-              it 'returns expected string' do
-                subject.ignore_tables.should == ' --ignore-table=demo_test.view0 --ignore-table=demo_test.view1'
-              end
-            end
+        subject { Dumper.new(source, '/tmp/dump_file.sql') }
 
-            context 'when there are no tables to be skipped' do
-              it 'returns nil' do
-                subject.stub!(:ignoretables => nil)
-                subject.ignore_tables.should be_nil
-              end
+        describe '#ignoretables' do
+          context 'when there are tables to be ignored' do
+            it 'returns a string containing ignore-table flags' do
+              string = '--ignore-table=database.a_view --ignore-table=database.another_view'
+              subject.ignoretables.should == string
             end
           end
 
-          describe '#protected?' do
-            it 'is false by default' do
-              subject.should_not be_protected
-            end
-
-            context 'when name matches production string' do
-              it 'is true by default ' do
-                subject.stub! :name => 'production-merge'
-                subject.should be_protected
-              end
-
-              context 'when protected is set to false' do
-                it 'is false' do
-                  subject.stub! :name => 'production', :protected => false
-                  subject.should_not be_protected
-                end
-              end
+          context 'when there are no tables to be ignored' do
+            it 'returns nil' do
+              source.stub!(:ignoretables => nil)
+              subject.ignoretables.should be_nil
             end
           end
+        end
 
-          describe '#flag' do
-            context 'when requested flag has a value' do
-              it 'returns expected string' do
-                subject.flag(:password, :p).should == '-pdevil'
-              end
-            end
-
-            context 'when requested flag has no value' do
-              it 'returns a blank string' do
-                subject.stub!(:password => nil)
-                subject.flag(:password, :p).should == ''
-              end
-            end
+        describe '#dump_command' do
+          it 'returns expected command' do
+            command = [
+              'mysqldump --ignore-table=database.a_view',
+              '--ignore-table=database.another_view -uroot',
+              '-psecret -h0.0.0.0 -P42 database > /tmp/dump_file.sql'
+            ].join(' ')
+            subject.dump_command.should == command
           end
         end
       end
 
       describe Importer do
         describe 'an importer instance' do
-          before  { Time.stub! :now => Time.parse('2012/03/23 12:30:32') }
-          let(:target) { mock :params => 'target-params', :protected? => false, :name => 'beta'  }
-          let(:source) { mock :params => 'source-params', :protected? => false, :name => 'development' }
-          subject { Importer.new source, target  }
+          before { Time.stub! :now => Time.parse('2012/03/23 12:30:32') }
+          let(:target)   { Environment.new :protected => false, :name => 'beta', :username => 'beta_user' }
+          let(:source)   { Environment.new :protected => false, :name => 'development', :username => 'root' }
+          let(:tmp_file) { '/some/arbitrary/path' }
+          subject        { Importer.new source, target, tmp_file }
 
           it 'has target and source attribute methods' do
-            %w[source target].each { |m| subject.should respond_to(m) }
-          end
-
-          it 'has a timestamped temporary file' do
-            subject.temp_file.should == '/tmp/120323123032'
+            %w[source target tmp_file].each { |m| subject.should respond_to m }
           end
 
           describe '#import_command' do
             context 'when environment is not protected' do
               it 'returns expected command' do
-                subject.import_command.should == 'mysql target-params < /tmp/120323123032'
+                subject.import_command.should == 'mysql -ubeta_user < /some/arbitrary/path'
               end
             end
 
@@ -101,10 +72,10 @@ module Dbmanager
             end
           end
 
-          describe '#remove_temp_file' do
+          describe '#remove_tmp_file' do
             it 'tries to remove the temporary file' do
-              Dbmanager.should_receive(:execute).with("rm #{subject.temp_file}")
-              subject.remove_temp_file
+              Dbmanager.should_receive(:execute).with("rm #{subject.tmp_file}")
+              subject.remove_tmp_file
             end
           end
 
@@ -117,29 +88,13 @@ module Dbmanager
 
             it 'imports the db' do
               Dumper.stub! :new => mock.as_null_object
-              subject.stub!(:remove_temp_file => true)
+              subject.stub!(:remove_tmp_file => true)
               Dbmanager.should_receive(:execute!).with(subject.import_command)
               subject.run
             end
           end
         end
       end
-
-      describe Dumper do
-        subject do
-          Dumper.new(
-            mock(:params => 'source-params', :ignore_tables => '--ignore-table=view'),
-            '/tmp/dump_file.sql'
-          )
-        end
-
-        describe '#dump_command' do
-          it 'returns expected command' do
-            command =  'mysqldump source-params --ignore-table=view > /tmp/dump_file.sql'
-            subject.dump_command.should == command
-          end
-        end
-      end
     end
   end
 end

data/spec/lib/dbmanager_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Dbmanager do
   describe '#rails_root' do
-    it 'should wrap Rails.root' do
+    it 'wraps Rails.root' do
       Rails = mock unless defined? Rails
       Rails.should_receive :root
       Dbmanager.rails_root
@@ -10,7 +10,7 @@ describe Dbmanager do
   end
 
   describe '#execute' do
-    it 'execute a system command' do
+    it 'executes a system command' do
       Dbmanager.should_receive(:system)
       Dbmanager.execute('echo')
     end

data/spec/lib/dumpable_spec.rb

@@ -0,0 +1,38 @@
+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/lib/environment_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+module Dbmanager
+  describe Environment do
+    describe 'a generic environment' do
+      subject { Environment.new :name => 'beta' }
+
+      it { subject.should_not be_protected }
+
+      context 'when the protected attribute is changed to true' do
+        before { subject.protected = true }
+
+        it { subject.should be_protected }
+      end
+    end
+
+    describe 'the production environment' do
+      subject { Environment.new(:name => 'production') }
+
+      it { subject.should be_protected }
+
+      context 'when the protected attribute is explicitly set to false' do
+        before { subject.protected = false }
+
+        it { subject.should_not be_protected }
+      end
+    end
+
+    describe '#flag' do
+      context 'when requested attribute is present' do
+        before { subject.stub(:password => 'secret') }
+
+        it 'returns a string containing the expected flag' do
+          subject.flag(:password, :p).should == '-psecret'
+        end
+      end
+
+      context 'when the requested attribute is not present' do
+        it 'returns nil' do
+          subject.flag(:foo, :p).should be_nil
+        end
+      end
+    end
+  end
+end

data/spec/lib/importable_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+module Dbmanager
+  describe Importable do
+    subject do
+      Object.new.tap {|o| o.extend Importable}
+    end
+
+    before do
+      stub_rails_root
+      subject.stub :output => STDStub.new, :input => STDStub.new, :get_env => nil
+    end
+
+    it 'has target attribute reader' do
+      subject.instance_eval { @target = 'something'}
+      subject.target.should == 'something'
+    end
+
+    context 'when source and target have same adapter' do
+      before do
+        subject.stub(
+          :source => mock(:adapter => 'mysql2'),
+          :target => mock(:adapter => 'mysql2')
+        )
+      end
+
+      it 'uses the expected adapter' do
+        subject.adapter.should == Dbmanager::Adapters::Mysql2
+      end
+
+      it 'delegates importing process to the adapter importer' do
+        adapter_importer = Dbmanager::Adapters::Mysql2::Importer
+        adapter_importer.should_receive(:new).and_return mock.as_null_object
+        subject.run
+      end
+    end
+
+    context 'when source and target adapters differ' do
+      before do
+        subject.stub(
+          :source => mock(:adapter => 'sqlite3'),
+          :target => mock(:adapter => 'mysql2')
+        )
+      end
+
+      it 'adapter raises MixedAdapterError' do
+        expect {subject.adapter}.to raise_error(MixedAdapterError)
+      end
+    end
+
+    describe '#run' do
+      it 'outputs expected messages' do
+        subject.stub(:execute_import => nil)
+        subject.run
+        message = 'Database Import completed.'
+        subject.output.content.should include(message)
+      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/tmp/740920141233')
+      end
+    end
+  end
+end

data/spec/lib/runner_spec.rb

@@ -3,68 +3,41 @@ require 'fixtures/adapter_sample'
 
 module Dbmanager
   describe Runner do
-    let(:input) { STDStub.new }
+    let(:envs)   { [mock] }
+    let(:input)  { STDStub.new }
     let(:output) { STDStub.new }
 
-    describe '#initialize' do
-      let(:envs) { [mock] }
+    before do
+      YmlParser.stub!(:environments => envs)
+      Runner.any_instance.stub(:get_environment => envs.first)
+    end
 
+    describe '#initialize' do
       subject { Runner.new(input, output) }
 
-      before do
-        YmlParser.stub!(:environments => envs)
-        Runner.any_instance.stub(:set_adapter => Adapters::SomeAdapter, :set_source => nil)
-      end
-
       it 'sets expected attributes' do
         subject.input.should        == input
         subject.output.should       == output
         subject.environments.should == envs
-        subject.adapter.should      == Adapters::SomeAdapter
-        subject.source.should be_a(Adapters::SomeAdapter::Connection)
+        subject.source.should       == envs.first
       end
     end
 
-    describe '#set_adapter' do
+    describe '#get_env' do
       subject { Runner.new(input, output) }
 
-      before { Runner.any_instance.stub(:set_source => nil) }
-
-      context 'when different adapters are mixed' do
-        it 'raises an error' do
-          envs = {:beta => mock(:adapter => 'Mysql'), :development => mock(:adapter => 'Sqlite3')}
-          subject.stub!(:environments => envs)
-          expect { subject.set_adapter }.to raise_error(AdapterError)
-        end
-      end
-
-      context 'when there is only one kind of adapter' do
-        it 'returns an adapter class' do
-          envs = {:beta => mock(:adapter => 'Mysql'), :development => mock(:adapter => 'Mysql')}
-          subject.instance_variable_set '@environments', envs
-          Dbmanager::Adapters.should_receive(:const_get).and_return(Adapters::SomeAdapter)
-          subject.set_adapter.should == Adapters::SomeAdapter
-        end
+      it 'outputs default message' do
+        subject.get_env
+        output.content.should include('Please choose source db:')
       end
 
-      context 'when the adapter is mysql2' do
-        it 'returns the correct adapter class' do
-          envs = {:development => mock(:adapter => 'mysql2')}
-          subject.instance_variable_set '@environments', envs
-          subject.set_adapter.should == Adapters::Mysql2
-        end
+      it 'outputs expected message' do
+        subject.get_env('target')
+        output.content.should include('Please choose target db:')
       end
-    end
-
-    describe '#set_source' do
-      subject { Runner.new(input, output) }
-
-      before { Runner.any_instance.stub(:set_adapter => Adapters::SomeAdapter) }
 
-      it 'outputs expected message' do
-        Runner.any_instance.stub(:get_env => nil)
-        subject.set_source
-        output.content.should include('Please choose source db:')
+      it 'returns the chosen environment' do
+        subject.get_env.should == envs.first
       end
     end
   end

data/spec/lib/yml_parser_spec.rb

@@ -52,12 +52,12 @@ module Dbmanager
         end
 
         it 'removes old unchanged settings' do
-          YmlParser.config['beta']['username'].should == 'beta_username'
+          YmlParser.config['beta']['username'].should == 'beta_user'
         end
 
         context 'when the environment has a ignoretables directive' do
           it 'should populate ignoretables with the expected array' do
-            YmlParser.config['beta']['ignoretables'].should == ['view0']
+            YmlParser.config['beta']['ignoretables'].should == ['some_view']
           end
         end
       end

metadata

@@ -1,74 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dbmanager
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
 platform: ruby
-authors: 
+authors:
 - andrea longhi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: helps manage db dumps and imports via rake tasks
-email: 
+email:
 - andrea.longhi@mikamai.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
@@ -79,8 +76,9 @@ files:
 - lib/dbmanager.rb
 - lib/dbmanager/adapters/mysql.rb
 - lib/dbmanager/adapters/mysql2.rb
-- lib/dbmanager/dumper.rb
-- lib/dbmanager/importer.rb
+- lib/dbmanager/dumpable.rb
+- lib/dbmanager/environment.rb
+- lib/dbmanager/importable.rb
 - lib/dbmanager/runner.rb
 - lib/dbmanager/version.rb
 - lib/dbmanager/yml_parser.rb
@@ -92,53 +90,46 @@ files:
 - spec/fixtures/config/dbmanager_override.yml
 - spec/lib/adapters/mysql_spec.rb
 - spec/lib/dbmanager_spec.rb
-- spec/lib/dumper_spec.rb
-- spec/lib/importer_spec.rb
+- spec/lib/dumpable_spec.rb
+- spec/lib/environment_spec.rb
+- spec/lib/importable_spec.rb
 - spec/lib/runner_spec.rb
 - spec/lib/yml_parser_spec.rb
 - spec/spec_helper.rb
 - spec/support/std_stub.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: dbmanager
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: database manager
-test_files: 
+test_files:
 - spec/fixtures/adapter_sample.rb
 - spec/fixtures/config/database.yml
 - spec/fixtures/config/dbmanager_override.yml
 - spec/lib/adapters/mysql_spec.rb
 - spec/lib/dbmanager_spec.rb
-- spec/lib/dumper_spec.rb
-- spec/lib/importer_spec.rb
+- spec/lib/dumpable_spec.rb
+- spec/lib/environment_spec.rb
+- spec/lib/importable_spec.rb
 - spec/lib/runner_spec.rb
 - spec/lib/yml_parser_spec.rb
 - spec/spec_helper.rb

data/lib/dbmanager/dumper.rb

@@ -1,31 +0,0 @@
-module Dbmanager
-  class Dumper < Runner
-    attr_reader :filename
-
-    def initialize(input=STDIN, output=STDOUT)
-      super
-      @filename = set_filename
-    end
-
-    def run
-      adapter::Dumper.new(source, filename).run
-      output.puts "Database Dump completed to #{filename}"
-    end
-
-    private
-
-    def set_filename
-      output.puts "\nPlease choose target file (defaults to #{default_filename})\n\n"
-      get_filename
-    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/importer.rb

@@ -1,22 +0,0 @@
-module Dbmanager
-  class Importer < Runner
-    attr_reader :target
-
-    def initialize(input=STDIN, output=STDOUT)
-      super
-      @target = adapter::Connection.new(set_target)
-    end
-
-    def run
-      adapter::Importer.new(source, target).run
-      output.puts 'Database Import completed.'
-    end
-
-    private
-
-    def set_target
-      output.puts "\nPlease choose target db:\n\n"
-      get_env
-    end
-  end
-end

data/spec/lib/dumper_spec.rb

@@ -1,28 +0,0 @@
-require 'spec_helper'
-require 'fixtures/adapter_sample'
-
-module Dbmanager
-  describe Dumper do
-    describe '#run' do
-      let(:input) { STDStub.new }
-      let(:output) { STDStub.new }
-
-      subject { Dumper.new(input, output) }
-
-      before do
-        stub_rails_root
-        input.stub!(:gets => mock.as_null_object)
-        Dumper.any_instance.stub(
-          :set_source       => nil,
-          :adapter          => Adapters::SomeAdapter,
-          :default_filename => 'default_filename'
-        )
-      end
-
-      it 'dumps a db' do
-        Adapters::SomeAdapter::Dumper.should_receive(:new).and_return(mock(:run => nil))
-        subject.run
-      end
-    end
-  end
-end

data/spec/lib/importer_spec.rb

@@ -1,24 +0,0 @@
-require 'spec_helper'
-require 'fixtures/adapter_sample'
-
-module Dbmanager
-  describe Importer do
-    describe '#run' do
-      let(:input) { STDStub.new }
-      let(:output) { STDStub.new }
-
-      subject { Importer.new(input, output) }
-
-      before do
-        stub_rails_root
-        input.stub!(:gets => "1\n")
-        Importer.any_instance.stub(:adapter => Adapters::SomeAdapter)
-      end
-
-      it 'imports a db' do
-        Adapters::SomeAdapter::Importer.should_receive(:new).and_return(mock(:run => nil))
-        subject.run
-      end
-    end
-  end
-end