xmigra 1.6.5 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f8a897f40302df5b84071bf9088b787c7be65fa
-  data.tar.gz: 1445c109f2e4fb2f58aa2f2407660c5b472a45cc
+  metadata.gz: 2417b3d567a7eb7401e6506e0f85ed6497545bd0
+  data.tar.gz: 8ec49a23120cf0ef8a60b0a47dc672bc755d7231
 SHA512:
-  metadata.gz: 8edd159507c099b6d6c16c99a5883cbad161025e6de3076fbe83465f4054e17da85c21b1c25e9b49bdc47e06cef46d9cd8cdb235b4a742ce42974df56fdbd0f5
-  data.tar.gz: 4b22d1239184bb5a44886db39ef5ccc8b8b569530bc495f8ab509e0a9df9272cd70e87e355210372a2d24b656271a5926005ae08d130392bbfbdbe40f45d26fa
+  metadata.gz: 21d5e5655534a89e5a25bbc67dd80dd33ceb3622e140f98075fe2df7a42765f27fb5a29b509bc9afc986b82f3ff45de4f7f893d8525bf0b2bd7b3f908a10f91f
+  data.tar.gz: 759c3e5cf893add4b0edefe5509858cb415efc46211c4d14eb5124ec444d8b93e5989ba2ee34ff0ae625fb541470354ddf206e869c3a7a14f617b7caa43791a9

data/lib/xmigra/branch_upgrade.rb

@@ -17,6 +17,7 @@ module XMigra
         begin
           verinc_info = YAML.load_file(path)
         rescue Error => e
+          XMigra.log_error(e)
           warning "Failed to load branch upgrade migration (#{e.class}).\n  #{e}"
           verinc_info = {}
         end

data/lib/xmigra/console.rb

@@ -87,6 +87,7 @@ module XMigra
           result = begin
             yield input_value
           rescue InvalidInput => e
+            XMigra.log_error(e)
             puts e.message if e.explicit_message?
             next
           end

data/lib/xmigra/db_support/psql.rb

@@ -554,7 +554,7 @@ module XMigra
     end
     
     def migration_application_sql
-      PgSQLSpecifics.in_plpgsql %Q{
+      PgSQLSpecifics.in_plpgsql(%Q{
         IF EXISTS (
           SELECT * FROM temp$xmigra_migrations
           WHERE "MigrationID" = '#{id}'
@@ -562,14 +562,15 @@ module XMigra
         ) THEN
           RAISE NOTICE #{PgSQLSpecifics.string_literal %Q{Applying "#{File.basename(file_path)}":}};
           
-          EXECUTE #{PgSQLSpecifics.string_literal sql};
+          EXECUTE
+        %s;
           
           INSERT INTO xmigra.applied ("MigrationID", "Description")
           VALUES ('#{id}', #{PgSQLSpecifics.string_literal description});
           
           RAISE NOTICE '    done';
         END IF;
-      }
+      }) % [PgSQLSpecifics.string_literal(sql)]
     end
     
     def reversion_tracking_sql

data/lib/xmigra/impdecl_migration_adder.rb

@@ -215,7 +215,8 @@ module XMigra
       end
     rescue DeclarativeSupport::SpecificationError
       raise
-    rescue StandardError
+    rescue StandardError => e
+      XMigra.log_error(e)
       raise if strict
       nil
     end

data/lib/xmigra/migration_conflict.rb

@@ -71,7 +71,7 @@ module XMigra
       # Update the latest implementing migration for any declarative
       # file that is modified in the working copy
       each_decohered_implementing_migration(
-        &method(:fix_decohered_implmeneting_migration!)
+        &method(:fix_decohered_implementing_migration!)
       )
     end
     
@@ -80,14 +80,16 @@ module XMigra
       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
     
-    def fix_decohered_implmeneting_migration!(file_path, last_commit)
+    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
-      file_path.open('w') do |f|
+      Pathname(file_path).open('w') do |f|
         $xmigra_yamler.dump(migration_info, f)
       end
     end

data/lib/xmigra/new_index_adder.rb

@@ -15,7 +15,7 @@ module XMigra
       raise(XMigra::Error, "Index \"#{new_fpath.basename}\" already exists") if new_fpath.exist?
       
       index_creation_template = begin
-        index_template_sql
+        index_template_sql.gsub('[{filename}]', name)
       rescue NameError
         ''
       end

data/lib/xmigra/schema_updater.rb

@@ -46,7 +46,8 @@ RUNNING THIS SCRIPT ON A PRODUCTION DATABASE WILL FAIL.
         @file_based_groups << [@branch_upgrade] if @branch_upgrade.found?
       rescue Error
         raise
-      rescue StandardError
+      rescue StandardError => e
+        XMigra.log_error(e)
         raise Error, "Error initializing #{self.class} components"
       end
       

data/lib/xmigra/vcs_support/git.rb

@@ -90,7 +90,7 @@ module XMigra
         end
         return ($?.success? ? output : nil) if options[:get_result] == :on_success
         return $?.success? if check_exit
-        raise(VersionControlError, "Git command failed with exit code #{$?.exitstatus}") unless $?.success?
+        raise(VersionControlError, "Git command failed with exit code #{$?.exitstatus}\n        Command: #{cmd_str}") unless $?.success?
         return output unless no_result
       end
       
@@ -352,6 +352,11 @@ module XMigra
           
           return :older
         elsif a_status == '  '
+          # Look for re-introduction of a declarative that was previously destroyed or renounced
+          if (b_status == '??' || b_status[0] == 'A') && [:renunciation, :destruction].include?(@object.goal)
+            return :unimplemented
+          end
+          
           return :newer unless b_status == '  '
           
           return begin
@@ -422,6 +427,11 @@ module XMigra
       git(:show, "HEAD:#{file_path}", :quiet=>true)
     end
     
+    def vcs_file_modified?(file_path)
+      gstat = git_retrieve_status(file_path)
+      gstat[0] != ' '
+    end
+    
     def git_status
       @git_status ||= git_retrieve_status(file_path)
     end
@@ -456,15 +466,16 @@ module XMigra
       return nil unless stage_numbers.sort == [1, 2, 3]
       
       chain_head = lambda do |stage_number|
+        head_file_relative = head_file.relative_path_from(self.path)
         return YAML.parse(
-          git(:show, ":#{stage_number}:#{head_file}")
+          git(:show, ":#{stage_number}:./#{head_file_relative}")
         ).transform
       end
       
       # Ours (2) before theirs (3)...
       heads = [2, 3].collect(&chain_head)
-      # ... unless merging from upstream
-      if self.git_merging_from_upstream?
+      # ... unless merging from upstream or the master branch
+      if self.git_merging_from_upstream? || self.git_merging_from_master?
         heads.reverse!
       end
       
@@ -565,6 +576,13 @@ module XMigra
       end
     end
     
+    def git_merging_from_master?
+      git_fetch_master_branch
+      return !(self.git_commits_in? git_master_local_branch..'MERGE_HEAD')
+    rescue VersionControlError
+      return false
+    end
+    
     def git_commits_in?(range, path=nil)
       git(
         :log,

data/lib/xmigra/vcs_support/svn.rb

@@ -227,6 +227,11 @@ END_OF_MESSAGE
       status.nil? || status.attributes['item'] == 'unversioned'
     end
     
+    def vcs_file_modified?(file_path)
+      status = subversion_retrieve_status(file_path).elements['entry/wc-status']
+      !status.nil? && status.attributes['item'] == 'modified'
+    end
+    
     class VersionComparator
       # vcs_object.kind_of?(SubversionSpecifics)
       def initialize(vcs_object, options={})
@@ -257,6 +262,11 @@ END_OF_MESSAGE
           
           return :older
         elsif a_status.attributes['item'] == 'normal'
+          # Look for re-introduction of a declarative that was previously destroyed or renounced
+          if (['unversioned', 'added'].include? b_status.attributes['item']) && [:renunciation, :destruction].include?(@object.goal)
+            return :unimplemented
+          end
+          
           return :newer unless b_status.attributes['item'] == 'normal'
           
           return begin

data/lib/xmigra/version.rb

@@ -1,3 +1,3 @@
 module XMigra
-  VERSION = "1.6.5"
+  VERSION = "1.7.0"
 end

data/lib/xmigra.rb

@@ -346,12 +346,31 @@ module XMigra
         if e.class.const_defined? :COMMAND_LINE_HELP
           STDERR.puts(XMigra.program_message(e.class::COMMAND_LINE_HELP))
         end
+        log_error(e)
         exit(2) if e.is_a?(OptionParser::ParseError)
         exit(2) if e.is_a?(XMigra::Program::ArgumentError)
         exit(1)
       end
     )
   end
+  
+  def self.log_error(e)
+    if log_file = ENV['XMIGRA_LOG_FILE']
+      Pathname(log_file).open('a') do |log|
+        log.puts "#{Time.now}: #{e} (#{e.class})"
+        e.backtrace.each do |frame|
+          log.puts "    " + frame
+        end
+        
+        while e.respond_to?(:cause) && e = e.cause
+          log.puts "  Caused by: #{e} (#{e.class})"
+          e.backtrace.each do |frame|
+            log.puts "    " + frame
+          end
+        end
+      end
+    end
+  end
 end
 
 require 'xmigra/vcs_support/svn'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmigra
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.7.0
 platform: ruby
 authors:
 - Next IT Corporation
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler