gitdb 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd555baba7939ba328863a24472a914e7d9eb436
-  data.tar.gz: d99302d2a081c812e8ab8757016cfd1acc79f24d
+  metadata.gz: 5aa6018d95449efb2183029a5944a5ef0311850a
+  data.tar.gz: 844937233a926d9e64455bf960e9f130dd7dc933
 SHA512:
-  metadata.gz: 06cf2a433f5c1734784a91cdf2190618cce47ddf4d9186e19cc42a6b779ee045c72ae29f973ed003e28eeaf6204e59da825c7358c520589e3ed0b8ae2af0d034
-  data.tar.gz: 906d0588f6c7206b39bbdac91e70da37f0f938b9c62f238de946a8b18194a483b509c0fc85bd8a4b8413985af3be82e5329990dfcbe29ef745b1f87f88d603b9
+  metadata.gz: 80a6012d3b3c0c0ac842c5d5bc149332dd085d8d512f332de6543f051ce0cb37dcd9f1b58bf3e53d5771f297937b35e6bcdb58fda8fa68f23f2db85526a4b9f5
+  data.tar.gz: f0bf2535fe3e5a543104fd197a5b606c6cb86d5b1598e8f70edd341c91156421e5258ac818b467f76d36182a56066eeafb8b64692020e70b2b7b7507641cb2ec

data/lib/gitdb/Card.rb

@@ -4,6 +4,8 @@ module Gitdb
 
     # 线程锁
     @@lock = Mutex.new
+    # 记录申请资源的repo, 用于判断是否需要锁
+    @@lock_repo = []
 
     def initialize repo
       @repo = repo
@@ -40,8 +42,7 @@ module Gitdb
     
     def create uid
 
-      # 同步信号量
-      @@lock.synchronize {
+      block = Proc.new {
         # 生成唯一的名片id
         while exist?(@id = Gitil::generate_code(4)) 
         end
@@ -52,6 +53,18 @@ module Gitdb
         # 添加到暂存区
         add_to_stage @id, JSON.pretty_generate(@content)
       }
+
+      # 如果repo中存在资源申请
+      if @@lock_repo.include? @repo.workdir
+        # 同步信号量
+        @@lock.synchronize &block
+      else
+      # 否则将新的repo加入记录
+        @@lock_repo << @repo.workdir
+        block.call
+      end
+      # 使用结束后清理记录
+      @@lock_repo.delete @repo.workdir
       
       # 返回Card实例
       self

data/lib/gitdb/Contacts.rb

@@ -49,15 +49,6 @@ module Gitdb
       end
     end
     
-    # 返回Card实例集合
-    def get_all_cards
-      if @repo.head_unborn?
-        []
-      else
-        @repo.head.target.tree.collect.each { |o| Card.new(@repo).access o[:name] }
-      end
-    end
-    
     # 返回Card实例
     def get_card_by_id id
       if @repo.head_unborn?
@@ -67,11 +58,30 @@ module Gitdb
       end
     end
 
+    # 条件查询
+    # 返回Card实例集合
+    def get_cards &condition
+      if @repo.head_unborn?
+        []
+      else
+        @repo.head.target.tree.map do |o|
+          yield Card.new(@repo).access o[:name]
+        end.compact
+      end
+    end
+
+    # 返回Card实例集合
+    def get_all_cards
+      get_cards { |card| card }
+    end
+
     def getmeta
       @meta = {
         :name => @repo.config['repo.name'],
         :owner => @repo.config['repo.owner'],
-        :gid => @repo.config['repo.gid']
+        :gid => @repo.config['repo.gid'],
+        # 动态获取contacts中card数量
+        :count => @repo.head_unborn? ? 0 : @repo.last_commit.tree.count
       }
     end
     

data/lib/gitdb/version.rb

@@ -1,3 +1,3 @@
 module Gitdb
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

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