silo 0.1.2 → 0.1.3

data/.travis.yml

@@ -1,7 +1,8 @@
 rvm:
-  - 1.8.6
   - 1.8.7
-  - 1.9.1
   - 1.9.2
-  - jruby
+  - 1.9.3
+  - rbx
+  - rbx-2.0
   - ree
+  - ruby-head

data/.yardopts

@@ -1 +1,4 @@
 --files Changelog.md,LICENSE
+--markup markdown
+--private
+--protected

data/Changelog.md

@@ -1,7 +1,19 @@
 # Changelog
 
+## Version 0.1.3
+
+ **September 21<sup>st</sup>, 2011**
+
+ * Fixed problems of the `remote` command
+ * Various improvements to code style and integration
+
+ See the [Git history](https://github.com/koraktor/silo/compare/0.1.2...0.1.3)
+ for version 0.1.3
+
 ## Version 0.1.2
 
+ **April 12<sup>th</sup>, 2011**
+
  * Improved compatibility with Rubies other than 1.8.7
  * Use Bundler
  * Added a monkey patch for Grit returning commits in wrong order
@@ -12,6 +24,8 @@
 
 ## Version 0.1.1
 
+ **February 2<sup>nd</sup>, 2011**
+
  * Fixed bugs related to file operations
  * Added a monkey patch for Grit not being able to delete directories
  * Lots of other fixes and improvements

data/Gemfile

@@ -1,11 +1,3 @@
 source :rubygems
 
-gem 'grit', '~> 2.4.1'
-
-group :development do
-  gem 'yard', '~> 0.6.7'
-end
-
-group :test do
-  gem 'shoulda', '~> 2.11.3'
-end
+gemspec

data/Gemfile.lock

@@ -1,18 +1,30 @@
+PATH
+  remote: .
+  specs:
+    silo (0.1.2)
+      grit (~> 2.4.1)
+      hashery (~> 1.4.0)
+      rubikon (~> 0.6.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     grit (2.4.1)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
+    hashery (1.4.0)
     mime-types (1.16)
+    rake (0.9.2)
+    rubikon (0.6.0)
     shoulda (2.11.3)
-    yard (0.6.7)
+    yard (0.7.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  grit (~> 2.4.1)
+  rake (~> 0.9.2)
   shoulda (~> 2.11.3)
-  yard (~> 0.6.7)
+  silo!
+  yard (~> 0.7.2)

data/Rakefile

@@ -1,22 +1,24 @@
+# -*- encoding: utf-8 -*-
+
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
 # Copyright (c) 2010-2011, Sebastian Staudt
 
-require 'rake/gempackagetask'
 require 'rake/testtask'
+require 'rubygems/package_task'
 
 task :default => :test
 
 # Rake tasks for building the gem
 spec = Gem::Specification.load('silo.gemspec')
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
 end
 
 # Test task
 Rake::TestTask.new do |t|
   t.libs << 'lib' << 'test'
-  t.pattern = 'test/**/test_*.rb'
+  t.test_files = FileList['test/**/test_*.rb']
   t.verbose = true
 end
 
@@ -26,8 +28,8 @@ begin
   # Create a rake task +:doc+ to build the documentation using YARD
   YARD::Rake::YardocTask.new do |yardoc|
     yardoc.name    = 'doc'
-    yardoc.files   = ['lib/**/*.rb', 'LICENSE', 'README.md']
-    yardoc.options = ['--private', '--title', 'Silo &mdash; API Documentation']
+    yardoc.files   = ['lib/**/*.rb', 'Changelog.md', 'LICENSE', 'README.md']
+    yardoc.options = ['--markup', 'markdown', '--private', '--protected', '--title', 'Silo – API Documentation']
   end
 rescue LoadError
   desc 'Generate YARD Documentation (not available)'

data/bin/silo

@@ -3,7 +3,8 @@
 # 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
 
-require File.join(File.dirname(__FILE__), '..', 'lib', 'silo.rb')
-require 'silo/cli.rb'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'silo')
+require File.join(File.dirname(__FILE__), '..', '..', 'rubikon', 'lib', 'rubikon')
+require 'silo/cli'

data/lib/silo/cli.rb

@@ -3,9 +3,15 @@
 #
 # Copyright (c) 2010-2011, Sebastian Staudt
 
-require 'rubygems'
 require 'rubikon'
 
+HASH_CLASS = if RUBY_VERSION < '1.9'
+  require 'hashery/ordered_hash'
+  OrderedHash
+else
+  Hash
+end
+
 module Silo
 
   # This class is a Rubikon application that implements the command-line
@@ -103,7 +109,8 @@ module Silo
       end
     end
 
-    command :remote, 'Add or remove remote repositories', { :action => ['add', 'rm', :optional], :name => :optional, :url => :optional } do
+    args = HASH_CLASS[:action, ['add', 'rm', :optional], :remote_name, :optional, :url, :optional]
+    command :remote, 'Add or remove remote repositories', args do
       usage = lambda do
         puts 'usage: silo remote add <name> <url>'
         puts '   or: silo remote rm <name>'
@@ -116,14 +123,14 @@ module Silo
             puts info
           end
         when 'add'
-          if url.nil?
-            repo.add_remote name, url
+          unless url.nil?
+            repo.add_remote remote_name, url
           else
             usage.call
           end
         when 'rm'
-          unless url.nil?
-            repo.remove_remote name
+          if url.nil?
+            repo.remove_remote remote_name
           else
             usage.call
           end

data/lib/silo/repository.rb

@@ -5,11 +5,8 @@
 
 require 'tmpdir'
 
-require 'rubygems'
-require 'bundler'
-Bundler.require :default
+require 'grit'
 
-require File.dirname(__FILE__) + '/../grit/git-ruby/repository'
 require File.dirname(__FILE__) + '/../grit/index'
 
 module Silo

data/lib/silo/version.rb

@@ -6,6 +6,6 @@
 module Silo
 
   # The current version of the Silo gem
-  VERSION = '0.1.2'
+  VERSION = '0.1.3' unless const_defined? :VERSION
 
 end

data/silo.gemspec

@@ -1,5 +1,3 @@
-require 'bundler'
-
 require File.expand_path(File.dirname(__FILE__) + '/lib/silo/version')
 
 Gem::Specification.new do |s|
@@ -13,7 +11,14 @@ Gem::Specification.new do |s|
   s.summary     = 'A command-line utility and API for Git-based backups'
   s.description = %Q{With Silo you can backup arbitrary files into one or more Git repositories and take advantage of Git's compression, speed and other features. No Git knowledge needed.}
 
-  s.add_bundler_dependencies
+  s.add_dependency 'grit', '~> 2.4.1'
+  s.add_dependency 'hashery', '~> 1.4.0' if RUBY_VERSION < '1.9'
+  s.add_dependency 'rubikon', '~> 0.6.0'
+
+  s.add_development_dependency 'rake', '~> 0.9.2'
+  s.add_development_dependency 'shoulda', '~> 2.11.3'
+  s.add_development_dependency 'yard', '~> 0.7.2'
+
   s.requirements = [ 'git >= 1.6' ]
 
   s.files              = `git ls-files`.split("\n")

data/test/helper.rb

@@ -1,11 +1,14 @@
 # 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
+
+require 'rubygems'
+require 'test/unit'
+
+require 'shoulda'
 
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
 $: << File.dirname(__FILE__)
 require 'silo'
 include Silo
-
-Bundler.require :test

data/test/test_repository.rb

@@ -98,14 +98,21 @@ class TestRepository < Test::Unit::TestCase
     end
 
     should 'save single files correctly' do
+      commit_msgs = [
+        'Enabled Silo for this repository',
+        "Added file #{@data_dir + 'file1'} into '/'",
+        "Added file #{@data_dir + 'file2'} into '/'"
+      ]
+
+      sleep 1
       @repo.add @data_dir/'file1'
+      sleep 1
       @repo.add @data_dir/'file2'
 
       assert_equal 3, @repo.git.commits.size
       assert_instance_of Grit::Blob, @repo.git.tree/'file1'
       assert_instance_of Grit::Blob, @repo.git.tree/'file2'
-      assert_equal "Added file #{@data_dir + 'file1'} into '/'", @repo.git.commits[1].message
-      assert_equal "Added file #{@data_dir + 'file2'} into '/'", @repo.git.commits[0].message
+      assert_same_elements commit_msgs, @repo.git.commits.map(&:message)
       assert_equal %w{.silo file1 file2}, @repo.contents
 
       assert_raise FileNotFoundError do
@@ -114,6 +121,7 @@ class TestRepository < Test::Unit::TestCase
     end
 
     should 'save directory trees correctly' do
+      sleep 1
       @repo.add @data_dir
 
       assert_equal 2, @repo.git.commits.size
@@ -134,14 +142,21 @@ class TestRepository < Test::Unit::TestCase
     end
 
     should 'save single files correctly into a prefix directory' do
+      commit_msgs = [
+        'Enabled Silo for this repository',
+        "Added file #{@data_dir + 'file1'} into 'prefix'",
+        "Added file #{@data_dir + 'file2'} into 'prefix'"
+      ]
+
+      sleep 1
       @repo.add @data_dir/'file1', 'prefix'
+      sleep 1
       @repo.add @data_dir/'file2', 'prefix'
 
       assert_equal 3, @repo.git.commits.size
       assert_instance_of Grit::Blob, @repo.git.tree/'prefix/file1'
       assert_instance_of Grit::Blob, @repo.git.tree/'prefix/file2'
-      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[0].message
+      assert_same_elements commit_msgs, @repo.git.commits.map(&:message)
 
       assert_raise FileNotFoundError do
         @repo.restore 'file1'
@@ -149,6 +164,7 @@ class TestRepository < Test::Unit::TestCase
     end
 
     should 'save directory trees correctly into a prefix directory' do
+      sleep 1
       @repo.add @data_dir, 'prefix'
 
       assert_equal 2, @repo.git.commits.size

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: silo
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Sebastian Staudt
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 Z
+date: 2011-09-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: grit
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -29,26 +31,88 @@ dependencies:
         - 4
         - 1
         version: 2.4.1
-  name: grit
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hashery
   prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
   type: :runtime
-  requirement: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: rubikon
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 7
         segments: 
         - 0
         - 6
-        - 7
-        version: 0.6.7
+        - 0
+        version: 0.6.0
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 37
+        segments: 
+        - 2
+        - 11
+        - 3
+        version: 2.11.3
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 7
+        - 2
+        version: 0.7.2
   type: :development
-  requirement: *id002
+  version_requirements: *id006
 description: With Silo you can backup arbitrary files into one or more Git repositories and take advantage of Git's compression, speed and other features. No Git knowledge needed.
 email: 
 - koraktor@gmail.com
@@ -70,7 +134,6 @@ files:
 - Rakefile
 - bin/silo
 - lib/core_ext/pathname.rb
-- lib/grit/git-ruby/repository.rb
 - lib/grit/index.rb
 - lib/silo.rb
 - lib/silo/cli.rb
@@ -115,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - git >= 1.6
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A command-line utility and API for Git-based backups

data/lib/grit/git-ruby/repository.rb

@@ -1,34 +0,0 @@
-# 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::GitRuby::Repository which will cause commits
-# to appear in the wrong order
-class Grit::GitRuby::Repository
-
-  # Returns a list of revisions for the given reference ID and the given
-  # options
-  #
-  # @returns [String] A list of commits and additional information, just like
-  #          git-rev-list.
-  def rev_list(sha, options)
-    (end_sha, sha) = sha if sha.is_a? Array
-
-    log = log(sha, options)
-    log = truncate_arr(log, end_sha) if end_sha
-
-    if options[:max_count]
-      if (opt_len = options[:max_count].to_i) < log.size
-        log = log[0, opt_len]
-      end
-    end
-
-    if options[:pretty] == 'raw'
-      log.map {|k, v| v }.join('')
-    else
-      log.map {|k, v| k }.join("\n")
-    end
-  end
-
-end