proton 0.3.5 → 0.3.6

data/HISTORY.md

@@ -1,3 +1,21 @@
+Proton v0.3.6 - Feb 05, 2012
+----------------------------
+
+### Fixed:
+  * Fixed bug where ^C doesn't work.
+
+Proton v0.3.5 - Oct 29, 2011
+----------------------------
+
+### Fixed:
+  * Remove the hard dependency on RedCloth and maruku. Hopefully fixes #1.
+
+### Misc:
+  * Added `rake test!`.
+  * Added comments in the default 'proton rack' Gemfile about CoffeeScript
+    support.
+  * Update the sinefunc/proton reference to rstacruz/proton.
+
 Proton v0.3.4 - Aug 01, 2011
 ----------------------------
 

data/lib/proton/server.rb

@@ -79,17 +79,39 @@ class Proton
 end
 
 module Proton::Server
+  extend Proton::CLI::Helpers
   # Available options:
   #   :last_modified  -- timestamp for all files
   def self.options
-    @options ||= Hash.new 
+    @options ||= Hash.new
   end
 
   # :Host, :Port
   def self.run!(options={})
     self.options.merge options
     handler = rack_handler  or return false
-    handler.run self, options
+    handler_name = handler.name.gsub(/.*::/, '')
+    url = "http://#{options[:Host]}:#{options[:Port]}/"
+
+
+    handler.run self, options do |server|
+      puts
+      say_status '==>', "Proton server has now started (via #{handler_name})."
+      say_info "Point your browser to: #{url}"
+      puts
+      [:INT, :TERM].each { |sig| trap(sig) { quit!(server, handler_name) } }
+    end
+
+  rescue Errno::EADDRINUSE => e
+    say_error "Someone is already performing on port #{port}!"
+  end
+
+  def self.quit!(server, handler_name)
+    # Use Thin's hard #stop! if available, otherwise just #stop.
+    server.respond_to?(:stop!) ? server.stop! : server.stop
+    puts
+    say_status '==>', "Exiting..." unless handler_name =~/cgi/i
+    puts
   end
 
   def self.rack_handler

data/lib/proton/version.rb

@@ -1,5 +1,5 @@
 class Proton
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 
   # Attribute: version (Proton)
   # Returns the version.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proton
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-29 00:00:00.000000000Z
+date: 2012-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shake
-  requirement: &2151865940 !ruby/object:Gem::Requirement
+  requirement: &2152506380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2151865940
+  version_requirements: *2152506380
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2151878060 !ruby/object:Gem::Requirement
+  requirement: &2152505660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *2151878060
+  version_requirements: *2152505660
 - !ruby/object:Gem::Dependency
   name: cuba
-  requirement: &2151899360 !ruby/object:Gem::Requirement
+  requirement: &2152505080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151899360
+  version_requirements: *2152505080
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2151908720 !ruby/object:Gem::Requirement
+  requirement: &2152504480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151908720
+  version_requirements: *2152504480
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2152188140 !ruby/object:Gem::Requirement
+  requirement: &2152503940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152188140
+  version_requirements: *2152503940
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2152678240 !ruby/object:Gem::Requirement
+  requirement: &2152503240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152678240
+  version_requirements: *2152503240
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &2152754680 !ruby/object:Gem::Requirement
+  requirement: &2152502180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.11.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152754680
+  version_requirements: *2152502180
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2153007040 !ruby/object:Gem::Requirement
+  requirement: &2152501680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153007040
+  version_requirements: *2152501680
 - !ruby/object:Gem::Dependency
   name: less
-  requirement: &2155935080 !ruby/object:Gem::Requirement
+  requirement: &2152500820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155935080
+  version_requirements: *2152500820
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &2156285760 !ruby/object:Gem::Requirement
+  requirement: &2152499700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156285760
+  version_requirements: *2152499700
 description: Proton lets you create static websites from a bunch of files written
   in HAML, Textile, Sass, or any other templating language.
 email:
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Prototyping tool / static site generator.