gitlab-grit 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5aaa4e0035d8ae6e93e1ee9849f5fa066cfa0d4
-  data.tar.gz: 897dcc63e1ee07f7aa434461e4113438740a4dd8
+  metadata.gz: f453ada29206a7deeb55fe63bba1105a9ee67fe5
+  data.tar.gz: d593185fb02934345a4835b3c5c2088aefb6d5fd
 SHA512:
-  metadata.gz: 47d55d33d126f01d735684029dd0b00ab3666f011a15b31cf8b110020f6bef345c43bc1a8f460571608d55d39425a278abc7592eade49b92f4e48e74baf3a196
-  data.tar.gz: 6af007ace705ca20f49287915a0f8441abe610578d94f2e84d33ab784951115d1fffd786ca53b92b5c58644f4e53bfdaa0b5b2590f003c9cb9136f87bdf08f36
+  metadata.gz: 056b694f2fc7938a97c142461d3b29a493c0aba78344bf15808bf42b9cc42af0c2c437bb5852b9b22db65d057ff8abfb4b73c0caac14354efc0f1cf244c64031
+  data.tar.gz: d56d89a626aee898ffca47a4e08aa8fd85c75fe14f3bf9d0beff6ffe611b78a7e2ffaa56f63853224ef20b6bd4bb9ccb29a0b3e0f28694ca14be1e9932beaeeb

data/lib/grit.rb

@@ -74,3 +74,7 @@ module Grit
     VERSION
   end
 end
+
+# Include grit_ext
+require 'charlock_holmes'
+require 'grit_ext'

data/lib/grit/grep.rb

@@ -0,0 +1,21 @@
+module Grit
+
+  class Grep
+    
+    attr_reader :repo
+    attr_reader :filename
+    attr_reader :startline
+    attr_reader :content
+    attr_reader :is_binary
+
+    def initialize(repo, filename, startline, content, is_binary)
+      @repo   = repo
+      @filename = filename
+      @startline = startline.to_i
+      @content = content
+      @is_binary = is_binary
+    end
+    
+  end
+  
+end

data/lib/grit_ext.rb

@@ -0,0 +1,41 @@
+require "charlock_holmes"
+require "grit_ext/actor"
+require "grit_ext/blob"
+require "grit_ext/commit"
+require "grit_ext/tree"
+require "grit_ext/diff"
+require "grit_ext/version"
+
+module GritExt
+  extend self
+
+  def encode!(message)
+    return nil unless message.respond_to? :force_encoding
+
+    # if message is utf-8 encoding, just return it
+    message.force_encoding("UTF-8")
+    return message if message.valid_encoding?
+
+    # return message if message type is binary
+    detect = CharlockHolmes::EncodingDetector.detect(message)
+    return message.force_encoding("BINARY") if detect && detect[:type] == :binary
+
+    # encoding message to detect encoding
+    if detect && detect[:encoding]
+      message.force_encoding(detect[:encoding])
+    end
+
+    # encode and clean the bad chars
+    message.replace clean(message)
+  rescue
+    encoding = detect ? detect[:encoding] : "unknown"
+    "--broken encoding: #{encoding}"
+  end
+
+  private
+  def clean(message)
+    message.encode("UTF-16BE", :undef => :replace, :invalid => :replace, :replace => "")
+           .encode("UTF-8")
+           .gsub("\0".encode("UTF-8"), "")
+  end
+end

data/lib/grit_ext/actor.rb

@@ -0,0 +1,15 @@
+module Grit
+  class Actor
+
+    alias_method :old_name, :name
+    alias_method :old_email, :email
+
+    def name
+      GritExt.encode! old_name
+    end
+
+    def email
+      GritExt.encode! old_email
+    end
+  end
+end

data/lib/grit_ext/blob.rb

@@ -0,0 +1,26 @@
+module Grit
+  class Blob
+
+    alias_method :old_name, :name
+    alias_method :old_data, :data
+
+    def name
+      GritExt.encode! old_name
+    end
+
+    def data
+      GritExt.encode! old_data
+    end
+
+    class << self
+      alias_method :old_blame, :blame
+
+      def blame(repo, commit, file)
+        old_blame(repo, commit, file).map do |b,lines|
+          [b, GritExt.encode!(lines.join('\n')).split('\n')]
+        end
+      end
+    end
+
+  end
+end

data/lib/grit_ext/commit.rb

@@ -0,0 +1,15 @@
+module Grit
+  class Commit
+
+    alias_method :old_message, :message
+    alias_method :old_short_message, :short_message
+
+    def message
+      GritExt.encode! old_message
+    end
+
+    def short_message
+      GritExt.encode! old_short_message
+    end
+  end
+end

data/lib/grit_ext/diff.rb

@@ -0,0 +1,23 @@
+module Grit
+  class Diff
+
+    def old_path
+      GritExt.encode! @a_path
+    end
+
+    def new_path
+      GritExt.encode! @b_path
+    end
+
+    def diff
+      if @diff.nil?
+        @diff = ""
+      else
+        lines = @diff.lines.to_a
+        path = GritExt.encode! lines.shift(2).join
+        body = GritExt.encode! lines.join
+        @diff = path + body
+      end
+    end
+  end
+end

data/lib/grit_ext/tag.rb

@@ -0,0 +1,10 @@
+module Grit
+  class Tag
+
+    alias_method :old_message, :message
+
+    def message
+      GritExt.encode! old_message
+    end
+  end
+end

data/lib/grit_ext/tree.rb

@@ -0,0 +1,10 @@
+module Grit
+  class Tree
+
+    alias_method :old_name, :name
+
+    def name
+      GritExt.encode! old_name
+    end
+  end
+end

data/lib/grit_ext/version.rb

@@ -0,0 +1,7 @@
+module GritExt
+  extend self
+
+  def version
+    "0.8.1"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-grit
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -12,6 +12,20 @@ bindir: bin
 cert_chain: []
 date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: charlock_holmes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.9
 - !ruby/object:Gem::Dependency
   name: posix-spawn
   requirement: !ruby/object:Gem::Requirement
@@ -77,17 +91,6 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- API.txt
-- History.txt
-- LICENSE
-- PURE_TODO
-- README.md
-- Rakefile
-- benchmarks.rb
-- benchmarks.txt
-- examples/ex_add_commit.rb
-- examples/ex_index.rb
-- grit.gemspec
 - lib/grit.rb
 - lib/grit/actor.rb
 - lib/grit/blame.rb
@@ -106,6 +109,7 @@ files:
 - lib/grit/git-ruby/internal/raw_object.rb
 - lib/grit/git-ruby/repository.rb
 - lib/grit/git.rb
+- lib/grit/grep.rb
 - lib/grit/index.rb
 - lib/grit/lazy.rb
 - lib/grit/merge.rb
@@ -116,6 +120,16 @@ files:
 - lib/grit/submodule.rb
 - lib/grit/tag.rb
 - lib/grit/tree.rb
+- lib/grit_ext.rb
+- lib/grit_ext/actor.rb
+- lib/grit_ext/blob.rb
+- lib/grit_ext/commit.rb
+- lib/grit_ext/diff.rb
+- lib/grit_ext/tag.rb
+- lib/grit_ext/tree.rb
+- lib/grit_ext/version.rb
+- README.md
+- LICENSE
 homepage: http://github.com/gitlabhq/grit
 licenses:
 - MIT
@@ -139,6 +153,6 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: 
-specification_version: 2
+specification_version: 4
 summary: Ruby Git bindings.
 test_files: []

data/API.txt

@@ -1,101 +0,0 @@
-== TODO ==
-
-* Add remote branch references (Grit::Remote)
-* Add status - what is modified, staged
-
-g.checkout('new_branch')
-g.checkout(g.branch('new_branch'))
-
-g.branch(name).merge(branch2)
-g.branch(branch2).merge  # merges HEAD with branch2
-
-g.branch(name).in_branch(message) { # add files }  # auto-commits
-g.merge('new_branch')
-g.merge('origin/remote_branch')
-g.merge(b.branch('master'))
-g.merge([branch1, branch2])
-
-r = g.add_remote(name, uri)  # Git::Remote
-r = g.add_remote(name, Git::Base)  # Git::Remote
-
-g.remotes  # array of Git::Remotes
-g.remote(name).fetch
-g.remote(name).remove
-g.remote(name).merge
-g.remote(name).merge(branch)
-
-g.fetch
-g.fetch(g.remotes.first)
-
-g.pull
-g.pull(Git::Repo, Git::Branch) # fetch and a merge
-
-g.add_tag('tag_name') # returns Git::Tag
-
-g.repack
-
-g.push
-g.push(g.remote('name'))
-   
-g.reset # defaults to HEAD
-g.reset_hard(Git::Commit)
-
-g.branch('new_branch') # creates new or fetches existing
-g.branch('new_branch').checkout
-g.branch('new_branch').delete
-g.branch('existing_branch').checkout
-
-
-
-
-
-require 'mojombo-grit'
-
-include Grit
-Grit.debug
-Grit.use_pure_ruby
-
-repo = Repo.new("/Users/tom/dev/grit")
-
-= Commit Log
-
-repo.commits('mybranch')
-repo.commits('40d3057d09a7a4d61059bca9dca5ae698de58cbe')
-repo.commits('v0.1')
-
-repo.log('mybranch', 100, 20)
-
-head = repo.commits.first
-head.id
-# => "e80bbd2ce67651aa18e57fb0b43618ad4baf7750"
-head.parents
-# => [#<Grit::Commit "91169e1f5fa4de2eaea3f176461f5dc784796769">]
-head.tree
-# => #<Grit::Tree "3536eb9abac69c3e4db583ad38f3d30f8db4771f">
-head.author
-# => #<Grit::Actor "Tom Preston-Werner <tom@mojombo.com>">
-head.authored_date
-# => Wed Oct 24 22:02:31 -0700 2007
-head.committer
-# => #<Grit::Actor "Tom Preston-Werner <tom@mojombo.com>">
-head.committed_date
-# => Wed Oct 24 22:02:31 -0700 2007
-head.message
-# => "add Actor inspect"
-contents = tree.contents
-  # => [#<Grit::Blob "4ebc8aea50e0a67e000ba29a30809d0a7b9b2666">,
-        #<Grit::Blob "81d2c27608b352814cbe979a6acd678d30219678">,
-        #<Grit::Tree "c3d07b0083f01a6e1ac969a0f32b8d06f20c62e5">,
-        #<Grit::Tree "4d00fe177a8407dbbc64a24dbfc564762c0922d8">]
-blob.id
-# => "4ebc8aea50e0a67e000ba29a30809d0a7b9b2666"
-blob.name
-# => "README.txt"
-blob.mode
-# => "100644"
-blob.size
-# => 7726
-blob.data
-
-repo.blob("4ebc8aea50e0a67e000ba29a30809d0a7b9b2666")
-# => #<Grit::Blob "4ebc8aea50e0a67e000ba29a30809d0a7b9b2666">

data/History.txt

@@ -1,163 +0,0 @@
-== 2.5.0 / 2012-04-22
-  * Minor Enhancements
-    * 100% Git-compliant actor creation.
-    * Handle newlines in author/committer.
-    * Grit::Git check_applies/patch related methods take command hash.
-    * Tags api now resty.
-    * Remove all the grit jruby hacks in favor of updated posix-spawn.
-    * Add Grit::Commit#patch_id.
-    * Support large packfiles with index v2.
-  * Bug Fixes
-    * Fix Loose Objects with non-ASCII content in Ruby 1.9
-    * Fix bugs in Grit::Repo #objects, #commit_objects, and #diff_objects
-      due to passing multiple arguments in a single argv element.
-    * ruby rev_list passes --verify to native rev_parse in fallback.
-    * Git ls-tree raises on non-zero exit.
-
-== 2.4.1 / 2011-01-13
-  * Minor Enhancements
-    * Grit::Process is used to implement Grit::Git#check_applies,
-      Grit::Git#get_patch, and Grit::Git#apply_patch.
-
-== 2.4.0 / 2011-01-06
-  * Major Enhancements
-    * Add support for parsing git notes.
-    * Add `git cat-file --batch` support with Grit::Repo#batch.
-    * Grit::Process is a custom written external command invocation heavily
-      optimized for running git commands quickly and efficiently.
-    * Grit::Git#native takes an :input option for piping data into git
-      commands
-    * Grit::Git#native takes an :env option for setting the git child
-      process's
-      environment without futsing with the parent's environment.
-    * Grit::Git#native takes an :chdir option for setting the current working
-      directory (PWD) of the git child process.
-    * Grit::Git#native takes an :raise => true option that causes an exception
-      to be raised when the git child process exits non-zero.
-  * Minor Enhancements
-    * Grit::Index#commit supports custom committer/author names and dates.
-    * Performance enhancements with internal command output buffering.
-    * Reduce fork/execs needed to execute a smoke command from between 3-4
-      to 1.
-    * Git child processes are now properly parented under the grit Ruby
-      process instead of being dropped under init.
-  * Bug Fixes
-    * Zero-Padding issue in Grit::Index was fixed.
-    * Fix issue where Repo#diff skips the first diff (#42)
-    * Fix Repo.init_bare for repo names not ending in .git (#40)
-    * Fix a variety of process hangs when git stderr output or data written
-      to stdin exceeded PIPE_BUF bytes.
-
-== 2.3.2 / 2011-01-06
-  * Erroneously released. SemVer violation and misc release screwups.
-
-== 2.3.1
-  * Skipped for unknown reasons.
-
-== 2.3.0 / 2010-09-29
-  * Minor Enhancements
-    * Add Grit::Repo.init.
-  * Bug Fixes
-    * Fix Ruby 1.9 compatibility (#24).
-
-== 2.2.1 / 2010-08-23
-  * Bug Fixes
-    * Fix minor regression due to the changed default values in
-      Grit::Index#commit.
-
-== 2.2.0 / 2010-08-19
-  * Minor Enhancements
-    * Add Grit::Index#delete to allow deletions of files from the index.
-
-== 2.1.0 / 2010-08-04
-  * Major Enhancements
-    * Add support for parsing annotated tag objects.
-    * Add Grit::Repo#recent_tag_name for getting the latest tag name that is
-      reachable in a commit.
-    * Grit::Diff tracks renames properly if given the :M option.
-    * Grit::Commit#diffs and Grit::Commit.diffs both take a git options hash
-      that is passed to `git diff`.
-  * Minor Enhancements
-    * Allow diff to only take one sha
-    * Add merge commit diff support
-    * Pass along the options to Real Git on a rev-parse miss
-    * Raise NoSuchPath with no tree in ls_tree_path
-    * Make pure-ruby `ls-tree -r` work with commits
-    * Implement select_existing_objects
-    * Switch to RakeGem for build management
-  * Bug Fixes
-    * Add no_quote option for fixing tag listings.
-    * Raise custom exceptions on invalid tree objects.
-    * Fix Repo#diff (was throwing an error).
-
-== 2.0.0 / 2009-10-27
-  * Major Enhancements
-    * All filesystem calls have been moved into Grit::Git to allow proxying
-  * Non-code changes
-    * Removed all trailing whitespace in code files
-  * Bug Fixes
-    * Repo.archive_tar_gz now passes -n option to gzip to be idempotent
-    * Fix RubyGit's diff to detect additions and deletions
-      [github.com/defunkt]
-
-== 1.1.1 / 2009-03-31
-  * Changes
-    * Don't include test directory in gem package (it's too big)
-
-== 1.1.0 / 2009-03-29
-  * Backwards breaking changes
-    * Diff#a_commit -> Diff#a_blob, Diff#b_commit -> Diff#b_blob
-  * Major Enhancments
-    * Ruby 1.9 compatibility [github.com/chapados, github.com/js]
-  * Minor Enhancements
-    * Convert readme to markdown
-    * Added a shortcut for commit_stats as Commit#stats [github.com/js]
-    * Add a #basename method to Submodule, Blob and Tree for retrieving the
-      name [github.com/js]
-    * Make Grit::Submodule grasp the concept of non-unix lineendings
-      [github.com/js]
-    * Added Repo#commit_deltas_from [github.com/js]
-    * do some mild shell escaping when running commands [github.com/js]
-    * Added two shortcut methods to Tree, for picking trees/blobs only
-      [github.com/Voker57]
-    * Added <=> method to Blob, needed for sorting tree [github.com/Voker57]
-    * Make the number of bytes to be read from git's stdout configurable
-      [github.com/josb]
-    * Repo.archive_to_file accepts extra parameters making plain zipping
-      possible [github.com/darwin]
-    * Handle commit stats that summarize commits with binary changes
-      [github.com/therealadam]
-    * Add a DiffStat class for easy access to diff stats
-      [github.com/therealadam]
-    * Don't split git logs that contain blank lines into two CommitStats
-      [github.com/therealadam]
-    * Add DiffStat#net for total change count [github.com/therealadam]
-
-== 1.0.3 / 2009-02-13
-  * Minor Enhancements
-    * Added Grit::Commit#to_patch for plaintext formatted patches.
-    * Fixed Grit::Tag to work with annotated tags.
-
-== 1.0.2 / 2009-02-10
-  * Minor Enhancements
-    * Implement Grit.version to use VERSION.yml file
-
-== 1.0.1 / 2009-02-10
-  * Bug Fixes
-    * Add diff-lcs as a dependency
-
-== 1.0.0 / 2009-01-27
-  * Tons of awesome in here. Also, we suck at updating the history.
-  * Let's do better at that from now on.
-
-== 0.8.3 / 2008-07-07
-  * Capture stderr and log if debug is true (rsanheim)
-
-== 0.8.2 / 2008-06-27
-  * Allow user provided logger (rsanheim)
-
-== 0.8.0 / 2008-04-24
-  * Lots of fixes and additions
-
-== 0.7.0 / 2008-01-07
-  * First public release!

data/PURE_TODO

@@ -1,35 +0,0 @@
-This is a listing of all the places I can find that Grit actually does a
-'git' system call.  My goal is to add native Ruby versions of all of them.
-
-Completed
-===========================
-** lib/grit/blob.rb:36:      @size ||= @repo.git.cat_file({:s => true}, id).chomp.to_i
-** lib/grit/blob.rb:43:      @data ||= @repo.git.cat_file({:p => true}, id)
-** lib/grit/tree.rb:16:      output = repo.git.ls_tree({}, treeish, *paths)
-
-
-
-lib/grit/commit.rb:74:      repo.git.rev_list({}, ref).strip.split("\n").size
-lib/grit/commit.rb:92:      output = repo.git.rev_list(actual_options, ref)
-lib/grit/commit.rb:94:      output = repo.git.rev_list(actual_options.merge(:all => true))
-
-
-Next to do
-===========================
-lib/grit/tag.rb:28:      output = repo.git.for_each_ref(actual_options, "refs/tags")
-lib/grit/head.rb:37:      output = repo.git.for_each_ref(actual_options, HEAD_PREFIX)
-lib/grit/head.rb:50:        self.new($1, repo.git.rev_parse(options, 'HEAD'))
-lib/grit/config.rb:9:      @repo.git.config({}, key, value)
-lib/grit/config.rb:40:        @repo.git.config(:list => true).split(/\n/)
-
-
-May not be fast enough
-=============================
-lib/grit/blob.rb:58:      data = repo.git.blame({:p => true}, commit, '--', file)
-
-
-More Difficult
-===========================
-lib/grit/commit.rb:39:      @id_abbrev ||= @repo.git.rev_parse({:short => true}, self.id).chomp
-lib/grit/commit.rb:150:      text = repo.git.diff({:full_index => true}, *paths)
-lib/grit/commit.rb:156:        diff = @repo.git.show({:full_index => true, :pretty => 'raw'}, @id)

data/Rakefile

@@ -1,149 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'date'
-
-#############################################################################
-#
-# Helper functions
-#
-#############################################################################
-
-def name
-  @name ||= Dir['*.gemspec'].first.split('.').first
-end
-
-def version
-  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
-  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
-end
-
-def date
-  Date.today.to_s
-end
-
-def rubyforge_project
-  name
-end
-
-def gemspec_file
-  "#{name}.gemspec"
-end
-
-def gem_file
-  "#{name}-#{version}.gem"
-end
-
-def replace_header(head, header_name)
-  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
-end
-
-#############################################################################
-#
-# Standard tasks
-#
-#############################################################################
-
-task :default => :test
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test' << '.'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-desc "Generate RCov test coverage and open in your browser"
-task :coverage do
-  require 'rcov'
-  sh "rm -fr coverage"
-  sh "rcov test/test_*.rb"
-  sh "open coverage/index.html"
-end
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "#{name} #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-desc "Open an irb session preloaded with this library"
-task :console do
-  sh "irb -rubygems -r ./lib/#{name}.rb"
-end
-
-#############################################################################
-#
-# Custom tasks (add your own tasks here)
-#
-#############################################################################
-
-desc "Upload site to Rubyforge"
-task :site do
-  sh "scp -r doc/* mojombo@grit.rubyforge.org:/var/www/gforge-projects/grit"
-end
-
-#############################################################################
-#
-# Packaging tasks
-#
-#############################################################################
-
-task :release => :build do
-  unless `git branch` =~ /^\* master$/
-    puts "You must be on the master branch to release!"
-    exit!
-  end
-  sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git tag v#{version}"
-  sh "git push origin master"
-  sh "git push origin v#{version}"
-  sh "gem push pkg/#{name}-#{version}.gem"
-end
-
-task :build => :gemspec do
-  sh "mkdir -p pkg"
-  sh "gem build #{gemspec_file}"
-  sh "mv #{gem_file} pkg"
-end
-
-task :gemspec => :validate do
-  # read spec file and split out manifest section
-  spec = File.read(gemspec_file)
-  head, manifest, tail = spec.split("  # = MANIFEST =\n")
-
-  # replace name version and date
-  replace_header(head, :name)
-  replace_header(head, :version)
-  replace_header(head, :date)
-  #comment this out if your rubyforge_project has a different name
-  replace_header(head, :rubyforge_project)
-
-  # determine file list from git ls-files
-  files = `git ls-files`.
-    split("\n").
-    sort.
-    reject { |file| file =~ /^\./ }.
-    reject { |file| file =~ /^(rdoc|pkg|test)/ }.
-    map { |file| "    #{file}" }.
-    join("\n")
-
-  # piece file back together and write
-  manifest = "  s.files = %w[\n#{files}\n  ]\n"
-  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
-  File.open(gemspec_file, 'w') { |io| io.write(spec) }
-  puts "Updated #{gemspec_file}"
-end
-
-task :validate do
-  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
-  unless libfiles.empty?
-    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
-    exit!
-  end
-  unless Dir['VERSION*'].empty?
-    puts "A `VERSION` file at root level violates Gem best practices."
-    exit!
-  end
-end

data/benchmarks.rb

@@ -1,129 +0,0 @@
-require 'fileutils'
-require 'benchmark'
-require 'rubygems'
-require 'ruby-prof'
-require 'memcache'
-require 'pp'
-
-
-#require 'grit'
-require 'lib/grit'
-
-def main
-  @wbare = File.expand_path(File.join('test', 'dot_git'))
-  
-  in_temp_dir do
-    #result = RubyProf.profile do
-
-      git = Grit::Repo.new('.')
-      puts Grit::VERSION
-      
-      Grit::GitRuby.use_commit_db = true
-      #Grit::GitRuby.cache_client = MemCache.new 'localhost:11211', :namespace => 'grit'
-      #Grit.debug = true
-    
-      #pp Grit::GitRuby.cache_client.stats 
-    
-      commit1 = '5e3ee1198672257164ce3fe31dea3e40848e68d5'
-      commit2 = 'ca8a30f5a7f0f163bbe3b6f0abf18a6c83b0687a'
-    
-      Benchmark.bm(8) do |x|
-            
-        run_code(x, 'packobj') do
-          @commit = git.commit('5e3ee1198672257164ce3fe31dea3e40848e68d5')
-          @tree = git.tree('cd7422af5a2e0fff3e94d6fb1a8fff03b2841881')
-          @blob = git.blob('4232d073306f01cf0b895864e5a5cfad7dd76fce')
-          @commit.parents[0].parents[0].parents[0]
-        end
-
-        run_code(x, 'commits 1') do
-          git.commits.size
-        end
-              
-        run_code(x, 'commits 2') do
-          log = git.commits('master', 15)
-          log.size
-          log.size
-          log.first
-          git.commits('testing').map { |c| c.message }
-        end
-
-        run_code(x, 'big revlist') do
-          c = git.commits('master', 200)
-        end
-
-        run_code(x, 'log') do
-          log = git.log('master')
-          log.size
-          log.size
-          log.first
-        end
-
-        run_code(x, 'diff') do
-          c = git.diff(commit1, commit2)
-        end
-
-        run_code(x, 'commit-diff') do
-          c = git.commit_diff(commit1)
-        end
-
-        run_code(x, 'heads') do
-          c = git.heads.collect { |b| b.commit.id }
-        end
-
-       # run_code(x, 'config', 100) do
-       #   c = git.config['user.name']
-       #   c = git.config['user.email']
-       # end
-
-        #run_code(x, 'commit count') do
-        #  c = git.commit_count('testing')
-        #end
-
-
-      end
-    #end
-
-    #printer = RubyProf::FlatPrinter.new(result)
-    #printer.print(STDOUT, 0)
-    
-  end
-
-
-end
-
-
-def run_code(x, name, times = 30)
-    x.report(name.ljust(12)) do
-      for i in 1..times do
-        yield i
-      end
-    end
-  
-  #end
-  
-  # Print a graph profile to text
-end
-
-def new_file(name, contents)
-  File.open(name, 'w') do |f|
-    f.puts contents
-  end
-end
-
-
-def in_temp_dir(remove_after = true)
-  filename = 'git_test' + Time.now.to_i.to_s + rand(300).to_s.rjust(3, '0')
-  tmp_path = File.join("/tmp/", filename)
-  FileUtils.mkdir(tmp_path)
-  Dir.chdir tmp_path do
-    FileUtils.cp_r(@wbare, File.join(tmp_path, '.git'))
-    yield tmp_path
-  end
-  puts tmp_path
-  #FileUtils.rm_r(tmp_path) if remove_after
-end
-
-main()
-
-##pp Grit::GitRuby.cache_client.stats 

data/benchmarks.txt

@@ -1,21 +0,0 @@
-Grit : 
-              user     system      total        real
-packobj       0.030000   0.270000   1.380000 (  1.507250)
-commits 1     0.030000   0.070000   0.390000 (  0.409931)
-commits 2     0.110000   0.170000   0.860000 (  0.896371)
-log           0.350000   0.130000   0.850000 (  0.875035)
-diff          0.190000   0.140000   1.940000 (  2.031911)
-commit-diff   0.540000   0.220000   1.390000 (  1.463839)
-heads         0.010000   0.070000   0.390000 (  0.413918)
-
-
-Grit (with GitRuby) : 
-
-              user     system      total        real
-packobj       0.050000   0.010000   0.060000 (  0.078318)
-commits 1     0.150000   0.010000   0.160000 (  0.174296)
-commits 2     0.440000   0.040000   0.480000 (  0.522310)
-log           0.490000   0.040000   0.530000 (  0.538128)
-diff          0.370000   0.230000   2.250000 (  2.255974)
-commit-diff   0.580000   0.260000   1.500000 (  1.553000)
-heads         0.020000   0.100000   0.430000 (  0.455464)

data/examples/ex_add_commit.rb

@@ -1,13 +0,0 @@
-require '../lib/grit'
-
-count = 1
-Dir.chdir("/Users/schacon/projects/atest") do
-  r = Grit::Repo.new('.')
-  while(count < 10) do
-    fname = Time.now.to_i.to_s + count.to_s
-    File.open(fname, 'w') { |f| f.write('hellor ' + fname) }
-    r.add(fname)
-    count += 1
-  end
-  r.commit_index('my commit')
-end

data/examples/ex_index.rb

@@ -1,21 +0,0 @@
-require '../lib/grit'
-
-count = 1
-Dir.chdir("/Users/schacon/projects/atest") do
-  r = Grit::Repo.new('.')
-  i = r.index
-  while(count < 10) do
-    fname = Time.now.to_i.to_s + count.to_s
-    i.add(fname, 'hello ' + fname)
-    count += 1
-  end
-  count = 5
-  while(count < 10) do
-    puts "HELLO"
-    fname = Time.now.to_i.to_s + count.to_s
-    i.add('test/' + fname, 'hello ' + fname)
-    count += 1
-  end
-  puts i.commit('my commit')
-  puts i.inspect
-end

data/grit.gemspec

@@ -1,74 +0,0 @@
-Gem::Specification.new do |s|
-  s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = '1.3.5'
-
-  s.name              = 'gitlab-grit'
-  s.version           = '2.5.0'
-  s.date              = '2013-05-06'
-  s.license     = 'MIT'
-
-  s.summary     = "Ruby Git bindings."
-  s.description = "Grit is a Ruby library for extracting information from a git repository in an object oriented manner. GitLab fork"
-
-  s.authors  = ["Tom Preston-Werner", "Scott Chacon", "Dmitriy Zaporozhets"]
-  s.email    = 'm@gitlabhq.com'
-  s.homepage = 'http://github.com/gitlabhq/grit'
-
-  s.require_paths = %w[lib]
-
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.extra_rdoc_files = %w[README.md LICENSE]
-
-  s.add_dependency('posix-spawn', "~> 0.3.6")
-  s.add_dependency('mime-types', "~> 1.15")
-  s.add_dependency('diff-lcs', "~> 1.1")
-
-  s.add_development_dependency('mocha')
-
-  # = MANIFEST =
-  s.files = %w[
-    API.txt
-    History.txt
-    LICENSE
-    PURE_TODO
-    README.md
-    Rakefile
-    benchmarks.rb
-    benchmarks.txt
-    examples/ex_add_commit.rb
-    examples/ex_index.rb
-    grit.gemspec
-    lib/grit.rb
-    lib/grit/actor.rb
-    lib/grit/blame.rb
-    lib/grit/blob.rb
-    lib/grit/commit.rb
-    lib/grit/commit_stats.rb
-    lib/grit/config.rb
-    lib/grit/diff.rb
-    lib/grit/errors.rb
-    lib/grit/git-ruby.rb
-    lib/grit/git-ruby/commit_db.rb
-    lib/grit/git-ruby/git_object.rb
-    lib/grit/git-ruby/internal/file_window.rb
-    lib/grit/git-ruby/internal/loose.rb
-    lib/grit/git-ruby/internal/pack.rb
-    lib/grit/git-ruby/internal/raw_object.rb
-    lib/grit/git-ruby/repository.rb
-    lib/grit/git.rb
-    lib/grit/index.rb
-    lib/grit/lazy.rb
-    lib/grit/merge.rb
-    lib/grit/ref.rb
-    lib/grit/repo.rb
-    lib/grit/ruby1.9.rb
-    lib/grit/status.rb
-    lib/grit/submodule.rb
-    lib/grit/tag.rb
-    lib/grit/tree.rb
-  ]
-  # = MANIFEST =
-
-  s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
-end