minad-git 1.1.3 → 1.1.5

data/lib/git.rb

@@ -40,7 +40,7 @@ require 'git/stash'
 # License::   MIT License
 module Git
 
-  VERSION = '1.1.3'
+  VERSION = '1.1.5'
 
   # open a bare repository
   #

data/lib/git/lib.rb

@@ -169,9 +169,10 @@ module Git
       data = {'blob' => {}, 'tree' => {}}
 
       command_lines('ls-tree', sha).each do |line|
-        (info, filenm) = line.split("\t")
-        (mode, type, sha) = info.split
-        data[type][filenm] = {:mode => mode, :sha => sha}
+        info, file = line.split("\t")
+        mode, type, sha = info.split
+        file = eval(file) if file =~ /^\".*\"$/ # FIXME: This takes care of quoted strings returned from git
+        data[type][file] = {:mode => mode, :sha => sha}
       end
 
       data
@@ -256,7 +257,7 @@ module Git
       hsh = {:total => {:insertions => 0, :deletions => 0, :lines => 0, :files => 0}, :files => {}}
 
       command_lines('diff', diff_opts).each do |file|
-        (insertions, deletions, filename) = file.split("\t")
+        insertions, deletions, filename = file.split("\t")
         hsh[:total][:insertions] += insertions.to_i
         hsh[:total][:deletions] += deletions.to_i
         hsh[:total][:lines] = (hsh[:total][:deletions] + hsh[:total][:insertions])
@@ -271,8 +272,8 @@ module Git
     def diff_files
       hsh = {}
       command_lines('diff-files').each do |line|
-        (info, file) = line.split("\t")
-        (mode_src, mode_dest, sha_src, sha_dest, type) = info.split
+        info, file = line.split("\t")
+        mode_src, mode_dest, sha_src, sha_dest, type = info.split
         hsh[file] = {:path => file, :mode_file => mode_src.to_s[1, 7], :mode_index => mode_dest,
                       :sha_file => sha_src, :sha_index => sha_dest, :type => type}
       end
@@ -283,8 +284,8 @@ module Git
     def diff_index(treeish)
       hsh = {}
       command_lines('diff-index', treeish).each do |line|
-        (info, file) = line.split("\t")
-        (mode_src, mode_dest, sha_src, sha_dest, type) = info.split
+        info, file = line.split("\t")
+        mode_src, mode_dest, sha_src, sha_dest, type = info.split
         hsh[file] = {:path => file, :mode_repo => mode_src.to_s[1, 7], :mode_index => mode_dest,
                       :sha_repo => sha_src, :sha_index => sha_dest, :type => type}
       end
@@ -294,9 +295,9 @@ module Git
     def ls_files
       hsh = {}
       command_lines('ls-files', '--stage').each do |line|
-        (info, file) = line.split("\t")
-        (mode, sha, stage) = info.split
-        file = eval(file) if file =~ /^\".*\"$/ # This takes care of quoted strings returned from git
+        info, file = line.split("\t")
+        mode, sha, stage = info.split
+        file = eval(file) if file =~ /^\".*\"$/ # FIXME: This takes care of quoted strings returned from git
         hsh[file] = {:path => file, :mode_index => mode, :sha_index => sha, :stage => stage}
       end
       hsh
@@ -318,19 +319,12 @@ module Git
 
     def config_get(name)
       config_list[name]
-      #command('config', ['--get', name])
     end
 
     def config_list
       config = {}
       config.merge!(parse_config('~/.gitconfig'))
       config.merge!(parse_config(File.join(@git_dir, 'config')))
-      #hsh = {}
-      #command_lines('config', ['--list']).each do |line|
-      #  (key, value) = line.split('=')
-      #  hsh[key] = value
-      #end
-      #hsh
     end
 
     def parse_config(file)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: minad-git
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors: 
 - Scott Chacon