hoof 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/hoof.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hoof}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
-  s.date = %q{2011-05-15}
+  s.date = %q{2011-05-16}
   s.default_executable = %q{hoof}
   s.description = %q{Hoof is linux variant of pow. It's based on nss, eventmachine and unicorn}
   s.email = %q{kinwizard@gmail.com}
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/hoof/application.rb",
     "lib/hoof/application_pool.rb",
     "lib/hoof/cli.rb",
+    "lib/hoof/control_server.rb",
     "lib/hoof/http_server.rb",
     "lib/hoof/unicorn_config.rb",
     "test/helper.rb",

data/lib/hoof.rb

@@ -3,17 +3,22 @@ require 'unicorn/launcher'
 require 'http/parser'
 
 require 'hoof/http_server'
+require 'hoof/control_server'
 require 'hoof/application'
 require 'hoof/application_pool'
 
 module Hoof
 
   def self.pool
-    @pool ||= Hoof::ApplicationPool.new
+    @pool ||= begin
+      app_pool = Hoof::ApplicationPool.new
+      app_pool.reload
+      app_pool
+    end
   end
 
-  def self.application name
-    pool.add name
+  def self.find name
+    pool[name]
   end
 
   def self.start
@@ -23,12 +28,17 @@ module Hoof
      trap("INT")  { stop }
 
      EventMachine::start_server "127.0.0.1", 3001, Hoof::HttpServer
+     EventMachine::start_server sock, Hoof::ControlServer
    end
   end
 
   def self.stop
-    EventMachine.stop
     pool.stop
+    EventMachine.stop
+  end
+
+  def self.sock
+    '/tmp/hoof.sock'
   end
 
 end

data/lib/hoof/application.rb

@@ -5,18 +5,13 @@ module Hoof
     def initialize name
       @name = name
       @root = File.readlink(File.expand_path(File.join("~/.hoof/", name)))
-
-      load_rvm
-      load_bundler
-      start
     end
 
     def start
-      system "cd #{root} && bundle exec unicorn_rails -c #{File.join(File.dirname(__FILE__), 'unicorn_config.rb')} -l #{sock} -D"
-    end
-
-    def stop
-      Process.kill "TERM", pid if File.exists? pid_file
+      unless running?
+        load_rvm
+        system "cd #{root} && bundle exec unicorn_rails -c #{File.join(File.dirname(__FILE__), 'unicorn_config.rb')} -l #{sock} -D"
+      end
     end
 
     def load_rvm
@@ -30,12 +25,15 @@ module Hoof
       end
     end
 
-    def load_bundler
-      #ENV['BUNDLE_GEMFILE'] = File.join(root, 'Gemfile')
-      #require 'bundler/setup'
+    def running?
+      Daemons::Pid.running? pid
+    end
+
+    def stop
+      Process.kill 'TERM', pid if running?
     end
 
-    def static? path
+    def static_file? path
       File.file? File.join(root, 'public', path)
     end
 
@@ -51,7 +49,7 @@ module Hoof
     end
 
     def sock
-      @sock ||= "/tmp/hoof_#{name}.sock"
+      @sock ||= File.join(root, 'tmp/sockets/unicorn.sock')
     end
 
     def pid_file
@@ -59,7 +57,7 @@ module Hoof
     end
 
     def pid
-      File.read(pid_file).to_i
+      File.read(pid_file).to_i if File.exists? pid_file
     end
 
   end

data/lib/hoof/application_pool.rb

@@ -1,12 +1,11 @@
 module Hoof
   class ApplicationPool < Hash
 
-    def add name
-      self[name] ||= Hoof::Application.new name
-    end
-
-    def list
-      keys
+    def reload
+      Dir[File.expand_path('~/.hoof/*')].each do |dir|
+        name = File.basename dir
+        self[name] = Hoof::Application.new name if File.symlink? dir
+      end
     end
 
     def stop

data/lib/hoof/cli.rb

@@ -8,17 +8,22 @@ module Hoof
 
     default_task :start
 
-    desc 'hoof start', 'Starts hoof daemon'
+    desc 'start', 'Starts hoof daemon'
     def start
       daemon 'start'
     end
 
-    desc 'hoof stop', 'Stops hoof daemon'
+    desc 'stop', 'Stops hoof daemon'
     def stop
       daemon 'stop'
     end
 
-    desc 'hoof init [NAME]', 'Initializes hoof for app in current directory'
+    desc 'restart', 'Restarts hoof daemon'
+    def restart
+      daemon 'restart'
+    end
+
+    desc 'init [NAME]', 'Initializes hoof for app in current directory'
     long_desc <<-D
       Initializes hoof for current directory application.
       This task creates symlink in ~/.hoof and adds unicorn to
@@ -31,9 +36,10 @@ module Hoof
       append_to_file 'Gemfile', "\ngem 'unicorn'"
     end
 
-    #desc "list", "Lists started applications"
-    #def list
-    #end
+    desc "status", "Lists hoof applications"
+    def status
+      control 'status'
+    end
 
   private
 
@@ -43,5 +49,16 @@ module Hoof
       end
     end
 
+    def control comand
+      begin
+        UNIXSocket.open(Hoof.sock) do |s|
+          s.write comand
+          puts s.read
+        end
+      rescue Errno::ECONNREFUSED
+        puts 'Hoof is not running'
+      end
+    end
+
   end
 end

data/lib/hoof/control_server.rb

@@ -0,0 +1,19 @@
+module Hoof
+  class ControlServer < EventMachine::Connection
+
+    def receive_data data
+      p "comand #{data}"
+      result = send data
+      send_data result
+      close_connection_after_writing
+    end
+
+    def status
+      Hoof.pool.map do |(name, app)|
+        status = app.running? ? "[\033[1;32mrunning\033[0m]" : "[\033[1;31mstopped\033[0m]"
+        "  #{app.pid if app.running?}\t#{name}\t\t\t#{status}"
+      end.join("\n")
+    end
+
+  end
+end

data/lib/hoof/http_server.rb

@@ -1,34 +1,39 @@
 module Hoof
   class HttpServer < EventMachine::Connection
-    attr_accessor :applications
-
-    def initialize *args
-      super
-      @applications = {}
-    end
 
     def receive_data data
       parser = Http::Parser.new
       parser.parse data
-
       host = parser.headers["HOST"].gsub(/:\d+$/, '')
-      if host =~ /.dev$/
-        name = host.gsub(/.dev$/, '')
-        application = Hoof.application name
 
-        if application && application.static?(parser.path.split('?', 2)[0])
-          p "serve static #{host}#{parser.path}"
-          send_data application.serve_static parser.path.split('?', 2)[0]
+      close_connection and return unless host =~ /.dev$/
+
+      name = host.gsub(/.dev$/, '')
+      path = parser.path.split('?', 2)[0]
+
+      application = Hoof.find name
+
+      if application
+        if application.static_file? path
+          puts "Serve static #{host}#{parser.path}"
+          send_data application.serve_static(path)
           close_connection_after_writing
         else
-          p "serve #{host}#{parser.path}"
-          EventMachine.defer(proc {
-            application.serve(data)
-          }, proc { |result|
-            send_data result
-            close_connection_after_writing
-          })
+          begin
+            application.start
+            puts "Serve #{host}#{parser.path}"
+            EventMachine.defer(proc {
+              application.serve data
+            }, proc { |result|
+              send_data result
+              close_connection_after_writing
+            })
+          rescue
+            puts "Failed to serve #{name}"
+          end
         end
+      else
+        close_connection
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoof
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - pyromaniac
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-15 00:00:00 +04:00
+date: 2011-05-16 00:00:00 +04:00
 default_executable: hoof
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -174,6 +174,7 @@ files:
 - lib/hoof/application.rb
 - lib/hoof/application_pool.rb
 - lib/hoof/cli.rb
+- lib/hoof/control_server.rb
 - lib/hoof/http_server.rb
 - lib/hoof/unicorn_config.rb
 - test/helper.rb