Class: XMigra::MigrationConflict

Inherits:
Object
  • Object
show all
Defined in:
lib/xmigra/migration_conflict.rb

Instance Attribute Summary collapse

Instance Method Summary collapse

Constructor Details

#initialize(path, branch_point, heads) ⇒ MigrationConflict

Returns a new instance of MigrationConflict.



4
5
6
7
8
9
10
11
 
# File 'lib/xmigra/migration_conflict.rb', line 4

def initialize(path, branch_point, heads)
  @path = Pathname.new(path)
  @branch_point = branch_point
  @heads = heads
  @branch_use = :undefined
  @scope = :repository
  @after_fix = nil
end

Instance Attribute Details

#after_fix ⇒ Object

Returns the value of attribute after_fix.



13
14
15
 
# File 'lib/xmigra/migration_conflict.rb', line 13

def after_fix
  @after_fix
end

#branch_use ⇒ Object

Returns the value of attribute branch_use.



13
14
15
 
# File 'lib/xmigra/migration_conflict.rb', line 13

def branch_use
  @branch_use
end

#scope ⇒ Object

Returns the value of attribute scope.



13
14
15
 
# File 'lib/xmigra/migration_conflict.rb', line 13

def scope
  @scope
end

Instance Method Details

#each_decohered_implementing_migration ⇒ Object 



78
79
80
81
82
83
84
85
86
 
# File 'lib/xmigra/migration_conflict.rb', line 78

def each_decohered_implementing_migration
  tool = SchemaUpdater.new(@path.join(".."))
  latest_impls = tool.migrations.latest_declarative_implementations
  latest_impls.each_pair do |decl_file, migration|
    next unless tool.vcs_file_modified?(decl_file)
    next if tool.vcs_file_modified?(migration.file_path)
    yield migration.file_path, tool.vcs_latest_revision(migration.file_path)
  end
end

#fix_conflict! ⇒ Object

Raises:



47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
 
# File 'lib/xmigra/migration_conflict.rb', line 47

def fix_conflict!
  raise(VersionControlError, "Unresolvable conflict") unless resolvable?
  
  file_to_fix, fixed_contents = migration_tweak
  
  # Rewrite the head file
  head_info = @heads[0].merge(@heads[1]) # This means @heads[1]'s LATEST_CHANGE wins
  File.open(@path.join(MigrationChain::HEAD_FILE), 'w') do |f|
    $xmigra_yamler.dump(head_info, f)
  end
  
  # Rewrite the first migration (on the current branch) after @branch_point
  File.open(@path.join(file_to_fix), 'w') do |f|
    $xmigra_yamler.dump(fixed_contents, f)
  end
  
  if @after_fix
    @after_fix.call
  end
  
  fix_merged_declarative_relations!
end

#fix_decohered_implementing_migration!(file_path, last_commit) ⇒ Object 



88
89
90
91
92
93
94
95
 
# File 'lib/xmigra/migration_conflict.rb', line 88

def fix_decohered_implementing_migration!(file_path, last_commit)
  migration_info = YAML.load_file(file_path)
  last_commit = "nonexistent" if last_commit.nil? || last_commit.empty?
  migration_info['pre-unbranch'] = last_commit
  Pathname(file_path).open('w') do |f|
    $xmigra_yamler.dump(migration_info, f)
  end
end

#fix_merged_declarative_relations! ⇒ Object 



70
71
72
73
74
75
76
 
# File 'lib/xmigra/migration_conflict.rb', line 70

def fix_merged_declarative_relations!
  # Update the latest implementing migration for any declarative
  # file that is modified in the working copy
  each_decohered_implementing_migration(
    &method(:fix_decohered_implementing_migration!)
  )
end

#migration_tweak ⇒ Object 



26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
 
# File 'lib/xmigra/migration_conflict.rb', line 26

def migration_tweak
  unless defined? @migration_to_fix and defined? @fixed_migration_contents
    # Walk the chain from @head[1][MigrationChain::LATEST_CHANGE] and find
    # the first migration after @branch_point
    branch_file = XMigra.yaml_path(@branch_point)
    cur_mig = XMigra.yaml_path(@heads[1][MigrationChain::LATEST_CHANGE])
    until cur_mig.nil?
      mig_info = YAML.load_file(@path.join(cur_mig))
      prev_mig = XMigra.yaml_path(mig_info[Migration::FOLLOWS])
      break if prev_mig == branch_file
      cur_mig = prev_mig
    end
    
    mig_info[Migration::FOLLOWS] = @heads[0][MigrationChain::LATEST_CHANGE]
    @migration_to_fix = cur_mig
    @fixed_migration_contents = mig_info
  end
  
  return @migration_to_fix, @fixed_migration_contents
end

#resolvable? ⇒ Boolean

Returns:

  • (Boolean) 


15
16
17
18
19
20
21
22
23
24
 
# File 'lib/xmigra/migration_conflict.rb', line 15

def resolvable?
  head_0 = @heads[0]
  @heads[1].each_pair do |k, v|
    next unless head_0.has_key?(k)
    next if k == MigrationChain::LATEST_CHANGE
    return false unless head_0[k] == v
  end
  
  return true
end