dotstrap 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0ccd6c31b5b1e94988783114e9913c1a407354f
-  data.tar.gz: 6b7703c9ac39592e8f334160e8d523d387c248de
+  metadata.gz: 06b5a3debbd877e85d7b1c418dd75cb7e0a29f30
+  data.tar.gz: 0b0fd86545433c553c8be7e9c7cec3f68f530d3e
 SHA512:
-  metadata.gz: 6b9890ddd3308ea41aceab5b77c08de8a29df6b0e597c4ac37a6dab8e9c1515401391c5e9e1af866c25939fba15edd8bafcdb7251ba37c1d443c156028e45f67
-  data.tar.gz: 0621d62ce0124555940e435aa5bf59f1e0f0665ab6d39e5107a8508478d39cafd5a77580266147fc38dd21b103dc6b041d14b29e1ccc1f5bb9eeed3b59c6d736
+  metadata.gz: 95cccf83f393fe078fa1b6c219f4f5ef233bf28be19283eda275a4cff9ecb668e84cea290fdaa3f6933df1b3e350edf39ede3223964d573f53155946b8e433cd
+  data.tar.gz: 022ddb81f1a5b47d8c354c9fae1e0ff4ec15419e4a86974cf0883ba6980d0ee83f4270438dbf514398ff067eeefd5d3754ac81094f0af74926d18f17039df39e

data/bin/dotstrap

@@ -72,24 +72,14 @@ module Dotstrap
            Download all the repositories listed in the file ~/.config/repos.txt
       \x5    $ ds install ~/.config/repos.txt
     LONGDESC
+    option :no_fetch, :type => :boolean
     def install(repo, *args)
       args << repo # so thor will not complain when you call `install` with no args
-      repos = []
-      args.each do |repo|
-        if File.exist?(repo)
-          File.open(repo).each do |line|
-            # FIXME: strip everything afer '#' until newline (repo # comment)
-            repos << line.strip unless line.start_with?('#')
-          end
-        else
-          repos << repo
-        end
-      end
-      repos = repos.reject(&:empty?)
-
+      repos = __determine_repos(args)
       __set_log_level
       $LOG.debug { "REPO ARGS:#{repos}" }
-      Dotstrap::Configuration.new(repos).configure
+      ds = Dotstrap::Configuration.new(repos)
+      options[:no_fetch] ? ds.configure : ds.install
     end
 
     desc 'uninstall REPO...', 'Remove specified REPO'
@@ -101,18 +91,7 @@ module Dotstrap
     LONGDESC
     def uninstall(repo, *args)
       args << repo # so thor will complain when you call `uninstall` with no args
-      repos = []
-      args.each do |repo|
-        if File.exist?(repo)
-          File.open(repo).each do |line|
-            args << line.strip unless line.start_with?('#')
-          end
-        else
-          repos << repo
-        end
-      end
-      repos = repos.reject(&:empty?)
-
+      repos = __determine_repos(args)
       __set_log_level
       $LOG.debug { "REPO ARGS:#{repos}" }
       Dotstrap::Configuration.new(repos).remove
@@ -128,30 +107,33 @@ module Dotstrap
       #{__repo_format_desc}
     LONGDESC
     def list(*args)
-      repos = []
       if args.empty?
         Dotstrap::Configuration.new(Dotstrap.installed_repos).list
         return
       end
+      repos = __determine_repos(args)
+      __set_log_level
+      $LOG.debug { "REPO ARGS:#{repos}" }
+      Dotstrap::Configuration.new(repos).list
+    end
+
+    private
 
-      args.each do |repo|
+    def __determine_repos(cli_args)
+      repos = []
+      cli_args.each do |repo|
         if File.exist?(repo)
           File.open(repo).each do |line|
-            args << line.strip unless line.start_with?('#')
+            # FIXME: strip everything afer '#' until newline (repo # comment)
+            repos << line.strip unless line.start_with?('#')
           end
         else
           repos << repo
         end
       end
       repos = repos.reject(&:empty?)
-
-      __set_log_level
-      $LOG.debug { "REPO ARGS:#{repos}" }
-      Dotstrap::Configuration.new(repos).list
     end
 
-    private
-
     def __set_log_level(level = nil)
       # $LOG.close; return if options[:quiet]
       unless level

data/dotstrap.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: dotstrap 0.2.0 ruby lib
+# stub: dotstrap 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "dotstrap"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.metadata = { "documentation" => "http://www.rubydoc.info/github/mkwmms/dotstrap/master/Dotstrap", "source_code" => "http://github.com/mkwmms/dotstrap" } if s.respond_to? :metadata=

data/lib/dotstrap/git.rb

@@ -18,9 +18,7 @@ module Dotstrap
     # FIXME: if user is not logged in to Git the prompt for username/password
     # is mangled because the threads are not synchronized
     def clone(url = @url, repo_path = @repo_path, repo = @repo)
-      if Dir.exist?(repo_path)
-        return pull(repo_path)
-      end
+      return pull(repo_path) if Dir.exist?(repo_path)
       return false unless system('git', 'clone', *git_verbosity, url, repo_path)
       $LOG.debug { "CLONE #{repo} #{url} #{repo_path}" }
       $LOG.unknown { "#{'=> '.colorize(:blue)}#{repo}\nupdated" }

data/lib/dotstrap.rb

@@ -8,7 +8,7 @@ require_relative 'dotstrap/shell'
 module Dotstrap
   NAME        = 'dotstrap'
   EXE_NAME    = 'dotstrap'
-  VERSION     = '0.2.0'
+  VERSION     = '0.3.0'
   AUTHOR      = 'William Myers'
   HOMEPAGE    = 'http://github.com/mkwmms/dotstrap'
   SOURCE_URL  = 'http://github.com/mkwmms/dotstrap'
@@ -105,13 +105,8 @@ module Dotstrap
       FileUtils.mkdir_p(Dotstrap.config_home)
     end
 
-    def configure(dest_dir = Dotstrap.config_home, repos = @repos)
-      if Dotstrap.shell_name == 'fish'
-        fish_config_home = Dotstrap.shell_config_home('fish')
-        FileUtils.mkdir_p(File.join(fish_config_home, 'functions'))
-        FileUtils.mkdir_p(File.join(fish_config_home, 'completions'))
-      end
-
+    def install(dest_dir = Dotstrap.config_home, repos = @repos)
+      initialize_fish_dirs if Dotstrap.shell_name == 'fish'
       Parallel.map(repos, in_threads: 16) do |r|
         bundle = Dotstrap::Git.new(r, dest_dir)
         path = bundle.clone
@@ -120,6 +115,15 @@ module Dotstrap
       end
     end
 
+    def configure(dest_dir = Dotstrap.config_home, repos = @repos)
+      initialize_fish_dirs if Dotstrap.shell_name == 'fish'
+      Parallel.map(repos, in_threads: 16) do |r|
+        path = Dotstrap::Git.new(r, dest_dir).repo_path
+        puts path
+        load_configs([path]) if path
+      end
+    end
+
     def remove(repos = @repos)
       repos.each do |repo|
         bundle = Dotstrap::Git.new(repo)
@@ -144,9 +148,16 @@ module Dotstrap
 
     def load_configs(repo_path)
       repo_path.each do |r|
-        shell = Dotstrap::Shell.new(r)
-        shell.configure(repo_path)
+        Dotstrap::Shell.new(r).configure(repo_path)
       end
     end
+
+    private
+
+    def initialize_fish_dirs
+      fish_config_home = Dotstrap.shell_config_home('fish')
+      FileUtils.mkdir_p(File.join(fish_config_home, 'functions'))
+      FileUtils.mkdir_p(File.join(fish_config_home, 'completions'))
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotstrap
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - William Myers