nimbu 0.2.4 → 0.2.5

data/lib/nimbu/command.rb

@@ -157,7 +157,7 @@ module Nimbu
     rescue OptionParser::ParseError => ex
       commands[cmd] ? run("help", [cmd]) : run("help")
     rescue Interrupt => e
-      error "\n[canceled]"
+      error "\n[exited]"
     end
 
     def self.parse(cmd)

data/lib/nimbu/command/server.rb

@@ -3,6 +3,7 @@ require "nimbu/server/base"
 require 'term/ansicolor'
 require 'compass'
 require 'compass/exec'
+require 'thin'
 
 # running a local server to speed up designing Nimbu themes
 #
@@ -17,23 +18,71 @@ class Nimbu::Command::Server < Nimbu::Command::Base
     if !Nimbu::Auth.read_configuration && !Nimbu::Auth.read_credentials
       print red(bold("ERROR")), ": this directory does not seem to contain any Nimbu theme or your credentials are not set. \n ==> Run \"", bold { "nimbu init"}, "\" to initialize this directory."
     else
-      server_pid = fork do
-        puts "Starting the server..."
-        Nimbu::Server::Base.run!
+      puts white("\nStarting up Nimbu Server + Compass + HAML compiler...")
+      puts green(
+            "             _   ___            __         \n" +
+            "            / | / (_)____ ___  / /_  __  __\n" +
+            "           /  |/ / // __ `__ \\/ __ \\/ / / /\n" +
+            "          / /|  / // / / / / / /_/ / /_/ / \n" +
+            "         /_/ |_/_//_/ /_/ /_/_.___/\\__,_/  \n")
+
+      rd1, wr1 = IO::pipe
+      rd2, wr2 = IO::pipe
+      rd3, wr3 = IO::pipe
+
+      server_pid = Process.fork do
+        $stdout.reopen(wr1)
+        rd1.close
+        puts "Starting..."
+        options = {
+          :Port               => 4567,
+          :DocumentRoot       => Dir.pwd
+        }
+        Rack::Handler::Thin.run Nimbu::Server::Base, options  do |server|
+          [:INT, :TERM].each { |sig| trap(sig) { server.respond_to?(:stop!) ? server.stop! : server.stop } }
+        end
       end
-      haml_pid = fork do
-        puts "Watching haml files..."
+      haml_pid = Process.fork do
+        $stdout.reopen(wr2)
+        rd2.close
+        puts "Starting..."
         HamlWatcher.watch
       end
-      compass_pid = fork do
-        puts "Watching compass files..."
+      compass_pid = Process.fork do
+        $stdout.reopen(wr3)
+        rd3.close
+        puts "Starting..."
         Compass::Exec::SubCommandUI.new(["watch","."]).run!
       end
+      watch_server_pid = Process.fork do
+        trap('INT') { exit }
+        wr1.close
+        rd1.each do |line|  
+          print cyan("SERVER:  ") + white(line) + ""
+        end
+      end
+      watch_haml_pid = Process.fork do
+        trap('INT') { exit }
+        wr2.close
+        rd2.each do |line|  
+          print magenta("HAML:    ") + white(line) + ""
+        end
+      end
+      watch_compass_pid = Process.fork do
+        trap('INT') { exit }
+        wr3.close
+        rd3.each do |line|  
+          print yellow("COMPASS: ") + white(line) + ""
+        end
+      end
+
+      [:INT, :TERM].each do |sig| 
+        trap(sig) do
+          puts green("\n\n== Nimbu has ended its work " + bold("(crowd applauds!)\n"))
+        end
+      end
 
-      Process.wait(server_pid)
-      Process.wait(haml_pid)
-      Process.wait(compass_pid)  
-      
+      Process.waitall      
     end
   end
 end
@@ -48,7 +97,7 @@ class HamlWatcher
     
     def watch
       refresh
-      puts ">>> HamlWatcher is watching for changes. Press Ctrl-C to Stop."
+      puts ">>> Haml is polling for changes. Press Ctrl-C to Stop."
       FSSM.monitor('haml', '**/*.haml') do
         update do |base, relative|
           puts ">>> Change detected to: #{relative}"

data/lib/nimbu/version.rb

@@ -1,3 +1,3 @@
 module Nimbu
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70348632583180 !ruby/object:Gem::Requirement
+  requirement: &70338780900920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70348632583180
+  version_requirements: *70338780900920
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70348632597260 !ruby/object:Gem::Requirement
+  requirement: &70338780899720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70348632597260
+  version_requirements: *70338780899720
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70348632596100 !ruby/object:Gem::Requirement
+  requirement: &70338780898680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70348632596100
+  version_requirements: *70338780898680
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70348632593760 !ruby/object:Gem::Requirement
+  requirement: &70338780897660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348632593760
+  version_requirements: *70338780897660
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70348632605460 !ruby/object:Gem::Requirement
+  requirement: &70338780896020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348632605460
+  version_requirements: *70338780896020
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &70348632604380 !ruby/object:Gem::Requirement
+  requirement: &70338780895260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348632604380
+  version_requirements: *70338780895260
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70348632603440 !ruby/object:Gem::Requirement
+  requirement: &70338780894260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348632603440
+  version_requirements: *70338780894260
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70348632601780 !ruby/object:Gem::Requirement
+  requirement: &70338780893000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348632601780
+  version_requirements: *70338780893000
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70348632600000 !ruby/object:Gem::Requirement
+  requirement: &70338780891960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348632600000
+  version_requirements: *70338780891960
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &70338780890400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70338780890400
 description: Client library and command-line tool to design and manage websites on
   the Nimbu platform.
 email: