ppl 1.0.5 → 1.0.6

data/lib/ppl/adapter/storage/disk.rb

@@ -10,7 +10,14 @@ class Ppl::Adapter::Storage::Disk < Ppl::Adapter::Storage
     if !Dir.exists? path
       FileUtils.mkdir_p(path)
     end
-    storage = self.new(path)
+    storage = self.new(Dir.new(path))
+
+    dot_ppl = File.join(path, ".ppl")
+    config  = File.join(dot_ppl, "config")
+    FileUtils.mkdir_p(dot_ppl)
+    FileUtils.touch(config)
+
+    storage
   end
 
   def initialize(directory)

data/lib/ppl/adapter/storage/git.rb

@@ -14,8 +14,12 @@ class Ppl::Adapter::Storage::Git < Ppl::Adapter::Storage
   end
 
   def self.create_address_book(path)
-    disk = Ppl::Adapter::Storage::Disk.create_address_book(path)
     repo = Rugged::Repository.init_at(path, false)
+    disk = Ppl::Adapter::Storage::Disk.create_address_book(path)
+
+    git = self.new(disk)
+    git.add(".ppl/config")
+    git.commit("first commit")
   end
 
   def load_address_book
@@ -63,7 +67,6 @@ class Ppl::Adapter::Storage::Git < Ppl::Adapter::Storage
     @disk.delete_contact(contact)
   end
 
-  private
 
   def add(file)
     @repository.index.add(file)
@@ -71,9 +74,22 @@ class Ppl::Adapter::Storage::Git < Ppl::Adapter::Storage
   end
 
   def commit(message)
-    hash    = @repository.index.write_tree
-    tree    = @repository.lookup hash
-    parents = [ @repository.lookup( @repository.head.target ).oid ]
+    hash = @repository.index.write_tree
+    tree = @repository.lookup hash
+    head = nil
+
+    begin
+      head = @repository.head
+    rescue
+    end
+
+    if !head.nil?
+      parents    = [ @repository.lookup( @repository.head.target ).oid ]
+      update_ref = "HEAD"
+    else
+      parents    = []
+      update_ref = "HEAD"
+    end
 
     name = ENV['USER']
     host = Socket.gethostname
@@ -90,7 +106,7 @@ class Ppl::Adapter::Storage::Git < Ppl::Adapter::Storage
       :committer  => author,
       :tree       => tree,
       :parents    => parents,
-      :update_ref => "HEAD",
+      :update_ref => update_ref,
     }
 
     Rugged::Commit.create(@repository, data)

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "1.0.5"
+  Version = "1.0.6"
 
   module Adapter
   end

data/ppl.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   spec.name        = "ppl"
-  spec.version     = "1.0.5"
+  spec.version     = "1.0.6"
   spec.date        = "2012-12-20"
 
   spec.required_ruby_version = ">= 1.9.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
-  requirement: &7714400 !ruby/object:Gem::Requirement
+  requirement: &16103420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *7714400
+  version_requirements: *16103420
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: &7713380 !ruby/object:Gem::Requirement
+  requirement: &16091980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.17.0.b6
   type: :runtime
   prerelease: false
-  version_requirements: *7713380
+  version_requirements: *16091980
 - !ruby/object:Gem::Dependency
   name: vpim
-  requirement: &7712420 !ruby/object:Gem::Requirement
+  requirement: &16091260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: '0.695'
   type: :runtime
   prerelease: false
-  version_requirements: *7712420
+  version_requirements: *16091260
 description: CLI Address Book
 email: henry@henrysmith.org
 executables: