gitdb 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aef162c77e8d0f480a4f18c95805015cde713bdc
-  data.tar.gz: 55a034e0c6b4243ebd305e3bc2287ef2267ed827
+  metadata.gz: 415b324df37bb5e094057579249db2c48bb0688c
+  data.tar.gz: 14b33e1f14ff4f2042c4c241d74789973ee9428f
 SHA512:
-  metadata.gz: 270b2a7809f3fbebe27c81527dcf9a0a9f07f8fe2b76b7d373303d418f742ef46587fb9209258d5537c5cf0763308d4de1c844249982c2ddd240ac404ae84adb
-  data.tar.gz: d234160bc0825efc8676813520e0d64c427bb8326e1a9ee2fdaeade67a8691572fb0d780cfe732f3074dc9864d9aa9396a69d7c81a0cfd294c6b07e9dbf2e427
+  metadata.gz: 4dbb35666c3a91878196ef67f6a4be2e5d3c70ad20260c3b86e5e1f3713b184a8a0e7b499bb9334c83429efefaa4ac546cc3cad2b2d3b62e5cc8322961ba9cc0
+  data.tar.gz: 06b3e24be21830a88f773e2867e7170cb9a42b89881f59a5e1a11ead45a09c01e8423463e9319d4b8e7a4daaf1c6039109bddc575e59c47789cd754e068bb5a0

data/lib/gitdb/Card.rb

@@ -2,12 +2,16 @@
 module Gitdb
   class Card
 
+    # 线程锁
+    @@lock = false
+
     def initialize repo
       @repo = repo
     end
 
     def self::exist? repo, id
-      repo.head.target.tree.find { |o| o[:name] == id } unless repo.branches.count == 0
+      # 检查stage而不是tree
+      nil != repo.index.get(id)
     end
 
     def exist? id
@@ -35,6 +39,13 @@ module Gitdb
     end
     
     def create uid
+      # 等待资源可用
+      loop do
+        break unless @@lock
+      end
+      # 锁定资源
+      @@lock = true
+
       # 生成唯一的名片id
       while exist?(@id = Gitil::generate_code(4)) 
       end
@@ -42,6 +53,12 @@ module Gitdb
       @uid = uid
       # 用默认格式初始化名片可读内容
       @content = format_card @id, @uid
+      # 添加到暂存区
+      add_to_stage @id, JSON.pretty_generate(@content)
+
+      # 释放资源
+      @@lock = false
+      
       # 返回Card实例
       self
     end
@@ -104,15 +121,12 @@ module Gitdb
       @content[:meta] = hash
     end
     
-    # Notice: 调用delete之后需要先commit, 然后才能继续调用add_to_stage
     def delete
-      @repo.index.read_tree @repo.head.target.tree unless @repo.branches.count == 0
-      @repo.index.find { |blob| @repo.index.remove blob[:path] if blob[:path] == @id }
+      @repo.index.remove @id
     end
 
     def add_to_stage id, content
       oid = @repo.write content, :blob
-      @repo.index.read_tree @repo.head.target.tree unless @repo.branches.count == 0
       @repo.index.add :path => id, :oid => oid, :mode => 0100644
     end
   end

data/lib/gitdb/Contacts.rb

@@ -2,6 +2,9 @@
 module Gitdb
   class Contacts
 
+    # 线程锁
+    @@lock = false
+
     attr_accessor 'repo'
     
     def initialize uid
@@ -17,13 +20,24 @@ module Gitdb
     end
 
     def create name
+      # 等待资源可用
+      loop do
+        break unless @@lock
+      end
+      # 锁定资源
+      @@lock = true
+
       # 生成联系人的唯一编码
       while exist?(@gid = Gitil::generate_code(4)) 
       end
       # 创建并打开git仓库
       @repo = Rugged::Repository.init_at "#{STORAGE_PATH}/#{@gid}"
+      # 释放资源
+      @@lock = false
       # 设置元信息
-      setmeta :name => name, :gid => @gid, :uid => @uid
+      setmeta :name => name, :gid => @gid, :owner => @uid
+      # 读取最后一次提交指向的tree的数据到暂存区
+      @repo.index.read_tree @repo.last_commit.tree unless @repo.head_unborn?
       # 返回Contacts实例
       self
     end
@@ -31,6 +45,8 @@ module Gitdb
     def access gid
       if exist?(@gid = gid)
         @repo = Rugged::Repository.new "#{STORAGE_PATH}/#{gid}"
+        # 读取最后一次提交指向的tree的数据到暂存区
+        @repo.index.read_tree @repo.last_commit.tree unless @repo.head_unborn?
         self
       else
         nil
@@ -39,7 +55,7 @@ module Gitdb
     
     # 返回Card实例集合
     def get_all_cards
-      if @repo.branches.count == 0
+      if @repo.head_unborn?
         []
       else
         @repo.head.target.tree.collect.each { |o| Card.new(@repo).access o[:name] }
@@ -48,7 +64,7 @@ module Gitdb
     
     # 返回Card实例
     def get_card_by_id id
-      if @repo.branches.count == 0
+      if @repo.head_unborn?
         nil
       else
         Card.new(@repo).access id
@@ -58,7 +74,7 @@ module Gitdb
     def getmeta
       @meta = {
         :name => @repo.config['repo.name'],
-        :uid => @repo.config['repo.owner'],
+        :owner => @repo.config['repo.owner'],
         :gid => @repo.config['repo.gid']
       }
     end
@@ -69,46 +85,48 @@ module Gitdb
       @repo.config['repo.gid'] = hash[:gid] if hash.member? :gid
     end
 
-    # 返回commit对象指向的tree-oid集合
+    # 返回commit对象oid
     def read_change_history
-      if @repo.branches.count == 0
+      if @repo.head_unborn?
         []
       else
         walker = Rugged::Walker.new repo
         walker.push repo.last_commit
-        walker.collect.each { |commit| commit.tree.oid }
+        walker.collect.each { |commit| commit.oid }
       end
     end
 
     # 等同于git工具的 "Revert"操作
-    # @sha: tree oid, NOT a commit oid
-    # 因为回滚需要的是tree而不是commit
-    #  => commit.tree.oid
-    def revert_to sha, author, message
-      if @repo.branches.count == 0
-        return nil
-      end
-
-      tree = @repo.lookup sha
-      tree.each do |e|
-        # 遍历sha tree, 重新构造tree并写入暂存区
-        write_to_stage e[:name], @repo.lookup(e[:oid]).content
-      end
-      # get committer info
-      # committer = get_card_by_id(@uid).getdata.sub_hash(:name, :email).merge :time => Time.now
+    # @sha = commit oid
+    # @options = { 
+    #   :message => '', 
+    #   :author => {:name=> '', :email=> '', :time=> Time}, 
+    #   :committer => {:name=> '', :email=> '', :time=> Time} 
+    # }
+    #
+    def revert_to sha, options
+      return nil if @repo.head_unborn?
+      commit = @repo.lookup sha
+      tree = commit.tree
+      # 构造tree
+      @repo.index.read_tree tree
       # 提交暂存区的tree
-      make_a_commit :author => author, :message => message, :committer => author
-    end
-
-    private
-    def write_to_stage card_id, content
-      oid = @repo.write content, :blob
-      @repo.index.add :path => card_id, :oid => oid, :mode => 0100644
+      make_a_commit options
     end
     
     # 生成一个commit对象
     # 每次修改最终要调用
+    # @options = { 
+    #   :message => '', 
+    #   :author => {:name=> '', :email=> '', :time=> Time}, 
+    #   :committer => {:name=> '', :email=> '', :time=> Time} 
+    # }
+    #
     def make_a_commit options
+      if @repo.index.count == 0 && @repo.head_unborn?
+        return nil
+      end
+      options[:message] = 'make a commit' unless options.include? :message
       options[:tree] = @repo.index.write_tree @repo
       options[:parents] = @repo.empty? ? [] : [@repo.head.target].compact
       options[:update_ref] = 'HEAD'

data/lib/gitdb/version.rb

@@ -1,3 +1,3 @@
 module Gitdb
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitdb
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Ran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged