vcs2json 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84a154a7c2e157db3170b0d03203eee8e5d192d8
-  data.tar.gz: df869d699ad341ce444c2f1a09e815798bb7280d
+  metadata.gz: e2efbda9981df490871ca8de83eb0ed5ac37f478
+  data.tar.gz: b6b42ca01b777d86bbdef0d3431cf014adf3c61d
 SHA512:
-  metadata.gz: ba3fc6feba3b1a9f7d946af2353d79e99558b521e0682c10815bb2533891e9b3a9764e876f36b1c98b27eeea10dadd0c1c592109c425049f54dcd5c1b8e7fc52
-  data.tar.gz: 114a22bce682633767cce7cfba3b4bf52df8b951a14d48c7bc7f6a82650fbb81057313ed175631abafe35124746d8cfc9b895aba99c9e6ba471a32dbe56b16bc
+  metadata.gz: 5bf544e9717c8a183defdfc9a6a41e25eb3ae1afd15eb59db51f7d24615fd95d602fe49701e49b92d9d21715a65c282bfbfb76123d4e9c54ac0e27078e9341f1
+  data.tar.gz: 192e055b5e38c75bd012d90d2cdbba2bfa017e80455bfdf505318e8da2228bfb5501368a003ca27bc35251a42b32e15a074c2e72793c1ff7494b9f8cc0a8928b

data/README.md

@@ -1,41 +1,32 @@
-# Vcs2json
+## Norsk brukerveiledning
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/vcs2json`. To experiment with that code, run `bin/console` for an interactive prompt.
 
-TODO: Delete this and the text above, and describe your gem
+1. Installer SrcML.  Skriptet er testet på Ubuntu 14 og 16, 32 og 64 bit, OSX El Capitan. 
 
-## Installation
+        bash <(curl -s https://bitbucket.org/evolveit/srcml_install/raw/6e11210fbe2e62d4796e0f3e2ed5c08b27f55f1c/install.sh)
 
-Add this line to your application's Gemfile:
+2. Installer Ruby 2.3.0
 
-```ruby
-gem 'vcs2json'
-```
+ 1. Installer RVM (Ruby Version Manager)
+ 
+        gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+        
+        \curl -sSL https://get.rvm.io | bash -s stable --ruby=2.3.0
 
-And then execute:
+ 2. Restart terminal
+ 
+ 3. Legg til 'rvm' kommando 
 
-    $ bundle
+        source ~/.rvm/scripts/rvm
+           
+ 4. Velg Ruby 2.3.0
 
-Or install it yourself as:
+        rvm use ruby-2.3.0
+            
+    Du skal nå ha Ruby 2.3.0, sjekk ved å kjøre:
+    
+        which ruby
 
-    $ gem install vcs2json
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/vcs2json.
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+2. Installer  vcs2json
 
+        gem install vcs2json

data/lib/vcs2json/git.rb

@@ -19,6 +19,10 @@ module Vcs2Json
       "%B"
 
     def initialize(opts)
+      # case id must be set before setting ignore
+      # as the id is used to lookup the list of
+      # files to ignore in the ignorefile
+      self.case_id = opts[:case_id]
       self.ignore = opts[:ignore]
       self.before = opts[:before]
       self.after = opts[:after]
@@ -87,9 +91,18 @@ 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")
-        # removed ignored files
-        changed_files.reject! {|i| self.ignore.include?(i)}
+        changed_files = `git log --pretty=format:'' --name-status #{id} -n 1`.split("\n").map {|line| line.split("\t")}
+
+        # remove ignored files
+        changed_files.reject! {|file| 
+          if self.ignore.include?(file[1])
+           logger.debug "[IGNOREDEBUG] Ignored #{file[1]} in commit #{id}" 
+           true
+          else
+            false
+          end
+        }
+
         # add files changed info
         if !changed_files.empty?
 
@@ -143,12 +156,9 @@ module Vcs2Json
           # print progress
 
 
-          changed_files.each_with_index do |line,index|
+          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 !line.empty?
-              file_info = line.split("\t")
-              file_name = file_info[1]
-              status = file_info[0]
+            if ![status,file_name].empty?
               # add finer grained change info
               if self.fine_grained
                 begin

data/lib/vcs2json/version.rb

@@ -1,3 +1,3 @@
 module Vcs2Json
-  VERSION = "2.0.1"
+  VERSION = "2.0.3"
 end

data/lib/vcs2json_helper.rb

@@ -7,5 +7,6 @@ require 'chronic'
 require 'logger'      # leveled logging
 require 'nokogiri'    # better/faster xml library
 require 'open3'       # make system calls and capture stdout/stderr/exitcodes easily
+require 'yaml'        # parse yaml files
 require 'require_all'
 require_rel '/**/*.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vcs2json
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Thomas Rolfsnes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler