acts_as_git 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57d28b8bef810b5e765dbb866cfe9bcb62ae2a93
-  data.tar.gz: 8b289a71897459306e711a6b89ee58574736c6f5
+  metadata.gz: 9cfac7da6682c3e215f5a77c5bf0ca2c8f60621c
+  data.tar.gz: d52a96b7575d9db099a7b3652467b43cfdd44a46
 SHA512:
-  metadata.gz: 7cdcc4881e2072c571d229daf2b6c59a88ed8948effd5ebf64fc578a9076cababfd1ba00b646df77a6eabd9ddd02e88d8286f923eedaa13fdb0ca307cc28a1ac
-  data.tar.gz: 982b943454ed3e833326b05018f1cf79f8ac3ee8e72977cf6a01b9e94062fa374f4de9e32881c8f9fa0494544431878f853b6535ff7c20f07968e1301faca5d3
+  metadata.gz: 1798aeeb52216cb6bf052226f049f9a10e3e2f5d738c6b964a72d7a77dbebda505895d8f6b7591abd0139d6f1abcea6b5863ca68668ba9064a407ede40b2397b
+  data.tar.gz: 01ae6282deebde107aaeb128a14c5dada7beabbf9294fc03ba608c52e6ff52633cb70572aa2be46e19de0f134181e52653305d9743dff8e41969a240f2d54322

data/README.md

@@ -24,7 +24,7 @@ end
 post = Post.new # create the directory `self.repodir` if not exist, and init repo.
 post.body = 'content'
 post.save # save the content into the file of `#filename`
-post.get_commit
+post.current
   => COMMIT_HASH_HOGE
 
 # load
@@ -39,7 +39,7 @@ post.is_changed?
 post.save
 post.is_changed?
   => false
-post.get_commit
+post.current
   => COMMIT_HASH_FUGA
 puts post.body
   => 'content2'

data/acts_as_git.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.homepage      = "https://github.com/rail44/acts_as_git"
   s.summary       = "Make your field act as a git repo"
   s.description   = "Make your field act as a git repo. Save the content to a file, and load the content from a file."
-  s.version       = '0.1.1'
+  s.version       = '0.2.0'
   s.date          = Time.now.strftime("%Y-%m-%d")
 
   s.extra_rdoc_files = Dir["*.rdoc"]

data/lib/acts_as_git.rb

@@ -22,6 +22,11 @@ module ActsAsGit
       @@username = username
     end
 
+    @@remote = nil
+    def self.remote=(remote)
+      @@remote = remote
+    end
+
     def get_option(index)
       option = {}
       option[:author] = { :email => @@email, :name => @@username, :time => Time.now }
@@ -36,13 +41,19 @@ module ActsAsGit
     def acts_as_git(params = {})
       self.class_eval do
         unless method_defined?(:save_with_file)
-          def self.path(filename)
-            File.join(repodir, filename)
+          repodir = self.repodir
+          FileUtils.mkdir_p(repodir)
+          begin
+            @@repo = Rugged::Repository.new(repodir)
+          rescue
+            Rugged::Repository.init_at(repodir)
+            @@repo = Rugged::Repository.new(repodir)
           end
+          @@origin = @@repo.remotes['origin'] || @@repo.remotes.create('origin', @@remote) if @@remote
 
-          def commit
-            if @commit
-              @commit
+          def current
+            if @current
+              @current
             else
              (@@repo.empty?)? nil: @@repo.head.target
             end
@@ -52,12 +63,31 @@ module ActsAsGit
             (@is_changed)? true: false
           end
 
-          def get_commit
-            (commit)? commit.oid: nil
+          define_method :path do |field|
+            filename = params[field].bind(self).call
+            File.join(self.class.repodir, filename)
+          end
+
+          define_method :log do |field|
+            filename = params[field].bind(self).call
+            walker = Rugged::Walker.new(@@repo)
+            walker.sorting(Rugged::SORT_DATE)
+            walker.push(@@repo.head.target)
+            commits = []
+            walker.map do |commit|
+              if commit.diff(paths: [path(field)])
+                commit
+              end
+            end
           end
 
           define_method :checkout do |commit|
-            @commit = (commit)? @@repo.lookup(commit): nil
+            @current = case commit
+            when Rugged::Commit
+              commit
+            when String
+              @current = (commit)? @@repo.lookup(commit): nil
+            end
             @is_changed = false
             params.each do |field, filename_instance_method|
               field = nil
@@ -65,13 +95,14 @@ module ActsAsGit
             self
           end
 
-          repodir = self.repodir
-          FileUtils.mkdir_p(repodir)
-          begin
-            @@repo = Rugged::Repository.new(repodir)
-          rescue
-            Rugged::Repository.init_at(repodir)
-            @@repo = Rugged::Repository.new(repodir)
+          def self.sync
+            cred = Rugged::Credentials::SshKeyFromAgent.new(username: 'git')
+            @@origin.fetch(credentials: cred)
+            branch = @@repo.branches["master"]
+            @@repo.checkout('origin/master', :strategy => :force)
+            @@repo.branches.delete(branch)
+            @@repo.create_branch('master')
+            @@repo.checkout('master', :strategy => :force)
           end
 
           define_method(:save_with_file) do |*args|
@@ -83,20 +114,16 @@ module ActsAsGit
               if repodir and filename and content
                 oid = @@repo.write(content, :blob)
                 index = @@repo.index
-                path = self.class.path(filename)
+                path = path(field)
                 action = File.exists?(path)? 'Update': 'Create'
                 FileUtils.mkdir_p(File.dirname(path))
-                File.open(path, 'w') do |f|
-                  f.write(content)
-                end
                 index.add(path: filename, oid: oid, mode: 0100644)
                 option = self.class.get_option(index)
                 option[:message] = "#{action} #{filename} for field #{field_name} of #{self.class.name}"
                 Rugged::Commit.create(@@repo, option)
-                @commit = @@repo.head.target
+                @current = @@repo.head.target
+                @@repo.checkout('HEAD', :strategy => :force)
                 @is_changed = false
-                index.read_tree(@commit.tree)
-                index.write
                 instance_variable_set(field_name, nil)
               end
             end
@@ -125,7 +152,7 @@ module ActsAsGit
               return nil unless repodir
               return nil unless filename
               return nil if @@repo.empty?
-              return nil unless fileob = commit.tree.path(filename)
+              return nil unless fileob = current.tree.path(filename)
               oid = fileob[:oid]
               file = StringIO.new(@@repo.lookup(oid).content)
               file.seek(offset) if offset
@@ -138,17 +165,14 @@ module ActsAsGit
               field_name = :"@#{field}"
               filename = filename_instance_method.bind(self).call
               index = @@repo.index
-              path = self.class.path(filename)
-              File.unlink(path) if File.exists?(path)
               begin
                 index.remove(filename)
                 option = self.class.get_option(index)
                 option[:message] = "Remove #{filename} for field #{field_name} of #{self.class.name}"
                 Rugged::Commit.create(@@repo, option)
-                @commit = @@repo.head.target
+                @current = @@repo.head.target
+                @@repo.checkout('HEAD', :strategy => :force)
                 @is_changed = false
-                index.read_tree(@commit.tree)
-                index.write
               rescue Rugged::IndexError => e
               end
             end

data/spec/acts_as_git_spec.rb

@@ -4,13 +4,28 @@ require_relative 'model'
 describe ActsAsGit do
   let(:subject) { TestPost.new }
   after do
-    File.unlink(TestPost.path subject.filename) if File.exist?(TestPost.path subject.filename)
+    path = subject.path(:body)
+    File.unlink(path) if File.exist?(path)
   end
 
   after(:context) do
     FileUtils.rm_rf(File.join(TestPost.repodir, '.git')) if Dir.exist?(File.join(TestPost.repodir, '.git'))
   end
 
+  context '#log' do
+    let(:commits) { [] }
+    before { subject.body = 'aaaa' }
+    before { subject.save }
+    before { commits << subject.current }
+    before { subject.body = 'bbbb' }
+    before { subject.save }
+    before { commits << subject.current }
+    before { subject.body = 'cccc' }
+    before { subject.save }
+    before { commits << subject.current }
+    it { expect(subject.log(:body)).to be == commits.reverse }
+  end
+
   context '#body=' do
     it { expect { subject.body = 'aaaa' }.not_to raise_error }
   end
@@ -37,7 +52,7 @@ describe ActsAsGit do
       before do
         subject.body = 'aaaa'
         subject.save
-        @commit = subject.get_commit
+        @commit = subject.current
         subject.body = 'bbbb'
         subject.save
       end
@@ -53,13 +68,13 @@ describe ActsAsGit do
     context 'save if body exists' do
       before { subject.body = 'aaaa' }
       before { subject.save }
-      it { expect(File.read(TestPost.path(subject.filename))).to eql('aaaa') }
+      it { expect(File.read(subject.path(:body))).to eql('aaaa') }
     end
 
     context 'does not save if body does not exist' do
       before { subject.body = nil }
       before { subject.save }
-      it { expect(File.exist?(TestPost.path(subject.filename))).to be_falsey }
+      it { expect(File.exist?(subject.path(:body))).to be_falsey }
     end
   end
 
@@ -68,12 +83,12 @@ describe ActsAsGit do
       before { subject.body = 'aaaa' }
       before { subject.save }
       before { subject.destroy }
-      it { expect(File.exist?(TestPost.path(subject.filename))).to be_falsey }
+      it { expect(File.exist?(subject.path(:body))).to be_falsey }
     end
 
     context 'fine even if file does not exist' do
       before { subject.destroy }
-      it { expect(File.exist?(TestPost.path(subject.filename))).to be_falsey }
+      it { expect(File.exist?(subject.path(:body))).to be_falsey }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_git
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Satoshi Amemiya
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged