@@ -22,12 +22,7 @@ def initialize(config_file, repo = nil)
2222 raise "You need to specify a config file" if !config_file
2323 raise "You need to specify a valid config file" if !valid_config ( config_file )
2424 @sigs = { }
25- if repo
26- @repo = repo
27- else
28- repo_path = Rugged ::Repository . discover ( '.' )
29- @repo = Rugged ::Repository . new ( repo_path )
30- end
25+ @repo = repo || Rugged ::Repository . discover ( '.' )
3126 end
3227
3328 def init_data ( version = 'HEAD' )
@@ -195,7 +190,7 @@ def generate_docs
195190 refname = "refs/heads/#{ br } "
196191 tsha = output_index . write_tree ( @repo )
197192 puts "\t wrote tree #{ tsha } "
198- ref = Rugged :: Reference . lookup ( @repo , refname )
193+ ref = @repo . references [ refname ]
199194 user = { :name => @repo . config [ 'user.name' ] , :email => @repo . config [ 'user.email' ] , :time => Time . now }
200195 options = { }
201196 options [ :tree ] = tsha
@@ -236,9 +231,7 @@ def show_warnings(data)
236231 end
237232
238233 def get_versions
239- tags = [ ]
240- @repo . tags . each { |tag | tags << tag . gsub ( %r(^refs/tags/) , '' ) }
241- VersionSorter . sort ( tags )
234+ VersionSorter . sort ( @repo . tags . map { |tag | tag . name . gsub ( %r(^refs/tags/) , '' ) } )
242235 end
243236
244237 def parse_headers ( index , version )
@@ -282,10 +275,10 @@ def tally_sigs!(version, data)
282275 def find_subtree ( version , path )
283276 tree = nil
284277 if version == 'HEAD'
285- tree = @repo . lookup ( @repo . head . target ) . tree
278+ tree = @repo . head . target . tree
286279 else
287- trg = @repo . lookup ( Rugged :: Reference . lookup ( @repo , "refs/tags/#{ version } " ) . target )
288- if ( trg . class == Rugged ::Tag )
280+ trg = @repo . references [ "refs/tags/#{ version } " ] . target
281+ if ( trg . kind_of? Rugged ::Tag :: Annotation )
289282 trg = trg . target
290283 end
291284
0 commit comments