vcs2json 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16eb57bedbd48bc94c5b73477ac784f40d8be16b
-  data.tar.gz: b2dcb78c8e63bc71c098f9b6642364c99bb65e2a
+  metadata.gz: 1628d43fb23f825bd38e025c470b378796d9f11c
+  data.tar.gz: a5e7a884bcdfda60a5c94816a0fadc603c3106fc
 SHA512:
-  metadata.gz: bd1b15c85e038ae87965aae44837349c380f89eb5dda91fc91a56c6c4ed3b90159b93c70c978421e4b382c8d34c4a0faaf9e7e4e388b7d470b7e61df3cdae567
-  data.tar.gz: e74a46888aefc4cc02d30cb23b8064c3185e140e51f9d0845ee66b9abdb434e33d63edb299e1e80b89cc5eb3218403c116250eb41c64899e4bf7a499431c0e1e
+  metadata.gz: a68392b573648d1db85febda70a0ee76443d0e678d0d9193997f750172412ee1db3e7023bef4b9a2ffa45c2911be0e1d01c6d67915944975b5f87597f6fef321
+  data.tar.gz: 4539de79de6ce53973205dcd05c42065b21607fe74b2d0b3162790519a4520214a5c8c2686970c1454221e4689ab1787523d3e8451672fff59413bdf447fb1e0

data/lib/vcs2json/git.rb

@@ -91,7 +91,8 @@ module Vcs2Json
       commit_ids.each do |id|
         logger.debug "Parsing commit: #{id}"
         # get the changed files
-        changed_files = `git log --pretty=format:'' --name-status #{id} -n 1`.split("\n").map {|line| line.split("\t")}
+        changed_files = `git log --pretty=format:'' --name-status #{id} -n 1`.split("\n")
+                          .map {|line| line.split(/(^[AMD])\s+/).delete_if {|e| e.empty?}}
 
         # remove ignored files
         changed_files.reject! {|file| 
@@ -157,15 +158,17 @@ module Vcs2Json
 
 
           changed_files.each_with_index do |(status,file_name),index|
-          STDERR.print "Parsing file #{index+1} of #{changed_files.size} in commit #{commit_counter+1} of #{self.number}                  \r"
-            if ![status,file_name].empty?
+            STDERR.print "Parsing file #{index+1} Of #{changed_files.size} in commit #{commit_counter+1} of #{self.number}                  \r"
+            if ([status,file_name].empty? | status.nil? | status.empty? | file_name.nil? | file_name.empty?)
+            # ignoring commit
+            else
               # add finer grained change info
               if self.fine_grained
                 begin
                   # new file, all methods are new, no need to calculate diff 
                   if status == 'A'
                     SrcML.methods(file_name,revision: id).keys.each {|m| output_hash[:changes] << m}
-                    # calculate diffs    
+                  # calculate diffs    
                   else
                     SrcML.changed_methods_git(file_name,id).each {|m| output_hash[:changes] << m}
                   end
@@ -178,7 +181,7 @@ module Vcs2Json
             end
           end # changes_files.each
 
-          # Only add commits where at least on changes was detected
+          # Only add commits where at least one change was detected
           if !output_hash[:changes].empty?
             ###########################
             # PRINT COMMIT TO $stdout #

data/lib/vcs2json/version.rb

@@ -1,3 +1,3 @@
 module Vcs2Json
-  VERSION = "2.2.4"
+  VERSION = "2.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vcs2json
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Thomas Rolfsnes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler