hubeye 0.1.0 → 0.2.5

data/LICENSE

@@ -18,3 +18,4 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/VERSION.rb

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

data/bin/hubeye

@@ -2,42 +2,18 @@
 
 # require environment and VERSION files
 require File.join(File.expand_path(File.dirname(__FILE__) + "/../"), "lib/environment")
-require File.expand_path(File.dirname(__FILE__) + "/../VERSION")
+include Environment
+require File.join(ROOTDIR, 'VERSION')
 
 # standard lib
 require 'optparse'
 require 'ostruct'
 
-# vendor
-unless RUBY_VERSION >= '1.9'
-  begin
-    require 'daemons'
-  rescue
-    require 'rubygems'
-    retry
-  else
-    raise "The daemons gem is needed to run hubeye as a daemon " +
-          "on Ruby < 1.9"
-  end
-end
-
-unless File.exists? ENV['HOME'] + '/.hubeye'
+unless File.exists?(File.join(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 }
 
+  require File.join(ROOTDIR, 'tasks/install')
+  Rake.application['install'].invoke
 end
 
 class Options
@@ -48,14 +24,14 @@ class Options
     options.server_wanted = true
     options.client_wanted = false
     options.server_daemonized = true
-    options.port = 2000
+    options.port = 4545
     options.host = 'localhost'
 
     opts_saved = OptionParser.new do |opts|
       opts.banner = "Usage: hubeye [options]"
       opts.separator ""
       opts.separator "Specific options:"
-      opts.separator "Note: The default port (for server and client) is 2000"
+      opts.separator "Note: The default port (for server and client) is 4545"
 
       opts.on("-s", "--server", "Start the server (default: daemonized process)") do
         options.client_wanted = false
@@ -110,17 +86,19 @@ class Hubeye
           puts "Other instances are running"
           exit 1
         end
-        require File.join(Environment::LIBDIR, '/server/hubeye_server.rb')
-        options.server_daemonized ? start_server(port, :daemon => true) : start_server(port, :daemon => false)
+        require File.join(LIBDIR, 'server', 'hubeye_server')
+        options.server_daemonized ?
+          start_server(port, :daemon => true) :
+          start_server(port, :daemon => false)
       else
-        require File.join(Environment::LIBDIR, '/client/hubeye_client.rb')
+        require File.join(LIBDIR, 'client', 'hubeye_client')
         start_client(host, port)
       end
     end
 
 
     def port_open?(port)
-      # this is the solution until multi-threading is implemented
+      # this is the solution until multi-threading or forking is implemented
       # on the TCP server
       listening_tcps = `netstat -l --tcp --numeric`
       if /#{port}/ =~ listening_tcps
@@ -138,7 +116,7 @@ class Hubeye
       server.start(port, options)
     end
 
-    # client connection defaults to localhost:2000
+    # client connection defaults to localhost:4545
     def start_client(host, port)
       client = HubeyeClient.new
       client.start(host, port)

data/lib/client/hubeye_client.rb

@@ -3,73 +3,78 @@ require 'socket'
 
 class HubeyeClient
 
-  def start(host, port)
-    connect(host, port)
-    read_welcome()
-    interact()
-  end
+  class Connection
+    attr_reader :s, :local, :peer, :peeraddr
+    def initialize(host, port)
+      _begin do
+        # Give the user some feedback while connecting.
+        STDOUT.print "Connecting..."
+        STDOUT.flush
+        @s = TCPSocket.open(host, port)
+        STDOUT.puts "Done" if @s
+
+        # Now display information about the connection.
+        @local, @peer = @s.addr, @s.peeraddr
 
-  def _begin
-    begin
-      yield
-    rescue
-      puts $!                 # Display the exception to the user
+        STDOUT.print "Connected to #{peer[2]}:#{peer[1]}"
+        STDOUT.puts " using local port #{local[1]}"
+      end
     end
-  end
 
-  def connect(host, port)
-    _begin do
-      # Give the user some feedback while connecting.
-      STDOUT.print "Connecting..."      # Say what we're doing
-      STDOUT.flush            # Make it visible right away
-      @s = TCPSocket.open(host, port)    # Connect
-      STDOUT.puts "Done" if @s
+    def receive_welcome
+      # Wait just a bit, to see if the server sends any initial message.
+      begin
+        sleep 1
+        msg = @s.readpartial(4096)
+        STDOUT.puts msg.chop
+      rescue SystemCallError, NoMethodError
+        STDOUT.puts "The server's not running!"
+      rescue EOFError
+        @retried ||= -1
+        @retried += 1
+        retry unless @retried >= 1
+      end
+    end
 
-      # Now display information about the connection.
-      local, peer = @s.addr, @s.peeraddr
+    private
 
-      STDOUT.print "Connected to #{peer[2]}:#{peer[1]}"
-      STDOUT.puts " using local port #{local[1]}"
+    def _begin
+      begin
+        yield
+      rescue
+        puts $! if @debug
+      end
     end
   end
 
-  def read_welcome
-    # Wait just a bit, to see if the server sends any initial message.
-    begin
-      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, NoMethodError
-      STDOUT.puts "The server's not running!"
-    end
+  def start(host, port, debug=false)
+    @debug = debug
+    conn = Connection.new(host, port)
+    conn.receive_welcome
+    interact(conn.s)
   end
 
-    # Now begin a loop of client/server interaction.
-  def interact
+  # Now begin a loop of client/server interaction.
+  def interact(socket)
+    @s = socket
     while @s
       loop do
-        STDOUT.print '> '           # Display prompt for local input
-        STDOUT.flush          # Make sure the prompt is visible
-        local = STDIN.gets        # Read line from the console
-        #break if !local             # Quit if no input from console
-        if local.match(/^\.$/) #pwd
-          @s.puts(local.gsub(/\A\.\Z/, "pwd" + Dir.pwd.split('/').last))    # Send the line to the server, daemons gem strips some special chars (/, :)
+        STDOUT.print '> '
+        STDOUT.flush
+        local = STDIN.gets
+        if local.match(/^\.$/) # '.' = pwd
+          # Send the line to the server, daemons gem strips some special chars (/, :)
+          @s.puts(local.gsub(/\A\.\Z/, "pwd" + Dir.pwd.split('/').last))
         else
           @s.puts(local.gsub(/\//, 'diiv'))
         end
-        @s.flush               # Force it out
-        # Read the server's response and print out.
-        # 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).
-
+        @s.flush
         if local =~ /load repo/
           puts "Loading..."
           sleep 1
         else
           sleep 0.5
         end
-
         begin
           response = @s.readpartial(4096)
         rescue EOFError
@@ -77,19 +82,19 @@ class HubeyeClient
         end
 
         if response.chop.strip == "Bye!"
-          puts(response.chop)
+          puts response.chop
           @s.close
-          exit
+          exit 0
         elsif response.chop.strip.match(/shutting/i)
           @s.close
-          exit
+          exit 0
         else
-          puts(response.chop)         # Display response to user
+          puts response.chop
           next
         end
       end
     end
   end
 
-end #end of class
+end
 

data/lib/config/parser.rb

@@ -9,44 +9,35 @@ class Hubeye
       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!
+            line = line.strip
             next if line.empty?
-            options = line.split(':')
-            options.each {|o| o.strip! }
-            case options[0]
+            user_opts = line.split(':').map! {|o| o.strip}
+            case user_opts[0]
             when "username"
-              @username = options[1]
+              @username = user_opts[1]
             when "track"
-              @default_track = get_comma_separated_values.call
+              @default_track = get_comma_separated_values(user_opts[1])
             when "load repos"
-              @load_repos = get_comma_separated_values.call
+              @load_repos = get_comma_separated_values(user_opts[1])
             when "oncearound"
-              @oncearound = options[1].to_i
+              @oncearound = user_opts[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"
+                raise ConfigParseError.new "oncearound in hubeyerc is " \
+                  "#{user_opts[1]} but must be a number that is greater than 0"
               end
             when "load hooks"
-              @load_hooks = get_comma_separated_values.call
+              @load_hooks = get_comma_separated_values(user_opts[1])
             when "desktop notification"
-              on_off = options[1]
+              on_off = user_opts[1]
               @notification_wanted = case on_off
               when "off"
                 false
               when "on"
                 true
               else
-                raise ConfigParseError.new "desktop notification in hubeyerc is " +
+                raise ConfigParseError.new "desktop notification in hubeyerc is " \
                   "'#{on_off}' and is expected to be either on or off"
               end
             end
@@ -55,6 +46,11 @@ class Hubeye
         yield self
       end
 
+      private
+      def get_comma_separated_values(values)
+        values.split(',').map {|v| v.strip}
+      end
+
     end
   end
 end

data/lib/hooks/executer.rb

@@ -5,7 +5,7 @@ module Hooks
 
       #options include the directory to execute the command
       #(that's it for now, will add more functionality later)
-      def self.execute(commands=[], options={})
+      def self.execute(commands, options={})
         opts = {:directory => nil, :repo => nil}.merge(options)
         dir  = opts[:directory]
         repo = opts[:repo]

data/lib/hooks/git_hooks.rb

@@ -4,16 +4,12 @@ module Hooks
     module Default
 
       def self.fetch(local_reponame, remotename, branchname)
-        #first, start a process to cd to the local repo
-        #then fetch the remote
         Dir.chdir(File.expand_path(local_reponame)) do
           ::Kernel.system("git fetch #{remotename} #{branchname}")
         end
       end
 
       def self.pull(local_reponame, remotename, branchname)
-        #first, start a process to cd to the local repo
-        #then pull the remote
         Dir.chdir(File.expand_path(local_reponame)) do
           ::Kernel.system("git pull #{remotename} #{branchname}")
         end

data/lib/log/logger.rb

@@ -1,5 +1,5 @@
 class Logger
-  LOG_DIR = ENV['HOME'] + "/.hubeye/log"
+  LOG_DIR = File.join(ENV['HOME'], '.hubeye', 'log')
 
   def self.log(msg)
     File.open(LOG_DIR, "a") do |f|
@@ -27,9 +27,9 @@ class Logger
     ===============================
     MSG
     if opts[:include_terminal]
-      puts change_msg
+      STDOUT.puts change_msg
     end
-    Logger.log(change_msg)
+    log(change_msg)
   end
 
 end