github-backup 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b560781a0d4503a6c990e0700002b9f64365e77
-  data.tar.gz: 46735fd878f8c10052f323dcdca503c34df967e9
+  metadata.gz: 5369c3068e82f9ef8466455c2216ccd68d6c5b50
+  data.tar.gz: 06f0366d478b651c8ec6a160d0502af6e2e58b41
 SHA512:
-  metadata.gz: 6091212894096370ba508a00eabf74d632ec065718257a59ea658e1d781f40a213c917253e3a3b028ddcf37c3eb5df07429e88eef223ac7589bcee84224fe872
-  data.tar.gz: 2b4dab9123f3a186882a73cc685173bd36d51226e2dea8ec2aa119f80576e7a0f36467a3f566f150b3787bbd0947865215a039a3f87bb52ec3bab4df083eb7cb
+  metadata.gz: 6723ef4b7331f84535277994b9f9bb627d9a91764f0945477a521d0f0ad6e4bf1c885b5c41bc98d591ddc30ffb2522a2e8eeb363e05f1167cdf4989baf0db073
+  data.tar.gz: 9996e98b8d954e0b96f17f6a15c28920194cc177692820fd82787f0e9770c4cffe9d826323da74c0c67e056266b2f9b1a51ac7d425cd97dd45742766f93cd032

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    github-backup (0.9.0)
+    github-backup (0.10.0)
       octokit (~> 3.7)
 
 GEM

data/bin/github-backup

@@ -20,8 +20,8 @@ unless ARGV.length == 2
   exit 1
 end
 
-username = ARGV.shift
-root     = ARGV.shift
+username              = ARGV.shift
+options[:backup_root] = ARGV.shift
 
-backup = GithubBackup::Backup.new(username, root, options)
+backup = GithubBackup::Backup.new(username, options)
 backup.execute

data/github-backup.gemspec

@@ -1,8 +1,6 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+$:.unshift File.expand_path("../lib", __FILE__)
 
-require 'github-backup/version'
+require "github-backup/version"
 
 Gem::Specification.new do |s|
   s.name        = "github-backup"
@@ -17,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split($/)
   s.require_paths = ['lib']
-  s.executables = "github-backup"
+  s.executables   = "github-backup"
 
   s.add_dependency "octokit", "~> 3.7"
 end

data/lib/github-backup/backup.rb

@@ -1,25 +1,12 @@
 module GithubBackup
   class Backup
-    attr_reader :backup_root, :debug, :username, :client
+    attr_reader :debug, :username, :client, :config
 
-    def initialize(username, backup_root, options = {})
+    def initialize(username, options = {})
       @username    = username
-      @backup_root = backup_root
-      @options     = options
       @debug       = false
-
-      unless options.key?(:token)
-        config = read_gitconfig
-        if config.key?('github')
-          options[:token] = config['github'].fetch('token', nil)
-        end
-      end
-
-      if options[:token]
-        @client = Octokit::Client.new(:access_token => options[:token])
-      else
-        @client = Octokit::Client.new
-      end
+      @config      = Config.new(options)
+      @client      = Octokit::Client.new(:access_token => config.token)
     end
 
     def execute
@@ -31,7 +18,11 @@ module GithubBackup
       puts "Or, use the arguments to authenticate with your username and API token."
     end
 
-    private ######################################################################
+    private
+
+    def backup_root
+      config.backup_root
+    end
 
     def backup_directory_for(repository)
       File.join(backup_root, repository.full_name) + '.git'
@@ -101,31 +92,6 @@ module GithubBackup
       username == client.user.login
     end
 
-    def read_gitconfig
-      config = {}
-      group = nil
-
-      return config unless File.exists?(gitconfig_path)
-
-      File.foreach(gitconfig_path) do |line|
-        line.strip!
-        if line[0] != ?# && line =~ /\S/
-          if line =~ /^\[(.*)\]$/
-            group = $1
-            config[group] ||= {}
-          else
-            key, value = line.split("=").map { |v| v.strip }
-            config[group][key] = value
-          end
-        end
-      end
-      config
-    end
-
-    def gitconfig_path
-      "#{ENV['HOME']}/.gitconfig"
-    end
-
     def shell(command)
       puts "EXECUTING: #{command}" if debug
       IO.popen(command, 'r') do |io|

data/lib/github-backup/config.rb

@@ -0,0 +1,47 @@
+module GithubBackup
+  class Config
+
+    DEFAULTS = {
+      :gitconfig_path => "#{ENV['HOME']}/.gitconfig",
+    }
+
+    attr_reader :backup_root, :gitconfig_path, :token
+
+    def initialize(options = {})
+      @backup_root    = options.fetch(:backup_root)    { raise ArgumentError, 'A backup_root option is required' }
+      @gitconfig_path = options.fetch(:gitconfig_path) { DEFAULTS[:gitconfig_path] }
+      @token          = options.fetch(:token)          { default_token }
+    end
+
+    private
+
+    def default_token
+      config = read_gitconfig
+      if config.key?('github')
+        config['github'].fetch('token', nil)
+      end
+    end
+
+    def read_gitconfig
+      config = {}
+      group = nil
+
+      return config unless File.exists?(gitconfig_path)
+
+      File.foreach(gitconfig_path) do |line|
+        line.strip!
+        if line[0] != ?# && line =~ /\S/
+          if line =~ /^\[(.*)\]$/
+            group = $1
+            config[group] ||= {}
+          else
+            key, value = line.split("=").map { |v| v.strip }
+            config[group][key] = value
+          end
+        end
+      end
+      config
+    end
+
+  end
+end

data/lib/github-backup/version.rb

@@ -1,3 +1,3 @@
 module GithubBackup
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-backup
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - David Dollar
@@ -42,6 +42,7 @@ files:
 - github-backup.gemspec
 - lib/github-backup.rb
 - lib/github-backup/backup.rb
+- lib/github-backup/config.rb
 - lib/github-backup/version.rb
 homepage: http://github.com/ddollar/github-backup
 licenses: