silo 0.1.0 → 0.1.1

data/Rakefile

@@ -4,6 +4,7 @@
 # Copyright (c) 2010, Sebastian Staudt
 
 require 'rake/testtask'
+require 'metric_fu'
 
 task :default => :test
 

data/lib/grit/index.rb

@@ -0,0 +1,32 @@
+# This code is free software; you can redistribute it and/or modify it under
+# the terms of the new BSD License.
+#
+# Copyright (c) 2011, Sebastian Staudt
+
+# Monkey patches an issue in Grit::Index which prevents directories from being
+# cleanly removed from the index and the repository
+class Grit::Index
+
+  # Add (or remove) a file to the index
+  #
+  # @param [String] path The path to the file
+  # @param [String] data The contents of the file
+  def add(path, data)
+    is_dir = path[-1] == 47
+    path = path.split('/')
+    filename = path.pop
+    filename += '/' if is_dir
+
+    current = self.tree
+    p current
+
+    path.each do |dir|
+      current[dir] ||= {}
+      node = current[dir]
+      current = node
+    end
+
+    current[filename] = data
+  end
+
+end

data/lib/silo/cli.rb

@@ -76,9 +76,9 @@ module Silo
     end
 
     command :init, 'Initialize a Silo repository', :path => :optional do
-      path = File.expand_path(path || '.')
-      puts "Initializing Silo repository in #{path}..."
-      Repository.new path
+      repo_path = File.expand_path(args[:path] || '.')
+      puts "Initializing Silo repository in #{repo_path}..."
+      Repository.new repo_path
     end
 
     flag :l, 'List each object in a separate line'

data/lib/silo/repository.rb

@@ -8,6 +8,8 @@ require 'tmpdir'
 require 'rubygems'
 require 'grit'
 
+require File.dirname(__FILE__) + '/../grit/index'
+
 module Silo
 
   # Represents a Silo repository
@@ -305,21 +307,12 @@ module Silo
     # @param [String] path The path of the file or directory to remove from the
     #        repository
     def remove(path)
+      object = object! path
+      path += '/' if object.is_a?(Grit::Tree) && path[-1] != 47
       index = @git.index
       index.read_tree 'HEAD'
-      remove = lambda do |f|
-        dir  = File.stat(f).directory?
-        if dir
-          Dir.entries(f)[2..-1].each do |child|
-            remove.call File.join(f, child)
-          end
-        else
-          index.delete f
-        end
-        dir
-      end
-      dir = remove.call path
-      type = dir ? 'directory' : 'file'
+      index.delete path
+      type = object.is_a?(Grit::Tree) ? 'directory' : 'file'
       commit_msg = "Removed #{type} #{path}"
       index.commit commit_msg, @git.head.commit.sha
     end

data/lib/silo/version.rb

@@ -1,11 +1,11 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2010, Sebastian Staudt
+# Copyright (c) 2010-2011, Sebastian Staudt
 
 module Silo
 
   # The current version of the Silo gem
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 
 end

data/test/test_repository.rb

@@ -105,6 +105,11 @@ class TestRepository < Test::Unit::TestCase
       assert (@repo.git.tree/('file2')).is_a? Grit::Blob
       assert_equal "Added file #{@data_dir + 'file1'} into '/'", @repo.git.commits[1].message
       assert_equal "Added file #{@data_dir + 'file2'} into '/'", @repo.git.commits[2].message
+      assert_equal %w{.silo file1 file2}, @repo.contents
+
+      assert_raise FileNotFoundError do
+        @repo.restore 'file3'
+      end
     end
 
     should 'save directory trees correctly' do
@@ -118,6 +123,13 @@ class TestRepository < Test::Unit::TestCase
       assert (@repo.git.tree/('data/subdir1/file1')).is_a? Grit::Blob
       assert (@repo.git.tree/('data/subdir2')).is_a? Grit::Tree
       assert (@repo.git.tree/('data/subdir2/file2')).is_a? Grit::Blob
+      assert_equal %w{data data/file1 data/file2 data/subdir1 data/subdir1/file1 data/subdir2 data/subdir2/file2}, @repo.contents('data')
+      assert_equal %w{data/subdir1 data/subdir1/file1}, @repo.contents('data/subdir1')
+      assert_equal %w{data/subdir2 data/subdir2/file2}, @repo.contents('data/subdir2')
+
+      assert_raise FileNotFoundError do
+        @repo.restore 'file1'
+      end
     end
 
     should 'save single files correctly into a prefix directory' do
@@ -129,6 +141,10 @@ class TestRepository < Test::Unit::TestCase
       assert (@repo.git.tree/('prefix/file2')).is_a? Grit::Blob
       assert_equal "Added file #{@data_dir + 'file1'} into 'prefix'", @repo.git.commits[1].message
       assert_equal "Added file #{@data_dir + 'file2'} into 'prefix'", @repo.git.commits[2].message
+
+      assert_raise FileNotFoundError do
+        @repo.restore 'file1'
+      end
     end
 
     should 'save directory trees correctly into a prefix directory' do
@@ -142,6 +158,10 @@ class TestRepository < Test::Unit::TestCase
       assert (@repo.git.tree/('prefix/data/subdir1/file1')).is_a? Grit::Blob
       assert (@repo.git.tree/('prefix/data/subdir2')).is_a? Grit::Tree
       assert (@repo.git.tree/('prefix/data/subdir2/file2')).is_a? Grit::Blob
+
+      assert_raise FileNotFoundError do
+        @repo.restore 'prefix/file1'
+      end
     end
 
     should 'restore single files correctly' do
@@ -168,6 +188,23 @@ class TestRepository < Test::Unit::TestCase
       assert File.exist? @target_dir/'subdir1/file1'
     end
 
+    should 'remove files and directories correctly' do
+      @repo.add @data_dir
+      @repo.add @data_dir/'file1'
+
+      @repo.remove 'data/file1'
+      assert_equal 4, @repo.git.commits.size
+      assert (@repo.git.tree/'data/file1').nil?
+
+      @repo.remove 'data'
+      assert_equal 5, @repo.git.commits.size
+      assert (@repo.git.tree/'data').nil?
+
+      @repo.remove 'file1'
+      assert_equal 6, @repo.git.commits.size
+      assert (@repo.git.tree/'file1').nil?
+    end
+
     should 'purge files and directories correctly' do
       @repo.add @data_dir
       @repo.add @data_dir/'file1'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: silo
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Sebastian Staudt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-30 00:00:00 +01:00
+date: 2011-02-02 00:00:00 +01:00
 default_executable: silo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,6 +120,7 @@ files:
 - test/data/subdir2/file2
 - test/data/subdir1/file1
 - lib/silo/version.rb
+- lib/grit/index.rb
 - Rakefile
 - README.md
 - test/test_repository.rb
@@ -159,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - git >= 1.6
 rubyforge_project: silo
-rubygems_version: 1.4.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A command-line utility and API for Git-based backups