hubeye 0.0.4 → 0.1.0

data/Rakefile

@@ -0,0 +1,17 @@
+$:.unshift 'lib'
+
+require 'rake/testtask'
+require 'rake/clean'
+
+task :default => [:test]
+
+desc 'Run tests (default)'
+Rake::TestTask.new(:test) do |t|
+  t.test_files = FileList['test/runner.rb']
+end
+
+desc 'Display current version'
+task :version do
+  require_relative 'VERSION'
+  puts Hubeye::VERSION * '.'
+end

data/VERSION.rb

@@ -1,5 +1,5 @@
 class Hubeye
-  # 0.0.4 since sept.5 2011
-  VERSION = [0,0,4]
+  # 0.1.0 since oct.4, 2011
+  VERSION = [0,1,0]
 end
 

data/bin/hubeye

@@ -17,7 +17,7 @@ unless RUBY_VERSION >= '1.9'
     retry
   else
     raise "The daemons gem is needed to run hubeye as a daemon " +
-                     "on Ruby < 1.9"
+          "on Ruby < 1.9"
   end
 end
 

data/lib/client/hubeye_client.rb

@@ -36,12 +36,11 @@ class HubeyeClient
   def read_welcome
     # Wait just a bit, to see if the server sends any initial message.
     begin
-      sleep(0.5)            # Wait half a second
+      sleep(1)            # Wait a second
       msg = @s.readpartial(4096)     # Read whatever is ready
       STDOUT.puts msg.chop      # And display it
     # If nothing was ready to read, just ignore the exception.
-    rescue SystemCallError
-    rescue NoMethodError
+    rescue SystemCallError, NoMethodError
       STDOUT.puts "The server's not running!"
     end
   end
@@ -64,7 +63,13 @@ class HubeyeClient
         # The server may send more than one line, so use readpartial
         # to read whatever it sends (as long as it all arrives in one chunk).
 
-        sleep 0.5
+        if local =~ /load repo/
+          puts "Loading..."
+          sleep 1
+        else
+          sleep 0.5
+        end
+
         begin
           response = @s.readpartial(4096)
         rescue EOFError

data/lib/log/logger.rb

@@ -14,12 +14,11 @@ class Logger
     end
   end
 
-  ##If {include_socket: true} is passed, then log to the client as well. If
-  #{include_terminal: true}, log to the terminal too (make sure that the
-  #process is not daemonized). Always log to the logfile.
+  # If {include_terminal: true}, log to the terminal too (make sure that the
+  # process is not daemonized). Always log to the logfile.
 
   def self.log_change(repo_name, commit_msg, committer, options={})
-    opts = {:include_socket => false, :include_terminal => false}.merge options
+    opts = {:include_terminal => false}.merge options
     change_msg = <<-MSG
     ===============================
     Repository: #{repo_name.downcase.strip} has changed (#{Time.now.strftime("%m/%d/%Y at %I:%M%p")})
@@ -27,10 +26,6 @@ class Logger
     Committer : #{committer}
     ===============================
     MSG
-    if opts[:include_socket]
-      socket.puts(change_msg)
-    end
-
     if opts[:include_terminal]
       puts change_msg
     end

data/lib/notification/notification.rb

@@ -8,10 +8,10 @@ module Notification
       elsif RUBY_PLATFORM =~ /linux/
         libnotify = system('locate libnotify-bin > /dev/null')
 
-        if libnotify && LibChecker.autotest
+        if libnotify && LibCheck.autotest
           require_relative "gnomenotify"
           return "libnotify"
-        elsif LibChecker.autotest_notification
+        elsif LibCheck.autotest_notification
           require_relative "growl"
           return "growl"
         else
@@ -20,9 +20,9 @@ module Notification
 
       elsif RUBY_PLATFORM =~ /darwin/i
 
-        if LibChecker.autotest_notification
-        require_relative "growl"
-        return "growl"
+        if LibCheck.autotest_notification
+          require_relative "growl"
+          return "growl"
         else
           return
         end
@@ -32,7 +32,7 @@ module Notification
 
   end
 
-  class LibChecker
+  class LibCheck
 
     class << self
       def autotest

data/lib/server/hubeye_server.rb

@@ -1,19 +1,19 @@
 module Server
   # standard lib.
   require 'socket'
-  require 'open-uri'
   require 'yaml'
 
   # vendor
   begin
-    require 'nokogiri'
+    require 'octopi'
   rescue LoadError
     if require 'rubygems'
       retry
     else
-      abort 'Nokogiri is needed to run hubeye. Gem install nokogiri'
+      abort 'Octopi is needed to run hubeye. Gem install octopi'
     end
   end
+  include Octopi
 
   # hubeye
   require "config/parser"
@@ -32,28 +32,27 @@ module Server
   #
   # Option overview:
   #
-  # CONFIG[:oncearound]: 30 (seconds) is the default amount of time for looking
+  # CONFIG[:oncearound]: 60 (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.
   #
-  # hubeyerc format: oncearound: 1000
+  # hubeyerc format => oncearound: 1000
   #
-  # CONFIG[:username] is the username used when not specified:
+  # CONFIG[:username] is the username used when not specified.
+  # hubeyerc format => username: 'hansolo'
   # 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[:username]       = c.username || 'john_doe'
     CONFIG[:oncearound]     = c.oncearound || 60
     CONFIG[:load_repos]     = c.load_repos || []
     CONFIG[:load_hooks]     = c.load_hooks || []
-    CONFIG[:default_track]  = c.default_track || []
+    CONFIG[:default_track]  = c.default_track || nil
     # returns true or false if defined in hubeyerc
     CONFIG[:notification_wanted] = case c.notification_wanted
                           when false
@@ -66,7 +65,8 @@ module Server
                           end
   end
 
-  CONFIG[:desktop_notification] = (CONFIG[:notification_wanted] ? Notification::Finder.find_notify : nil)
+  CONFIG[:desktop_notification] = (CONFIG[:notification_wanted] ?
+                                  Notification::Finder.find_notify : nil)
 
   class InputError < StandardError; end
 
@@ -79,7 +79,6 @@ module Server
         get_input(@socket)
         puts @input if @debug
         parse_input()
-        get_github_doc("/#{@username}/#{@repo_name}")
         parse_doc()
         @username = CONFIG[:username]
       end
@@ -95,14 +94,18 @@ module Server
   def setup_env(options={})
     @daemonized = options[:daemon]
     @sockets = [@server]  # An array of sockets we'll monitor
-    if CONFIG[:default_track].empty?
-      @ary_commits_repos = []
+    if CONFIG[:default_track].nil?
+      # will be array of 2-element arrays that contain the
+      # tracked repo name [0] and hash of latest sha and latest commit object
+      # for that repo [1]
+      # Example:
+      # [ ['luke-gru/hubeye', {:sha1 => 90j93r0rf389, :commit => <#Commit Object>}], [..., ...] ]
       @hubeye_tracker = []
     else
       # default tracking arrays (hubeyerc configurations)
       @hubeye_tracker = CONFIG[:default_track]
-      @ary_commits_repos = insert_default_tracking_messages
     end
+    setup_hubeye_singleton_methods
 
     if CONFIG[:load_hooks].empty?
       # do nothing (the hooks hash is only assigned when needed)
@@ -125,89 +128,148 @@ module Server
     @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)
+  class ::Array
+    include Octopi
+    class NotTrackerElementError < TypeError ; end
+
+    def extract_old_and_new
+      if length != 2
+        raise NotTrackerElementError.new "#{self} is not a @hubeye_tracker element"
+      else
+        tracked_repo, tracked_sha = self[0], self[1][:sha1]
+        username, repo_name = tracked_repo.split '/'
+        begin
+          gh_user = User.find(username)
+        rescue Octopi::NotFound
+          # fall back to using default username if not found
+          gh_user = @username
+        end
+        begin
+          repo = gh_user.repository repo_name
+        rescue Octopi::NotFound
+          raise
+        end
+      end
+      [tracked_sha, repo]
     end
-    track_default
   end
-  private :insert_default_tracking_messages
 
+  def setup_hubeye_singleton_methods
+    def_try_append_or_replace!
+    def_eyeing
+    def_rm_repo
+  end
 
-  def not_connected
-    # if no client is connected, but the commits array contains repos
-    if @sockets.size == 1 and @ary_commits_repos.empty? == false
-
-      while @remote_connection == false
-        @hubeye_tracker.each do |repo|
-          doc = Nokogiri::HTML(open("https://github.com/#{repo}/"))
-
-          # make variable not block-local
-          commit_msg = nil
-
-          doc.xpath('//div[@class = "message"]/pre').each do |node|
-            commit_msg = node.text
-            if @ary_commits_repos.include?(commit_msg)
-              CONFIG[:oncearound].times do
-                sleep 1
-                @remote_connection = client_ready(@sockets) ? true : false
-                break if @remote_connection
-              end
+  def def_try_append_or_replace!
+    @hubeye_tracker.singleton_class.class_eval do
+      define_method :try_append_or_replace! do |repo_name, new_commit_obj|
+        status = {:replace => nil, :add => nil, :same => true}
+        match = nil
+        map! do |e|
+          if e[0] == repo_name
+            match = true
+            if e[1][:sha1] == new_commit_obj.id
+              e
             else
-              # There was a change to a tracked repository.
+              e[1][:sha1]   = new_commit_obj.id
+              e[1][:commit] = new_commit_obj
+              status = status.merge :replace => true, :same => false
+            end
+          else
+            e
+          end
+        end # end of map!
+        if match
+          return status
+        else
+          self << [repo_name, {:sha1 => new_commit_obj.id,
+                               :commit => new_commit_obj}]
+          return status.merge :add => true, :same => false
+        end
+      end
+    end
+  end
 
-              # make variable not block-local
-              committer = nil
+  def def_eyeing
+    @hubeye_tracker.singleton_class.class_eval do
+      define_method :eyeing do
+        (ary = []).tap do
+          each do |e|
+            ary << e[0]
+          end
+        end
+      end
+    end
+  end
+
+  def def_rm_repo
+    @hubeye_tracker.singleton_class.class_eval do
+      define_method :rm_repo do |repo_name|
+        match = nil
+        reject! do |e|
+          e[0] == repo_name ? match = true : nil
+        end
+        match
+      end
+    end
+  end
 
-              doc.xpath('//div[@class = "actor"]/div[@class = "name"]').each do |node|
-                committer = node.text
-              end
 
-              # notify of change to repository
-              # if they have a Desktop notification
-              # library installed
-              change_msg = "Repo #{repo} has changed\nNew commit: #{commit_msg} => #{committer}"
-              case CONFIG[:desktop_notification]
-              when "libnotify"
-                Autotest::GnomeNotify.notify("Hubeye", change_msg)
-                Logger.log_change(repo, commit_msg, committer)
-              when "growl"
-                Autotest::Growl.growl("Hubeye", change_msg)
-                Logger.log_change(repo, commit_msg, committer)
-              when nil
-
-                if @daemonized
-                  Logger.log_change(repo, commit_msg, committer)
-                else
-                  Logger.log_change(repo, commit_msg, committer, :include_terminal => true)
-                end
+  def not_connected
+    # if no client is connected, but the commits array contains repos
+    if @sockets.size == 1 and !@hubeye_tracker.empty?
 
+      while @remote_connection == false
+        sleep_amt = CONFIG[:oncearound] / @hubeye_tracker.length
+        @hubeye_tracker.each do |ary|
+          # this method does api calls, takes a couple of seconds to
+          # complete right now (TODO: see what's taking so long)
+          start_time = Time.now
+          old_sha, new_repo = ary.extract_old_and_new
+          api_time = (Time.now - start_time).to_i
+          new_commit = new_repo.commits.first
+          if new_commit.id == old_sha
+            (sleep_amt - api_time).times do
+              sleep 1
+              @remote_connection = client_ready(@sockets) ? true : false
+              break if @remote_connection
+            end
+          else
+            # There was a change to a tracked repository.
+            full_repo_name = ary[0]
+            commit_msg     = new_commit.message
+            committer      = new_commit.author['name']
+            # notify of change to repository
+            # if they have a Desktop notification
+            # library installed
+            change_msg = "Repo #{full_repo_name} has changed\nNew commit: " +
+                         "#{commit_msg}\n=> #{committer}"
+            case CONFIG[:desktop_notification]
+            when "libnotify"
+              Autotest::GnomeNotify.notify("Hubeye", change_msg)
+              Logger.log_change(full_repo_name, commit_msg, committer)
+            when "growl"
+              Autotest::Growl.growl("Hubeye", change_msg)
+              Logger.log_change(full_repo_name, commit_msg, committer)
+            when nil
+              if @daemonized
+                Logger.log_change(full_repo_name, commit_msg, committer)
+              else
+                Logger.log_change(full_repo_name, commit_msg, committer, :include_terminal => true)
               end
-              # execute any hooks for that repository
-              unless @hook_cmds.nil? || @hook_cmds.empty?
-                if @hook_cmds[repo]
-                  hook_cmds = @hook_cmds[repo].dup
-                  dir = (hook_cmds.include?('/') ? hook_cmds.shift : nil)
-
-                  # execute() takes [commands], {options} where
-                  # options = :directory and :repo
-                  Hooks::Command.execute(hook_cmds, :directory => dir, :repo => repo)
-                end
+            end
+            # execute any hooks for that repository
+            unless @hook_cmds.nil? || @hook_cmds.empty?
+              if @hook_cmds[full_repo_name]
+                hook_cmds = @hook_cmds[full_repo_name].dup
+                dir = (hook_cmds.include?('/') ? hook_cmds.shift : nil)
+
+                # execute() takes [commands], {options} where
+                # options = :directory and :repo
+                Hooks::Command.execute(hook_cmds, :directory => dir, :repo => repo)
               end
-
-              @ary_commits_repos << repo
-              @ary_commits_repos << commit_msg
-              # delete the repo and old commit that appear first in the array
-              index_old_HEAD = @ary_commits_repos.index(repo)
-              @ary_commits_repos.delete_at(index_old_HEAD)
-              # and again to get rid of the commit message
-              @ary_commits_repos.delete_at(index_old_HEAD)
             end
+            @hubeye_tracker.try_append_or_replace!(full_repo_name, new_commit)
           end
         end
         redo unless @remote_connection
@@ -232,10 +294,11 @@ module Server
         @socket = client           # From here on in referred to as @socket
         sockets << @socket         # Add it to the set of sockets
         # Inform the client of connection
+        basic_inform = "Hubeye running on #{Socket.gethostname} as #{@username}"
         if !@hubeye_tracker.empty?
-          @socket.puts "Hubeye running on #{Socket.gethostname}\nTracking:#{@hubeye_tracker.join(' ')}"
+          @socket.puts "#{basic_inform}\nTracking:#{@hubeye_tracker.eyeing.join ', '}"
         else
-          @socket.puts "Hubeye running on #{Socket.gethostname}"
+          @socket.puts basic_inform
         end
 
         if !@daemonized
@@ -298,11 +361,8 @@ module Server
       @socket.puts("Bye!")  # Say goodbye
       Logger.log "Closing connection to #{@socket.peeraddr[2]}"
       @remote_connection = false
-      if !@ary_commits_repos.empty?
-        Logger.log "Tracking: "
-        @ary_commits_repos.each do |repo|
-          Logger.log repo if @ary_commits_repos.index(repo).even?
-        end
+      if !@hubeye_tracker.empty?
+        Logger.log "Tracking: #{@hubeye_tracker.eyeing.join ', '}"
       end
       Logger.log "" # to look pretty when multiple connections per loop
       @sockets.delete(@socket)  # Stop monitoring the socket
@@ -328,7 +388,7 @@ module Server
     else
       return
     end
-    shutdown()
+    shutdown
   end
 
 
@@ -341,14 +401,13 @@ module Server
 
   def parse_hook
     if %r{hook add} =~ @input
-      hook_add()
+      hook_add
     else
       return
     end
   end
 
 
-  ##
   # @hook_cmds:
   # repo is the key, value is array of directory and commands. First element
   # of array is the local directory for that remote repo, rest are commands
@@ -390,7 +449,7 @@ module Server
     elsif @input =~ %r{\A\s*save repo(s?) as (.+)\Z}
       if !@hubeye_tracker.empty?
         File.open("#{ENV['HOME']}/.hubeye/repos/#{$2}.yml", "w") do |f_out|
-          ::YAML.dump(@hubeye_tracker, f_out)
+          ::YAML.dump(@hubeye_tracker.eyeing, f_out)
         end
         @socket.puts("Saved repo#{$1} as #{$2}")
       else
@@ -452,20 +511,15 @@ module Server
         end
         # newrepos is an array of repos to be tracked
         newrepos.each do |e|
-          # append the repo and the newest commit message to the repos and
-          # commit messages array, then inform the client of the newest
-          # commit message
-          commit_msg = get_commit_msg(e)
-          # if the commit_msg is non-false, don't do anything, otherwise 'next'
-          commit_msg ? nil : next
-          @ary_commits_repos << e << commit_msg
-          # and append the repo to the hubeye_tracker array
-          @hubeye_tracker << e
+          # append the repo name and the commit hash to the hubeye tracker
+          # array, then inform the client of the newest commit message
+          username, repo = e.split '/'
+          gh_user = User.find(username)
+          gh_repo = gh_user.repository repo
+          new_commit = gh_repo.commits.first
+          @hubeye_tracker.try_append_or_replace!(e, new_commit)
         end
-        @ary_commits_repos.uniq!
-        @hubeye_tracker.uniq!
-
-        @socket.puts "Loaded #{$2}.\nTracking:\n#{show_repos_pretty()}"
+        @socket.puts "Loaded #{$2}.\nTracking:\n#{@hubeye_tracker.eyeing.join ', '}"
       else
         # no repo file with that name
         @socket.puts("No file to load from")
@@ -522,46 +576,18 @@ module Server
       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
+      newrepos.each do |e|
+        username, repo = e.split '/'
+        gh_user = User.find(username)
+        gh_repo = gh_user.repository repo
+        new_commit = gh_repo.commits.first
+        @hubeye_tracker.try_append_or_replace!(e, new_commit)
       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
-  def get_commit_msg(remote_repo)
-    begin
-      @doc = Nokogiri::HTML(open("https://github.com#{'/' + remote_repo}"))
-    rescue
-      return nil
-    end
-    # returns the commit message
-    commit_msg = parse_msg(@doc)
-  end
-
-
-  def show_repos_pretty
-    pretty_repos = ""
-    @ary_commits_repos.each do |e|
-      if @ary_commits_repos.index(e).even?
-        pretty_repos += e + "\n"
-      else
-        pretty_repos += "  " + e + "\n"
-      end
-    end
-    pretty_repos
-  end
-
-
   def hook_list
     if @input =~ %r{hook list}
       unless @hook_cmds.nil? || @hook_cmds.empty?
@@ -597,7 +623,7 @@ remote: #{remote}
   # they're tracking
   def tracking_list
     if @input =~ /\Atracking\s*\Z/
-      list = show_repos_pretty
+      list = @hubeye_tracker.eyeing.join ', '
       @socket.puts(list)
       throw(:next)
     else
@@ -648,24 +674,13 @@ remote: #{remote}
       else
         @username, @repo_name = "#{@username}/#{$1}".split('/')
       end
-
-      begin
-        index_found = @ary_commits_repos.index("#{@username}/#{@repo_name}")
-        if index_found
-          # consecutive indices in the array
-          for i in 1..2
-            @ary_commits_repos.delete_at(index_found)
-          end
-          @hubeye_tracker.delete("#{@username}/#{@repo_name}")
-          @socket.puts("Stopped watching repository #{@username}/#{@repo_name}")
-          sleep 0.5
-          throw(:next)
-        else
-          @socket.puts("Repository #{@username}/#{@repo_name} not currently being watched")
-          throw(:next)
-        end
-      rescue
-        @socket.puts($!)
+      rm = @hubeye_tracker.rm_repo("#{@username}/#{@repo_name}")
+      if rm
+        @socket.puts("Stopped watching repository #{@username}/#{@repo_name}")
+        sleep 0.5
+        throw(:next)
+      else
+        @socket.puts("Repository #{@username}/#{@repo_name} not currently being watched")
         throw(:next)
       end
     else
@@ -690,84 +705,49 @@ remote: #{remote}
     @repo_name = @input
   end
 
-
-  def get_github_doc(full_repo_path)
-    begin
-      # if adding a repo with another username
-      @doc = Nokogiri::HTML(open("https://github.com#{full_repo_path}"))
-    rescue OpenURI::HTTPError
-      @socket.puts("Not a Github repository!")
-      throw(:next)
-    rescue URI::InvalidURIError
-      @socket.puts("Not a valid URI")
-      throw(:next)
-    end
-  end
-
-
   def parse_doc
-    # get commit msg
-    @commit_msg = parse_msg(@doc)
-    # get committer
-    @committer = parse_committer()
-
+    @full_repo_name = "#{@username}/#{@repo_name}"
+    begin
+      gh_user = User.find(@username)
+      gh_repo = gh_user.repository @repo_name
+    rescue ArgumentError, Octopi::NotFound
+      #Octopi library's User.find ArgumentError
+      @socket.puts "Not a Github repository name"
+      throw :next
+    end
+    new_commit = gh_repo.commits.first
+    change_status = @hubeye_tracker.try_append_or_replace!(@full_repo_name, new_commit)
+    # get commit info
+    commit_msg = new_commit.message
+    committer  = new_commit.author['name']
+    url = "https://www.github.com#{new_commit.url[0..-30]}"
+    msg =  "#{commit_msg}\n=> #{committer}"
     # new repo to track
-    full_repo_name = "#{@username}/#{@repo_name}"
-    if !@ary_commits_repos.include?(full_repo_name)
-      @ary_commits_repos << full_repo_name
-      @hubeye_tracker << full_repo_name
-      @ary_commits_repos << @commit_msg
-      # get commit info
-      @info = parse_info()
-      @msg =  "#{@commit_msg} => #{@committer}".gsub(/\(author\)/, '')
+    if change_status[:add]
       # log the fact that the user added a repo to be tracked
-      Logger.log("Added to tracker: #{@ary_commits_repos[-2]} (#{NOW})")
+      Logger.log("Added to tracker: #{@full_repo_name} (#{NOW})")
       # show the user, via the client, the info and commit msg for the commit
-      @socket.puts("#{@info}\n#{@msg}")
+      @socket.puts("#{msg}\n#{url}")
 
       # new commit to tracked repo
-    elsif !@ary_commits_repos.include?(@commit_msg)
+    elsif change_status[:replace]
+      change_msg = "New commit on #{@full_repo_name}\n"
+      change_msg << "#{msg}\n#{url}"
+      @socket.puts(change_msg)
       begin
-        index_of_msg = @ary_commits_repos.index(@username + "/" + @repo_name) + 1
-        @ary_commits_repos.delete_at(index_of_msg)
-        @ary_commits_repos.insert(index_of_msg - 1, @commit_msg)
-
         # log to the logfile and tell the client
         if @daemonized
-          Logger.log_change(@repo_name, @commit_msg, @committer,
-                            :include_socket => true)
+          Logger.log_change(@full_repo_name, commit_msg, committer)
         else
-          Logger.log_change(@repo_name, @commit_msg, @committer,
-                            :include_socket => true, :include_terminal => true)
+          Logger.log_change(@full_repo_name, commit_msg, committer,
+                            :include_terminal => true)
         end
       rescue
-        @socket.puts($!)
+        throw :next
       end
     else
       # no change to the tracked repo
-      @socket.puts("Repository #{@repo_name} has not changed")
-    end
-  end
-
-
-  def parse_msg(html_doc)
-    # get commit msg
-    html_doc.xpath('//div[@class = "message"]/pre').each do |node|
-      return commit_msg = node.text
-    end
-  end
-
-
-  def parse_committer
-    @doc.xpath('//div[@class = "actor"]/div[@class = "name"]').each do |node|
-      return committer = node.text
-    end
-  end
-
-
-  def parse_info
-    @doc.xpath('//div[@class = "machine"]').each do |node|
-      return info =  node.text.gsub(/\n/, '').gsub(/tree/, "\ntree").gsub(/parent.*?(\w)/, "\nparent  \\1").strip!
+      @socket.puts("Repository #{@full_repo_name} has not changed")
     end
   end
 
@@ -776,7 +756,7 @@ end # of Server module
 class HubeyeServer
   include Server
 
-  def initialize(debug=false)
+  def initialize(debug=true)
     @debug = debug
   end
 

data/test/runner.rb

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 
 # environment file
-require File.join(File.dirname(__FILE__), "/../lib/environment")
+require File.join(File.expand_path(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 File.join(File.expand_path(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.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000Z
+date: 2011-10-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &71785010 !ruby/object:Gem::Requirement
+  name: octopi
+  requirement: &86576300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71785010
+  version_requirements: *86576300
 description: Github repository commit watcher -- keep your eye on new commits from
   multiple repos through an interactive CLI
 email: luke.gru@gmail.com
@@ -42,7 +42,7 @@ files:
 - lib/environment.rb
 - lib/helpers/time.rb
 - bin/hubeye
-- README.md.html
+- Rakefile
 - README.md
 - VERSION.rb
 - LICENSE

data/README.md.html

@@ -1,212 +0,0 @@
-<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>