mongration 0.0.4.pre.beta → 0.0.5.pre.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20730b095053fceae0d065822f9492a8e70eb89b
-  data.tar.gz: 4a57e71108a1453971fc04145a31b6ba1c2bf4eb
+  metadata.gz: f1f71d2e5d3c7e355445796dab1273bae59e0391
+  data.tar.gz: b894bde28c6d7af02bbc3ccba842f135dfce8bc1
 SHA512:
-  metadata.gz: 7ed9c54e2a8c160eb8ca9089e83c07310dd6b916e1e8b86f460e6f753892d6f0e43a7e5ab0b340b67ec3a6cd14a6a9b53c22e878e401dd695a81bdb538a995a3
-  data.tar.gz: 7708282338c9c5740a675c65f1f6ee836280f59c0e03cb95d030430353500c5bed606e6cf2c3bea99dc34c46ab6b616691f90832ad3aade93831275d96b09eb6
+  metadata.gz: 8700887b66be864d7246255249c160bd4a128b0aae90de3eaa2ff50ee99f1ed8ec0946565bc7a1328bb8a32838ff8c8bb3fc815c104b8d0ab80c3265c2ff710c
+  data.tar.gz: 8c50e8a7405c20581a2fdcf6795d2b24208bc08916732c9c9a36188a52890bd5d811a445d20c8627ad63af51151d460186dc9e37f82d0e21c92817d6eb87a7c2

data/lib/mongration.rb

@@ -3,10 +3,6 @@ require 'rake'
 
 require 'mongration/version'
 require 'mongration/errors'
-
-require 'mongration/file'
-require 'mongration/migration'
-
 require 'mongration/rake_tasks'
 require 'mongration/configuration'
 
@@ -14,9 +10,9 @@ module Mongration
   extend self
 
   autoload :CreateMigration, 'mongration/create_migration'
-  autoload :MigrateAllUp,    'mongration/migrate_all_up'
-  autoload :MigrateUp,       'mongration/migrate_up'
-  autoload :MigrateDown,     'mongration/migrate_down'
+  autoload :File,            'mongration/file'
+  autoload :Migrate,         'mongration/migrate'
+  autoload :Migration,       'mongration/migration'
   autoload :NullOutput,      'mongration/null_output'
   autoload :Rollback,        'mongration/rollback'
   autoload :Status,          'mongration/status'
@@ -33,13 +29,16 @@ module Mongration
 
     case version
     when nil
-      MigrateAllUp.perform
+      files = File.pending
+      Migrate::Up.new(files).perform
 
     when pending
-      MigrateUp.new(version).perform
+      files = File.pending.select { |f| f.version <= version }
+      Migrate::Up.new(files).perform
 
     when migrated
-      MigrateDown.new(version).perform
+      files = File.migrated.select { |f| f.version > version }.reverse
+      Migrate::Down.new(files).perform
 
     else
       out.puts("Invalid Version: #{version} does not exist.")
@@ -53,9 +52,8 @@ module Mongration
   # @return [void]
   #
   def rollback(step = 1)
-    step.times do
-      Rollback.perform
-    end
+    files = File.migrated.reverse.first(step)
+    Migrate::Down.new(files).perform
   end
 
   # Creates a migration with the given name

data/lib/mongration/file.rb

@@ -3,6 +3,9 @@ module Mongration
   # @private
   class File
     include Comparable
+    extend Forwardable
+
+    def_delegators :klass, :up, :down
 
     def self.all_file_names
       Dir[::File.join(Mongration.configuration.dir, '*.rb')].map do |path|
@@ -40,27 +43,6 @@ module Mongration
       @file_name = file_name
     end
 
-    def up
-      Mongration.out.puts("#{version} #{class_name}: migrating")
-
-      load_file
-      klass.up
-
-      Migration.create_by_file_name(file_name)
-      Mongration.out.puts("#{version} #{class_name}: migrated")
-      true
-
-    rescue => e
-      Mongration.out.puts("#{e.class}: An error has occured, this and all later migrations cancelled")
-      false
-    end
-
-    def down
-      load_file
-      klass.down
-      Migration.destroy_by_file_name(file_name)
-    end
-
     def name
       underscored_name.gsub('_', ' ')
     end
@@ -81,16 +63,17 @@ module Mongration
       number <=> other.number
     end
 
-    private
-
-    def load_file
-      load(::File.join(Mongration.configuration.dir, @file_name))
+    alias_method :_load, :load
+    def load
+      _load(::File.join(Mongration.configuration.dir, @file_name))
     end
 
     def klass
       class_name.constantize
     end
 
+    private
+
     def underscored_name
       @file_name.chomp('.rb').gsub(/^\d+_/, '')
     end

data/lib/mongration/migrate.rb

@@ -0,0 +1,7 @@
+module Mongration
+  module Migrate
+    autoload :Direction, 'mongration/migrate/direction'
+    autoload :Down,      'mongration/migrate/down'
+    autoload :Up,        'mongration/migrate/up'
+  end
+end

data/lib/mongration/migrate/direction.rb

@@ -0,0 +1,42 @@
+module Mongration
+  module Migrate
+    class Direction
+
+      def initialize(files)
+        @files = files
+      end
+
+      def perform
+        @files.each do |file|
+          file.load
+
+          summarize(description_for(file)) do
+            migrate(file)
+          end
+
+          persist(file)
+        end
+      end
+
+      private
+
+      def summarize(description)
+        Mongration.out.puts("#{description}: #{before_text}")
+
+        begin
+          yield
+        rescue => e
+          Mongration.out.puts("#{e.inspect}: An error has occured, this and all later migrations cancelled")
+          raise e
+        end
+
+        Mongration.out.puts("#{description}: #{after_text}")
+        Mongration.out.puts
+      end
+
+      def description_for(file)
+        "#{file.version} #{file.class_name}"
+      end
+    end
+  end
+end

data/lib/mongration/migrate/down.rb

@@ -0,0 +1,26 @@
+module Mongration
+  module Migrate
+
+    # @private
+    class Down < Direction
+
+      private
+
+      def migrate(file)
+        file.down
+      end
+
+      def persist(file)
+        Migration.destroy_by_file_name(file.file_name)
+      end
+
+      def before_text
+        'reverting'
+      end
+
+      def after_text
+        'reverted'
+      end
+    end
+  end
+end

data/lib/mongration/migrate/move.rb

@@ -0,0 +1,6 @@
+module Mongration
+  module Migrate
+    class Move
+    end
+  end
+end

data/lib/mongration/migrate/up.rb

@@ -0,0 +1,26 @@
+module Mongration
+  module Migrate
+
+    # @private
+    class Up < Direction
+
+      private
+
+      def migrate(file)
+        file.up
+      end
+
+      def persist(file)
+        Migration.create_by_file_name(file.file_name)
+      end
+
+      def before_text
+        'migrating'
+      end
+
+      def after_text
+        'migrated'
+      end
+    end
+  end
+end

data/lib/mongration/version.rb

@@ -1,3 +1,3 @@
 module Mongration
-  VERSION = '0.0.4-beta'
+  VERSION = '0.0.5-beta'
 end

data/spec/integration/migrate_spec.rb

@@ -17,6 +17,7 @@ describe 'Mongration.migrate' do
     it 'includes success message' do
       expect(Mongration.out).to receive(:puts).with('001 AddFoo: migrating')
       expect(Mongration.out).to receive(:puts).with('001 AddFoo: migrated')
+      allow(Mongration.out).to receive(:puts)
       migrate
     end
   end
@@ -33,7 +34,9 @@ describe 'Mongration.migrate' do
       )
     end
 
-    let(:migrate) { Mongration.migrate }
+    let(:migrate) do
+      expect { Mongration.migrate }.to raise_error
+    end
 
     it 'does not run later migrations' do
       migrate
@@ -42,7 +45,8 @@ describe 'Mongration.migrate' do
 
     it 'includes failed message' do
       expect(Mongration.out).to receive(:puts).with('1 MigrationWithError: migrating')
-      expect(Mongration.out).to receive(:puts).with(/StandardError: An error has occured, this and all later migrations cancelled/)
+      expect(Mongration.out).to receive(:puts).with('#<StandardError: StandardError>: An error has occured, this and all later migrations cancelled')
+      allow(Mongration.out).to receive(:puts)
       migrate
     end
   end

data/spec/integration/rollback_spec.rb

@@ -2,12 +2,40 @@ require 'spec_helper'
 
 describe 'Mongration.rollback' do
 
-  it 'rollsback a migration' do
-    foo_create_migration
-    Mongration.migrate
+  context 'when the rollback is successful' do
+    before do
+      foo_create_migration
+      Mongration.migrate
+    end
 
-    Mongration.rollback
-    expect(Foo.count).to eq(0)
+    it 'rollsback a migration' do
+      Mongration.rollback
+      expect(Foo.count).to eq(0)
+    end
+
+    it 'outputs messaging when starting and finishing the rollback' do
+      expect(Mongration.out).to receive(:puts).with('001 AddFoo: reverting')
+      expect(Mongration.out).to receive(:puts).with('001 AddFoo: reverted')
+      allow(Mongration.out).to receive(:puts)
+      Mongration.rollback
+    end
+  end
+
+  context 'when the rollback is not successful' do
+    before do
+      create_migration(
+        '1_migration_with_error',
+        down: 'raise StandardError'
+      )
+      Mongration.migrate
+    end
+
+    it 'outputs messaging when rollback raises an error' do
+      expect(Mongration.out).to receive(:puts).with('1 MigrationWithError: reverting')
+      expect(Mongration.out).to receive(:puts).with('#<StandardError: StandardError>: An error has occured, this and all later migrations cancelled')
+      allow(Mongration.out).to receive(:puts)
+      expect { Mongration.rollback }.to raise_error
+    end
   end
 
   it 'can rollback twice' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongration
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre.beta
+  version: 0.0.5.pre.beta
 platform: ruby
 authors:
 - Mike Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -133,9 +133,11 @@ files:
 - lib/mongration/create_migration/migration_file_writer.rb
 - lib/mongration/errors.rb
 - lib/mongration/file.rb
-- lib/mongration/migrate_all_up.rb
-- lib/mongration/migrate_down.rb
-- lib/mongration/migrate_up.rb
+- lib/mongration/migrate.rb
+- lib/mongration/migrate/direction.rb
+- lib/mongration/migrate/down.rb
+- lib/mongration/migrate/move.rb
+- lib/mongration/migrate/up.rb
 - lib/mongration/migration.rb
 - lib/mongration/null_output.rb
 - lib/mongration/rake_tasks.rb

data/lib/mongration/migrate_all_up.rb

@@ -1,20 +0,0 @@
-module Mongration
-
-  # @private
-  class MigrateAllUp
-
-    def self.perform
-      new.perform
-    end
-
-    def perform
-      files_to_migrate.take_while(&:up)
-    end
-
-    private
-
-    def files_to_migrate
-      File.pending
-    end
-  end
-end

data/lib/mongration/migrate_down.rb

@@ -1,20 +0,0 @@
-module Mongration
-
-  # @private
-  class MigrateDown
-
-    def initialize(version)
-      @version = version
-    end
-
-    def perform
-      files_to_rollback.each(&:down)
-    end
-
-    private
-
-    def files_to_rollback
-      File.migrated.select { |f| f.version > @version }.reverse
-    end
-  end
-end

data/lib/mongration/migrate_up.rb

@@ -1,20 +0,0 @@
-module Mongration
-
-  # @private
-  class MigrateUp
-
-    def initialize(version)
-      @version = version
-    end
-
-    def perform
-      files_to_migrate.take_while(&:up)
-    end
-
-    private
-
-    def files_to_migrate
-      File.pending.select { |f| f.version <= @version }
-    end
-  end
-end