hoof 0.0.4 → 0.0.5

data/README.rdoc

@@ -2,6 +2,7 @@
 
 Linux version of https://github.com/37signals/pow/
 
+
 == Installation
 
 === Gem
@@ -10,23 +11,15 @@ At first - install gem
 
 <tt>gem install hoof</tt>
 
-=== NSS extension
-
-Second step - you should compile and install libnss_hoof.so.
-
-Compile: cd /to/your/gems/installation/path/gems/hoof-x.x.x/ext and +make+
+=== NSS extension and port forwarding
 
-Install: just symlink maked libnss_hoof.so.2 to /lib/libnss_hoof.so.2. Like this:
-
-<tt>cd /lib; sudo ln -sf /to/your/gems/installation/path/gems/hoof-x.x.x/ext/libnss_hoof.so.2</tt>
+<tt>hoof install</tt>
 
 Then change your /etc/nsswitch.conf like this:
 
 <tt>hosts:          files mdns4_minimal [NOTFOUND=return] dns mdns4 hoof</tt>
 
-Then set port redirecting up:
-
-<tt>hoof route</tt>
+!!Do not forget restart browser!!
 
 === Application
 

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/ext/Makefile

@@ -11,3 +11,9 @@ libnss_hoof.so.2: $(OBJ)
 
 clean:
 	rm -f *.o *~ libnss_hoof.so.2
+
+install:
+	ln -sf $(CURDIR)/libnss_hoof.so.2 /lib
+
+uninstall:
+	rm /lib/libnss_hoof.so.2

data/hoof.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hoof}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
-  s.date = %q{2011-05-16}
+  s.date = %q{2011-05-17}
   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}

data/lib/hoof/cli.rb

@@ -36,22 +36,26 @@ module Hoof
       append_to_file 'Gemfile', "\ngem 'unicorn'"
     end
 
-    desc "status", "Lists hoof applications"
+    desc 'status', 'Lists hoof applications'
     def status
       control 'status'
     end
 
-    desc "route", "Redirects http ports to hoof default ports with iptables"
-    def route
-      exec <<-E
+    desc 'install [TARGET]', 'Redirects http ports to hoof default ports with iptables'
+    def install target = ''
+      ext = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'ext'))
+      puts "Successfully installed NSS library" if system "cd #{ext} && make && sudo make install"
+      puts "Successfully added iptables rules" if system <<-E
         sudo iptables -t nat -I OUTPUT --source 0/0 --destination 127.0.0.1 -p tcp --dport 80 -j REDIRECT --to-ports #{Hoof.http_port} &&
         sudo iptables -t nat -I OUTPUT --source 0/0 --destination 127.0.0.1 -p tcp --dport 443 -j REDIRECT --to-ports #{Hoof.https_port}
       E
     end
 
-    desc "unroute", "Destroys hoof iptables redirecting rules"
-    def unroute
-      exec <<-E
+    desc 'uninstall [TARGET]', 'Destroys hoof iptables redirecting rules'
+    def uninstall target = ''
+      ext = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'ext'))
+      puts "Successfully uninstalled NSS library" if system "cd #{ext} && sudo make uninstall && make clean"
+      puts "Successfully removed iptables rules" if system <<-E
         sudo iptables -t nat -D OUTPUT --source 0/0 --destination 127.0.0.1 -p tcp --dport 80 -j REDIRECT --to-ports #{Hoof.http_port} &&
         sudo iptables -t nat -D OUTPUT --source 0/0 --destination 127.0.0.1 -p tcp --dport 443 -j REDIRECT --to-ports #{Hoof.https_port}
       E

data/lib/hoof/control_server.rb

@@ -2,7 +2,7 @@ module Hoof
   class ControlServer < EventMachine::Connection
 
     def receive_data data
-      p "comand #{data}"
+      puts "Comand #{data}"
       result = send data
       send_data result
       close_connection_after_writing

data/lib/hoof/http_server.rb

@@ -2,17 +2,18 @@ module Hoof
   class HttpServer < EventMachine::Connection
 
     def receive_data data
-      parser = Http::Parser.new
-      parser.parse data
-      host = parser.headers["HOST"].gsub(/:\d+$/, '')
+      begin
+        parser = Http::Parser.new
+        parser.parse data
 
-      close_connection and return unless host =~ /.dev$/
+        host = parser.headers["HOST"].gsub(/:\d+$/, '')
 
-      name = host.gsub(/.dev$/, '')
-      application = Hoof.find name
+        close_connection and return unless host =~ /.dev$/
 
-      if application
-        begin
+        name = host.gsub(/.dev$/, '')
+        application = Hoof.find name
+
+        if application
           application.start
           puts "Serve #{host}#{parser.path}"
           EventMachine.defer(proc {
@@ -21,10 +22,12 @@ module Hoof
             send_data result
             close_connection_after_writing
           })
-        rescue
-          puts "Failed to serve #{name}"
+        else
+          close_connection
         end
-      else
+      rescue => e
+        puts e.message
+        puts e.backtrace.join("\n")
         close_connection
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoof
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - pyromaniac
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 +04:00
+date: 2011-05-17 00:00:00 +04:00
 default_executable: hoof
 dependencies: 
 - !ruby/object:Gem::Dependency