pro 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88c563fe2053d87fa48f4e6cee7c524cb76fae67
-  data.tar.gz: e2870e0364138adfdbffa9a3d459560260485b93
+  metadata.gz: 07227b6c46ae38f06d1f71d88f7af991c8529961
+  data.tar.gz: 4f47220c46cada7a220f9d697c27cd93c2f4ef3d
 SHA512:
-  metadata.gz: a75815fa9f72220d7db560c20af9ec19611a4899c272e71825af478e078fff17e6bc608a8ac8abd88ad57b238938bd3bcab84699b3bc69646f9bb4b11d13f729
-  data.tar.gz: e57aec62751ac749b813bb12cb4b8c047f0bbc04e3d1882e1ab0062430da7be32a0c3f78b1aa136fa007b3f5e90f152a53dbe2be9cf412c1c007e74c588e13af
+  metadata.gz: 4bf92b9b967ce02ec82c2423dcc2deda45f9c2d3b374ea1e02b333fe21372cc6698f0ba8c79da7378f9d59a9eeebdd03fe833a0506f9df9bfa91e6585f874f98
+  data.tar.gz: 2d863cb3c27e014c3512ed4175f8fede472100d8b1d22111e877bb01c79ba3d3cab0ff769a7b0151a9c0c914e2ea70cc311f72f4d517276b1ced68d3cbc0b6ac

data/README.md

@@ -4,8 +4,8 @@
 It includes features like instantly cd'ing to your git repos and getting a
 status overview, and running an arbitrary command in every git repo.
 
-Note that pro only currently works on Unix systems. If you experience speed issues
-see the section on setting a pro base.
+Note that pro only currently works on Unix systems. **If you experience speed issues
+see the section on setting a pro base.**
 
 ## CD'ing to a project's repository
 
@@ -21,6 +21,8 @@ Once you have it you can do some pretty intense cd'ing:
 
 ![pd demo](http://thume.ca/assets/postassets/pro/pd_screen.png)
 
+**Protip:** running `pd` with no arguments changes to the pro base.
+
 ## State of the Repos Address
 
 Oftentimes I find myself wondering which git repositories of mine still have
@@ -52,8 +54,11 @@ Notice that it double checks before running so you don't accidentally run
 `pro` can use a base directory to speed up its search for git repos. By default it
 uses your home folder.
 
-To set the base directory either create a file at `~/.proBase` containing the
-base path or set the environment variable PRO_BASE.
+To set the base directory set the PRO_BASE environment variable or make
+a ~/.proBase file containing the path. The .proBase file can contain many lines
+each with a path to a folder to search. Pro will search the path in the PRO_BASE
+variable as well as all paths in the .proBase file. If neither exists then the home
+directory will be used.
 
 ## Installation
 
@@ -73,7 +78,10 @@ You may also want to set your Pro Base. See the above section.
     they don't have to be at the base level, just somewhere down the tree.
 
     To set the base directory set the PRO_BASE environment variable or make
-    a ~/.proBase file containing the path.
+    a ~/.proBase file containing the path. The .proBase file can contain many lines
+    each with a path to a folder to search. Pro will search the path in the PRO_BASE
+    variable as well as all paths in the .proBase file. If neither exists then the home
+    directory will be used.
 
     Commands ===============
     pro search <query> - prints path of git repo that matches query.
@@ -88,12 +96,16 @@ You may also want to set your Pro Base. See the above section.
     You can use the 'pro install' command to install a wrapper shell function that allows
     you to cd to git repositories in your Pro Base wherever you are based on fuzzy matching.
 
+    Just running 'pd' cd's to the pro base.
+
     Example:
 
       ~/randomFolder/ $ pd pro
       pro/ $ pwd
       /Users/tristan/Box/Dev/Projects/pro
-
+      pro/ $ pd
+      Dev/ $ pwd
+      /Users/tristan/Box/Dev
 
 ## Contributing
 

data/bin/pro

@@ -12,7 +12,10 @@ This is the folder that contains all your other git repositories;
 they don't have to be at the base level, just somewhere down the tree.
 
 To set the base directory set the PRO_BASE environment variable or make
-a ~/.proBase file containing the path.
+a ~/.proBase file containing the path. The .proBase file can contain many lines
+each with a path to a folder to search. Pro will search the path in the PRO_BASE
+variable as well as all paths in the .proBase file. If neither exists then the home
+directory will be used.
 
 Commands ===============
 pro search <query> - prints path of git repo that matches query.
@@ -27,11 +30,16 @@ CD Command ============
 You can use the 'pro install' command to install a wrapper shell function that allows
 you to cd to git repositories in your Pro Base wherever you are based on fuzzy matching.
 
+Just running 'pd' cd's to the pro base.
+
 Example:
 
   ~/randomFolder/ $ pd pro
   pro/ $ pwd
   /Users/tristan/Box/Dev/Projects/pro
+  pro/ $ pd
+  Dev/ $ pwd
+  /Users/tristan/Box/Dev
 
 END
 

data/lib/pro.rb

@@ -33,31 +33,37 @@ module Pro
   # Finds the base directory where repos are kept
   # Checks the environment variable PRO_BASE and the
   # file .proBase
-  def self.base_dir()
+  def self.base_dirs()
+    bases = []
     # check environment first
     base = ENV['PRO_BASE']
-    return base if base
+    bases << base if base
     # next check proBase file
     path = ENV['HOME'] + "/.proBase"
-    base = ENV['HOME'] # default to home
     if File.exists?(path)
-      base = IO.read(path).chomp
-      base = File.expand_path(base)
+      # read lines of the pro base file
+      bases += IO.read(path).split("\n").map {|p| File.expand_path(p.strip)}
     end
-    base
+    # strip bases that do not exist
+    bases.select! {|b| File.exists?(b)}
+    # if no bases then return home
+    bases << ENV['HOME'] if bases.empty?
+    bases
   end
 
   # Searches for all the git repositories in the base directory.
   # returns an array of [repo_name, path] pairs.
   def self.repo_list
     repos = []
-    Find.find(Pro.base_dir) do |path|
-      if FileTest.directory?(path)
-        # is this folder a git repo
-        if File.exists?(path+"/.git")
-          base_name = File.basename(path)
-          repos << [base_name,path]
-          Find.prune
+    Pro.base_dirs.each do |base|
+      Find.find(base) do |path|
+        if FileTest.directory?(path)
+          # is this folder a git repo
+          if File.exists?(path+"/.git")
+            base_name = File.basename(path)
+            repos << [base_name,path]
+            Find.prune
+          end
         end
       end
     end
@@ -66,7 +72,10 @@ 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 self.find_repo(name)
+    return Pro.base_dirs.first unless name
     repos = Pro.repo_list
     match = FuzzyMatch.new(repos, :read => :first).find(name)
     match[1] unless match.nil?

data/lib/pro/version.rb

@@ -1,3 +1,3 @@
 module Pro
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pro
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Tristan Hume
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fuzzy_match