rjgit_grack 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c120bee899ad48c317673385f483c4bf782f4462
-  data.tar.gz: b3a4605897c893252bede1547f0a27b4d2d88bc7
+  metadata.gz: 84344229b7966b8960708f9ca83b982ec60de07c
+  data.tar.gz: ddb642960dc5175ac9de200260beec3a00f63bf2
 SHA512:
-  metadata.gz: 86a8ec1ada212e5b94d9507ac5c4f7fd7f2f4677593492fc8dc6998cd0c90dadad8c3b91b5b53f0fdab3f4d862c4bdac6270c7cb63b1a873315d50ff9fefb6c9
-  data.tar.gz: 776bc8fda334167d6b84f497c49134a7fe0727bbddceb4ba0e436c5cf952972a28b201afd3bdda7ed90f13d3f5e8fb730cf21b51d8a65f3e436e664b7d9beb44
+  metadata.gz: 4f7f0d798f28ec5cfb730ec7b5f694d2c692a43e8e18a1c1f595b472122a2aa527fa374faaa96e813e0b26e93a7fb8d3390b7385865055844e5b38eca839ec09
+  data.tar.gz: 4565154688cea2e309af64fbbe89f30b5394ab84d908150ac38c1bc7c71b60224f29827d578afb9fd4ebbf3ca6bacc6583786489ad4549255f8b2b4b43f7c90c

data/Gemfile

@@ -6,6 +6,7 @@ gem 'coveralls', require: false
 group :test do
   gem "test"
   gem "mocha"
+  gem "grack", :git => 'https://github.com/grackorg/grack'
   gem "simplecov", :require => false
 end
 

data/README.md

@@ -1,10 +1,10 @@
 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/dometto/rjgit_grack.svg?branch=master)](https://travis-ci.org/dometto/rjgit_grack)
-[![Dependency Status](https://gemnasium.com/dometto/rjgit_grack.svg)](https://gemnasium.com/dometto/rjgit_grack)
+[![Build Status](https://travis-ci.org/dometto/rjgit_grack.svg?branch=master)](https://travis-ci.org/grackorg/rjgit_grack)
+[![Dependency Status](https://gemnasium.com/dometto/rjgit_grack.svg)](https://gemnasium.com/grackorg/rjgit_grack)
 
-Alternative Adapter for [grack](http://github.com/schacon/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.
+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.
 
 Installation
 ===========
@@ -15,14 +15,21 @@ Usage
 ===========
 
 1. Get grack.
-2. After requiring `rjgit_grack.rb`, you can tell Grack to use the `RJGitAdapter` by editing its configuration, like so:
+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'
+
 config = {
-  :adapter => Grack::RJGitAdapter,
-  :upload_pack => true,
-  :receive_pack => true,
+  :root => '/path/to/bare/repositories',
+  :allow_push => true,
+  :allow_pull => true,
+  :git_adapter_factory => ->{ Grack::RJGitAdapter.new }
 }
+
+run Grack::App.new(config)
 ```
 
 Specs
@@ -35,8 +42,8 @@ Run the specs:
 Dependencies
 ===========
 
-- [Grack](http://github.com/schacon/grack)
-- The [RJGit](http://github.com/repotag/rjgit) gem, which requires jruby
+- [Grack](http://github.com/grackorg/grack) >= 0.1.0.pre
+- The [RJGit](http://github.com/repotag/rjgit) gem, which requires JRuby
 
 License
 ========================

data/lib/rjgit_grack.rb

@@ -2,63 +2,53 @@ require "rjgit"
 
 module Grack
 
-  class RJGitAdapter
+  class RJGitAdapter < GitAdapter
 
-    def repo(repository_path)
-      RJGit::Repo.new(repository_path)
+    def initialize
+      @repository_path = nil
     end
   
-    def service_command(cmd, repository_path, opts = {}, &block)
-      pack = case cmd
-        when :upload_pack
-          RJGit::RJGitUploadPack.new(repo repository_path)
-        when :receive_pack
-          RJGit::RJGitReceivePack.new(repo repository_path)
-        else
-          nil
+    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 unless pack
       if opts[:advertise_refs] then
-        return pack.advertise_refs
+        io_out.write advertisement_prefix(pack_type)
+        result = pack.advertise_refs
       else
-        msg = opts.has_key?(:msg) ? opts[:msg] : ""
-        result, err = pack.process(msg)
-        if block_given? then
-          yield result
-        else
-          return result.read
-        end
-      end    
-    end
-  
-    def upload_pack(repository_path, opts = {}, &block)
-      self.service_command(:upload_pack, repository_path, opts, &block)
-    end
-  
-    def receive_pack(repository_path, opts = {}, &block)
-      self.service_command(:receive_pack, repository_path, opts, &block)
+        result = pack.process(io_in.read).first.read
+      end
+      io_out.write(result)
     end
-  
-    def update_server_info(repository_path, opts = {}, &block)
-      repo(repository_path).update_server_info
+
+    def update_server_info
+      repo.update_server_info
     end
 
-    def get_config_setting(repository_path, key)
-      repository = repo(repository_path)
-      domains = key.split(".")
+    def config(key)
       begin
-        loop_settings = repository.config
+        settings = repo.config
       rescue
         return nil
       end
-      domains.each do |domain|
+      key.split(".").each do |domain|
         begin
-          loop_settings = loop_settings[domain]
+          settings = settings[domain]
         rescue
           return nil
         end
       end
-      return loop_settings.is_a?(Hash) ? loop_settings : loop_settings.to_s
+      settings.is_a?(Hash) ? settings : settings.to_s
+    end
+
+    private
+
+    def repo
+      RJGit::Repo.new(repository_path)
     end
   
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rjgit_grack
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Dawa Ometto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-02 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rjgit
@@ -16,15 +16,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '4.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '4.0'
   prerelease: false
   type: :runtime
-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.
+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.
 email: d.ometto@gmail.com
 executables: []
 extensions: []
@@ -34,7 +34,7 @@ files:
 - LICENSE
 - README.md
 - lib/rjgit_grack.rb
-homepage: http://github.com/dometto/rjgit_grack
+homepage: http://github.com/grackorg/rjgit_grack
 licenses:
 - MIT
 metadata: {}
@@ -57,5 +57,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
-summary: Adapts grack (http://github.com/schacon/grack) to use JGit.
+summary: Adapts grack (http://github.com/grackorg/grack) to use JGit.
 test_files: []