norr-merb-manage 0.6 → 0.6.1

data/README

@@ -35,6 +35,6 @@ Configuration:
 		servers:		the amount of servers to start (for clustering/load balancing etc)
 		port:			the port to start the Merb application on (in the case of multiple servers, the ports will be sequential from the port specified, i.e. servers set to 3, with port set to 5000, would start the application on 5000, 5001 and 5002)
 		logging:		the logging level to pass through to Merb - debug, info, warn, error and fatal
-		gem:			set to true to use bundled merb gem in app (bin/merb). set to false or leave out to use global merb
+		frozen:			set to true to use frozen merb in app (bin/merb). set to false or leave out to use global merb
 		
 	Most of these options can be left off if you simply want the Merb defaults - if "servers" isn't specified however, then Merb will be passed the "-d" flag to ensure that the single Merb server will run in daemonized mode.

data/bin/merb-manage-ctl

@@ -30,11 +30,11 @@ end
 
 # This starts the server as per the specified yml config
 def start(yml)
-  # Decide which merb to use, bundled gem or global
-  if yml["gem"].nil?
+  # Decide which merb to use, frozen merb or global merb
+  if yml["frozen"].nil?
     command = "merb -m #{yml['path']} "
   else
-    if yml["gem"]
+    if yml["frozen"]
       command = "#{yml['path']}/bin/merb -m #{yml['path']} "
     else
       command = "merb -m #{yml['path']} "  
@@ -82,4 +82,4 @@ case ARGV[0]
 else
   # Print out the usage as the arguments didn't match a known action
   puts "Usage: merb-manage-ctl {start|stop|restart} (-c CONFIG_GLOB)"
-end
+end

data/config/merb.yml.sample

@@ -1,5 +1,5 @@
 path: /var/www/sample_app
-gem: false
+frozen: false
 adapter: thin
 environment: production
 port: 5000

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: norr-merb-manage
 version: !ruby/object:Gem::Version 
-  version: "0.6"
+  version: 0.6.1
 platform: ruby
 authors: 
 - El Draper