github-backup 0.4.1 → 0.5.0

data/README.md

@@ -4,7 +4,7 @@ Back up your Github repositories locally.
 
 To install it as a Gem, just run:
 
-    $ sudo gem install ddollar-github-backup
+    $ gem install github-backup
 
 To use it:
 
@@ -18,13 +18,21 @@ You will need a `~/.gitconfig` file in place with a `[github]` section
 
 See: http://github.com/guides/tell-git-your-user-name-and-email-address
 
+### Specify authentication at the command line
+
+If you don't have a `[github]` section set up in your `~/.gitconfig` file, you
+can provide your user name and Github API at the command line.
+
 ## License
 
 MIT License
 
 ## Author
 
-David Dollar
+Created by David Dollar
+
+Patches contributed by:
+  Gabriel Gilder
 
 ## Copyright
 

data/bin/github-backup

@@ -4,14 +4,29 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'octopi'
 require 'github-backup'
+require 'optparse'
+
+options = {}
+optionparser = OptionParser.new do |opts|
+  opts.banner = "Usage: github-backup [options] username local_backup_root"
+  
+  opts.on("-t", "--token TOKEN", "Github API Token") do |t|
+    options[:token] = t
+  end
+  
+  opts.on("-u", "--username USER", "Github API Username") do |u|
+    options[:login] = u
+  end
+end
+optionparser.parse!
 
 unless ARGV.length == 2
-  puts "usage: github-backup <username> <local backup root>"
+  puts optionparser.help
   exit 1
 end
 
 username = ARGV.shift
 root     = ARGV.shift
 
-backup = Github::Backup.new(username, root)
+backup = Github::Backup.new(username, root, options)
 backup.execute

data/lib/github-backup.rb

@@ -5,41 +5,71 @@ module Github; end
 
 class Github::Backup
 
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 
   include Octopi
 
   attr_reader :backup_root, :debug, :username
 
-  def initialize(username, backup_root)
+  def initialize(username, backup_root, options = {})
     @username    = username
     @backup_root = backup_root
+    @options     = options
+    if (options[:token] && !options[:login])
+      options[:login] = @username
+    end
     @debug = false
   end
 
   def execute
-    FileUtils::mkdir_p(backup_root)
-    authenticated do
-      repositories = User.find(username).repositories.sort_by { |r| r.name }
-      repositories.each do |repository|
-        puts "Backing up: #{repository.name}"
-        backup_repository repository
-      end
-    end
+    backup_all @options
+    
   rescue Errno::ENOENT
     puts "Please install git and create a ~/.gitconfig"
     puts "  See: http://github.com/guides/tell-git-your-user-name-and-email-address"
   rescue NoMethodError
     puts "Please add a [github] section to your ~/.gitconfig"
     puts "  See: http://github.com/guides/tell-git-your-user-name-and-email-address"
+  rescue Octopi::APIError => e
+    # only handle "Authentication required" errors
+    unless (e.message =~ /status 401$/)
+      raise e
+    end
+    puts "Github API authentication failed."
+    puts "Please add a [github] section to your ~/.gitconfig"
+    puts "  See: http://github.com/guides/tell-git-your-user-name-and-email-address"
+    puts "Or, use the arguments to authenticate with your username and API token."
   end
 
 private ######################################################################
 
+  def github_authenticate(options={})
+    if (options[:login])
+      authenticated_with(options) do
+        yield
+      end
+    else
+      authenticated do
+        yield
+      end
+    end
+  end
+
   def backup_directory_for(repository)
     File.join(backup_root, repository.name)
   end
 
+  def backup_all(options={})
+    FileUtils::mkdir_p(backup_root)
+    github_authenticate(options) do
+      repositories = User.find(username).repositories.sort_by { |r| r.name }
+      repositories.each do |repository|
+        puts "Backing up: #{repository.name}"
+        backup_repository repository
+      end
+    end
+  end
+
   def backup_repository(repository)
     if File.exists?(backup_directory_for(repository))
       backup_repository_incremental(repository)

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: github-backup
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
+  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors: 
 - |
@@ -17,37 +12,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 -04:00
+date: 2011-09-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: parka
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
-  name: parka
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: octopi
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 2
-        - 8
-        version: 0.2.8
+        version: 0.4.5
   type: :runtime
-  name: octopi
   prerelease: false
   version_requirements: *id002
 description: Backup your Github repositories
@@ -78,23 +65,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: nowarning
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Backup your Github repositories