vcs2json 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 808a2147f066558be1e90670f3979e9359150f91
-  data.tar.gz: 6e819f0ac8e0f882d9ad3ebcc17d3367c14a07e5
+  metadata.gz: 15d7ae8091e66e7a08873392edccfcbb5a97fdd2
+  data.tar.gz: d0b611ebafc4ced7993371f8836e1f9aa81e6cbd
 SHA512:
-  metadata.gz: ccc60734a7eaa93afe2d6210e9a6a8ea09046883c7ff76ca1c7fff5e736c30411c73d8b92b8eff856d17154dc2aa6ce1e60f098540efef926cf0ec39fea3a654
-  data.tar.gz: 8d9629e31d29a2060078543edc4ee586901dec1b111402944e23f6758b1c052b8d8130e71a32510aa25afbefac128b5efafb33ac7fe1b10beb51d3a7fdd19b80
+  metadata.gz: 74b531c87495036b5f7622fc58310d9a9cb81ebe1eee55e3aa2d293cd15702ec7dc46cfdbebf97c8b2843009491d78d6f1b5b5e6e16aa1ec3b69ede98bf2f18c
+  data.tar.gz: e3fa836d920cc77295a10de443419fdd11e8ddef8e901b94acf85343cb5daf6de41934df344b14ce507865952d87d78281e3b10e04206243ade963b6df3b6c7a

data/lib/cli/main.rb

@@ -8,7 +8,7 @@ module Vcs2JsonCLI
     method_option :number, :aliases => '-n', :desc => "The number of commits to dump"
     desc "git [options]","Make a dump of the change-history of system using git, output on stdout"
     def git
-          Vcs2Json::Git.new(options).execute
+          $stdout.puts Vcs2Json::Git.new(options).execute
     end
   end
 end

data/lib/exceptions/ambigious_date.rb

@@ -0,0 +1,8 @@
+module Vcs2Json
+  module Exceptions
+    module KM
+      class AmbigiousDate < StandardError
+      end
+    end
+  end
+end

data/lib/exceptions/could_not_find_format_of_date.rb

@@ -0,0 +1,8 @@
+module Vcs2Json
+  module Exceptions
+    module KM
+      class CouldNotFindFormatOfDate < StandardError
+      end
+    end
+  end
+end

data/lib/exceptions/could_not_parse_date.rb

@@ -0,0 +1,8 @@
+module Vcs2Json
+  module Exceptions
+    module KM
+      class CouldNotParseDate < StandardError
+      end
+    end
+  end
+end

data/lib/exceptions/no_base_path.rb

@@ -0,0 +1,8 @@
+module Vcs2Json
+  module Exceptions
+    module KM
+      class NoBasePath < StandardError
+      end
+    end
+  end
+end

data/lib/exceptions/no_date_field.rb

@@ -0,0 +1,8 @@
+module Vcs2Json
+  module Exceptions
+    module KM
+      class NoDateField < StandardError
+      end
+    end
+  end
+end

data/lib/exceptions/no_file_section.rb

@@ -0,0 +1,8 @@
+module Vcs2Json
+  module Exceptions
+    module KM
+      class NoFileSection < StandardError
+      end
+    end
+  end
+end

data/lib/exceptions/no_time_data_in_chafiles_field.rb

@@ -0,0 +1,8 @@
+module Vcs2Json
+  module Exceptions
+    module KM
+      class NoTimeDataInChaFilesField < StandardError
+      end
+    end
+  end
+end

data/lib/vcs2json/git.rb

@@ -0,0 +1,109 @@
+require_relative '../vcs2json_helper'
+
+module Vcs2Json
+  class Git
+        def initialize(opts)
+          @opts = opts
+        end
+
+
+        # simply un-abbreviates the status code given by --name-status
+        def parse_status(abbreviated_status)
+          case abbreviated_status
+          when "A"
+            "added"
+          when "M"
+            "modified"
+          when "D"
+            "deleted"
+          end
+        end
+
+
+        # attempts to parse an issue/bug id from the given commit message
+        def parse_issue(message)
+          if match = /(bug|issue) (?<id>\d+)/i.match(message)
+            return match[:id]
+          else
+            return ""
+          end
+        end
+
+
+        def execute
+          before = @opts[:before].nil? ? '' : "--before=\"#{@opts[:before]}\""
+          after = @opts[:after].nil?   ? '' : "--after=\"#{@opts[:after]}\""
+          number = @opts[:number].nil? ? '' : "-n #{@opts[:number]}"
+          options = "#{before} #{after} #{number} --no-merges"
+
+          # Generate separators between fields and commits
+          field_sep = Digest::SHA256.hexdigest Time.new.to_s + "field_sep"
+          commit_sep = Digest::SHA256.hexdigest Time.new.to_s + "commit_sep"
+
+          # Create a new hash that defaults to creating new hashes given hash[:key]
+          # so we can do 'commit[:commit][:author][:name] = .. ' without creating the :commit and :author hashes first
+          commits = Hash.new {|h,k| h[k] = Hash.new(&h.default_proc) }
+
+          #TODO: log this =>  print "Getting metadata on the commits..\r"
+          raw_commits = `git log #{options} --pretty=format:'%H#{field_sep}%cn#{field_sep}%ce#{field_sep}%cd#{field_sep}%ad#{field_sep}%B#{commit_sep}'`
+          commits_info = raw_commits.encode('UTF-8', :invalid => :replace).split(commit_sep)
+
+          commits_info.each do |commit|
+            fields = commit.split(field_sep)
+            sha = fields[0].delete("\n") #remove astray newlines
+            commits[sha][:sha]            = sha
+            commits[sha][:name]           = fields[1]
+            commits[sha][:email]          = fields[2]
+            commits[sha][:date]           = Time.parse fields[3]
+            commits[sha][:author_date]    = Time.parse fields[4]
+            commits[sha][:message]        = fields[5]
+
+            # attempt to parse an issue id from the commit message
+            if @opts.issue?
+              commits[commit[0]][:issue] = parse_issue(commits[sha][:message])
+            end
+          end
+
+
+          commits_changes_type = `git log --pretty=format:'#{field_sep}%H' --name-status #{options}`.split(field_sep)
+          commits_changes_type.each do |commit|
+            if !commit.empty?
+              lines = commit.split("\n")
+              sha = lines[0]
+              commits[sha][:changes][:all] = []
+              if lines.size > 1
+                lines[1..-1].each do |line|
+                  if !line.empty?
+                    file_info = line.split("\t")
+                    file_name = file_info[1]
+                    status = file_info[0]
+                    commits[sha][:changes][:all] << file_name
+                    commits[sha][:changes][:details][file_name][:filename] = file_name
+                    commits[sha][:changes][:details][file_name][:status] = parse_status(status)
+                  end
+                end
+              end
+            end
+          end
+
+          # create file_name -> integer mapping
+          mapping = Hash.new
+          index_counter = 0
+          commits.each do |sha,info|
+            integer_representation = []
+            info[:changes][:all].each do |file|
+              if mapping[file].nil?
+                mapping[file] = index_counter
+                index_counter += 1
+              end
+              integer_representation << mapping[file]
+              info[:changes][:details][file][:id] = mapping[file]
+            end
+            info[:changes][:all].clear
+            info[:changes][:all] = integer_representation
+          end
+
+          JSON.pretty_generate(commits.sort_by {|id,commit| commit[:date]}.reverse.map {|(sha,commit)| commit})
+        end
+  end
+end

data/lib/vcs2json/version.rb

@@ -1,3 +1,3 @@
 module Vcs2json
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/vcs2json_helper.rb

@@ -2,5 +2,7 @@ require 'thor'
 require 'digest'
 require 'json/pure'
 require 'time'
+require 'csv'
+require 'chronic'
 require 'require_all'
 require_rel '/**/*.rb'

data/vcs2json.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "require_all"
   spec.add_runtime_dependency "json_pure"
+  spec.add_runtime_dependency "chronic"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vcs2json
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Thomas Rolfsnes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - mail@thomasrolfsnes.com
@@ -114,8 +128,14 @@ files:
 - bin/vcs2json
 - lib/cli/cli_helper.rb
 - lib/cli/main.rb
-- lib/vcs2json/git/json.rb
-- lib/vcs2json/km/json.rb
+- lib/exceptions/ambigious_date.rb
+- lib/exceptions/could_not_find_format_of_date.rb
+- lib/exceptions/could_not_parse_date.rb
+- lib/exceptions/no_base_path.rb
+- lib/exceptions/no_date_field.rb
+- lib/exceptions/no_file_section.rb
+- lib/exceptions/no_time_data_in_chafiles_field.rb
+- lib/vcs2json/git.rb
 - lib/vcs2json/version.rb
 - lib/vcs2json_helper.rb
 - vcs2json.gemspec
@@ -139,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Create JSON dumps of change history from git etc.

data/lib/vcs2json/git/json.rb

@@ -1,86 +0,0 @@
-require_relative '../../vcs2json_helper'
-
-module Vcs2Json
-  class Git
-      def initialize(opts)
-        @opts = opts
-      end
-
-
-      # simply un-abbreviates the status code given by --name-status
-      def parse_status(abbreviated_status)
-        case abbreviated_status
-        when "A"
-          "added"
-        when "M"
-          "modified"
-        when "D"
-          "deleted"
-        end
-      end
-
-
-      # attempts to parse an issue/bug id from the given commit message
-      def parse_issue(message)
-        if match = /(bug|issue) (?<id>\d+)/i.match(message)
-          return match[:id]
-        else
-          return ""
-        end
-      end
-
-
-      def execute
-        before = @opts[:before].nil? ? '' : "--before=\"#{@opts[:before]}\""
-        after = @opts[:after].nil?   ? '' : "--after=\"#{@opts[:after]}\""
-        number = @opts[:number].nil? ? '' : "-n #{@opts[:number]}"
-        options = "#{before} #{after} #{number} --no-merges"
-
-        # Generate separators between fields and commits
-        field_sep = Digest::SHA256.hexdigest Time.new.to_s + "field_sep"
-        commit_sep = Digest::SHA256.hexdigest Time.new.to_s + "commit_sep"
-
-        # Create a new hash that defaults to creating new hashes given hash[:key]
-        # so we can do 'commit[:commit][:author][:name] = .. ' without creating the :commit and :author hashes first
-        commits = Hash.new {|h,k| h[k] = Hash.new(&h.default_proc) }
-
-      #TODO: log this =>  print "Getting metadata on the commits..\r"
-          raw_commits = `git log #{options} --pretty=format:'%h#{field_sep}%cn#{field_sep}%ce#{field_sep}%cd#{field_sep}%ad#{field_sep}%B#{commit_sep}'`
-          commits_info = raw_commits.encode('UTF-8', :invalid => :replace).split(commit_sep)
-
-        commits_info.each do |commit|
-          fields = commit.split(field_sep)
-          sha = fields[0].delete("\n") #remove astray newlines
-          commits[sha][:sha]            = sha
-          commits[sha][:name]           = fields[1]
-          commits[sha][:email]          = fields[2]
-          commits[sha][:date]           = Time.parse fields[3]
-          commits[sha][:author_date]    = Time.parse fields[4]
-          commits[sha][:message]        = fields[5]
-
-          # attempt to parse an issue id from the commit message
-          if @opts.issue?
-            commits[commit[0]][:issue] = parse_issue(commits[sha][:message])
-          end
-        end
-
-
-        #TODO: log this => print "Adding info on files changed..   \r"
-        commits_changes_type = `git log --pretty=format:'%h' --name-status #{options}`.split("\n\n")
-        commits_changes_type.each do |commit|
-          lines = commit.split("\n")
-          sha = lines[0]
-          commits[sha][:changes][:all] = []
-          lines[1..-1].each do |line|
-            file_info = line.split("\t")
-            file_name = file_info[1]
-            status = file_info[0]
-            commits[sha][:changes][:all] << file_name
-            commits[sha][:changes][:details][file_name][:filename] = file_name
-            commits[sha][:changes][:details][file_name][:status] = parse_status(status)
-          end
-        end
-      $stdout.puts JSON.pretty_generate(commits.sort_by {|id,commit| commit[:date]}.reverse.map {|(sha,commit)| commit})
-    end
-  end
-end

data/lib/vcs2json/km/json.rb

@@ -1,14 +0,0 @@
-require_relative '../../vcs2json_helper'
-
-module Tarma
-  module TransactionExtractor
-    ##
-    # This is primarily a version history parser for KMs use of the Track tool
-    module Track
-
-      def initialize(opts)
-        self.opts = opts
-      end
-    end
-  end
-end