gollum-rugged_adapter 0.2b → 0.3b

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWUyNjcxMGEzMTk5YWRhNDA3YWNmYjA3NzU1NmY5NWRhNDJjMmNjZQ==
-  data.tar.gz: !binary |-
-    YjY1MjA3YzEwMTlmY2ZlYmI0ZDQ0MWZlNDkwZjc4ZTg2MzljYjQ3MA==
+SHA1:
+  metadata.gz: 681f1982e090a6564d149a492bcca52a729f2847
+  data.tar.gz: ad1568ee08b703c30c9f9f79415fade9da9b81d4
 SHA512:
-  metadata.gz: !binary |-
-    ZjEyMjRlMjYzMzRjOGQzN2I4ZDc4MGY5MmRiODk3ZDVhMTk0MTY0M2E2ZDdk
-    NWExOTQyOWViMzk1ZWY4YmZlMTIzODFiZGYzYjA1NjAyOWU5ZTNjYTJiZTk3
-    NGQwYWRmNWIzZjE3Yzg1ZjIzZTY4MGM5YmZhOWI0YjY2MTA2Y2Q=
-  data.tar.gz: !binary |-
-    NWFjZjBjYTgyYjA1MDk4MTVjMjc5YmQ3MjIwYjQ1MmE1MzFhMDQzM2M5NTBk
-    NTg4ZTBmYzRkYmU5YTk0ODExMmMzNmZlNmViZTM2MmEyM2I1ODc3ZDc4NzY0
-    YjRkYTU5OTAyNzk3ZTM1MGJjNzg5MWNiZWFkNTVlMGI5M2Y0OTI=
+  metadata.gz: 4390808d02e57389b0c86b324030487bf6646fe0d6fb4be975a54edd49183b59736863d765537b9e14adb2ba9d0038011a7a1d7e42fa60248f21022fbcba06ac
+  data.tar.gz: 2b4cf0f1f2f8dc83a1c8461befee408233c436f43c3aca90ac89c47bcdf9a47d236ea743e81ec9323273c6a994837f509f1faa6ffafa492520267d16cb1dd751

data/lib/rugged_adapter/git_layer_rugged.rb

@@ -273,6 +273,34 @@ module Gollum
         sha_or_commit_from_ref(ref, :commit)
       end
 
+      def push(remote, branches = nil, options = {})
+        branches = [branches].flatten.map {|branch| "refs/heads/#{branch}" unless branch =~ /^refs\/heads\//}
+        @repo.push(remote, branches, options)
+      end
+
+      def pull(remote, branches = nil, options = {})
+        branches = [branches].flatten.map {|branch| "refs/heads/#{branch}" unless branch =~ /^refs\/heads\//}
+        r = @repo.remotes[remote]
+        r.fetch(branches, options)
+        r.save
+        branches.each do |branch|
+          branch_name = branch.match(/^refs\/heads\/(.*)/)[1]
+          remote_name = remote.match(/^(refs\/heads\/)?(.*)/)[2]
+          remote_ref = @repo.branches["#{remote_name}/#{branch_name}"].target
+          local_ref = @repo.branches[branch].target
+          index = @repo.merge_commits(local_ref, remote_ref)
+          options = { author: Actor.default_actor.to_h,
+            committer:  Actor.default_actor.to_h,
+            message:    "Merged branch #{branch} of #{remote}.",
+            parents: [local_ref, remote_ref],
+            tree: index.write_tree(@repo),
+            update_ref: branch
+          }
+          Rugged::Commit.create @repo, options
+          @repo.checkout(@repo.head.name, :strategy => :force) if !@repo.bare? && branch == @repo.head.name
+        end
+      end
+
       private
 
       def sha?(str)

data/lib/rugged_adapter/version.rb

@@ -1,7 +1,7 @@
 module Gollum
   module Lib
     module Git
-      VERSION = '0.2b'
+      VERSION = '0.3b'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum-rugged_adapter
 version: !ruby/object:Gem::Version
-  version: 0.2b
+  version: 0.3b
 platform: ruby
 authors:
 - Bart Kamphorst, Dawa Ometto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -17,7 +17,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.21.3
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.21.3
   type: :runtime
@@ -27,7 +27,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.21.3
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.21.3
 - !ruby/object:Gem::Dependency
@@ -66,17 +66,17 @@ 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: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Adapter for Gollum to use Rugged (libgit2) at the backend.