spaarti 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42a2c8cb93c926b9c911da42d81fb138864905c1
-  data.tar.gz: 919a5542bd9ec0de3f7c1058b8bf9e2b63ccf50b
+  metadata.gz: 60f66d0c8df26290e5fd5b9db40167d6e757f25b
+  data.tar.gz: 0f0cd166dc2e6b01a04bb6ad080a5dec07f0e392
 SHA512:
-  metadata.gz: 6ce2e64fb7b01b27d98222d3a41959d3d610e6a44804ee9aff37c7a5434846e5653ad49dfb4f52743d22854eb9a3101ddd74b9c29af4e88a3f597056fb3cef7d
-  data.tar.gz: 6e0deddbc39abf6881c08d02bbbb0d15184f14a0cc2d5d2dd8c88c930268bcbfe001abecd62241156e1357253338918a8b21fe18ef070055a4b2231b25cf1efc
+  metadata.gz: 9daab0358cfc4e3daab536e1b7c90f2b7d633c29df5b470ded1bf158960c1a5258728a628dfe45e745376767355e889dd43e50cb1ebd85829230dac2b531e8a3
+  data.tar.gz: 519a19ddb18f4347f2513fb73fe020c38684c7bb86f20dac5dd7aa26064687da3b734e443b5d9202dfa44483f9d1da6f5572811fdda35e9382e3a976a9dc26b9

data/bin/spaarti

@@ -8,7 +8,7 @@ Mercenary.program(:spaarti) do |p|
   p.description 'Tool for managing local checkouts of git repos'
   p.syntax 'spaarti [options]'
 
-  p.option :config, '-c FILE', '--config FILE', 'Config file'
+  p.option :config_file, '-c FILE', '--config FILE', 'Config file'
   p.option :purge, '-p', '--purge', 'Remove orphaned repos'
   p.option :quiet, '-q', '--quiet', 'Silence standard output'
 

data/lib/spaarti/repo.rb

@@ -4,15 +4,15 @@ module Spaarti
   ##
   # Repo object, handles individual repo syncing and state
   class Repo
-    def initialize(data, client, params)
-      @raw = data
+    def initialize(data, client, params = {})
+      @data = data
       @client = client
-      @params = params
-      @path = @params[:format] % @raw
+      @options = params
+      @path = @options[:format] % @data
     end
 
     def sync!
-      return log("#{@raw[:full_name]} already cloned") if Dir.exist?(@path)
+      return log("#{@data[:full_name]} already cloned") if Dir.exist?(@path)
       clone
       Dir.chdir(@path) { config && add_upstream }
     end
@@ -24,7 +24,7 @@ module Spaarti
     private
 
     def log(msg)
-      puts msg unless @params[:quiet]
+      puts msg unless @options[:quiet]
     end
 
     def err(msg)
@@ -37,22 +37,22 @@ module Spaarti
     end
 
     def clone
-      log "Cloning #{@raw[:ssh_url]} to #{@path}"
+      log "Cloning #{@data[:ssh_url]} to #{@path}"
       run(
-        "git clone '#{@raw[:ssh_url]}' '#{@path}' &>/dev/null",
-        "Failed to clone #{@raw[:ssh_url]}"
+        "git clone '#{@data[:ssh_url]}' '#{@path}' &>/dev/null",
+        "Failed to clone #{@data[:ssh_url]}"
       )
     end
 
     def config
-      @params[:git_config].each do |k, v|
+      @options[:git_config].each do |k, v|
         run("git config '#{k}' '#{v}'", "Failed to set config for #{@path}")
       end
     end
 
     def add_upstream
-      return unless @raw[:fork]
-      upstream = @client.repo(@raw[:id]).source.git_url
+      return unless @data[:fork]
+      upstream = @client.repo(@data[:id]).source.git_url
       run(
         "git remote add upstream '#{upstream}'",
         "Failed to add upstrema for #{@path}"

data/lib/spaarti/site.rb

@@ -6,29 +6,31 @@ require 'pathname'
 ##
 # Main Spaarti code, defines defaults and Site object
 module Spaarti
-  DEFAULT_CONFIG_PATH = '~/.spaarti.yml'
-
-  DEFAULT_CONFIG = {
+  DEFAULT_OPTIONS = {
     base_path: './',
     auth_file: :default,
+    config_file: File.expand_path('~/.spaarti.yml'),
     exclude: [],
     format: '%{full_name}',
-    git_config: []
+    git_config: [],
+    quiet: false,
+    purge: false
   }
 
   ##
-  # Site object, represents a group of repos with a config
+  # Site object, represents a group of repos
   class Site
-    def initialize(options)
-      @options = options
-      if options[:config] && !File.exist?(options[:config])
-        fail 'Config file does not exist'
+    def initialize(params = {})
+      if params[:config_file]
+        params[:config_file] = File.expand_path params[:config_file]
+        fail 'Conf file does not exist' unless File.exist? params[:config_file]
       end
-      @options[:config] ||= DEFAULT_CONFIG_PATH
+      @options = DEFAULT_OPTIONS.dup.merge params
+      load_config
     end
 
     def sync!
-      Dir.chdir(config[:base_path]) do
+      Dir.chdir(@options[:base_path]) do
         repos.each(&:sync!)
         purge! if @options[:purge]
       end
@@ -44,17 +46,10 @@ module Spaarti
 
     private
 
-    def config
-      @config ||= build_config
-    end
-
-    def build_config
-      path = @options[:config]
-      config = DEFAULT_CONFIG.dup
-      return config unless File.exist?(path)
-      file = File.open(path) { |fh| YAML.load fh.read }
-      return nest if file.is_a? Array
-      config.merge! Cymbal.symbolize(file)
+    def load_config
+      return unless File.exist?(@options[:config_file])
+      config = File.open(@options[:config_file]) { |fh| YAML.load fh.read }
+      @options.merge! Cymbal.symbolize(config)
     end
 
     def client
@@ -68,7 +63,7 @@ module Spaarti
     def auth
       @auth ||= Octoauth.new(
         note: 'spaarti',
-        file: config[:auth_file],
+        file: @options[:auth_file],
         autosave: true
       )
     end
@@ -76,12 +71,12 @@ module Spaarti
     def repos
       @repos ||= client.repos.map do |data|
         next if excluded(data.name) || excluded(data.full_name)
-        Repo.new data.to_h, client, config.subset(:format, :git_config)
+        Repo.new data.to_h, client, @options.subset(:format, :git_config)
       end
     end
 
     def excluded(string)
-      config[:exclude].any? { |x| string.match(x) }
+      @options[:exclude].any? { |x| string.match(x) }
     end
   end
 end

data/lib/spaarti/version.rb

@@ -1,5 +1,5 @@
 ##
 # Set the version (needed for Mercenary -v)
 module Spaarti
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spaarti
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit