projector 0.0.1 → 0.1.0

data/README.md

@@ -1,38 +1,35 @@
 # Projector
 
-A simple command-line app to keep your projects directory up to date with all of your Github projects.  I got tired of having to re-clone new projects all the time, and figured there had to be an easier way...so here it is.
+A simple command-line app to keep your projects directory up to date with all of your Github projects.  I got tired of having to re-clone new projects all the time, and figured there had to be an easier way.  Turns out there wasn't, so I built one.
 
 ## Dependencies
 
-Requires the [Thor](https://github.com/wycats/thor) and JSON gems.  See the gemspec for more info.
+Requires the [Thor](https://github.com/wycats/thor) and JSON gems.  You'll also need a Github account and API key.
 
 ## Installation and Usage
 
-1.  Install the gem
+Install the gem:
 
     gem install projector
-    
-2.  Configure your Github settings (if you haven't done so already).  Details are [here](http://help.github.com/set-your-user-name-email-and-github-token/), but the short version is:
-    
+
+Configure your Github settings (if you haven't done so already).  Details are [here](http://help.github.com/set-your-user-name-email-and-github-token/), but the short version is:
+
     git config --global github.user <username>
     git config --global github.token <token>
 
-3.  Configure your working directory
+Configure your working directory.  I have a `Projects` directory under my home directory where I keep all of my working copies.  Adjust to your own convention as needed.
 
-    # For me, I have a Projects directory under my home directory where I keep all of my working copies.  Adjust to fit your own conventions.
     git config --global projector.workingdir ~/Projects
-    
-4.  Run projector update
-    
-  Projector will find all of the repos you have access to and prompt you to clone them under your working directory if they're not already cloned.  By default, it will create a nested directory structure based on the repository owner, something like this:
-  
+
+Run `projector checkout`.  Projector will find all of the repos you have access to and prompt you to clone them under your working directory if they're not already cloned.  By default, it will create a nested directory structure based on the repository owner, something like this:
+
     jayzes/
     jayzes/projector
     jayzes/cucumber-api-steps
     gvarela/
     gvarela/food_court_recipes
 
-If you want it to forge ahead and clone everything, there's a -y option that assumes yes to every clone confirmation and doesn't bother prompting.
+If you want it to forge ahead and clone everything, there's a `-a` option that assumes yes to every clone confirmation and doesn't bother prompting.
 
 ## Future Ideas
 * Skiplist/repo ignore regexes

data/lib/projector/cli.rb

@@ -32,27 +32,48 @@ module Projector
     end
     
     
-    desc "update", "Go through the Github repositories you can access and ensure that working copies for them are cloned into your working directory"
+    desc "checkout", "Go through the Github repositories you can access and ensure that working copies for them are cloned into your working directory"
     long_desc <<-DESC
-      Projector loop through all of the repositories that you can access and clone working
+      Projector loops through all of the repositories that you can access and clones working
       copies of them under your configured working directory if they don't already exist
     DESC
-    method_option :yes, :type => :boolean, :aliases => "-y"
-    def update
+    method_option :assume, :type => :boolean, :aliases => "-a"
+    def checkout
       invoke :check
-      
       repos = all_repos
-      
       say "Checking #{repos.size} repositories"
       repos.each do |repo|
         say "Looking at #{repo.path}"
-        if !repo_cloned?(repo) && (options[:yes] || yes?("Repo #{repo.path} is not cloned yet.  Clone it? (y/n)"))
+        if should_clone_repo?(repo, options[:assume])
           say "Cloning #{repo.clone_url} to #{repo.clone_path(projector_working_dir)}"
           repo.clone(projector_working_dir) 
         end
       end 
     end
     
+    desc "update", "Go through the Github repositories you have in your working copy and see which ones need updating from origin"
+    long_desc <<-DESC
+      Projector loops through all of the repositories that you can access and updates the working
+      copies of them under your configured working directory if they are outdated
+    DESC
+    method_option :assume, :type => :boolean, :aliases => "-a"
+    def update
+      invoke :check
+      repos = all_repos
+      say "Checking #{repos.size} repositories"
+      repos.each do |repo|
+        unless repo_cloned?(repo)
+          say "Skipping #{repo.path} since it is not cloned"
+          next
+        end
+        say "Looking at #{repo.path}"
+        update_repo(repo) if repo_out_of_date?(repo) && (yes?("Repo #{repo.path} has remote changes.  Update it? (y/n)") || options[:assume])
+      end 
+    end
+    
+    
+    
+    
 
     desc "version", "Prints Projector's version information"
     def version

data/lib/projector/helpers.rb

@@ -32,6 +32,19 @@ module Projector
       File.directory?(File.join(repo.clone_path(projector_working_dir), '.git'))
     end
     
+    def repo_out_of_date?(repo)
+      repo.fetch_refs(projector_working_dir)
+      repo.local_head(projector_working_dir) != repo.remote_head(projector_working_dir)
+    end
+    
+    def update_repo(repo)
+      repo.update(projector_working_dir)
+    end
+    
+    def should_clone_repo?(repo, assume_yes = false)
+      !repo_cloned?(repo) && (assume_yes || yes?("Repo #{repo.path} is not cloned yet.  Clone it? (y/n)"))
+    end
+    
     def user_repos
       repo_api_request("https://github.com/api/v2/json/repos/show/#{github_username}")
     end

data/lib/projector/repo.rb

@@ -14,4 +14,21 @@ Repo = Struct.new(:owner, :name) do
   def clone(base_dir)
     system("git clone #{clone_url} #{clone_path(base_dir)}")
   end
+  
+  def local_head(base_dir)
+    `cd #{clone_path(base_dir)} && git rev-parse master`.strip
+  end
+  
+  def remote_head(base_dir)
+    `cd #{clone_path(base_dir)} && git rev-parse origin/master`.strip
+  end
+  
+  def fetch_refs(base_dir)
+    system("cd #{clone_path(base_dir)} && git fetch origin")
+  end
+  
+  def update(base_dir)
+    system("cd #{clone_path(base_dir)} && git pull --rebase origin master")
+  end
+  
 end

data/lib/projector/version.rb

@@ -1,3 +1,3 @@
 module Projector
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: projector
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jay Zeschin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 -06:00
+date: 2011-06-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency