hubeye 0.0.1 → 0.0.2

data/README.md

@@ -1,8 +1,12 @@
 #Hubeye
+<br />
+Keep track of repositories on Github, get notified when they change and<br />
+(optionally) run local system commands when new commits come in to Github.<br />
+<br />
 
-Hubeye is composed of a client and server. Once the server is run,
-you can connect to it via the client. Once connected, you'll be
-prompted by a '>'. Type the name of a Github repository. 
+Hubeye is composed of a client and server. Once the server is run,<br />
+you can connect to it via the client. Once connected, you'll be<br />
+prompted by a '>'. Type the name of a Github repository.
 
 Example: (what the user enters is preceded by the prompt)
 
@@ -12,63 +16,174 @@ Example: (what the user enters is preceded by the prompt)
     parent  ea63fe317fe58dff1c95
     log tracking info for repos on client quit  => luke-gru
 
-What you see is the latest commit reference, tree reference and parent 
-commit reference on Github for that repository. Note that the user did 
-not type a username. This is because the user defined a username in his
-~/.hubeyerc file.
+What you see is the latest commit reference, tree reference and parent<br />
+commit reference on Github for that repository. Note that the user did<br />
+not type a username. This is because the user defined a username in his<br />
+~/.hubeye/hubeyerc file.
 
-###~/.hubeyerc
+##Starting Hubeye
 
-    username = luke-gru
+To start the server:
 
-This allows the user to type the repository name only, and to receive
-information regarding that user's repository. The username must be a 
-valid Github username.
+    >hubeye -s
+or just
+
+    >hubeye
+
+This starts the server as a daemonized process. To run the server in<br />
+your terminal (on <b>t</b>op):
+
+    >hubeye -st
+
+Hubeye runs on port 2000 be default. Change the port like this:
+
+    >hubeye -sp 9001
+
+To connect with the client:
+
+    >hubeye -c
+
+For more options:
+
+    >hubeye -h
+
+
+###~/.hubeye/hubeyerc
+
+    username: luke-gru
+
+This allows the user to type a repository name only, and to receive<br />
+information regarding that <i>username</i>'s repository. The username<br />
+should be a valid Github username.
 
 ###Keeping track of repositories
 
-Hubeye doesn't actually track any repositories unless you disconnect
+Hubeye doesn't actually track any repositories unless you disconnect<br />
 from the server and leave the server running. This can be done by:
 
     >quit
     Bye!
 
-If Hubeye has any repos to watch, it will watch Github for changes.
-It can keep track of as many repos as you want; just keep typing
-them in. If Hubeye finds a change in a repo, it will tell you that the
-repo has changed in the terminal where the server is running. Also, next
-time you connect to the server via the client, it will remind you. 
-Hubeye does not remove a repo from the watch list unless explicitly 
-told to do so.
+If Hubeye has any repos to watch (track), it will watch Github for changes.<br />
+It can keep track of as many repos as you want; just keep typing<br />
+them in. If Hubeye finds a change to a repo, it will notify you of the<br />
+changes using your Desktop notification system (libnotify, growl). It will<br />
+also log the changes to your $HOME/.hubeye/log file. If the server is run<br />
+in a terminal (-t option), the changes will also be logged to the terminal.<br
+/>
 
-    >rm luke-gru/hubeye
+To track your own repository, start the client in the root directory<br />
+of your local git repo:
+
+    >.
+
+This only works if a <i>username</i> is added to the hubeyerc, and if the<br />
+Github repository name is the same as the local root directory name.<br />
+ie: '.' put in '/home/luke/code/hubeye' would track https://www.github.com/
+luke-gru/hubeye<br />
+if <i>username</i> was set to luke-gru.<br />
 
-this removes luke-gru's hubeye repo from the watch list. You can also
-add another user's repo like this:
+You can add another user's repo like this:
 
     >rails/rails
 
-This adds https://github.com/rails/rails to the watch list.
+This adds https://github.com/rails/rails to the watch list.<br />
+Hubeye does not remove a repo from the watch list unless explicitly<br />
+told to do so:
+
+    >rm luke-gru/hubeye
+
+To see a list of all repos (with recent commit messages) in the watch (track) list:
+
+    >tracking
+
+###Desktop Notification
+<i>On Linux: install libnotify-bin. On Mac: install growl (if not already installed).<br />
+The autotest gem is needed for Desktop notification to work in both
+cases.</i><br />
+
+###Shutting down and persistence between sessions
 
-###Shutting down
-    
     >shutdown
 
-Next time you start up the server, the watch list is empty.
-In order to have a default watch list:
+Next time you start up the server, the watch list will be empty<br />
+(and so will the log file). In order to have a default watch list:
+
+<i>~/.hubeye/hubeyerc</i>
+
+    track: rails/rails, dchelimsky/rspec
+
+These will be watched automatically when starting up the server.<br />
+
+A way to interactively save all currently tracked repositories:
+
+    >save repos as my_work_repos
+
+And then load any time (even after a shutdown; next session, next week, etc...)
+
+    >load repos my_work_repos
+
+###Working with hooks
+
+    >hook add rails/rails dir: /path/to/local/rails cmd: git pull origin master
+
+When <b>https://www.github.com/rails/rails</b> changes, a process will start,
+<br />
+change to the selected directory and execute the command. The <i>(dir: /my/dir)
+<br />
+</i> part is optional, and when ignored won't change directories. In this
+case,
+<br />
+the directory will be where the hubeye server was originally
+started from.<br />
 
-~/.hubeyerc
+To see all currently loaded hooks:
 
-    default = rails/rails | dchelimsky/rspec
+    >hook list
 
-These will be watched automatically when starting up the server
+To save all hooks for next sessions (after a server shutdown)
+
+    >save hooks as weekend_projects_hooks
+
+Then, next weekend:
+
+    >load hooks weekend_projects_hooks
+
+These hooks, of course, will only really do anything if the repositories they
+<br />
+are hooked to are currently being watched. This is not done automatically.
 
 ###All ~/.hubeyerc configurations
 
-    username = luke-gru
-    default = username/reponame | username2/reponame2 | myreponame
+When the server is started, the options are set here.
+
+    username: luke-gru
+    track: username/reponame, username2/reponame2, myreponame
     oncearound = 90
+    load hooks: myhook1, myworkhooks
+    load repos: workprojects, funprojects
+    desktop notification: on/off
+
+<i>username</i>: username used for Github URLS when the full path is not
+given<br />
+inside of the client.<br />
+
+<i>track</i>: default repositories to watch for changes upon server start<br />
+
+<i>oncearound</i>: number of seconds before completing a check of every repo in<br />
+the watch list for changes<br />
+
+<i>load hooks</i>: load hooks on server start. To see how to save hooks in the
+<br />
+client, see the <i>Working with hooks</i> section<br />
+
+<i>load repos</i>: load repos on server start. To see how to save repos in the
+<br />
+client, see the <i>Shutting down and persistence between sessions</i> section.
+<br />
 
-oncearound: number of seconds before completing a check of every repo in
-the watch list for changes
+<i>desktop notification</i>: whether to notify of repo changes using libnotify
+<br />
+or growl. This is set to <i>on</i> by default. However, if no notification<br />
+system is found, it is ignored.
 

data/README.md.html

@@ -0,0 +1,212 @@
+<h1>Hubeye</h1>
+
+<p><br />
+Keep track of repositories on Github, get notified when they change and<br />
+(optionally) run local system commands when new commits come in to Github.<br />
+<br /></p>
+
+<p>Hubeye is composed of a client and server. Once the server is run,<br />
+you can connect to it via the client. Once connected, you'll be<br />
+prompted by a '>'. Type the name of a Github repository.</p>
+
+<p>Example: (what the user enters is preceded by the prompt)</p>
+
+<pre><code>&gt;hubeye
+commit  77b82b54044c16751228
+tree    8ce18af1461b5c741003
+parent  ea63fe317fe58dff1c95
+log tracking info for repos on client quit  =&gt; luke-gru
+</code></pre>
+
+<p>What you see is the latest commit reference, tree reference and parent<br />
+commit reference on Github for that repository. Note that the user did<br />
+not type a username. This is because the user defined a username in his<br />
+~/.hubeye/hubeyerc file.</p>
+
+<h2>Starting Hubeye</h2>
+
+<p>To start the server:</p>
+
+<pre><code>&gt;hubeye -s
+</code></pre>
+
+<p>or just</p>
+
+<pre><code>&gt;hubeye
+</code></pre>
+
+<p>This starts the server as a daemonized process. To run the server in<br />
+your terminal (on <b>t</b>op):</p>
+
+<pre><code>&gt;hubeye -st
+</code></pre>
+
+<p>Hubeye runs on port 2000 be default. Change the port like this:</p>
+
+<pre><code>&gt;hubeye -sp 9001
+</code></pre>
+
+<p>To connect with the client:</p>
+
+<pre><code>&gt;hubeye -c
+</code></pre>
+
+<p>For more options:</p>
+
+<pre><code>&gt;hubeye -h
+</code></pre>
+
+<h3>~/.hubeye/hubeyerc</h3>
+
+<pre><code>username: luke-gru
+</code></pre>
+
+<p>This allows the user to type a repository name only, and to receive<br />
+information regarding that <i>username</i>'s repository. The username<br />
+should be a valid Github username.</p>
+
+<h3>Keeping track of repositories</h3>
+
+<p>Hubeye doesn't actually track any repositories unless you disconnect<br />
+from the server and leave the server running. This can be done by:</p>
+
+<pre><code>&gt;quit
+Bye!
+</code></pre>
+
+<p>If Hubeye has any repos to watch (track), it will watch Github for changes.<br />
+It can keep track of as many repos as you want; just keep typing<br />
+them in. If Hubeye finds a change to a repo, it will notify you of the<br />
+changes using your Desktop notification system (libnotify, growl). It will<br />
+also log the changes to your $HOME/.hubeye/log file. If the server is run<br />
+in a terminal (-t option), the changes will also be logged to the terminal.<br
+/></p>
+
+<p>To track your own repository, start the client in the root directory<br />
+of your local git repo:</p>
+
+<pre><code>&gt;.
+</code></pre>
+
+<p>This only works if a <i>username</i> is added to the hubeyerc, and if the<br />
+Github repository name is the same as the local root directory name.<br />
+ie: '.' put in '/home/luke/code/hubeye' would track https://www.github.com/
+luke-gru/hubeye<br />
+if <i>username</i> was set to luke-gru.<br /></p>
+
+<p>You can add another user's repo like this:</p>
+
+<pre><code>&gt;rails/rails
+</code></pre>
+
+<p>This adds https://github.com/rails/rails to the watch list.<br />
+Hubeye does not remove a repo from the watch list unless explicitly<br />
+told to do so:</p>
+
+<pre><code>&gt;rm luke-gru/hubeye
+</code></pre>
+
+<p>To see a list of all repos (with recent commit messages) in the watch (track) list:</p>
+
+<pre><code>&gt;tracking
+</code></pre>
+
+<h3>Desktop Notification</h3>
+
+<p><i>On Linux: install libnotify-bin. On Mac: install growl (if not already installed).<br />
+The autotest gem is needed for Desktop notification to work in both
+cases.</i><br /></p>
+
+<h3>Shutting down and persistence between sessions</h3>
+
+<pre><code>&gt;shutdown
+</code></pre>
+
+<p>Next time you start up the server, the watch list will be empty<br />
+(and so will the log file). In order to have a default watch list:</p>
+
+<p><i>~/.hubeye/hubeyerc</i></p>
+
+<pre><code>track: rails/rails, dchelimsky/rspec
+</code></pre>
+
+<p>These will be watched automatically when starting up the server.<br /></p>
+
+<p>A way to interactively save all currently tracked repositories:</p>
+
+<pre><code>&gt;save repos as my_work_repos
+</code></pre>
+
+<p>And then load any time (even after a shutdown; next session, next week, etc...)</p>
+
+<pre><code>&gt;load repos my_work_repos
+</code></pre>
+
+<h3>Working with hooks</h3>
+
+<pre><code>&gt;hook add rails/rails dir: /path/to/local/rails cmd: git pull origin master
+</code></pre>
+
+<p>When <b>https://www.github.com/rails/rails</b> changes, a process will start,
+<br />
+change to the selected directory and execute the command. The <i>(dir: /my/dir)
+<br />
+</i> part is optional, and when ignored won't change directories. In this
+case,
+<br />
+the directory will be where the hubeye server was originally
+started from.<br /></p>
+
+<p>To see all currently loaded hooks:</p>
+
+<pre><code>&gt;hook list
+</code></pre>
+
+<p>To save all hooks for next sessions (after a server shutdown)</p>
+
+<pre><code>&gt;save hooks as weekend_projects_hooks
+</code></pre>
+
+<p>Then, next weekend:</p>
+
+<pre><code>&gt;load hooks weekend_projects_hooks
+</code></pre>
+
+<p>These hooks, of course, will only really do anything if the repositories they
+<br />
+are hooked to are currently being watched. This is not done automatically.</p>
+
+<h3>All ~/.hubeyerc configurations</h3>
+
+<p>When the server is started, the options are set here.</p>
+
+<pre><code>username: luke-gru
+track: username/reponame, username2/reponame2, myreponame
+oncearound = 90
+load hooks: myhook1, myworkhooks
+load repos: workprojects, funprojects
+desktop notification: on/off
+</code></pre>
+
+<p><i>username</i>: username used for Github URLS when the full path is not
+given<br />
+inside of the client.<br /></p>
+
+<p><i>track</i>: default repositories to watch for changes upon server start<br /></p>
+
+<p><i>oncearound</i>: number of seconds before completing a check of every repo in<br />
+the watch list for changes<br /></p>
+
+<p><i>load hooks</i>: load hooks on server start. To see how to save hooks in the
+<br />
+client, see the <i>Working with hooks</i> section<br /></p>
+
+<p><i>load repos</i>: load repos on server start. To see how to save repos in the
+<br />
+client, see the <i>Shutting down and persistence between sessions</i> section.
+<br /></p>
+
+<p><i>desktop notification</i>: whether to notify of repo changes using libnotify
+<br />
+or growl. This is set to <i>on</i> by default. However, if no notification<br />
+system is found, it is ignored.</p>

data/VERSION.rb

@@ -1,5 +1,5 @@
-#/* vim: set ft=ruby :*/
 class Hubeye
-  VERSION = [0,0,1]
+  # 0.0.2 since sept.4 2011
+  VERSION = [0,0,2]
 end
 

data/bin/hubeye

@@ -16,11 +16,30 @@ unless RUBY_VERSION >= '1.9'
     require 'rubygems'
     retry
   else
-    RuntimeError.new "The daemons gem is needed to run hubeye as a daemon " +
+    raise "The daemons gem is needed to run hubeye as a daemon " +
                      "on Ruby < 1.9"
   end
 end
 
+unless File.exists? ENV['HOME'] + '/.hubeye'
+  require 'rake'
+  require 'stringio'
+
+  def capture_stdout
+    s = StringIO.new
+    oldstdout = $stdout
+    $stdout = s
+    yield
+    s.string
+  ensure
+    $stdout = oldstdout
+  end
+
+  require File.join(File.expand_path(File.dirname(__FILE__) + "/.."), 'tasks/install')
+  results = capture_stdout { Rake.application['install'].invoke }
+
+end
+
 class Options
   def self.parse(args)
 

data/lib/config/parser.rb

@@ -0,0 +1,60 @@
+class Hubeye
+  module Config
+    class Parser
+
+      class ConfigParseError < StandardError; end
+      attr_reader :username, :load_repos, :oncearound, :load_hooks, :notification_wanted,
+                  :default_track
+
+      def initialize(config_file, options={})
+        opts = {:test => false}.merge options
+        if opts[:test] then klass = StringIO else klass = File end
+
+        # not a pretty line, but take options array from element 1,
+        # stringify it, get rid of commas separating the repos and
+        # split them back into an array on the spaces
+        get_comma_separated_values = Proc.new do
+          options[1..-1].join('').gsub(',', '').split(' ')
+        end
+
+        klass.open(config_file) do |f|
+          while line = f.gets
+            line.strip!
+            next if line.empty?
+            options = line.split(':')
+            options.each {|o| o.strip! }
+            case options[0]
+            when "username"
+              @username = options[1]
+            when "track"
+              @default_track = get_comma_separated_values.call
+            when "load repos"
+              @load_repos = get_comma_separated_values.call
+            when "oncearound"
+              @oncearound = options[1].to_i
+              if @oncearound.zero?
+                raise ConfigParseError.new "oncearound in hubeyerc is " +
+                  "#{options[1]} but must be a number that is greater than 0"
+              end
+            when "load hooks"
+              @load_hooks = get_comma_separated_values.call
+            when "desktop notification"
+              on_off = options[1]
+              @notification_wanted = case on_off
+              when "off"
+                false
+              when "on"
+                true
+              else
+                raise ConfigParseError.new "desktop notification in hubeyerc is " +
+                  "'#{on_off}' and is expected to be either on or off"
+              end
+            end
+          end
+        end
+        yield self
+      end
+
+    end
+  end
+end

data/lib/environment.rb

@@ -1,6 +1,6 @@
 module Environment
 
-ROOTDIR = File.join(File.dirname(__FILE__), "..")
+ROOTDIR = File.expand_path(File.dirname(__FILE__) + '/..')
 
 LIBDIR = File.join(ROOTDIR, "lib")
 BINDIR = File.join(ROOTDIR, "bin")

data/lib/helpers/time.rb

@@ -0,0 +1,5 @@
+module Helpers
+  module Time
+    NOW = ::Time.now.strftime("%m/%d/%Y at %I:%M%p")
+  end
+end

data/lib/log/logger.rb

@@ -1,14 +1,15 @@
 class Logger
+  LOG_DIR = ENV['HOME'] + "/.hubeye/log"
 
   def self.log(msg)
-    File.open(ENV['HOME'] + "/hublog" * 2, "a") do |f|
+    File.open(LOG_DIR, "a") do |f|
       f.puts(msg)
     end
   end
 
   def self.relog(msg)
     #wipe the file and start anew
-    File.open(ENV['HOME'] + "/hublog" * 2, "w") do |f|
+    File.open(LOG_DIR, "w") do |f|
       f.puts(msg)
     end
   end

data/lib/server/hubeye_server.rb

@@ -16,21 +16,57 @@ module Server
   end
 
   # hubeye
-  require "notification/notification"
+  require "config/parser"
   require "log/logger"
-  require "timehelper/timehelper"
+  require "notification/notification"
   require "hooks/git_hooks"
   require "hooks/executer"
+  require "helpers/time"
+  include Helpers::Time
 
-  # ONCEAROUND: 30 (seconds) is the default amount of time for looking
+  CONFIG_FILE = ENV['HOME'] + "/.hubeye/hubeyerc"
+  CONFIG = {}
+  # find Desktop notification system
+
+  # CONFIG options: defined in ~/.hubeye/hubeyerc
+  #
+  # Option overview:
+  #
+  # CONFIG[:oncearound]: 30 (seconds) is the default amount of time for looking
   # for changes in every single repository. If tracking lots of repos,
   # it might be a good idea to increase the value, or hubeye will cry
   # due to overwork, fatigue and general anhedonia.
-  ONCEAROUND = 30
-  # USERNAME: defined in ~/.hubeyerc
-  USERNAME = 'luke-gru'
-  # find Desktop notification system
-  DESKTOP_NOTIFICATION = Notification::Finder.find_notify
+  #
+  # hubeyerc format: oncearound: 1000
+  #
+  # CONFIG[:username] is the username used when not specified:
+  # when set to 'hansolo'
+  # >rails
+  # would track https://www.github.com/hansolo/rails
+  # but a full URI path won't use CONFIG[:username]
+  # >rails/rails
+  # would track https://www.github.com/rails/rails
+  #
+  # hubeyerc format: username: hansolo
+  ::Hubeye::Config::Parser.new(CONFIG_FILE) do |c|
+    CONFIG[:username]       = c.username || ''
+    CONFIG[:oncearound]     = c.oncearound || 60
+    CONFIG[:load_repos]     = c.load_repos || []
+    CONFIG[:load_hooks]     = c.load_hooks || []
+    CONFIG[:default_track]  = c.default_track || []
+    # returns true or false if defined in hubeyerc
+    CONFIG[:notification_wanted] = case c.notification_wanted
+                          when false
+                            false
+                          when true
+                            true
+                          when nil
+                            # default is true if not defined in hubeyerc
+                            true
+                          end
+  end
+
+  CONFIG[:desktop_notification] = (CONFIG[:notification_wanted] ? Notification::Finder.find_notify : nil)
 
   class InputError < StandardError; end
 
@@ -39,13 +75,13 @@ module Server
     setup_env(options)
     loop do
       catch(:next) do
-      not_connected() unless @remote_connection
-      get_input(@socket)
-      puts @input if @debug
-      parse_input()
-      get_github_doc("/#{@username}/#{@repo_name}")
-      parse_doc()
-      @username = USERNAME
+        not_connected() unless @remote_connection
+        get_input(@socket)
+        puts @input if @debug
+        parse_input()
+        get_github_doc("/#{@username}/#{@repo_name}")
+        parse_doc()
+        @username = CONFIG[:username]
       end
     end
   end
@@ -59,14 +95,49 @@ module Server
   def setup_env(options={})
     @daemonized = options[:daemon]
     @sockets = [@server]  # An array of sockets we'll monitor
-    @ary_commits_repos = []
-    @hubeye_tracker = []
-    # @username changes if input includes a '/' when removing, adding tracked
-    # repos.
-    @username = 'luke-gru'
+    if CONFIG[:default_track].empty?
+      @ary_commits_repos = []
+      @hubeye_tracker = []
+    else
+      # default tracking arrays (hubeyerc configurations)
+      @hubeye_tracker = CONFIG[:default_track]
+      @ary_commits_repos = insert_default_tracking_messages
+    end
+
+    if CONFIG[:load_hooks].empty?
+      # do nothing (the hooks hash is only assigned when needed)
+    else
+      hooks_ary = CONFIG[:load_hooks].dup
+      load_hooks_or_repos :internal_input => hooks_ary,
+                          :internal_input_hooks => true
+    end
+
+    if CONFIG[:load_repos].empty?
+      # do nothing
+    else
+      repos_ary = CONFIG[:load_repos].dup
+      load_hooks_or_repos :internal_input => repos_ary,
+                          :internal_input_repos => true
+    end
+    # @username changes if input includes a '/' when removing and adding
+    # tracked repos.
+    @username = CONFIG[:username]
     @remote_connection = false
   end
 
+  def insert_default_tracking_messages
+    track_default = CONFIG[:default_track].dup
+    track_default.each do |repo|
+      commit_msg = get_commit_msg(repo)
+      # next unless commit_msg is non-false
+      commit_msg ? nil : next
+      ary_index = track_default.index(repo)
+      track_default.insert(ary_index + 1, commit_msg)
+    end
+    track_default
+  end
+  private :insert_default_tracking_messages
+
 
   def not_connected
     # if no client is connected, but the commits array contains repos
@@ -82,7 +153,7 @@ module Server
           doc.xpath('//div[@class = "message"]/pre').each do |node|
             commit_msg = node.text
             if @ary_commits_repos.include?(commit_msg)
-              ONCEAROUND.times do
+              CONFIG[:oncearound].times do
                 sleep 1
                 @remote_connection = client_ready(@sockets) ? true : false
                 break if @remote_connection
@@ -101,7 +172,7 @@ module Server
               # if they have a Desktop notification
               # library installed
               change_msg = "Repo #{repo} has changed\nNew commit: #{commit_msg} => #{committer}"
-              case DESKTOP_NOTIFICATION
+              case CONFIG[:desktop_notification]
               when "libnotify"
                 Autotest::GnomeNotify.notify("Hubeye", change_msg)
                 Logger.log_change(repo, commit_msg, committer)
@@ -168,17 +239,17 @@ module Server
         end
 
         if !@daemonized
-          puts "Client connected at #{::TimeHelper::NOW}"
+          puts "Client connected at #{NOW}"
         end
 
         @socket.flush
         # And log the fact that the client connected
         if @still_logging == true
           # if the client quit, do not wipe the log file
-          Logger.log "Accepted connection from #{@socket.peeraddr[2]} (#{::TimeHelper::NOW})"
+          Logger.log "Accepted connection from #{@socket.peeraddr[2]} (#{NOW})"
         else
           # wipe the log file and start anew
-          Logger.relog "Accepted connection from #{@socket.peeraddr[2]} (#{::TimeHelper::NOW})"
+          Logger.relog "Accepted connection from #{@socket.peeraddr[2]} (#{NOW})"
         end
         Logger.log "local:  #{@socket.addr}"
         Logger.log "peer :  #{@socket.peeraddr}"
@@ -207,7 +278,7 @@ module Server
     elsif parse_shutdown()
     elsif save_hooks_or_repos()
     elsif load_hooks_or_repos()
-    # parse_hook must be before parse_fullpath_add for the moment
+      # parse_hook must be before parse_fullpath_add for the moment
     elsif parse_hook()
     elsif hook_list()
     elsif tracking_list()
@@ -249,7 +320,7 @@ module Server
     if @input == "shutdown"
       # local
       Logger.log "Closing connection to #{@socket.peeraddr[2]}"
-      Logger.log "Shutting down... (#{::TimeHelper::NOW})"
+      Logger.log "Shutting down... (#{NOW})"
       Logger.log ""
       Logger.log ""
       # peer
@@ -287,7 +358,7 @@ module Server
     @input.gsub!(/diiv/, '/')
     # make match-$globals parse input
     @input =~ /add ([^\/]+\/\w+) (dir: (\S*) )?cmd: (.*)\Z/
-    @hook_cmds ||= {}
+      @hook_cmds ||= {}
     if $1 != nil && $4 != nil
       if @hook_cmds[$1]
         @hook_cmds[$1] << $4
@@ -308,7 +379,7 @@ module Server
   def save_hooks_or_repos
     if @input =~ %r{\A\s*save hook(s?) as (.+)\Z}
       if !@hook_cmds.nil? && !@hook_cmds.empty?
-        File.open("#{ENV['HOME']}/hublog/hooks/#{$2}.yml", "w") do |f_out|
+        File.open("#{ENV['HOME']}/.hubeye/hooks/#{$2}.yml", "w") do |f_out|
           ::YAML.dump(@hook_cmds, f_out)
         end
         @socket.puts("Saved hook#{$1} as #{$2}")
@@ -318,7 +389,7 @@ module Server
       throw(:next)
     elsif @input =~ %r{\A\s*save repo(s?) as (.+)\Z}
       if !@hubeye_tracker.empty?
-        File.open("#{ENV['HOME']}/hublog/repos/#{$2}.yml", "w") do |f_out|
+        File.open("#{ENV['HOME']}/.hubeye/repos/#{$2}.yml", "w") do |f_out|
           ::YAML.dump(@hubeye_tracker, f_out)
         end
         @socket.puts("Saved repo#{$1} as #{$2}")
@@ -332,9 +403,27 @@ module Server
   end
 
 
-  def load_hooks_or_repos
+  # options are internal input: can be true or falselike.
+  # When falselike (nil is default), it outputs to the client socket.
+  # When truelike (such as when used internally), it outputs nothing.
+  def load_hooks_or_repos(options={})
+    opts = {:internal_input => nil, :internal_input_hooks => nil,
+      :internal_input_repos => nil}.merge options
+    if opts[:internal_input].nil?
+      load_hooks_repos_from_terminal_input
+    elsif opts[:internal_input]
+      input = opts[:internal_input]
+      if opts[:internal_input_hooks]
+        load_hooks_from_internal_input(input)
+      elsif opts[:internal_input_repos]
+        load_repos_from_internal_input(input)
+      end
+    end
+  end
+
+  def load_hooks_repos_from_terminal_input
     if @input =~ %r{\A\s*load hook(s?) (.+)\Z}
-      hookfile = "#{ENV['HOME']}/hublog/hooks/#{$2}.yml"
+      hookfile = "#{ENV['HOME']}/.hubeye/hooks/#{$2}.yml"
 
       # establish non block-local scope
       newhooks = nil
@@ -351,7 +440,7 @@ module Server
       end
       throw(:next)
     elsif @input =~ %r{\A\s*load repo(s)? (.+)\Z}
-      if File.exists? repo_file = "#{ENV['HOME']}/hublog/repos/#{$2}.yml"
+      if File.exists? repo_file = "#{ENV['HOME']}/.hubeye/repos/#{$2}.yml"
         newrepos = nil
         File.open(repo_file) do |f|
           newrepos = ::YAML.load(f)
@@ -386,6 +475,66 @@ module Server
     return
   end
 
+  def load_hooks_from_internal_input(input)
+    if input.respond_to? :to_a
+      input = input.to_a
+      input.each do |hook|
+        hookfile = "#{ENV['HOME']}/.hubeye/hooks/#{hook}.yml"
+        newhook = nil
+        if File.exists?(hookfile)
+          File.open(hookfile) do |f|
+            newhook = ::YAML.load(f)
+          end
+          @hook_cmds ||= {}
+          @hook_cmds = newhook.merge(@hook_cmds)
+        else
+          # do nothing because of no extra processing after this, newhook
+          # can stay nil if the hook file doesn't exist
+        end
+      end
+    else
+      raise ArgumentError.new "#{input} must be array-like"
+    end
+  end
+
+  def load_repos_from_internal_input(input)
+    if input.respond_to? :to_a
+      input = input.to_a
+      newrepos = []
+      input.each do |repo|
+        repofile = "#{ENV['HOME']}/.hubeye/repos/#{repo}.yml"
+        newrepo = nil
+        if File.exists?(repofile)
+          File.open(repofile) do |f|
+            newrepo = ::YAML.load(f)
+          end
+          # empty repo file, go to next repo file in the array
+          if !newrepo
+            next
+          else
+            # append the newrepo array to the newrepos array
+            newrepos << newrepo
+          end
+        else
+          # file doesn't exist, next repo file
+          next
+        end
+      end # end of input#each
+      # flatten the newrepos array because it contains arrays
+      newrepos.flatten!
+      newrepos.each do |repo|
+        commit_msg = get_commit_msg(repo)
+        commit_msg ? nil : next
+        @ary_commits_repos << repo << commit_msg
+        @hubeye_tracker << repo
+      end
+      @ary_commits_repos.uniq!
+      @hubeye_tracker.uniq!
+    else
+      raise ArgumentError.new "#{input} must be array-like"
+    end
+  end
+
 
   # helper method to get commit message for a
   # single repo
@@ -416,6 +565,7 @@ module Server
   def hook_list
     if @input =~ %r{hook list}
       unless @hook_cmds.nil? || @hook_cmds.empty?
+        format_string = ""
         @hook_cmds.each do |repo, ary|
           remote = repo
           if ary.first.include? '/'
@@ -425,11 +575,11 @@ module Server
             cmds = ary
             local = "N/A"
           end
-          format_string = <<-EOS
+          format_string += <<-EOS
 remote: #{remote}
   dir : #{local}
   cmds: #{cmds.each {|cmd| print cmd + ' ' }} \n
-           EOS
+  EOS
         end
         @socket.puts(format_string)
         @socketspoke = true
@@ -571,11 +721,11 @@ remote: #{remote}
       @info = parse_info()
       @msg =  "#{@commit_msg} => #{@committer}".gsub(/\(author\)/, '')
       # log the fact that the user added a repo to be tracked
-      Logger.log("Added to tracker: #{@ary_commits_repos[-2]} (#{::TimeHelper::NOW})")
+      Logger.log("Added to tracker: #{@ary_commits_repos[-2]} (#{NOW})")
       # show the user, via the client, the info and commit msg for the commit
       @socket.puts("#{@info}\n#{@msg}")
 
-    # new commit to tracked repo
+      # new commit to tracked repo
     elsif !@ary_commits_repos.include?(@commit_msg)
       begin
         index_of_msg = @ary_commits_repos.index(@username + "/" + @repo_name) + 1

data/test/config_parser.rb

@@ -0,0 +1,114 @@
+# Hubeye::Config::Parser.new uses StringIO.open() when option {:test => true} is set
+require 'stringio'
+
+class ConfigParserTests < Test::Unit::TestCase
+
+  def get_config_settings(config_file)
+    Hubeye::Config::Parser.new(config_file, :test => true) do |c|
+      @username = c.username
+      @default_track = c.default_track
+      @hooks = c.load_hooks
+      @repos = c.load_repos
+      @oncearound = c.oncearound
+      @notification_wanted = c.notification_wanted
+    end
+  end
+
+  def test_proper_username_parse
+    text = 'username: luke-gru'
+    get_config_settings(text)
+    assert_nil @default_track
+    assert_nil @oncearound
+    assert_nil @hooks
+    assert_nil @notification_wanted
+    assert_nil @repos
+
+    assert_equal 'luke-gru', @username
+  end
+
+  def test_proper_default_track_parse
+    text = 'track: rails/rails, jimweirich/rake, sinatra/sinatra'
+    get_config_settings(text)
+    assert_nil @username
+    assert_nil @oncearound
+    assert_nil @hooks
+    assert_nil @notification_wanted
+    assert_nil @repos
+
+    assert_equal 3, @default_track.length
+    assert_equal ['rails/rails', 'jimweirich/rake', 'sinatra/sinatra'], @default_track
+  end
+
+  def test_oncearound_error
+    text = 'oncearound: fooey'
+    assert_raises(Hubeye::Config::Parser::ConfigParseError) { get_config_settings(text) }
+  end
+
+  def test_proper_oncearound_parse
+    text = 'oncearound: 80'
+    get_config_settings(text)
+    assert_nil @username
+    assert_nil @default_track
+    assert_nil @hooks
+    assert_nil @notification_wanted
+    assert_nil @repos
+
+    assert_equal 80, @oncearound
+  end
+
+  def test_proper_default_hook_parse
+    text = 'load hooks: myhook1, myhook2, captain_hook'
+    get_config_settings(text)
+    assert_nil @username
+    assert_nil @oncearound
+    assert_nil @default_track
+    assert_nil @notification_wanted
+    assert_nil @repos
+
+    assert_equal ['myhook1', 'myhook2', 'captain_hook'], @hooks
+  end
+
+  def test_proper_default_repos_parse
+    text = 'load repos: myforks, myprojects, mywork'
+    get_config_settings(text)
+    assert_nil @username
+    assert_nil @oncearound
+    assert_nil @default_track
+    assert_nil @notification_wanted
+    assert_nil @hooks
+
+    assert_equal ['myforks', 'myprojects', 'mywork'], @repos
+  end
+
+  def test_notification_off_parse
+    text = 'desktop notification: off'
+    get_config_settings(text)
+    assert_nil @username
+    assert_nil @oncearound
+    assert_nil @default_track
+    assert_nil @hooks
+    assert_nil @repos
+
+    assert_equal false, @notification_wanted
+  end
+
+  def test_notification_on_parse
+    text = 'desktop notification: on'
+    get_config_settings(text)
+    assert_nil @username
+    assert_nil @oncearound
+    assert_nil @default_track
+    assert_nil @hooks
+    assert_nil @repos
+
+    assert_equal true, @notification_wanted
+
+  end
+
+  def test_notification_error
+    text = 'desktop notification: fooey'
+    assert_raises(Hubeye::Config::Parser::ConfigParseError) { get_config_settings(text) }
+  end
+
+end
+

data/test/environment.rb

@@ -0,0 +1,18 @@
+class EnvironmentTests < Test::Unit::TestCase
+
+  include ::Environment
+
+  def test_proper_rootdir
+    assert_equal File.expand_path(File.dirname(__FILE__) + '/..'), ROOTDIR
+  end
+
+  def test_proper_libdir
+    assert_equal File.join(File.expand_path(File.dirname(__FILE__) + '/..'), 'lib'), LIBDIR
+  end
+
+  def test_proper_bindir
+    assert_equal File.join(File.expand_path(File.dirname(__FILE__) + '/..'), 'bin'), BINDIR
+  end
+
+end
+

data/test/notification.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), "/../lib/notification/notification")
-
 class NotifyTests < Test::Unit::TestCase
 
   def test_libnotify_on_linux

data/test/runner.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+# environment file
+require File.join(File.dirname(__FILE__), "/../lib/environment")
+
+# test/unit
+require 'test/unit'
+
+# test files
+require_relative 'environment'
+require File.join(File.dirname(__FILE__), "/../lib/notification/notification")
+require_relative "notification"
+require Environment::LIBDIR + '/config/parser'
+require_relative "config_parser"
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubeye
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-31 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-09-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &69555570 !ruby/object:Gem::Requirement
+  requirement: &74408990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *69555570
+  version_requirements: *74408990
 description: Github repository commit watcher -- keep your eye on new commits from
   multiple repos through an interactive CLI
 email: luke.gru@gmail.com
@@ -31,24 +30,26 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/config/parser.rb
 - lib/client/hubeye_client.rb
 - lib/notification/growl.rb
 - lib/notification/gnomenotify.rb
 - lib/notification/notification.rb
-- lib/timehelper/timehelper.rb
 - lib/server/hubeye_server.rb
 - lib/hooks/executer.rb
 - lib/hooks/git_hooks.rb
 - lib/log/logger.rb
 - lib/environment.rb
+- lib/helpers/time.rb
 - bin/hubeye
-- Rakefile
+- README.md.html
 - README.md
 - VERSION.rb
 - LICENSE
-- test/test.rb
+- test/config_parser.rb
+- test/runner.rb
+- test/environment.rb
 - test/notification.rb
-has_rdoc: true
 homepage: 
 licenses:
 - MIT
@@ -70,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Github repository commit watcher -- keep your eye on new commits from multiple

data/Rakefile

@@ -1,34 +0,0 @@
-task :install => :chmod do
-  puts "Done"
-end
-
-task :chmod => :makelog do
-  binfile = File.join(File.dirname(__FILE__), "/bin/hubeye")
-  chmod 0777, binfile unless File.executable?(binfile)
-end
-
-task :makelog => :config_file do
-  hublog_dir  =  ENV['HOME'] + "/hublog"
-  mkdir(hublog_dir) unless File.exists?(hublog_dir)
-
-  hooks_dir = hublog_dir + "/hooks"
-  mkdir(hooks_dir) unless File.exists?(hooks_dir)
-
-  repos_dir = hublog_dir + "/repos"
-  mkdir(repos_dir) unless File.exists?(repos_dir)
-
-  hublog_file =  File.join(ENV['HOME'], "/hublog/hublog")
-  touch hublog_file unless File.exists?(hublog_file)
-end
-
-task :config_file do
-  config_file = File.join(ENV['HOME'], ".hubeyerc")
-  touch config_file unless File.exists? config_file
-end
-
-task :config_file => :message
-
-task :message do
-  puts "Installing Hubeye..."
-end
-

data/lib/timehelper/timehelper.rb

@@ -1,3 +0,0 @@
-module TimeHelper
-  NOW = Time.now.strftime("%m/%d/%Y at %I:%M%p")
-end

data/test/test.rb

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require 'test/unit'
-require_relative "notification"
-require File.join(File.dirname(__FILE__), "/../lib/environment")