gitback 0.1.1 → 0.1.2

data/.gitignore

@@ -1,21 +1,7 @@
-## MAC OS
 .DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
 *.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
+.rvmrc

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# dependencies are specified in gitback.gemspec
+gemspec

data/README.md

@@ -1,24 +1,26 @@
 Gitback
 ====
 
+Do you have backups of your production web/mail/db configs? crontabs?
+
+How fast could you configure a production machine if everything was lost?
+
 Gitback allows you to version arbitrary files and/or directories in a git
 repository.  You just need to include the gem and write a brief ruby script
 that indicates the files/directories you'd like to backup.  Then, run the
 script via cron.  Gitback will take care of a adding/commiting/pushing whenever
 your files are modified.
 
-The typical usage for this is backing up config files.
-
 
 ## Requirements ###############################################################
 
-* git (http://git-scm.com) tested with 1.6.0.4
-* grit (http://github.com/mojombo/grit) 2.0.0 or higher
+* git (http://git-scm.com) tested with 1.7.4
+* grit (http://github.com/mojombo/grit) tested with 2.4.1
 
 
 ## Install ####################################################################
 
-    $ gem install gitback -s http://gemcutter.org
+    $ gem install gitback
 
 ## Usage ######################################################################
 
@@ -29,32 +31,21 @@ Here's a basic example of a script using gitback:
 
     Gitback::Repository.new '/var/config-backup/' do |repo|
       repo.backup '/opt/nginx/conf/nginx.conf'
+      repo.backup '/etc/mysql/'
+      repo.backup '/etc/memcached.conf'
+      repo.backup '/etc/ssh/sshd_config'
+      repo.backup '/var/spool/cron/crontabs/'
     end
 
-This will check /opt/nginx/conf/nginx.conf for changes.  If the file has
-changed, gitback will commit a new version.
+This will check these files for additions/changes.  If a file has been added or
+changed, gitback will commit it.
 
-This nginx config file would be saved to the following location:
+For example, the nginx config file would be saved to the following location:
 
     /var/config-backup/opt/nginx/conf/nginx.conf
 
-Everything starts with instantiating a new `Gitback::Repository` object. The
-first parameter is the path to the git repository you'd like to backup to. The
-second parameter is a block indicating the files/directories you'd like to
-backup.
-
-
-### Directory support
-
-In addition to basic files, directory paths can also be backed up:
-
-    Gitback::Repository.new '/var/config-backup/' do |repo|
-      repo.backup '/opt/nginx/conf/nginx.conf'
-      repo.backup '/etc/mysql/'
-    end
-
-Notice that '/etc/mysql' is a directory.  Gitback will copy everything within
-that directory into the git repository.
+Notice that '/etc/mysql' is a directory.  Gitback accepts directories and will
+copy everything within that directory into the git repository.
 
 
 ### Namespaces

data/Rakefile

@@ -1,46 +1,2 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "gitback"
-    gem.summary = %Q{A simple ruby library for backing up files to git}
-    gem.description = %Q{Provide a list of files and/or directories and gitback will copy them to your git repo, commit and push when there are changes.}
-    gem.email = "brycethornton@gmail.com"
-    gem.homepage = "http://github.com/brycethornton/gitback"
-    gem.authors = ["Bryce Thornton"]
-    gem.add_dependency "grit", ">= 2.0.0"
-    gem.add_development_dependency "shoulda"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "gitback #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/gitback.gemspec

@@ -1,67 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "gitback/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{gitback}
-  s.version = "0.1.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Bryce Thornton"]
-  s.date = %q{2010-05-20}
-  s.description = %q{Provide a list of files and/or directories and gitback will copy them to your git repo, commit and push when there are changes.}
-  s.email = %q{brycethornton@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "gitback.gemspec",
-     "lib/gitback.rb",
-     "lib/gitback/repository.rb",
-     "test/data/another/file.txt",
-     "test/data/another/test.txt",
-     "test/data/some/deep/.bash_profile",
-     "test/data/some/deep/directory/fstab",
-     "test/data/some/deep/directory/test.conf",
-     "test/data/some/deep/nginx.conf",
-     "test/data/some/test_file.txt",
-     "test/data/testing.txt",
-     "test/helper.rb",
-     "test/repos/.gitignore",
-     "test/test_gitback.rb"
-  ]
-  s.homepage = %q{http://github.com/brycethornton/gitback}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.name      = "gitback"
+  s.version   = Gitback::VERSION
+  s.platform  = Gem::Platform::RUBY
+  s.authors   = ["Bryce Thornton"]
+  s.email     = ["brycethornton@gmail.com"]
+  s.homepage  = "http://github.com/brycethornton/gitback"
   s.summary = %q{A simple ruby library for backing up files to git}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_gitback.rb"
-  ]
+  s.description = %q{Provide a list of files and/or directories and gitback will copy them to your git repo, commit and push when there are changes.}
+
+  s.add_dependency "grit", ">= 2.4.1"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "gitback"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<grit>, [">= 2.0.0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-    else
-      s.add_dependency(%q<grit>, [">= 2.0.0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<grit>, [">= 2.0.0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end
 

data/lib/gitback/repository.rb

@@ -95,7 +95,7 @@ module Gitback
         if commit_result !~ /working directory clean/
           if @remote
             puts "Pushing repository changes..."
-            @repo.git.push({}, @remote, @branch)
+            @repo.git.native(:push, {}, @remote, @branch)
           end
         else
           puts "No changes committed."

data/lib/gitback/version.rb

@@ -0,0 +1,3 @@
+module Gitback
+  VERSION = "0.1.2"
+end

data/test/helper.rb

@@ -1,10 +1,6 @@
 require 'rubygems'
 require 'test/unit'
-require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'gitback'
-
-class Test::Unit::TestCase
-end

data/test/test_gitback.rb

@@ -1,114 +1,118 @@
 require "#{File.dirname(__FILE__)}/helper"
 
 class TestGitback < Test::Unit::TestCase
-  context 'Gitback' do
-    setup do
-      @dirname = File.expand_path(File.dirname(__FILE__))
-      @remote_path = File.expand_path(File.join(@dirname, *%w[repos remote_repo]))
-      @local_path  = File.expand_path(File.join(@dirname, *%w[repos local_repo]))
-
-      # Cleanup the "remote" repo from previous tests
-      if File.exists?(@remote_path)
-        FileUtils.remove_dir(@remote_path)
-      end
+  def setup
+    @dirname = File.expand_path(File.dirname(__FILE__))
+    @remote_path = File.expand_path(File.join(@dirname, *%w[repos remote_repo]))
+    @local_path  = File.expand_path(File.join(@dirname, *%w[repos local_repo]))
 
-      # Cleanup the "local" repo from previous tests
-      if File.exists?(@local_path)
-        FileUtils.remove_dir(@local_path)
-      end
+    # Create the "remote" repo directory
+    FileUtils.mkdir_p(@remote_path)
 
-      # Create the "remote" repo directory
-      FileUtils.mkdir_p(@remote_path)
+    Dir.chdir(@remote_path) do
+      # Init the "remote" git repo and make first commit
+      `git init`
+      # By default, git won't let you push to a non-bare repo
+      # This config setting says to ignore that restriction
+      `git config receive.denyCurrentBranch ignore`
+      `touch README`
+
+      @remote_repo = Grit::Repo.new(@remote_path)
+      @remote_repo.add(@remote_path + '/*')
+      @remote_repo.commit_all("first commit")
+    end
 
-      Dir.chdir(@remote_path) do
-        # Init the "remote" git repo and make first commit
-        `git init`
-        `touch README`
+    # Clone the "remote" repo to a "local" repo
+    `git clone #{@remote_path} #{@local_path}`
+  end
 
-        @remote_repo = Grit::Repo.new(@remote_path)
-        @remote_repo.add(@remote_path + '/*')
-        @remote_repo.commit_all("first commit")
-      end
+  def teardown
+    # Cleanup the "remote" repo from previous tests
+    if File.exists?(@remote_path)
+      FileUtils.remove_dir(@remote_path)
+    end
 
-      # Clone the "remote" repo to a "local" repo
-      `git clone #{@remote_path} #{@local_path}`
+    # Cleanup the "local" repo from previous tests
+    if File.exists?(@local_path)
+      FileUtils.remove_dir(@local_path)
     end
+  end
 
-    should "handle basic file backups" do
-      files = []
-      files << "#{@dirname}/data/testing.txt"
-      files << "#{@dirname}/data/some/deep/nginx.conf"
+  def test_handle_basic_file_backups
+    files = []
+    files << "#{@dirname}/data/testing.txt"
+    files << "#{@dirname}/data/some/deep/nginx.conf"
 
-      output = Gitback::Repository.new @local_path do |repo|
-        files.each do |file|
-          repo.backup file
-        end
+    output = Gitback::Repository.new @local_path do |repo|
+      files.each do |file|
+        repo.backup file
       end
+    end
 
-      assert_files(files)
+    assert_files(files)
+  end
+
+  def test_handle_directory_backups
+    output = Gitback::Repository.new @local_path do |repo|
+      repo.backup "#{@dirname}/data/another/"
+      repo.backup "#{@dirname}/data/some/deep/nginx.conf"
     end
 
-    should "handle directory backups" do
-      output = Gitback::Repository.new @local_path do |repo|
+    files = []
+    files << "#{@dirname}/data/another/file.txt"
+    files << "#{@dirname}/data/another/test.txt"
+    files << "#{@dirname}/data/some/deep/nginx.conf"
+
+    assert_files(files)
+  end
+
+  def test_use_namespaces
+    output = Gitback::Repository.new @local_path do |repo|
+      repo.namespace 'blah.domain.com' do
         repo.backup "#{@dirname}/data/another/"
         repo.backup "#{@dirname}/data/some/deep/nginx.conf"
       end
-
-      files = []
-      files << "#{@dirname}/data/another/file.txt"
-      files << "#{@dirname}/data/another/test.txt"
-      files << "#{@dirname}/data/some/deep/nginx.conf"
-
-      assert_files(files)
     end
 
-    should "use namespaces" do
-      output = Gitback::Repository.new @local_path do |repo|
-        repo.namespace 'blah.domain.com' do
-          repo.backup "#{@dirname}/data/another/"
-          repo.backup "#{@dirname}/data/some/deep/nginx.conf"
-        end
-      end
-
-      # Make sure local repo has the files
-      files = []
-      files << "blah.domain.com/#{@dirname}/data/another/file.txt"
-      files << "blah.domain.com/#{@dirname}/data/another/test.txt"
-      files << "blah.domain.com/#{@dirname}/data/some/deep/nginx.conf"
+    # Make sure local repo has the files
+    files = []
+    files << "/blah.domain.com#{@dirname}/data/another/file.txt"
+    files << "/blah.domain.com#{@dirname}/data/another/test.txt"
+    files << "/blah.domain.com#{@dirname}/data/some/deep/nginx.conf"
 
-      assert_files(files)
-    end
+    assert_files(files)
+  end
 
-    should "deal with symlinks" do
-      # Create a symlink
-      linked_file = "#{@dirname}/data/linked.txt"
-      File.symlink("#{@dirname}/data/testing.txt", linked_file)
+  def test_deal_with_symlinks
+    # Create a symlink
+    linked_file = "#{@dirname}/data/linked.txt"
+    File.symlink("#{@dirname}/data/testing.txt", linked_file)
 
-      Gitback::Repository.new @local_path do |repo|
-        repo.backup linked_file
-      end
+    Gitback::Repository.new @local_path do |repo|
+      repo.backup linked_file
+    end
 
-      files = [linked_file]
+    files = [linked_file]
 
-      assert_files(files)
+    assert_files(files)
 
-      # Delete the link for future tests
-      File.delete(linked_file)
-    end
+    # Delete the link for future tests
+    File.delete(linked_file)
   end
 
   def assert_files(file_array)
     file_array.each do |file|
-      assert File.exists? "#{@local_path}/#{file}"
+      assert File.exists?("#{@local_path}#{file}"), "Couldn't find #{@local_path}#{file}"
     end
 
-    # Need to reset in order for the files to not be deleted
+    # Need to reset in order for the files to show up in the remote
+    # Normally we'd be pushing to a bare repo, but for testing we aren't
     Dir.chdir(@remote_path) do
       `git reset --hard`
     end
 
     file_array.each do |file|
-      assert File.exists? "#{@remote_path}/#{file}"
+      assert File.exists?("#{@remote_path}#{file}"), "Couldn't find #{@remote_path}#{file}"
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitback
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Bryce Thornton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-20 00:00:00 -04:00
+date: 2011-04-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,47 +26,33 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 29
         segments: 
         - 2
-        - 0
-        - 0
-        version: 2.0.0
+        - 4
+        - 1
+        version: 2.4.1
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
 description: Provide a list of files and/or directories and gitback will copy them to your git repo, commit and push when there are changes.
-email: brycethornton@gmail.com
+email: 
+- brycethornton@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
-- .document
 - .gitignore
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - gitback.gemspec
 - lib/gitback.rb
 - lib/gitback/repository.rb
+- lib/gitback/version.rb
 - test/data/another/file.txt
 - test/data/another/test.txt
 - test/data/some/deep/.bash_profile
@@ -83,8 +69,8 @@ homepage: http://github.com/brycethornton/gitback
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -107,11 +93,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: gitback
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A simple ruby library for backing up files to git
 test_files: 
+- test/data/another/file.txt
+- test/data/another/test.txt
+- test/data/some/deep/.bash_profile
+- test/data/some/deep/directory/fstab
+- test/data/some/deep/directory/test.conf
+- test/data/some/deep/nginx.conf
+- test/data/some/test_file.txt
+- test/data/testing.txt
 - test/helper.rb
+- test/repos/.gitignore
 - test/test_gitback.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/VERSION

@@ -1 +0,0 @@
-0.1.1