rjgit_grack 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b3b6f0083eb09801ec9ab63c21d3cc61c0b4ee76
-  data.tar.gz: 35ba1805472c93b622aed689fbf90386b20b7369
+SHA256:
+  metadata.gz: 34c2343905a45fd0f5b0630de0d1d51d648bd2dadd6384af3db5e8f86203796e
+  data.tar.gz: 7df53ace4f4bebd370fe2f42a79dfde2c121070ff02a0597a60edf4f44a575fb
 SHA512:
-  metadata.gz: a9ba14877655ed68438964b979f292a27a0be4e28643c20b310cfa1a98b680d702572c313b331cb6e3285728aeae945658210fb643db442c5c4262d5a62dba57
-  data.tar.gz: debe40b287309f60ec97fdaf595b73d10b142cd9e5edac3f5a60aef89bbfb3086330dc498818c5bda0d20f5b48d57e2306163a96f1f16bd0a455dbb10afad314
+  metadata.gz: af136a2150625b2cfd1a7d03262ee875da5f905b124ddd56e4b25f7d12ef9f23b7b2460a3e24fed8ddde4bd959d075b7d298d42fa01b6d46760113edbc69a8d5
+  data.tar.gz: e3f3d4925e05894fb82a9a1d5f41359c45a0d571d98f5efe563859a57fe097a810af52da0bbc957478ed81b6e16a1af46d2e5d5e8af6ea60c373055de1fea3eb

data/Gemfile

@@ -1,13 +1,13 @@
 source 'https://rubygems.org'
 
 gem 'rake'
-gem 'coveralls', require: false
+gem 'coveralls', '~> 0.8.23', require: false
 
 group :test do
   gem "minitest"
   gem "rack-test"
   gem "mocha"
-  gem "grack", :git => 'https://github.com/grackorg/grack'
+  gem "grack"
   gem "simplecov", :require => false
 end
 

data/README.md

@@ -2,6 +2,7 @@ rjgit_grack
 ===========
 [![Gem Version](https://badge.fury.io/rb/rjgit_grack.svg)](http://badge.fury.io/rb/rjgit_grack)
 [![Build Status](https://travis-ci.org/grackorg/rjgit_grack.svg?branch=master)](https://travis-ci.org/grackorg/rjgit_grack.svg?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/grackorg/rjgit_grack/badge.svg?branch=master)](https://coveralls.io/github/grackorg/rjgit_grack?branch=master)
 [![Dependency Status](https://gemnasium.com/dometto/rjgit_grack.svg)](https://gemnasium.com/grackorg/rjgit_grack)
 
 Alternative Adapter for [grack](http://github.com/grackorg/grack); uses the [RJGit](http://github.com/repotag/rjgit) gem for a pure jruby interface to git repos. Together with Grack, this yields a pure jruby implementation of git's smart-http protocol.
@@ -14,16 +15,15 @@ Installation
 Usage
 ===========
 
-1. Get [grack](https://github.com/grackorgs/grack).
+1. Get [grack](https://github.com/grackorg/grack).
 2. After requiring `rjgit_grack.rb`, you can tell Grack to use the `RJGitAdapter` by editing its configuration, for example:
 
 ```ruby
 require 'grack/app'
-require 'grack/git_adapter'
-require 'rjgit_grack'
+require 'grack/rjgit_adapter'
 
 config = {
-  :root => '/path/to/bare/repositories',
+  :root => '/tmp/',
   :allow_push => true,
   :allow_pull => true,
   :git_adapter_factory => ->{ Grack::RJGitAdapter.new }
@@ -49,12 +49,12 @@ This adapter allows you to specify hooks to be called when receive operations (i
 
 You can specify the following hooks:
   * `:preReceive` executed immediately before a receive-operation is performed. Yields an `Array` with `Hash` objects containing info about each ref that is about to be pushed, of the following form:
-    ```ruby
-      {:ref_name => 'refs/heads/masters', :old_id => 'somesha1', :new_id => 'someothersha1', :type => "FAST_FORWARD", :result => "OK"}
+    ```
+      {:ref_name => 'refs/heads/masters', :old_id => 'somesha1', :new_id => 'someothersha1', :type => "FAST_FORWARD"}
     ```
   * `:postReceive` executed after a receive-operation is completed. Yields an `Array` with `Hash` objects for each ref that was pushed, of the same form as above, plus a `:result` field. The result will be a `String`, and can have one of the values [defined by JGit](http://download.eclipse.org/jgit/site/4.3.0.201604071810-r/apidocs/index.html).
-  * `:preReceive` executed immediately before an upload-operation is performed, i.e. before data is sent to the client. Yields an `Array` of `String` object-id's (SHA1-hashes) already in common between client and server.
-  * `:postReceive` executed after an upload-operation to a client is complete. Returns an `org.eclipse.jgit.storage.pack.PackStatistics` object (see [here](http://download.eclipse.org/jgit/site/4.3.0.201604071810-r/apidocs/org/eclipse/jgit/storage/pack/PackStatistics.html)).
+  * `:preUpload` executed immediately before an upload-operation is performed, i.e. before data is sent to the client. Yields an `Array` of `String` object-id's (SHA1-hashes) already in common between client and server.
+  * `:postUpload` executed after an upload-operation to a client is complete. Returns an `org.eclipse.jgit.storage.pack.PackStatistics` object (see [here](http://download.eclipse.org/jgit/site/4.3.0.201604071810-r/apidocs/org/eclipse/jgit/storage/pack/PackStatistics.html)).
 
 Note that JGit blocks all read and write operations on the repository until a hook is complete, so the hooks should only contain code that runs quickly (e.g. running workers or threads to perform the heavy work).
 

data/Rakefile

@@ -0,0 +1,110 @@
+task :default => :test
+ 
+desc "Run the tests."
+task :test do
+  rename_test_git_dir
+  Dir.glob("tests/*_test.rb").each do |file|
+        require "./#{file}"
+  end
+end
+
+def rename_test_git_dir
+  dot_git = File.join(File.dirname(__FILE__), 'tests', 'example')
+  cp_r File.join(dot_git, '_git'), File.join(dot_git, 'test_repo', '.git'), :remove_destination => true
+end
+
+
+require 'rubygems'
+require 'date'
+
+#############################################################################
+#
+# Helper functions
+#
+#############################################################################
+
+def name
+  @name ||= Dir['*.gemspec'].first.split('.').first
+end
+
+def date
+  Date.today.to_s
+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
+
+def version
+  spec = File.read(gemspec_file)
+  spec.match(/s\.version = \'(.*)\'/)[1]
+end
+
+#############################################################################
+#
+# Packaging tasks
+#
+#############################################################################
+
+desc 'Create a release build and push to rubygems'
+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 pull --rebase origin master"
+  sh "git tag v#{version}"
+  sh "git push origin master"
+  sh "git push origin v#{version}"
+  sh "gem push pkg/#{name}-#{version}.gem"
+end
+
+desc 'Publish to rubygems. Same as release'
+task :publish => :release
+
+desc 'Build gem'
+task :build => :gemspec do
+  sh "mkdir -p pkg"
+  sh "gem build #{gemspec_file}"
+  sh "mv #{gem_file} pkg"
+end
+
+desc "Build and install"
+task :install => :build do
+  sh "gem install --local --no-document pkg/#{name}-#{version}.gem"
+end
+
+desc 'Update gemspec'
+task :gemspec do
+  # read spec file and split out manifest section
+  spec = File.read(gemspec_file)
+  head, manifest, tail = spec.split("  # = MANIFEST =\n")
+
+  # replace name and date
+  replace_header(head, :name)
+  replace_header(head, :date)
+
+  # determine file list from git ls-files
+  files = `git ls-files`.
+    split("\n").
+    sort.
+    reject { |file| file =~ /^\./ }.
+    reject { |file| file =~ /^(rdoc|pkg|test|Home\.md|\.gitattributes)/ }.
+    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

data/lib/grack/hooks.rb

@@ -0,0 +1,59 @@
+module Grack 
+  module Hooks
+
+    class Hook
+      def initialize(hook)
+        @hook = hook
+      end
+    end
+
+    class PreReceiveHook < Hook
+      include org.eclipse.jgit.transport.PreReceiveHook
+      def onPreReceive(pack, commands)
+        @hook.call(commands.to_a.map {|cmd|
+          {
+            :ref_name => cmd.getRefName,
+            :old_id => cmd.getOldId.getName,
+            :new_id => cmd.getNewId.getName,
+            :type => cmd.getType.toString,
+          }
+        })
+      end
+    end
+
+    class PostReceiveHook < Hook
+      include org.eclipse.jgit.transport.PostReceiveHook
+      def onPostReceive(pack, commands)
+        @hook.call(commands.to_a.map {|cmd|
+          {
+            :ref_name => cmd.getRefName,
+            :old_id => cmd.getOldId.getName,
+            :new_id => cmd.getNewId.getName,
+            :type => cmd.getType.toString,
+            :result => cmd.getResult.toString
+          }
+        })
+      end
+    end
+
+    class PostUploadHook < Hook
+      include org.eclipse.jgit.transport.PostUploadHook
+      def onPostUpload(stats)
+        @hook.call(stats)
+      end
+    end
+
+    class PreUploadHook < Hook
+      include org.eclipse.jgit.transport.PreUploadHook
+
+      def onSendPack(pack, wants, haves)
+        @hook.call(wants.to_a.map {|obj| obj.getName}, haves.to_a.map {|obj| obj.getName})
+      end
+
+      def onBeginNegotiateRound(pack, wants, cnt_offered); end
+      def onEndNegotiateRound(pack, wants, cnt_common, cnt_not_found, ready ); end
+
+    end
+
+  end
+end

data/lib/grack/rjgit_adapter.rb

@@ -0,0 +1,68 @@
+require 'rjgit'
+
+module Grack
+
+  class RJGitAdapter < GitAdapter
+
+    def initialize(hooks = nil)
+      @repository_path = nil
+      @hooks = hooks
+    end
+  
+    def handle_pack(pack_type, io_in, io_out, opts = {})
+      pack = case pack_type
+        when 'git-upload-pack'
+          RJGit::RJGitUploadPack.new(repo)
+        when 'git-receive-pack'
+          RJGit::RJGitReceivePack.new(repo)
+      end
+      return nil if pack.nil?
+      set_hooks(pack) if @hooks
+      if opts[:advertise_refs] then
+        io_out.write advertisement_prefix(pack_type)
+        result = pack.advertise_refs
+      else
+        result = pack.process(io_in.read).first.read
+      end
+      io_out.write(result)
+    end
+
+    def update_server_info
+      repo.update_server_info
+    end
+
+    def config(key)
+      begin
+        settings = repo.config
+      rescue
+        return nil
+      end
+      key.split(".").each do |domain|
+        begin
+          settings = settings[domain]
+        rescue
+          return nil
+        end
+      end
+      settings.is_a?(Hash) ? settings : settings.to_s
+    end
+
+    private
+
+    def repo
+      RJGit::Repo.new(repository_path)
+    end
+
+    def set_hooks(pack)
+      if pack.is_a?(RJGit::RJGitUploadPack)
+        pack.jpack.setPostUploadHook(Grack::Hooks::PostUploadHook.new(@hooks[:postUpload])) if @hooks[:postUpload]
+        pack.jpack.setPreUploadHook(Grack::Hooks::PreUploadHook.new(@hooks[:preUpload])) if @hooks[:preUpload]
+      elsif pack.is_a?(RJGit::RJGitReceivePack)
+        pack.jpack.setPostReceiveHook(Grack::Hooks::PostReceiveHook.new(@hooks[:postReceive])) if @hooks[:postReceive]
+        pack.jpack.setPreReceiveHook(Grack::Hooks::PreReceiveHook.new(@hooks[:preReceive])) if @hooks[:preReceive]
+      end
+    end
+  
+  end
+
+end

data/lib/rjgit_grack.rb

@@ -1,69 +1,2 @@
-require 'rjgit'
-require 'hooks'
-
-module Grack
-
-  class RJGitAdapter < GitAdapter
-
-    def initialize(hooks = nil)
-      @repository_path = nil
-      @hooks = hooks
-    end
-  
-    def handle_pack(pack_type, io_in, io_out, opts = {})
-      pack = case pack_type
-        when 'git-upload-pack'
-          RJGit::RJGitUploadPack.new(repo)
-        when 'git-receive-pack'
-          RJGit::RJGitReceivePack.new(repo)
-      end
-      return nil if pack.nil?
-      set_hooks(pack) if @hooks
-      if opts[:advertise_refs] then
-        io_out.write advertisement_prefix(pack_type)
-        result = pack.advertise_refs
-      else
-        result = pack.process(io_in.read).first.read
-      end
-      io_out.write(result)
-    end
-
-    def update_server_info
-      repo.update_server_info
-    end
-
-    def config(key)
-      begin
-        settings = repo.config
-      rescue
-        return nil
-      end
-      key.split(".").each do |domain|
-        begin
-          settings = settings[domain]
-        rescue
-          return nil
-        end
-      end
-      settings.is_a?(Hash) ? settings : settings.to_s
-    end
-
-    private
-
-    def repo
-      RJGit::Repo.new(repository_path)
-    end
-
-    def set_hooks(pack)
-      if pack.is_a?(RJGit::RJGitUploadPack)
-        pack.jpack.setPostUploadHook(Grack::Hooks::PostUploadHook.new(@hooks[:postUpload])) if @hooks[:postUpload]
-        pack.jpack.setPreUploadHook(Grack::Hooks::PreUploadHook.new(@hooks[:preUpload])) if @hooks[:preUpload]
-      elsif pack.is_a?(RJGit::RJGitReceivePack)
-        pack.jpack.setPostReceiveHook(Grack::Hooks::PostReceiveHook.new(@hooks[:postReceive])) if @hooks[:postReceive]
-        pack.jpack.setPreReceiveHook(Grack::Hooks::PreReceiveHook.new(@hooks[:preReceive])) if @hooks[:preReceive]
-      end
-    end
-  
-  end
-
-end
+require File.expand_path('../grack/rjgit_adapter.rb', __FILE__)
+require File.expand_path('../grack/hooks.rb', __FILE__)

data/rjgit_grack.gemspec

@@ -0,0 +1,27 @@
+Gem::Specification.new do |s|
+  s.name = 'rjgit_grack'
+  s.version = '0.5.0'
+  s.date = '2020-03-14'
+  s.summary = "Adapts grack (http://github.com/grackorg/grack) to use JGit."
+  s.description = "Alternative Adapter for grack; uses the RJGit gem for a pure jruby interface to git repos. Together with Grack, this yields a pure JRuby implementation of git's smart-http protocol."
+  s.authors = ['Dawa Ometto']
+  s.email = 'd.ometto@gmail.com'
+  s.files = ['lib/rjgit_grack.rb', 'README.md', 'LICENSE', 'Gemfile']
+  s.require_paths = ['lib']
+  s.homepage = "http://github.com/grackorg/rjgit_grack"
+  s.license = 'MIT'
+
+  s.add_dependency 'rjgit', '~> 5.6'
+  # = MANIFEST =
+  s.files = %w[
+    Gemfile
+    LICENSE
+    README.md
+    Rakefile
+    lib/grack/hooks.rb
+    lib/grack/rjgit_adapter.rb
+    lib/rjgit_grack.rb
+    rjgit_grack.gemspec
+  ]
+  # = MANIFEST =
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rjgit_grack
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Dawa Ometto
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-30 00:00:00.000000000 Z
+date: 2020-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rjgit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
+        version: '5.6'
+  name: rjgit
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.6'
 description: Alternative Adapter for grack; uses the RJGit gem for a pure jruby interface
   to git repos. Together with Grack, this yields a pure JRuby implementation of git's
   smart-http protocol.
@@ -35,30 +35,33 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
+- lib/grack/hooks.rb
+- lib/grack/rjgit_adapter.rb
 - lib/rjgit_grack.rb
+- rjgit_grack.gemspec
 homepage: http://github.com/grackorg/rjgit_grack
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6
+signing_key:
 specification_version: 4
 summary: Adapts grack (http://github.com/grackorg/grack) to use JGit.
 test_files: []
-has_rdoc: