vcs2json 2.2.6 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08174428a277ad239a11023de140d4328662907a
-  data.tar.gz: 679d3c2db878a846b4dea46a33281238728c43b9
+  metadata.gz: ab389feb10eca7d3bae067bffb53f91198d9c0db
+  data.tar.gz: 965ecacd7dc2cc024ccf10c55d8071fd3891db9a
 SHA512:
-  metadata.gz: 48e74d000dff612601c6c4b631b8993a6aa027a3aef290eca229fa026b4242de316ce006135ef9ddfa7c1d31d40a1a8893cc5038cfbbbbc9e2fb6d4e1f7313ad
-  data.tar.gz: 1bad49b3f420cc7f833a7ce92959a8d5981864794572159fbfe5b002c9b4023d9fd69902ef5ad6d147380544c6320af7d0a4d4209a8291452a97de127abae3f7
+  metadata.gz: c55f4ea4d2685b16c7b800f336dd68bf4e735df12390bb85f79488e628df9e56705edc7d500bf2cf8ba69fc3b1b46669d015b92b8dcf6b5aab4b7a6f1be1b3c5
+  data.tar.gz: eb56f5bd44a04330755e6a9d7f8ab16c37417c20eebe05a700a7528d449207dbcc94e1e50a0c4a397a5e8dd9353ebfe516352da8de47e6cc7dd399effd116980

data/lib/srcML/srcml.rb

@@ -17,15 +17,8 @@ module SrcML
     '.cs'   => 'C#',
     '.c'    => 'C'}
 
-  # Check that SrcML is available
-  begin
-   version,e,s =  Open3.capture3("srcml --version")
-   $stderr.puts version
-   SRCML = "srcml"
-  rescue Errno::ENOENT
-    $stderr.puts "SrcML is required, please install from www.srcml.com"
-    exit
-  end
+  # name of srcml command
+  SRCML = 'srcml'
 
   ##
   # PUBLIC INTERFACE
@@ -109,7 +102,7 @@ module SrcML
     else
       ast,e,s = Open3.capture3("#{SRCML} #{path}")
       if !s.success?
-        raise SrcML::ParseError, "Failed to parse #{path}"
+        raise SrcML::ParseError, "Failed to parse #{path}, is srcml installed?"
       end
     end
     # turn into structured xml

data/lib/vcs2json/git.rb

@@ -35,6 +35,17 @@ module Vcs2Json
       SrcML.ignore_comments = opts[:ignore_comments]
       SrcML.ignore_whitespace = opts[:ignore_whitespace]
       SrcML.residuals = opts[:residuals]
+
+      # Check that SrcML is available if fine grained is turned on
+      if self.fine_grained
+        begin
+          Open3.capture3("srcml --version")
+        rescue Errno::ENOENT
+          $stderr.puts "SrcML is required for fine grained change history extraction, please install from www.srcml.com"
+          $stderr.puts "Defaulting to file level"
+          self.fine_grained = false
+        end
+      end
     end
 
     def after=(after)

data/lib/vcs2json/version.rb

@@ -1,3 +1,3 @@
 module Vcs2Json
-  VERSION = "2.2.6"
+  VERSION = "2.2.7"
 end

metadata

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