gitbak 0.4.3 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3e3a5e41025ca2744190c8babdc5bac3247a007b
+  data.tar.gz: 65f8655194b5bf74dbc6d5e488e166f6870bc700
+SHA512:
+  metadata.gz: ddee8e238c06d24f9db78c23c2b896d886b9ab29bda530d449f6a6e6b6698cded0b86919aafb7bbde3e079bf710b06d6a1788a8b651815a41584221856e4ffcb
+  data.tar.gz: 92627c7bd07aeaf46896e92d40a0567815d5c216f577ca6571c45311654dd9f3ada2cc2230ea348c8377085b418b93c414de693f935762a0bb13aed8c7cb6552

data/README.md

@@ -1,16 +1,15 @@
-<!-- \{{{1 -->
+[]: {{{1
 
     File        : README
     Maintainer  : Felix C. Stegerman <flx@obfusk.net>
-    Date        : 2013-04-21
+    Date        : 2014-02-19
 
-    Copyright   : Copyright (C) 2013  Felix C. Stegerman
-    Version     : v0.4.3
+    Copyright   : Copyright (C) 2014  Felix C. Stegerman
+    Version     : v0.5.0
 
-<!-- }}}1 -->
+[]: }}}1
 
 ## Description
-<!-- \{{{1 -->
 
   gitbak - bitbucket/github/gist backup
 
@@ -19,70 +18,63 @@
 
   When run, gitbak:
 
-  * asks for unspecified passwords;
+  * asks for passwords;
   * lists repositories using APIs - authenticating if necessary;
   * clones/updates repositories;
   * shows a summary (if verbose)
 
-<!-- }}}1 -->
-
 ## Usage
-<!-- \{{{1 -->
-
-    $ gitbak --help                   # show options
-    $ vim ~/.gitbak                   # configure
-    $ gitbak -v                       # mirror
-    $ time gitbak -v 2>&1 | tee log   # w/ logfile
-
-  You may want to run gitbak as a cron job.                       TODO
 
-<!-- }}}1 -->
+```bash
+$ gitbak --help                                     # show options
+$ vim ~/.gitbak                                     # configure
+$ gitbak --no-act                                   # dry run
+$ gitbak -v                                         # mirror
+$ time gitbak -v 2>&1 | tee "$(date +%Y%m%d)".log   # w/ logfile
+```
 
 ## Installing
-<!-- \{{{1 -->
 
-    $ gem install gitbak              # rubygems
+```bash
+$ gem install gitbak                                # rubygems
+```
 
   Get it at https://github.com/obfusk/gitbak.  Depends: git, ruby.
 
-<!-- }}}1 -->
-
 ## Configuration
-<!-- \{{{1 -->
 
 ### Example
 
 ```ruby
 # ~/.gitbak
-
 dir = "#{ Dir.home }/__mirror__/#{ Time.new.strftime '%Y%m%d' }"
-
-GitBak.configure do |auth, services|
-  %w{ bob alice }.each do |u|
-    services.bitbucket  "#{dir}/#{u}/bitbucket", u, auth: true
-    services.github     "#{dir}/#{u}/github"   , u, auth: true
-    services.gist       "#{dir}/#{u}/gist"     , u, auth: true
-  end
+%w{ bob alice }.each do |u|
+  bitbucket  "#{dir}/#{u}/bitbucket", user: u
+  github     "#{dir}/#{u}/github"   , user: u, token: true
+  gist       "#{dir}/#{u}/gist"     , user: u, auth: :github
 end
 ```
 
 ### Methods
 
-    auth.<service>        user[, password]
-    services.<service>    dir, user[, options]
-
-  The (default) services are: bitbucket, github, gist.  GitBak will
-  prompt for unspecified passwords.
-
-#### Repository Options
+```ruby
+bitbucket repo #, options...
+github    repo #, options...
+gist      repo #, options...
+```
 
-    :auth     can be true (same user) or 'username'.
-    :method   defaults to :ssh.
+### Options
 
-<!-- }}}1 -->
+```ruby
+user:   "username"    # mandatory
+token:  true          # use token instead of user/pass (default: false)
+auth:   false         # use authentication (default: true);
+                        use :github w/ gist to re-use github auth
+method: :https        # clone method (default: :ssh);
+                        NB: https auth not implemented yet
+```
 
 ## TODO
-<!-- \{{{1 -->
 
   Some things that may be useful/implemented at some point.
 
@@ -90,7 +82,7 @@ end
   * tests?
   * better error handling?
 
-<!-- -->
+#
 
   * custom services (should be easy to add already)
   * metadata (issues, wikis, ...)
@@ -99,26 +91,18 @@ end
   * filtering
   * oauth?
 
-<!-- -->
+#
 
   * specify ssh key(s)?
   * https clone auth?
 
-<!-- }}}1 -->
-
 ## License
-<!-- \{{{1 -->
 
-  GPLv2 [1].
-
-<!-- }}}1 -->
+  GPLv3+ [1].
 
 ## References
-<!-- \{{{1 -->
-
-  [1] GNU General Public License, version 2
-  --- http://www.opensource.org/licenses/GPL-2.0
 
-<!-- }}}1 -->
+  [1] GNU General Public License, version 3
+  --- http://www.gnu.org/licenses/gpl-3.0.html
 
-<!-- vim: set tw=70 sw=2 sts=2 et fdm=marker : -->
+[]: ! ( vim: set tw=70 sw=2 sts=2 et fdm=marker : )

data/gitbak.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
 
     When run, gitbak:
 
-    * asks for unspecified passwords;
+    * asks for passwords;
     * lists repositories using APIs - authenticating if necessary;
     * clones/updates repositories;
     * shows a summary (if verbose)
@@ -23,13 +23,11 @@ Gem::Specification.new do |s|
   s.authors     = [ 'Felix C. Stegerman' ]
   s.email       = %w{ flx@obfusk.net }
 
-  s.license     = 'GPLv2'
+  s.license     = 'GPLv3+'
 
   s.executables = %w{ gitbak }
-  s.files       = %w{ .yardopts README.md bin/gitbak gitbak.gemspec }\
+  s.files       = %w{ .yardopts README.md gitbak.gemspec } \
                 + Dir['lib/**/*.rb']
 
-  s.add_runtime_dependency 'json'
-
   s.required_ruby_version = '>= 1.9.1'
 end

data/lib/gitbak.rb

@@ -2,41 +2,47 @@
 #
 # File        : gitbak.rb
 # Maintainer  : Felix C. Stegerman <flx@obfusk.net>
-# Date        : 2013-01-03
+# Date        : 2014-02-19
 #
-# Copyright   : Copyright (C) 2013  Felix C. Stegerman
-# Licence     : GPLv2
+# Copyright   : Copyright (C) 2014  Felix C. Stegerman
+# Licence     : GPLv3+
 #
 # --                                                            ; }}}1
 
 require 'gitbak/misc'
-require 'gitbak/services'
-require 'gitbak/version'
 
 require 'fileutils'
+require 'json'
+require 'open-uri'
 
 # --
 
 # gitbak namespace
 module GitBak
 
+  module Services; end
+
+  # authentication error
+  class AuthError < Error; end
+
+  SERVICES = {}
+
+  # --
+
   # extract name from remote; e.g. "git@server:foo/bar.git" and
   # "https://server/foo/bar.git" become "bar"
-  def self.repo_name (remote)
+  def self.repo_name(remote)
     remote.sub(%r!^.*[/:]!, '').sub(/\.git$/, '')
   end
 
-  # clone (from remote) or update repository (in dir); optionally
+  # clone (from remote) or update repository (in dir), optionally
   # verbose
-  def self.mirror_repo (verbose, noact, remote, dir)            # {{{1
+  def self.mirror_repo(verbose, noact, remote, dir)             # {{{1
     name      = repo_name remote
     name_     = name + '.git'
     repo_dir  = "#{dir}/#{name_}"
-
-    sys = ->(args) { Misc.sys *args, verbose: verbose, noact: noact }
-
+    sys       = -> args { Misc.sys *args, verbose: verbose, noact: noact }
     FileUtils.mkdir_p dir
-
     if Misc.exists? repo_dir
       puts "$ cd #{repo_dir}" if verbose or noact
       FileUtils.cd(repo_dir) do
@@ -52,79 +58,82 @@ module GitBak
 
   # --
 
-  # check auth; ask passwords
-  def self.process_config (config)                              # {{{1
-    config_ = Misc.deepdup config
-
-    config_[:repos].each do |service, cfgs|
-      auth = config_[:auth][service] ||= {}
-      cfgs.each do |cfg|
-        user = cfg[:auth]
-        auth[user] = { user: user, pass: nil } if user && !auth[user]
+  # get data from API, optionally w/ auth
+  # @raise AuthError on 401
+  def self.api_get(url, opts, info, auth, f)                    # {{{1
+    g = f || -> x { x }
+    o = auth ? { http_basic_authentication:
+                   [auth[:user],auth[:pass]] } : {}
+    begin
+      g[open url, o.merge(opts || {})]
+    rescue OpenURI::HTTPError => e
+      if e.io.status[0] == '401'
+        raise AuthError, "401 for #{auth[:user]} #{info}"
+      else
+        raise
       end
     end
+  end                                                           # }}}1
 
-    config_[:auth].each do |service, auth|
-      next if GitBak::Services::USE_AUTH[service]
-      auth.each_value do |x|
-        p = "#{service} password for #{x[:user]}: "
-        x[:pass] ||= Misc.prompt p, true                        # TODO
-      end
-    end
+  # get paginated data from API
+  def self.paginate(url, opts, info, auth, f, pag, join)
+    pages = []; g = -> { api_get url, opts, info, auth, f }
+    while url; pages << data = g[]; url = pag[data]; end
+    join[pages]
+  end
 
-    [config_[:auth], config_[:repos]]
-  end                                                           # }}}1
+  # concatenate json
+  def self.cat_json(pages)
+    pages.map { |x| JSON.load x } .flatten 1
+  end
+
+  # --
 
-  # fetch repository lists; optionally verbose
-  def self.fetch (verbose, auth, repos)                         # {{{1
-    repos.map do |service, cfgs|
-      au = auth[Services::USE_AUTH.fetch service, service]
-      cfgs.map do |cfg|
-        puts "listing #{service}/#{cfg[:user]} ..." if verbose
+  # show info about mirroring
+  def self.show_mirror(*args)
+    puts "==> #{args*' | '} <=="
+  end
 
-        begin
-          rs = Services.repositories service, cfg, au[cfg[:auth]]
-        rescue Services::AuthError => e
-          Misc.die! "authentication failure: #{e}"
-        end
+  # show info about number of repos
+  def self.show_summary(info, n)
+    printf "  %3d | %s\n", n, info
+  end
 
-        [service, cfg[:user], cfg[:dir], rs]
-      end
-    end .flatten 1
-  end                                                           # }}}1
+  # --
 
-  # mirror repositories; optionally verbose
-  def self.mirror (verbose, noact, repos)                       # {{{1
-    repos.each do |s, usr, dir, rs|
-      rs.each do |r|
-        name, desc = r[:name], r[:description]
-        puts "==> #{s} | #{usr} | #{name} | #{desc} <==" if verbose
-        mirror_repo verbose, noact, r[:remote], dir
-        puts if verbose
-      end
+  # configure
+  def self.configure(file)                                      # {{{1
+    c = {}; x = Object.new
+    x.instance_eval { def self._binding; binding; end }
+    SERVICES.each_pair do |k,v|
+      x.define_singleton_method(k) { |*a| v.configure c, *a }
     end
+    x._binding.eval File.read(file), file; c
   end                                                           # }}}1
 
-  # print summary
-  def self.summary (repos)                                      # {{{1
-    puts '', '=== Summary ===', ''
-    repos.each do |service, usr, dir, rs|
-      printf "  %-15s for %-20s: %10s repositories\n",
-        service, usr, rs.length
+  # run!
+  def self.main(verbose, noact, config)                         # {{{1
+    SERVICES.each_pair do |k,v|
+      begin
+        v.fetch config, verbose
+      rescue AuthError => e
+        Misc.die! "authentication failure: #{e}"
+      end
     end
     puts
+    SERVICES.each_pair do |k,v|
+      v.mirror config, verbose, noact
+    end
+    puts
+    if verbose
+      puts '=== Summary ==='; puts
+      SERVICES.each_pair do |k,v|
+        v.summarise config
+      end
+      puts
+    end
   end                                                           # }}}1
 
-  # --
-
-  # run!
-  def self.main (verbose, noact, config)
-    auth, repos   = process_config config
-    repositories  = fetch verbose, auth, repos
-    mirror verbose, noact, repositories
-    summary repositories if verbose
-  end
-
 end
 
 # vim: set tw=70 sw=2 sts=2 et fdm=marker :

data/lib/gitbak/exec.rb

@@ -2,15 +2,17 @@
 #
 # File        : gitbak/exec.rb
 # Maintainer  : Felix C. Stegerman <flx@obfusk.net>
-# Date        : 2013-01-03
+# Date        : 2014-02-19
 #
-# Copyright   : Copyright (C) 2013  Felix C. Stegerman
-# Licence     : GPLv2
+# Copyright   : Copyright (C) 2014  Felix C. Stegerman
+# Licence     : GPLv3+
 #
 # --                                                            ; }}}1
 
 require 'gitbak'
-require 'gitbak/config'
+require 'gitbak/misc'
+require 'gitbak/services'
+require 'gitbak/version'
 
 require 'optparse'
 
@@ -31,63 +33,50 @@ module GitBak
     # --
 
     # parse command line options; die on failure
-    def self.parse_options (args)                               # {{{1
+    def self.parse_options(args)                                # {{{1
       args_   = args.dup
       options = { cfgfile: "#{Dir.home}/.gitbak", verbose: false,
                   noact: false }
-
-      op = OptionParser.new do |opts|                           # {{{2
+      op = OptionParser.new do |opts|
         opts.banner = USAGE
-
         opts.on('-c', '--config-file FILE',
                 'Configuration file') do |x|
           options[:cfgfile] = x
         end
-
         opts.on('-v', '--[no-]verbose', 'Run verbosely') do |x|
           options[:verbose] = x
         end
-
         opts.on('-n', '--no-act', 'List w/o mirroring') do |x|
           options[:noact] = !x
         end
-
         opts.on_tail('-h', '--help', 'Show this message') do
-          puts INFO, '', opts
-          exit
+          puts INFO, '', opts; exit
         end
-
         opts.on_tail('--version', 'Show version') do
-          puts "gitbak v#{GitBak::VERSION}"
-          exit
+          puts "gitbak v#{GitBak::VERSION}"; exit
         end
-      end                                                       # }}}2
-
+      end
       begin
         op.parse! args_
       rescue OptionParser::ParseError => e
         GitBak::Misc.die! "#{e}\n\n#{op}"
       end
-
       GitBak::Misc.die! "usage: #{USAGE}" unless args_.length == 0
-
       options
     end                                                         # }}}1
 
     # parse configuration file; die on failure
-    def self.parse_cfgfile (file)
+    def self.configure(file)
       GitBak::Misc.die! "configuration file (#{file}) not found" \
         unless GitBak::Misc.exists? file
-
-      GitBak::Config.load file
+      GitBak.configure file
     end
 
     # run!
-    def self.main (args = nil)
-      options = parse_options (args or ARGV)
-      cfg     = parse_cfgfile options[:cfgfile]
-
-      GitBak.main options[:verbose], options[:noact], cfg.data
+    def self.main(args = nil)
+      options = parse_options(args || ARGV)
+      cfg     = configure options[:cfgfile]
+      GitBak.main options[:verbose], options[:noact], cfg
     end
 
   end

data/lib/gitbak/misc.rb

@@ -2,10 +2,10 @@
 #
 # File        : gitbak/misc.rb
 # Maintainer  : Felix C. Stegerman <flx@obfusk.net>
-# Date        : 2013-01-03
+# Date        : 2014-02-19
 #
-# Copyright   : Copyright (C) 2013  Felix C. Stegerman
-# Licence     : GPLv2
+# Copyright   : Copyright (C) 2014  Felix C. Stegerman
+# Licence     : GPLv3+
 #
 # --                                                            ; }}}1
 
@@ -27,36 +27,22 @@ module GitBak
 
     # --
 
-    # deep copy using Marshal
-    def self.deepdup (obj)
-      Marshal.load(Marshal.dump obj)
-    end
-
     # print msg to stderr and exit
     def self.die! (msg)
-      STDERR.puts msg
-      exit 1
+      STDERR.puts msg; exit 1
     end
 
     # does file/dir or symlink exists?
     def self.exists? (path)
-      File.exists?(path) or File.symlink?(path)
+      File.exists?(path) || File.symlink?(path)
     end
 
     # prompt for line; optionally hide input
-    def self.prompt (prompt, hide = false)                      # {{{1
-      STDOUT.print prompt
-      STDOUT.flush
-
-      if hide
-        line = STDIN.noecho { |i| i.gets }
-        STDOUT.puts
-      else
-        line = STDIN.gets
-      end
-
-      line and line.chomp
-    end                                                         # }}}1
+    def self.prompt (prompt, hide = false)
+      STDOUT.print prompt; STDOUT.flush
+      (line = hide ? STDIN.noecho { |i| i.gets } .tap { STDOUT.puts }
+                   : STDIN.gets) && line.chomp
+    end
 
     # execute command
     # @raise SysError on failure
@@ -69,10 +55,8 @@ module GitBak
     # @see sys_
     def self.sys (cmd, *args)                                   # {{{1
       opts = Hash === args.last ? args.pop : {}
-
       puts "$ #{ ([cmd] + args).join ' ' }" \
         if opts[:verbose] or opts[:noact]
-
       if opts[:noact]
         puts '(not actually doing anything)'
       else

data/lib/gitbak/services.rb

@@ -2,156 +2,15 @@
 #
 # File        : gitbak/services.rb
 # Maintainer  : Felix C. Stegerman <flx@obfusk.net>
-# Date        : 2013-04-21
+# Date        : 2014-02-19
 #
-# Copyright   : Copyright (C) 2013  Felix C. Stegerman
-# Licence     : GPLv2
+# Copyright   : Copyright (C) 2014  Felix C. Stegerman
+# Licence     : GPLv3+
 #
 # --                                                            ; }}}1
 
-require 'gitbak/misc'
-
-require 'json'
-require 'open-uri'
-
-# --
-
-# gitbak namespace
-module GitBak
-
-  # git hosting services
-  module Services
-
-    # authentication error
-    class AuthError < GitBak::Error; end
-
-    # --
-
-    # avaliable services
-    SERVICES = %w{ bitbucket github gist }.map(&:to_sym)
-
-    # use another service's authentication
-    USE_AUTH = { gist: :github }
-
-    # API urls
-    APIS = {
-      bitbucket:  ->(user) { "api.bitbucket.org/1.0/users/#{user}"  },
-      github:     ->(user) { "api.github.com/users/#{user}/repos"   },
-      gist:       ->(user) { "api.github.com/users/#{user}/gists"   },
-    }
-
-    # github pagination
-    GH_PAGES = ->(data; l, n, r) {
-      (l = data.meta['link']) &&
-      (n = l.split(',').grep(/rel="next"/).first) &&
-      (r = l.match(%r{<(https://[^>]*)>})) && r[1]
-    }
-
-    # pagination
-    PAGES = { github: GH_PAGES, gist: GH_PAGES }
-
-    # JSON pages concat
-    JCAT = ->(pages) { pages.map { |x| JSON.load x } .flatten 1 }
-
-    # remote urls
-    REMOTES =                                                   # {{{1
-    {
-      bitbucket: {
-        ssh:    ->(u, r)  { "git@bitbucket.org:#{u}/#{r}.git"     },
-        https:  ->(u, r)  { "https://bitbucket.org/#{u}/#{r}.git" },
-      },
-      github: {
-        ssh:    ->(u, r)  { "git@github.com:#{u}/#{r}.git"        },
-        https:  ->(u, r)  { "https://github.com/#{u}/#{r}.git"    },
-      },
-      gist: {
-        ssh:    ->(id)    { "git@gist.github.com:#{id}.git"       },
-        https:  ->(id)    { "https://gist.github.com/#{id}.git"   },
-      },
-    }                                                           # }}}1
-
-    # long keyword^wsymbol ;-)
-    AUTH = :http_basic_authentication
-
-    # --
-
-    # get data from API
-    # @raise AuthError on 401
-    def self.api_get_ (url, auth, service, user)                # {{{1
-      opts = auth ? { AUTH => [auth[:user], auth[:pass]] } : {}
-
-      begin
-        data = open url, opts
-      rescue OpenURI::HTTPError => e
-        if e.io.status[0] == '401'
-          raise AuthError,
-            "401 for #{auth[:user]} on #{service}/#{user}"
-        else
-          raise
-        end
-      end
-
-      data
-    end                                                         # }}}1
-
-    # paginate
-    def self.paginate (pag, url, &b)
-      pages = []
-      while url; pages << data = b[url]; url = pag[data]; end
-      pages
-    end
-
-    # get data from API (w/ pagination if necessary); see api_get_
-    # @return [String]
-    # @return [<String>] if paginated
-    def self.api_get (service, user, auth)
-      get = ->(u) { api_get_ u, auth, service, user }
-      url = "https://#{APIS[service][user]}"
-      pag = PAGES[service]
-      pag ? paginate(pag, url) { |u| get[u] } : get[url]
-    end
-
-    # get repositories from service; uses api_get if service in APIS,
-    # api_get_<service> otherwise
-    #
-    # @return [<Hash>] [!{name:, remote:, description:},...]
-    def self.repositories (service, cfg, auth)
-      rem   = REMOTES[service][cfg.fetch(:method, :ssh).to_sym]
-      args  = [service, cfg[:user], auth]
-      data  = APIS[service] ? api_get(*args) :
-                send("api_get_#{service}", *args)
-      send service, cfg, data, rem
-    end
-
-    # --
-
-    # turn bitbucket API data into a list of repositories
-    def self.bitbucket (cfg, data, rem)
-      data_ = JSON.load data
-      repos = data_['repositories'].select { |r| r['scm'] == 'git' }
-      repos.map do |r|
-        { name: r['name'], remote: rem[cfg[:user], r['name']],
-          description: r['description'] }
-      end
-    end
-
-    # turn github API data into a list of repositories
-    def self.github (cfg, data, rem)
-      JCAT[data].map do |r|
-        { name: r['name'], remote: rem[cfg[:user], r['name']],
-          description: r['description'] }
-      end
-    end
-
-    # turn gist API data into a list of repositories
-    def self.gist (cfg, data, rem)
-      JCAT[data].map do |r|
-        { name: r['id'], remote: rem[r['id']],
-          description: r['description'] }
-      end
-    end
-
- end
-end
+require 'gitbak/services/bitbucket'
+require 'gitbak/services/gist'
+require 'gitbak/services/github'
 
 # vim: set tw=70 sw=2 sts=2 et fdm=marker :

data/lib/gitbak/services/bitbucket.rb

@@ -0,0 +1,85 @@
+# --                                                            ; {{{1
+#
+# File        : gitbak/services/bitbucket.rb
+# Maintainer  : Felix C. Stegerman <flx@obfusk.net>
+# Date        : 2014-02-19
+#
+# Copyright   : Copyright (C) 2014  Felix C. Stegerman
+# Licence     : GPLv3+
+#
+# --                                                            ; }}}1
+
+require 'gitbak'
+
+module GitBak::Services
+
+  module Bitbucket
+
+    API     = -> user { "https://bitbucket.org/api/2.0/repositories/#{user}" }
+    SSH     = -> user, repo { "git@bitbucket.org:#{user}/#{repo}.git"      }
+    HTTPS   = -> user, repo { "https://bitbucket.org/#{user}/#{repo}.git"  }
+
+    def self.to_json(data)
+      JSON.load data
+    end
+
+    def self.next_page(data)
+      data['next']
+    end
+
+    def self.cat_json_values(pages)
+      pages.map { |x| x['values'] } .flatten(1) .sort_by { |x| x['name'] }
+    end
+
+    def self.configure(cfg, dir, opts = {})                     # {{{1
+      u = opts[:user] or raise 'no user'                        # TODO
+      c = cfg[:bitbucket] ||= []
+      a = if opts[:auth] == false
+        nil
+      else
+        p = GitBak::Misc.prompt "password for bitbucket/#{u}: ", true
+        { user: u, pass: p }
+      end
+      c << { dir: dir, user: u, auth: a, method: opts[:method] }
+    end                                                         # }}}1
+
+    def self.fetch(cfg, verbose)                                # {{{1
+      f     = method :to_json; pag = method :next_page
+      join  = method :cat_json_values
+      (cfg[:bitbucket] || []).each do |x|
+        meth = x[:method] == :https ? HTTPS : SSH
+        info = "bitbucket/#{x[:user]}"
+        print "fetching #{info} ..." if verbose
+        repos = GitBak.paginate API[x[:user]], nil, info, x[:auth], f,
+          pag, join
+        x[:repos] = repos.select { |r| r['scm'] == 'git' } .map do |r|
+          { name: r['name'], remote: meth[x[:user], r['name']],
+            description: r['description'] }
+        end
+        puts " #{repos.length} repositories" if verbose
+      end
+    end                                                         # }}}1
+
+    def self.mirror(cfg, verbose, noact)                        # {{{1
+      (cfg[:bitbucket] || []).each do |x|
+        x[:repos].each do |r|
+          GitBak.show_mirror 'bitbucket', x[:user], r[:name], r[:description]
+          GitBak.mirror_repo verbose, noact, r[:remote], x[:dir]
+          puts if verbose
+        end
+      end
+    end                                                         # }}}1
+
+    def self.summarise(cfg)
+      (cfg[:bitbucket] || []).each do |x|
+        GitBak.show_summary "bitbucket/#{x[:user]}", x[:repos].length
+      end
+    end
+
+  end
+
+  GitBak::SERVICES[:bitbucket] = Bitbucket
+
+end
+
+# vim: set tw=70 sw=2 sts=2 et fdm=marker :

data/lib/gitbak/services/gist.rb

@@ -0,0 +1,80 @@
+# --                                                            ; {{{1
+#
+# File        : gitbak/services/gist.rb
+# Maintainer  : Felix C. Stegerman <flx@obfusk.net>
+# Date        : 2014-02-19
+#
+# Copyright   : Copyright (C) 2014  Felix C. Stegerman
+# Licence     : GPLv3+
+#
+# --                                                            ; }}}1
+
+require 'gitbak'
+require 'gitbak/services/github'
+
+module GitBak::Services
+
+  module Gist
+
+    API     = 'https://api.github.com/gists'
+    SSH     = -> id { "git@gist.github.com:#{id}.git"     }
+    HTTPS   = -> id { "https://gist.github.com/#{id}.git" }
+
+    HEADERS = GitHub::HEADERS
+
+    def self.configure(cfg, dir, opts = {})                     # {{{1
+      u = opts[:user] or raise 'no user'                        # TODO
+      c = cfg[:gist] ||= []
+      a = if opts[:auth] == false
+        nil
+      elsif opts[:auth] == :github
+        (cfg[:github].find { |x| x[:user] == u })[:auth]
+      elsif opts[:token]
+        t = GitBak::Misc.prompt "token for gist/#{u}: ", true
+        { user: t, pass: '' }
+      else
+        p = GitBak::Misc.prompt "password for gist/#{u}: ", true
+        { user: u, pass: p }
+      end
+      c << { dir: dir, user: u, auth: a, method: opts[:method] }
+    end                                                         # }}}1
+
+    def self.fetch(cfg, verbose)                                # {{{1
+      pag = GitHub.method :next_page; join = GitBak.method :cat_json
+      (cfg[:gist] || []).each do |x|
+        meth = x[:method] == :https ? HTTPS : SSH
+        info = "gist/#{x[:user]}"
+        print "fetching #{info} ..." if verbose
+        repos = GitBak.paginate API, HEADERS, info, x[:auth], nil,
+          pag, join
+        x[:repos] = repos.map do |r|
+          { name: r['id'], remote: meth[r['id']],
+            description: r['description'] }
+        end
+        puts " #{repos.length} repositories" if verbose
+      end
+    end                                                         # }}}1
+
+    def self.mirror(cfg, verbose, noact)                        # {{{1
+      (cfg[:gist] || []).each do |x|
+        x[:repos].each do |r|
+          GitBak.show_mirror 'gist', x[:user], r[:name], r[:description]
+          GitBak.mirror_repo verbose, noact, r[:remote], x[:dir]
+          puts if verbose
+        end
+      end
+    end                                                         # }}}1
+
+    def self.summarise(cfg)
+      (cfg[:gist] || []).each do |x|
+        GitBak.show_summary "gist/#{x[:user]}", x[:repos].length
+      end
+    end
+
+  end
+
+  GitBak::SERVICES[:gist] = Gist
+
+end
+
+# vim: set tw=70 sw=2 sts=2 et fdm=marker :

data/lib/gitbak/services/github.rb

@@ -0,0 +1,83 @@
+# --                                                            ; {{{1
+#
+# File        : gitbak/services/github.rb
+# Maintainer  : Felix C. Stegerman <flx@obfusk.net>
+# Date        : 2014-02-19
+#
+# Copyright   : Copyright (C) 2014  Felix C. Stegerman
+# Licence     : GPLv3+
+#
+# --                                                            ; }}}1
+
+require 'gitbak'
+
+module GitBak::Services
+
+  module GitHub
+
+    API     = 'https://api.github.com/user/repos?type=owner'
+    SSH     = -> user, repo { "git@github.com:#{user}/#{repo}.git"      }
+    HTTPS   = -> user, repo { "https://github.com/#{user}/#{repo}.git"  }
+
+    HEADERS = { 'Accept' => 'application/vnd.github.v3+json' }
+
+    def self.next_page(data)
+      (l = data.meta['link']) &&
+      (n = l.split(',').grep(/rel="next"/).first) &&
+      (r = l.match(%r{<(https://[^>]*)>})) && r[1]
+    end
+
+    def self.configure(cfg, dir, opts = {})                     # {{{1
+      u = opts[:user] or raise 'no user'                        # TODO
+      c = cfg[:github] ||= []
+      a = if opts[:auth] == false
+        nil
+      elsif opts[:token]
+        t = GitBak::Misc.prompt "token for github/#{u}: ", true
+        { user: t, pass: '' }
+      else
+        p = GitBak::Misc.prompt "password for github/#{u}: ", true
+        { user: u, pass: p }
+      end
+      c << { dir: dir, user: u, auth: a, method: opts[:method] }
+    end                                                         # }}}1
+
+    def self.fetch(cfg, verbose)                                # {{{1
+      pag = method :next_page; join = GitBak.method :cat_json
+      (cfg[:github] || []).each do |x|
+        meth = x[:method] == :https ? HTTPS : SSH
+        info = "github/#{x[:user]}"
+        print "fetching #{info} ..." if verbose
+        repos = GitBak.paginate API, HEADERS, info, x[:auth], nil,
+          pag, join
+        x[:repos] = repos.map do |r|
+          { name: r['name'], remote: meth[x[:user], r['name']],
+            description: r['description'] }
+        end
+        puts " #{repos.length} repositories" if verbose
+      end
+    end                                                         # }}}1
+
+    def self.mirror(cfg, verbose, noact)                        # {{{1
+      (cfg[:github] || []).each do |x|
+        x[:repos].each do |r|
+          GitBak.show_mirror 'github', x[:user], r[:name], r[:description]
+          GitBak.mirror_repo verbose, noact, r[:remote], x[:dir]
+          puts if verbose
+        end
+      end
+    end                                                         # }}}1
+
+    def self.summarise(cfg)
+      (cfg[:github] || []).each do |x|
+        GitBak.show_summary "github/#{x[:user]}", x[:repos].length
+      end
+    end
+
+  end
+
+  GitBak::SERVICES[:github] = GitHub
+
+end
+
+# vim: set tw=70 sw=2 sts=2 et fdm=marker :

data/lib/gitbak/version.rb

@@ -1,7 +1,7 @@
 module GitBak
   # version and ...
-  VERSION = '0.4.3'
+  VERSION = '0.5.0'
 
   # ... date (for gemspec) ;-)
-  DATE = '2013-04-21'
+  DATE = '2014-02-19'
 end

metadata

@@ -1,44 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: gitbak
 version: !ruby/object:Gem::Version
-  version: 0.4.3
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Felix C. Stegerman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-21 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &17607720 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *17607720
-description: ! 'GitBak mirrors Bitbucket/GitHub/Gist repositories; paths, users,
-
+date: 2014-02-19 00:00:00.000000000 Z
+dependencies: []
+description: |
+  GitBak mirrors Bitbucket/GitHub/Gist repositories; paths, users,
   and authentication are specified in ~/.gitbak.
 
-
   When run, gitbak:
 
-
-  * asks for unspecified passwords;
-
+  * asks for passwords;
   * lists repositories using APIs - authenticating if necessary;
-
   * clones/updates repositories;
-
   * shows a summary (if verbose)
-
-'
 email:
 - flx@obfusk.net
 executables:
@@ -46,41 +27,40 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .yardopts
+- ".yardopts"
 - README.md
-- bin/gitbak
 - gitbak.gemspec
-- lib/gitbak.rb
-- lib/gitbak/version.rb
 - lib/gitbak/misc.rb
-- lib/gitbak/eval.rb
-- lib/gitbak/config.rb
+- lib/gitbak/services/bitbucket.rb
+- lib/gitbak/services/gist.rb
+- lib/gitbak/services/github.rb
 - lib/gitbak/services.rb
+- lib/gitbak/version.rb
 - lib/gitbak/exec.rb
+- lib/gitbak.rb
+- bin/gitbak
 homepage: https://github.com/obfusk/gitbak
 licenses:
-- GPLv2
+- GPLv3+
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: bitbucket/github/gist backup
 test_files: []
-has_rdoc: 

data/lib/gitbak/config.rb

@@ -1,112 +0,0 @@
-# --                                                            ; {{{1
-#
-# File        : gitbak/config.rb
-# Maintainer  : Felix C. Stegerman <flx@obfusk.net>
-# Date        : 2013-01-03
-#
-# Copyright   : Copyright (C) 2013  Felix C. Stegerman
-# Licence     : GPLv2
-#
-# --                                                            ; }}}1
-
-require 'gitbak/eval'
-require 'gitbak/misc'
-require 'gitbak/services'
-
-# --
-
-# gitbak namespace
-module GitBak
-
-  # configuration
-  module Config                                                 # {{{1
-
-    # configuration error
-    class ConfigError < GitBak::Error; end
-
-    # --
-
-    # configuration base class
-    class ServiceCfg                                            # {{{2
-      # data
-      attr_reader :_data
-
-      # init
-      def initialize
-        @_data = {}
-      end
-
-      # pass on to _service or super
-      def method_missing (meth, *args, &block)
-        if GitBak::Services::SERVICES.include? meth
-          _service meth, *args
-        else
-          super
-        end
-      end
-    end                                                         # }}}2
-
-    # authentication configuration
-    class AuthCfg < ServiceCfg                                  # {{{2
-      # set service auth
-      def _service (name, user, pass = nil)
-        (@_data[name] ||= {})[user] = { user: user, pass: pass }
-      end
-    end                                                         # }}}2
-
-    # repository configuration
-    class ReposCfg < ServiceCfg                                 # {{{2
-      # set service repo
-      def _service (name, dir, user, opts = {})
-        c = opts.merge dir: dir, user: user
-        c[:auth] = c[:user] if c[:auth] == true
-        (@_data[name] ||= []) << c
-      end
-    end                                                         # }}}2
-
-    # authentication and repository configuration
-    class Cfg                                                   # {{{2
-      # data
-      attr_reader :auth, :repos
-
-      # init
-      def initialize
-        @auth   = AuthCfg.new
-        @repos  = ReposCfg.new
-      end
-
-      # get data
-      def data                                                  # {{{3
-        auth  = @auth._data
-        repos = @repos._data
-
-        { auth: auth, repos: repos }
-      end                                                       # }}}3
-    end                                                         # }}}2
-
-    # --
-
-    # load configuration file
-    # @raise ConfigError unless file returns Cfg
-    def self.load (file)                                        # {{{2
-      cfg = eval File.read(file), GitBak::Eval.new.binding, file # ???
-
-      raise ConfigError,  "[#{file}] isn't a GitBak::Config::Cfg " \
-                          "(#{cfg.class} instead)." \
-        unless Cfg === cfg
-
-      cfg
-    end                                                         # }}}2
-
-  end                                                           # }}}1
-
-  # configure
-  def self.configure (&block)
-    cfg = Config::Cfg.new
-    block[cfg.auth, cfg.repos]
-    cfg
-  end
-
-end
-
-# vim: set tw=70 sw=2 sts=2 et fdm=marker :

data/lib/gitbak/eval.rb

@@ -1,6 +0,0 @@
-module GitBak
-  # evaluation wrapper
-  class Eval
-    public :binding
-  end
-end