piano 0.7.4 → 0.7.5

data/README.rdoc

@@ -84,6 +84,7 @@ Note: you can also add a <tt>server/folder/data/404.yaml</tt> file to keep layer
 * Port number: Any number passed as an argument to the <tt>piano</tt> command will be used as the port number.
 * Environment: Any string that does not matches any other argument will be setted as the environment. 
 * <tt>noetags</tt>: Adding <tt>noetags</tt> to the shell command will cause Piano to run without etags.
+* <tt>nocoffee</tt>: Adding <tt>nocoffee</tt> to the shell command will cause Piano to Not load the CoffeeScript library. Useful when no JavaScript environment is available.
 
 == Library Usage
 
@@ -185,6 +186,7 @@ Etags cause client side caching. This should not be a problem since the hash cha
 * Deploy of sample with command line <tt>--sample</tt> argument.
 * Online source files edition.
 * Test <tt>use Piano</tt> within a <tt>Sinatra::Base</tt> class.
+* If CoffeeScript can't run, inform of the <tt>nocoffee</tt> command line option.
 
 * Now it would be nice to give Piano personalized templates not only to 404 but for all error pages, specially 500
 * Custom error when there's no data

data/bin/piano

@@ -1,16 +1,16 @@
 #!/usr/bin/env ruby
 
-require "piano"
-
 unless ARGV.empty?
   
+  args = {}
+  
   ARGV.each do |arg|
     if arg =~ /^\d+$/
-      Piano.port = arg
+      args[:port] = arg
     elsif arg =~ /^noetags$/
-      Piano.etags = :off
-    elsif arg =~ /^nocoffee%/
-      $nocoffeescript = true
+      args[:etags] = :off
+    elsif arg =~ /^nocoffee/
+      $notcoffeescript = true
     elsif arg =~ /^sample$/
       puts "Warning: the sample site folder files will be created in the current directory."
       puts "Any files with the same name will be overwritten."
@@ -29,12 +29,20 @@ unless ARGV.empty?
 #        end
       end 
     elsif arg =~ /^[a-z]+$/
-      Piano.environment = arg.to_sym
+      args[:environment] = arg.to_sym
     end
   end
 
 end
 
+require "piano"
+
+if args
+  Piano.port = args[:port]  if args[:port]
+  Piano.environment = args[:environment] if args[:environment]
+  Piano.etags = args[:etags] if args[:etags]
+end
+
 def make_sample
   require "fileutils"
   

data/lib/piano/version.rb

@@ -1,3 +1,3 @@
 module Piano
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piano
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &21455076 !ruby/object:Gem::Requirement
+  requirement: &21716892 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *21455076
+  version_requirements: *21716892
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &21454776 !ruby/object:Gem::Requirement
+  requirement: &21716592 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *21454776
+  version_requirements: *21716592
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &21454500 !ruby/object:Gem::Requirement
+  requirement: &21716316 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *21454500
+  version_requirements: *21716316
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &21454224 !ruby/object:Gem::Requirement
+  requirement: &21716040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *21454224
+  version_requirements: *21716040
 description: Out-of-the-box sinatra server for web site sketching using haml + sass
   + coffee-script
 email: