gitdb 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 415b324df37bb5e094057579249db2c48bb0688c
-  data.tar.gz: 14b33e1f14ff4f2042c4c241d74789973ee9428f
+  metadata.gz: fd555baba7939ba328863a24472a914e7d9eb436
+  data.tar.gz: d99302d2a081c812e8ab8757016cfd1acc79f24d
 SHA512:
-  metadata.gz: 4dbb35666c3a91878196ef67f6a4be2e5d3c70ad20260c3b86e5e1f3713b184a8a0e7b499bb9334c83429efefaa4ac546cc3cad2b2d3b62e5cc8322961ba9cc0
-  data.tar.gz: 06b3e24be21830a88f773e2867e7170cb9a42b89881f59a5e1a11ead45a09c01e8423463e9319d4b8e7a4daaf1c6039109bddc575e59c47789cd754e068bb5a0
+  metadata.gz: 06cf2a433f5c1734784a91cdf2190618cce47ddf4d9186e19cc42a6b779ee045c72ae29f973ed003e28eeaf6204e59da825c7358c520589e3ed0b8ae2af0d034
+  data.tar.gz: 906d0588f6c7206b39bbdac91e70da37f0f938b9c62f238de946a8b18194a483b509c0fc85bd8a4b8413985af3be82e5329990dfcbe29ef745b1f87f88d603b9

data/README.md

@@ -30,19 +30,19 @@ Or install it yourself as:
 
 + class method: `exist?(gid)`
 
-##### instance: `Gitdb::Contacts.new(uid)`
+##### instance: `Gitdb::Contacts.new(user_id)`
 
 + property: `repo`
-+ method: `exist?(gid)`
-+ method: `create(gid)`
-+ method: `access(gid)`
++ method: `exist?(contacts_id)`
++ method: `create(contacts_name)`
++ method: `access(contacts_id)`
 + method: `getmeta`
 + method: `setmeta(Hash)`
 + method: `get_all_cards`
-+ method: `get_card_by_id(id)`
++ method: `get_card_by_id(card_id)`
 + method: `read_change_history`
-+ method: `revert_to(sha, authorhash, message)`
-+ method: `make_a_commit(optionhash)`
++ method: `revert_to(sha, {})`
++ method: `make_a_commit({})`
 
 #### Class: `Gitdb::Card`
 
@@ -50,8 +50,8 @@ Or install it yourself as:
 
 ##### instance: `Gitdb::Card.new(repo)`
 
-+ method: `create(uid)`
-+ method: `access(id)`
++ method: `create(user_id)`
++ method: `access(card_id)`
 + method: `format_card(id, uid)`
 + method: `getdata`
 + method: `setdata(Hash)`

data/lib/gitdb/Card.rb

@@ -3,7 +3,7 @@ module Gitdb
   class Card
 
     # 线程锁
-    @@lock = false
+    @@lock = Mutex.new
 
     def initialize repo
       @repo = repo
@@ -39,25 +39,19 @@ module Gitdb
     end
     
     def create uid
-      # 等待资源可用
-      loop do
-        break unless @@lock
-      end
-      # 锁定资源
-      @@lock = true
-
-      # 生成唯一的名片id
-      while exist?(@id = Gitil::generate_code(4)) 
-      end
-      # 记录名片创建者id
-      @uid = uid
-      # 用默认格式初始化名片可读内容
-      @content = format_card @id, @uid
-      # 添加到暂存区
-      add_to_stage @id, JSON.pretty_generate(@content)
 
-      # 释放资源
-      @@lock = false
+      # 同步信号量
+      @@lock.synchronize {
+        # 生成唯一的名片id
+        while exist?(@id = Gitil::generate_code(4)) 
+        end
+        # 记录名片创建者id
+        @uid = uid
+        # 用默认格式初始化名片可读内容
+        @content = format_card @id, @uid
+        # 添加到暂存区
+        add_to_stage @id, JSON.pretty_generate(@content)
+      }
       
       # 返回Card实例
       self
@@ -77,26 +71,6 @@ module Gitdb
         nil
       end
     end
-    
-    def self::getdata repo, id
-      Card.new(repo).access(id).getdata
-    end
-
-    def self::setdata repo, id, hash
-      Card.new(repo).access(id).setdata hash
-    end
-
-    def self::getmeta repo, id
-      Card.new(repo).access(id).getmeta
-    end
-
-    def self::setmeta repo, id, hash
-      Card.new(repo).access(id).setmeta hash
-    end
-
-    def self::delete repo, id
-      Card.new(repo).access(id).delete
-    end
 
     def getdata
       data = @content.clone

data/lib/gitdb/Contacts.rb

@@ -3,7 +3,7 @@ module Gitdb
   class Contacts
 
     # 线程锁
-    @@lock = false
+    @@lock = Mutex.new
 
     attr_accessor 'repo'
     
@@ -20,20 +20,16 @@ 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
+      # 同步信号量
+      @@lock.synchronize {
+        # 生成联系人的唯一编码
+        while exist?(@gid = Gitil::generate_code(4)) 
+        end
+        # 创建并打开git仓库
+        @repo = Rugged::Repository.init_at "#{STORAGE_PATH}/#{@gid}"
+      }
+      
       # 设置元信息
       setmeta :name => name, :gid => @gid, :owner => @uid
       # 读取最后一次提交指向的tree的数据到暂存区

data/lib/gitdb/util.rb

@@ -5,7 +5,7 @@ module Gitil
   end
 
   def self::data_keys_of_card
-    ["firstname", "lastname", "mobile", "phone", "email", "birthday", "address", "im"]
+    ["firstname", "lastname", "mobile", "phone", "email", "birthday", "address", "im", "note"]
   end
 
   def self::meta_keys_of_card

data/lib/gitdb/version.rb

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

data/lib/gitdb.rb

@@ -1,5 +1,6 @@
 require "json"
 require "rugged"
+require "thread"
 require "gitdb/util"
 require "gitdb/version"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitdb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ran