xmigra 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cb39f2f3e68d7626142c0c9350b43c01bb671ed
-  data.tar.gz: c27a8bf6031cdb6961b480324f4ebd542f92adb3
+  metadata.gz: 7dd656447d3e97ab9d03aa2e54e46bb9a127360d
+  data.tar.gz: 26d2311252254c1cd30ff722a0ace2bd3b30a932
 SHA512:
-  metadata.gz: 760fb0843ae1e04e1cc3a3d1c0b3eed019ac31f7eca3a5f4dba14d84e674261ebb2f6923108f20b8cdc31ad1a9a859af1d8f0108805101582ab19cd37aae989b
-  data.tar.gz: 3e9f5ee4872cdb8387e9bf1ccb4f5ac32342085b5f41b408700b2b0937bc9d1fc571264af52ffffd684a1ffd4917db430c9d8fea0235ad89c5b50e4e758dfecc
+  metadata.gz: 756effc61f5a46850c356b7f5d9732cd75781f511950a588766fc035bfa081bdc6ab52b9c85c7941ccb0972652aacfd0c555525b370cd9130de07e6c1bb08840
+  data.tar.gz: f309fab4c6ae9b3f7ce74d3eec5957e34d42b23cbdf5901f1f78f0449bd1466466ebfe2ac975c0d54cd48f315a9d8160cdcf3e4fa28b09e75666368680be29e5

data/lib/xmigra/vcs_support/git.rb

@@ -281,7 +281,10 @@ module XMigra
     def vcs_production_contents(path)
       return nil unless git_master_head(:required => false)
       git_fetch_master_branch
-      git(:show, [git_master_local_branch, git_internal_path].join(':'), :quiet=>true)
+      # Skip the first two characters after the join to leave off the "./" prefix,
+      # which makes git consider the current directory
+      target_path = [git_internal_path, Pathname(path).relative_path_from(self.path)].join('/')[2..-1]
+      git(:show, [git_master_local_branch, target_path].join(':'), :quiet=>true)
     rescue VersionControlError
       return nil
     end

data/lib/xmigra/version.rb

@@ -1,3 +1,3 @@
 module XMigra
-  VERSION = "1.6.2"
+  VERSION = "1.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmigra
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Next IT Corporation
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler