dbmanager 0.1.1 → 0.1.2

data/lib/dbmanager/adapters/mysql.rb

@@ -58,11 +58,7 @@ module Dbmanager
         end
 
         def import_command
-          unless target.protected?
-            "mysql #{params(target)} < #{tmp_file}"
-          else
-            raise EnvironmentProtectedError
-          end
+          "mysql #{params(target)} < #{tmp_file}"
         end
 
         def remove_tmp_file

data/lib/dbmanager/dumpable.rb

@@ -5,6 +5,7 @@
 #
 # 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)

data/lib/dbmanager/environment.rb

@@ -1,4 +1,3 @@
-require 'ostruct'
 # An +Environment+ object is created for each environment listed in the
 # database.yml file.
 #
@@ -13,6 +12,9 @@ require 'ostruct'
 # 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.
+
+require 'ostruct'
+
 module Dbmanager
   class Environment < OpenStruct
 

data/lib/dbmanager/importable.rb

@@ -8,6 +8,7 @@
 # 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)
@@ -16,8 +17,12 @@ module Dbmanager
 
     def run
       @target = get_env('target')
-      execute_import
-      output.puts 'Database Import completed.'
+      if target.protected?
+        raise EnvironmentProtectedError
+      else
+        execute_import
+        output.puts 'Database Import completed.'
+      end
     end
 
     def execute_import

data/lib/dbmanager/runner.rb

@@ -7,6 +7,7 @@
 #
 # Extension modules must define the #run method which contains the specific
 # behaviour they provide.
+
 module Dbmanager
   class Runner
     attr_reader :input, :output, :environments, :source

data/lib/dbmanager/version.rb

@@ -1,3 +1,3 @@
 module Dbmanager
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/lib/adapters/mysql_spec.rb

@@ -58,17 +58,8 @@ module Dbmanager
           end
 
           describe '#import_command' do
-            context 'when environment is not protected' do
-              it 'returns expected command' do
-                subject.import_command.should == 'mysql -ubeta_user < /some/arbitrary/path'
-              end
-            end
-
-            context 'when environment is protected' do
-              it 'raises EnvironmentProtectedError' do
-                target.stub! :protected? => true
-                expect { subject.import_command }.to raise_error(EnvironmentProtectedError)
-              end
+            it 'returns expected command' do
+              subject.import_command.should == 'mysql -ubeta_user < /some/arbitrary/path'
             end
           end
 

data/spec/lib/importable_spec.rb

@@ -20,7 +20,7 @@ module Dbmanager
       before do
         subject.stub(
           :source => mock(:adapter => 'mysql2'),
-          :target => mock(:adapter => 'mysql2')
+          :target => mock(:adapter => 'mysql2', :protected? => false)
         )
       end
 
@@ -49,11 +49,23 @@ module Dbmanager
     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)
+      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
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbmanager
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - andrea longhi
@@ -15,11 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-27 00:00:00 Z
+date: 2012-07-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,11 +30,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  requirement: *id001
-  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,11 +44,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  requirement: *id002
-  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,8 +58,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  requirement: *id003
-  prerelease: false
+  version_requirements: *id003
 description: helps manage db dumps and imports via rake tasks
 email: 
 - andrea.longhi@mikamai.com
@@ -146,3 +146,4 @@ test_files:
 - spec/lib/yml_parser_spec.rb
 - spec/spec_helper.rb
 - spec/support/std_stub.rb
+has_rdoc: