gitolite-rugged 1.2.1.pre.devel → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af594539d972d1b2f8d7a30e493e83fabec75f01
-  data.tar.gz: 1eb4ec207defe5014819bcaf4c0e66cebb367a10
+  metadata.gz: 2b28ad4995956104cd037104756e8edf41bea5f2
+  data.tar.gz: 831314b52bccf8ac936cc72b4084da9c3f054212
 SHA512:
-  metadata.gz: 129b807992315d1d3dbcfaa2fddc18ac674d5d0f25f77d8a1d1ae3527a70635bdc048471e57559be1980c02db6f78a41540e58d0145c61e83b144fd4f15561f0
-  data.tar.gz: 60817e257935d2854fcab2466af48494360888f008dcac676078a65e4ae431133e5f897289a5ab0c4289bf48a1545b121fb6df4c37bec170ce4f48181e067b47
+  metadata.gz: 2ad57b09cded9f42d1d3b99ad04080e19fb5a4201bdd9bbde3d3e123b36a7542b58ff9f76209e1a2936ed3d9952836dbd630e818e59e976a29bba1bbba86c172
+  data.tar.gz: 3e77c292b569df1c3fa376d6a4c0abbbc9c3f30d0d0bee0026d26ef39208c129044820e9a09456f942c7328dcce3255c304fe2b51ec846267942ad1f06ad42d3

data/Gemfile

@@ -2,4 +2,4 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in gitolite.gemspec
 gemspec
-gem 'rugged', git: 'git://github.com/libgit2/rugged.git', branch: 'development', submodules: true
+gem 'rugged', :github => 'libgit2/rugged', :tag => 'v0.21.0', :submodules => true

data/README.md

@@ -17,7 +17,7 @@ It provides these functionalities :
 ## Requirements ##
 * Ruby 1.9.x or 2.0.x
 * a working [gitolite](https://github.com/sitaramc/gitolite) installation
-* The [rugged](https://github.com/libgit2/rugged) bindings to libgit2 with SSH-key credentials added (currently on devel-branch).
+* The [rugged](https://github.com/libgit2/rugged) bindings to libgit2 with SSH-key credentials added (Version >= 0.21 or dev branch).
 
 ## Installation ##
 

data/gitolite.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rspec_junit_formatter", "~> 0.1", ">= 0.1.6"
 
-  s.add_dependency "rugged", "~> 0.19",   ">= 0.19.0"
+  s.add_dependency "rugged", "~> 0.21", ">= 0.21.0"
   s.add_dependency "gratr19", "~> 0.4.4", ">= 0.4.4.1"
 
   s.files         = `git ls-files`.split("\n")

data/lib/gitolite/gitolite_admin.rb

@@ -20,7 +20,11 @@ module Gitolite
       key_dir: "keydir",
       key_subdir: "",
       config_file: "gitolite.conf",
-      lock_file_path: '.lock'
+      lock_file_path: '.lock',
+
+      # Repo settings
+      update_on_init: true,
+      reset_before_update: true
     }
 
     class << self
@@ -33,7 +37,7 @@ module Gitolite
         begin
           repo = Rugged::Repository.new(dir)
           return false if repo.empty?
-        rescue Rugged::RepositoryError
+        rescue Rugged::RepositoryError, Rugged::OSError
           return false
         end
 
@@ -46,7 +50,7 @@ module Gitolite
       end
 
       def admin_url(settings)
-        [settings[:git_user], '@', settings[:host], '/gitolite-admin.git'].join
+        ['ssh://', settings[:git_user], '@', settings[:host], '/gitolite-admin.git'].join
       end
     end
 
@@ -79,21 +83,26 @@ module Gitolite
 
       # setup credentials
       @credentials = Rugged::Credentials::SshKey.new(
-        username: settings[:git_user], publickey: settings[:public_key], 
-        privatekey: settings[:private_key] )
-      
-      @repo =
-      if self.class.is_gitolite_admin_repo?(path)
-        Rugged::Repository.new(path, credentials: @credentials)
-      else
-        clone
-      end
+        username: @settings[:git_user],
+        publickey: settings[:public_key],
+        privatekey: settings[:private_key]
+      )
 
       @config_dir_path    = File.join(@path, @settings[:config_dir])
       @config_file_path = File.join(@config_dir_path, @settings[:config_file])
       @key_dir_path     = File.join(@path, relative_key_dir)
 
-      @commit_author = { email: settings[:author_email], name: settings[:author_name] }
+      @commit_author = { email: @settings[:author_email], name: @settings[:author_name] }
+
+      if self.class.is_gitolite_admin_repo?(path)
+        @repo = Rugged::Repository.new(path, credentials: @credentials )
+        # Update repository
+        if @settings[:update_on_init]
+          update
+        end
+      else
+        @repo = clone
+      end
 
       reload!
     end
@@ -149,10 +158,9 @@ module Gitolite
 
 
     # This method will destroy all local tracked changes, resetting the local gitolite
-    # git repo to HEAD and reloading the entire repository
+    # git repo to HEAD
     def reset!
       @repo.reset('origin/master', :hard)
-      reload!
     end
 
 
@@ -201,7 +209,7 @@ module Gitolite
       commit_tree = index.write_tree @repo
       index.write
 
-      commit_author = { email: 'wee@example.org', name: 'gitolite-rugged gem', time: Time.now }
+      commit_author = @commit_author.merge(time: Time.now)
 
       Rugged::Commit.create(@repo,
         author: commit_author,
@@ -242,12 +250,19 @@ module Gitolite
 
     # Updates the repo with changes from remote master
     # Warning: This resets the repo before pulling in the changes.
-    def update(settings = {})
-      reset!
+    def update()
+
+      # Reset --hard repo before update
+      if @settings[:reset_before_update]
+        reset!
+      end
+
+      # Fetch changes from origin
+      @repo.fetch('origin', credentials: @credentials )
 
-      # Currently, this only supports merging origin/master into master.
-      master = repo.branches["master"].target
-      origin_master = repo.branches["origin/master"].target
+      # Currently, only merging from origin/master into master is supported.
+      master = @repo.references["refs/heads/master"].target
+      origin_master = @repo.references["refs/remotes/origin/master"].target
 
       # Create the merged index in memory
       merge_index = repo.merge_commits(master, origin_master)
@@ -259,7 +274,7 @@ module Gitolite
         message: '[gitolite-rugged] Merged `origin/master` into `master`',
         author: @commit_author,
         committer: @commit_author,
-        update_ref: 'master'
+        update_ref: 'refs/heads/master'
       )
 
       reload!
@@ -278,8 +293,8 @@ module Gitolite
     # The hostname may use an optional :port to allow for custom SSH ports.
     # E.g., +git@localhost:2222/gitolite-admin.git+
     #
-    def clone()
-      Rugged::Repository.clone_at(admin_url(@settings), File.expand_path(@path), credentials: @credentials)
+    def clone
+      Rugged::Repository.clone_at(GitoliteAdmin.admin_url(@settings), File.expand_path(@path), credentials: @credentials )
     end
 
 

data/lib/gitolite/ssh_key.rb

@@ -50,7 +50,7 @@ module Gitolite
         self.new(type, blob, email, owner, location)
       end
 
-            # Parse the key path above the key to be read.
+      # Parse the key path above the key to be read.
       # As we can omit the location, there are two possible options:
       #
       # 1. Location is empty. Path is <keydir>/<owner>/

data/lib/gitolite/version.rb

@@ -1,3 +1,3 @@
 module Gitolite
-  VERSION = "1.2.1-devel"
+  VERSION = "1.2.2"
 end

data/spec/dirty_proxy_spec.rb

@@ -28,27 +28,27 @@ describe Gitolite::DirtyProxy do
 
   describe 'dirty checking methods' do
     it 'should respond to clean_up!' do
-      proxy.respond_to?(:clean_up!).should be_true
+      proxy.respond_to?(:clean_up!).should be true
     end
 
     it 'should respond to dirty?' do
-      proxy.respond_to?(:dirty?).should be_true
+      proxy.respond_to?(:dirty?).should be true
     end
 
     context 'when just initialized' do
       it 'should be clean' do
-        proxy.dirty?.should be_false
+        proxy.dirty?.should be false
       end
     end
 
     shared_examples 'dirty? clean_up!' do
       it 'should be dirty' do
-        proxy.dirty?.should be_true
+        proxy.dirty?.should be true
       end
 
       it 'should be clean again after clean_up!' do
         proxy.clean_up!
-        proxy.dirty?.should be_false
+        proxy.dirty?.should be false
       end
     end
 

data/spec/gitolite_admin_spec.rb

@@ -5,7 +5,7 @@ describe Gitolite::GitoliteAdmin do
   repo_dir   = File.join(File.dirname(__FILE__), 'fixtures', 'gitolite-admin')
 
   # Rugged doesn't complain when giving nil keys for testing
-  settings = {private_key: nil, public_key: nil}
+  settings = {private_key: nil, public_key: nil, update_on_init: false}
 
   describe '#is_gitolite_admin_repo?' do
     it 'should detect a non gitolite-admin repository' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitolite-rugged
 version: !ruby/object:Gem::Version
-  version: 1.2.1.pre.devel
+  version: 1.2.2
 platform: ruby
 authors:
 - Oliver Günther
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -216,20 +216,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.21'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.21'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: gratr19
   requirement: !ruby/object:Gem::Requirement
@@ -358,9 +358,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2