git_store 0.3.1 → 0.3.3

data/Rakefile

@@ -1,32 +1,17 @@
 require 'rake'
-require "rake/rdoctask"
-
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts <<-EOS
-To use rspec for testing you must install the rspec gem:
-    gem install rspec
-EOS
-  exit(0)
-end
+require 'rdoc/task'
+require 'rspec/core/rake_task'
 
 desc "Run all specs"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = ['-cfs']
-  t.spec_files = FileList['test/**/*_spec.rb']
-end
-
-desc "Print SpecDocs"
-Spec::Rake::SpecTask.new(:doc) do |t|
-  t.spec_opts = ["--format", "specdoc"]
-  t.spec_files = FileList['test/*_spec.rb']
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'test/**/*_spec.rb'
+  spec.rspec_opts = ['--backtrace']
 end
 
 desc "Generate the RDoc"
-Rake::RDocTask.new do |rdoc|
+RDoc::Task.new do |rdoc|
   files = ["README.md", "LICENSE", "lib/**/*.rb"]
-  rdoc.rdoc_files.add(files)
+  rdoc.rdoc_files.include(files)
   rdoc.main = "README.md"
   rdoc.title = "Git Store - using Git as versioned data store in Ruby"
 end

data/git_store.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = 'git_store'
-  s.version = '0.3.1'
+  s.version = '0.3.3'
   s.summary = 'a simple data store based on git'
   s.author = 'Matthias Georgi'
   s.email = 'matti.georgi@gmail.com'
-  s.homepage = 'http://ww.matthias-georgi.de/git_store'
+  s.homepage = 'http://georgi.github.com/git_store'
   s.description = <<END
 GitStore implements a versioned data store based on the revision
 management system Git. You can store object hierarchies as nested

data/lib/git_store.rb

@@ -198,10 +198,10 @@ class GitStore
   # Example:
   #   store.transaction { store['a'] = 'b' }
   #
-  def transaction(message = "")
+  def transaction(message = "", author = User.from_config, committer = author)
     start_transaction
     result = yield
-    commit message
+    commit message, author, committer
 
     result
   rescue

data/lib/git_store/pack.rb

@@ -293,13 +293,13 @@ class GitStore
       obj_offset = offset
       packfile.seek(offset)
 
-      c = packfile.read(1)[0]
+      c = packfile.read(1)[0].ord
       size = c & 0xf
       type = (c >> 4) & 7
       shift = 4
       offset += 1
       while c & 0x80 != 0
-        c = packfile.read(1)[0]
+        c = packfile.read(1)[0].ord
         size |= ((c & 0x7f) << shift)
         shift += 7
         offset += 1
@@ -326,10 +326,10 @@ class GitStore
 
       if type == OBJ_OFS_DELTA
         i = 0
-        c = data[i]
+        c = data[i].ord
         base_offset = c & 0x7f
         while c & 0x80 != 0
-          c = data[i += 1]
+          c = data[i += 1].ord
           base_offset += 1
           base_offset <<= 7
           base_offset |= c & 0x7f
@@ -380,21 +380,21 @@ class GitStore
       dest_size, pos = patch_delta_header_size(delta, pos)
       dest = ""
       while pos < delta.size
-        c = delta[pos]
+        c = delta[pos].ord
         pos += 1
         if c & 0x80 != 0
           pos -= 1
           cp_off = cp_size = 0
-          cp_off = delta[pos += 1] if c & 0x01 != 0
-          cp_off |= delta[pos += 1] << 8 if c & 0x02 != 0
-          cp_off |= delta[pos += 1] << 16 if c & 0x04 != 0
-          cp_off |= delta[pos += 1] << 24 if c & 0x08 != 0
-          cp_size = delta[pos += 1] if c & 0x10 != 0
-          cp_size |= delta[pos += 1] << 8 if c & 0x20 != 0
-          cp_size |= delta[pos += 1] << 16 if c & 0x40 != 0
+          cp_off = delta[pos += 1].ord if c & 0x01 != 0
+          cp_off |= delta[pos += 1].ord << 8 if c & 0x02 != 0
+          cp_off |= delta[pos += 1].ord << 16 if c & 0x04 != 0
+          cp_off |= delta[pos += 1].ord << 24 if c & 0x08 != 0
+          cp_size = delta[pos += 1].ord if c & 0x10 != 0
+          cp_size |= delta[pos += 1].ord << 8 if c & 0x20 != 0
+          cp_size |= delta[pos += 1].ord << 16 if c & 0x40 != 0
           cp_size = 0x10000 if cp_size == 0
           pos += 1
-          dest += base[cp_off,cp_size]
+          dest += base[cp_off, cp_size]
         elsif c != 0
           dest += delta[pos,c]
           pos += c
@@ -414,6 +414,7 @@ class GitStore
         if c == nil
           raise PackFormatError, 'invalid delta header'
         end
+        c = c.ord
         pos += 1
         size |= (c & 0x7f) << shift
         shift += 7

data/lib/git_store/tree.rb

@@ -74,12 +74,15 @@ class GitStore
 
     # Write entry with specified name.
     def put(name, value)
-      @modified = true
-
       if value.is_a?(Tree)
+        @modified = true
         @table[name] = value
       else
-        @table[name] = Blob.new(store, nil, handler_for(name).write(value))
+        data = handler_for(name).write(value)
+        if @table[name].nil? or data != @table[name].data
+          @modified = true
+          @table[name] = Blob.new(store, nil, data)
+        end
       end
 
       value

data/lib/git_store/user.rb

@@ -1,29 +1,38 @@
 class GitStore
-
-  class User
-    attr_accessor :name, :email, :time
-
-    def initialize(name, email, time)
-      @name, @email, @time = name, email, time
-    end
-
+  class User < Struct.new(:name, :email, :time)
     def dump
       "#{ name } <#{email}> #{ time.to_i } #{ time.strftime('%z') }"
     end
+    alias to_s dump
 
-    def self.from_config
-      name = IO.popen("git config user.name")  { |io| io.gets.chomp }
-      email = IO.popen("git config user.email") { |io| io.gets.chomp }
+    def inspect
+      "#<GitStore::User name=%p email=%p time=%p>" % [name, email, time]
+    end
 
+    def self.from_config
+      name, email = config_get('user.name'), config_get('user.email')
       new name, email, Time.now
     end
 
+    def self.config_get(key)
+      value = `git config #{key}`.chomp
+
+      if $?.exitstatus == 0
+        return value unless value.empty?
+        raise RuntimError, "#{key} is empty"
+      else
+        raise RuntimError, "No #{key} found in git config"
+      end
+    end
+
+    def self.config_user_email
+      email = `git config user.email`.chomp
+    end
+
     def self.parse(user)
       if match = user.match(/(.*)<(.*)> (\d+) ([+-]\d+)/)
         new match[1].strip, match[2].strip, Time.at(match[3].to_i + match[4].to_i * 3600)
       end
     end
-
   end
-
 end

data/test/commit_spec.rb

@@ -32,7 +32,7 @@ This is a message"
   end
 
   it "should be readable by git binary" do
-    time = Time.local(2009, 4, 20)
+    time = Time.utc(2009, 4, 20)
     author = GitStore::User.new("hans", "hans@email.de", time)
     
     store['a'] = "Yay"
@@ -41,7 +41,7 @@ This is a message"
     IO.popen("git log") do |io|
       io.gets.should == "commit #{commit.id}\n"
       io.gets.should == "Author: hans <hans@email.de>\n"
-      io.gets.should == "Date:   Mon Apr 20 00:00:00 2009 #{Time.now.strftime('%z')}\n"
+      io.gets.should == "Date:   Mon Apr 20 00:00:00 2009 +0000\n"
       io.gets.should == "\n"
       io.gets.should == "    Commit Message\n"
     end

data/test/git_store_spec.rb

@@ -14,6 +14,8 @@ describe GitStore do
     Dir.chdir REPO
     
     `git init`
+    `git config user.name 'User Name'`
+    `git config user.email 'user.name@email.com'`
     @store = GitStore.new(REPO)
   end
   
@@ -243,14 +245,13 @@ describe GitStore do
 
     store.load
 
-    user = GitStore::User.from_config
     id = File.read('.git/refs/tags/0.1')
     tag = store.get(id)
 
     tag.type.should == 'commit'
     tag.object.should == store.head
-    tag.tagger.name.should == user.name
-    tag.tagger.email.should == user.email
+    tag.tagger.name.should == 'User Name'
+    tag.tagger.email.should == 'user.name@email.com'
     tag.message.should =~ /message/    
   end
   

metadata

@@ -1,33 +1,33 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: git_store
-version: !ruby/object:Gem::Version 
-  version: 0.3.1
+version: !ruby/object:Gem::Version
+  version: 0.3.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Matthias Georgi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-02-07 00:00:00 +01:00
-default_executable: 
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies: []
+description: ! 'GitStore implements a versioned data store based on the revision
 
-description: |
-  GitStore implements a versioned data store based on the revision
   management system Git. You can store object hierarchies as nested
+
   hashes, which will be mapped on the directory structure of a git
+
   repository. GitStore checks out the repository into a in-memory
+
   representation, which can be modified and finally committed.
 
+'
 email: matti.georgi@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - .gitignore
 - LICENSE
 - README.md
@@ -47,33 +47,29 @@ files:
 - test/commit_spec.rb
 - test/git_store_spec.rb
 - test/tree_spec.rb
-has_rdoc: true
-homepage: http://ww.matthias-georgi.de/git_store
+homepage: http://georgi.github.com/git_store
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: a simple data store based on git
 test_files: []
-
+has_rdoc: true