pro 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3db7f68df476b807f22c2d69fce741dbe6cb9940
-  data.tar.gz: 95a0ced81a2cf42b99bb91deb5d47b48895136eb
+  metadata.gz: bac7d8d2053e0da160ba6538267c02fac60d3296
+  data.tar.gz: 9612b95281dd1742e4b4cf9bcccacc62dd5cbfb4
 SHA512:
-  metadata.gz: 70eb07a63a67d9986b5a801b68d1e6ad64016e68d670efbc33d69981571cdd7a9bb8b74c574297e95761155bb44c4693cfbcd8b6e5e946a315c95e254d27a315
-  data.tar.gz: b9c79cb990b22445219cb8bc77b89eb5e9871f7a81b57d39305d302a483f1065d9b5d70b66b37909062ea158e851aff08020dc2c8ba0aa0f05de04868cbef5da
+  metadata.gz: 120a20d1a8fbafb8ee31313b1136ff41850c98dde9d29963e099773ca06e18e3dd527e3f92240c973514e771d3376f7cb6c7a8beea031ad0782567977ee8afc4
+  data.tar.gz: f4bf179ae60d60086ad5c5a66d0fc75d9b46f3228a704dd86780d351c5fe88168b06d17f97adf3cf85a42bc389cb8491a1068535bdc9f7b310e2622ef6a29ec6

data/lib/pro/commands.rb

@@ -2,6 +2,7 @@ require "pro/index"
 require "find"
 require "fuzzy_match"
 require "colored"
+require "open3"
 
 SHELL_FUNCTION = <<END
 
@@ -40,7 +41,7 @@ module Pro
 
     # Fuzzy search for a git repository by name
     # Returns the full path to the repository.
-    # 
+    #
     # If name is nil return the pro base.
     def find_repo(name)
       return @index.base_dirs.first unless name
@@ -56,9 +57,14 @@ module Pro
       end
       @index.each do |r|
         Dir.chdir(r.path)
-        result = `#{command}`
-        puts "#{r.name}:".bold.red
-        puts result
+        stdin, result, wait_thr = Open3.popen2e(command)
+        if wait_thr.value == 0
+          puts "#{r.name}:".bold.green
+        else
+          puts "#{r.name}:".bold.red
+        end
+        puts result.read
+        [stdin, result].map &:close
       end
     end
 

data/lib/pro/indexer.rb

@@ -104,12 +104,20 @@ module Pro
 
     def index_repos_fast(base)
       Dir.chdir(base)
-      res = `find . -name .git`
-      # turn the output into a list of repos
+      git_paths = `find . -name .git`.lines
+      # additionally, index repos symlinked directly from a base root
+      dirs     = `find -L . -maxdepth 1 -type d`.lines
+      symlinks = `find    . -maxdepth 1 -type l`.lines
+      # intersect those two results
+      dir_sl = dirs & symlinks
+      dir_sl_git_paths = dir_sl.
+        map {|path| path.chomp + '/.git'}.
+        select {|path| File.exists?(path)}
+      # turn the command outputs into a list of repos
       repos = []
-      res.each_line do |line|
-        next if line.empty?
-        git_path = File.expand_path(line.chomp)
+      (git_paths + dir_sl_git_paths).each do |git_path|
+        next if git_path.empty?
+        git_path = File.expand_path(git_path.chomp)
         path = File.dirname(git_path)
         repo_name = File.basename(path)
         repos << Repo.new(repo_name,path)
@@ -122,8 +130,14 @@ module Pro
       STDERR.puts "WARNING: pro is indexing slowly, please install the 'find' command."
       repos = []
       Find.find(base) do |path|
+        target = path
+        # additionally, index repos symlinked directly from a base root
+        if FileTest.symlink?(path)
+          next if File.dirname(path) != base
+          target = File.readlink(path)
+        end
         # dir must exist and be a git repo
-        if FileTest.directory?(path) && File.exists?(path+"/.git")
+        if FileTest.directory?(target) && File.exists?(path+"/.git")
           base_name = File.basename(path)
           repos << Repo.new(base_name,path)
           Find.prune

data/lib/pro/version.rb

@@ -1,3 +1,3 @@
 module Pro
-  VERSION = "1.1.5"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pro
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Tristan Hume
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fuzzy_match