xmigra 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bb7f3c0d919cad77388a4068703578605c1db43
-  data.tar.gz: 516b05df5c5e2eca101239ad6ac674c32f4eb23c
+  metadata.gz: 16f83be4f63c7d9cddec772164eb318447e4703b
+  data.tar.gz: 9a3c0dc01f24880947285d935112471ca8b81e88
 SHA512:
-  metadata.gz: 9ab6106dc64c496340c9c1708df3b07bb07074bbac0f5f6d73e83656e6342548513dfaf7540bbee21c0e9546946c9dfbec6333aee056c49bf704b520efd90e67
-  data.tar.gz: 16106a3ddc6857c356e370472d837de62995a9104cf1e16dc00fb1f53b3a2276f521f61b125b72ee8fe0f4f705297ddd0173fb3431969643a91da1c248db333f
+  metadata.gz: dc6dbad80b535f5428f37cbfcf842e6aa7a819c233bca333796e3fd3a29de8f6016265319ecd7842a9668da6343bb85bb136c1d66a105f38f542896d1ba687ee
+  data.tar.gz: 9b83b2aac9231ab1b67f5ec181393b16bdf3157d2dddc375b5d58f9e1b29d4986038acf4d5b800bbabc0b934c36be9987354344d23c20cc331b42adfd15bd720

data/lib/xmigra/vcs_support/git.rb

@@ -197,19 +197,19 @@ module XMigra
       
       git_fetch_master_branch
       migrations.each do |m|
-        # Check that the migration has not changed in the currently checked-out branch
+        # Check that the migration in the working tree is the same as in head of the central master branch
         fpath = m.file_path
-        
-        history = git(:log, %w{--format=%H --}, fpath).split
-        if history[1]
-          raise VersionControlError, "'#{fpath}' has been modified in the current branch of the repository since its introduction"
+        unless git(:diff, '--exit-code', self.git_master_local_branch, '--', fpath, check_exit: true)
+          master_url, remote_branch = self.git_master_head.split('#', 2)
+          raise VersionControlError, "'#{fpath}' is different locally than on '#{remote_branch}' in #{master_url}"
         end
       end
       
       # Since a production script was requested, warn if we are not generating
       # from a production branch
       if branch_use != :production
-        raise VersionControlError, "The working tree is not a commit in the master history."
+        master_url, remote_branch = self.git_master_head.split('#', 2)
+        raise VersionControlError, "The working tree is not a commit in the history of '#{remote_branch}' in #{master_url}"
       end
     end
     

data/lib/xmigra/version.rb

@@ -1,3 +1,3 @@
 module XMigra
-  VERSION = "1.7.1"
+  VERSION = "1.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmigra
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Next IT Corporation
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2019-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Toolkit for managing database schema evolution with version control.