peony 0.1.9 → 0.3.0

data/templates/nginx/www.conf.erb

@@ -1,91 +1,91 @@
 #user usergroup
-user <%= user %> <%= group %>;
+user    <%= user %> <%= group %>;
 
-worker_processes		<%= worker_processes %>;
+worker_processes            <%= nginx.worker_processes %>;
 
 #[debug, info, notice, warn, error, crit]
-error_log				  www_error.log  debug;
-pid						    <%= nginx_run_dir %>/www.pid;
+error_log                   www_error.log  debug;
+pid                         <%= nginx.run_dir %>/www.pid;
 
-worker_rlimit_nofile	8192;
+worker_rlimit_nofile        8192;
 
 #async IO event model.
 events {
-	worker_connections	8192;
+    worker_connections      8192;
 }
 
 http {
-	include				  conf/mime.types;	
-	default_type		application/octet-stream;
-
-	log_format			main '$remote_addr – $remote_user [$time_local] $status '
-						      '"$request" $body_bytes_sent "$http_referer" ' 
-						      '"$http_user_agent" "$http_x_forwarded_for"';
-
-	access_log			www_access.log main;
-	
-	server_names_hash_bucket_size	  128; 	
-	client_header_buffer_size		    32k;
-	large_client_header_buffers		  4 128k;
-	client_max_body_size			      32m;
-	client_body_buffer_size			    512k;  
-	
-	sendfile						    on;
-	tcp_nopush						  on;	
-	tcp_nodelay 					  on;
-	
-	keepalive_timeout				60;
-	
-	fastcgi_connect_timeout			  300;
-	fastcgi_send_timeout			    300;
-	fastcgi_read_timeout			    300;
-	fastcgi_buffer_size				    64k;
-	fastcgi_buffers					      4			64k;
-	fastcgi_busy_buffers_size		  128k;
-	fastcgi_temp_file_write_size	128k;
-	
-	gzip							            on;
-	gzip_min_length					      1k;
-	gzip_buffers					        4			16k;
-	gzip_http_version				      1.1;
-	gzip_comp_level					      2;
-	gzip_types						        text/plain	application/x-javascript	text/css	application/xml;
-	gzip_vary						          on;
-	
-
-<%- upstreams.each do|up| -%>
-  upstream <%= up[:name] %> {
-    <%- up[:servers].each do|config| -%>
-    server  <%= config %>;
+    include                 conf/mime.types;
+    default_type            application/octet-stream;
+
+    log_format			    main '$remote_addr – $remote_user [$time_local] $status '
+                            '"$request" $body_bytes_sent "$http_referer" '
+                            '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log              www_access.log main;
+
+    server_names_hash_bucket_size       128;
+    client_header_buffer_size           32k;
+    large_client_header_buffers         4 128k;
+    client_max_body_size                32m;
+    client_body_buffer_size             512k;
+
+    sendfile                            on;
+    tcp_nopush                          on;
+    tcp_nodelay                         on;
+
+    keepalive_timeout                   60;
+
+    fastcgi_connect_timeout             300;
+    fastcgi_send_timeout                300;
+    fastcgi_read_timeout                300;
+    fastcgi_buffer_size                 64k;
+    fastcgi_buffers                     4            64k;
+    fastcgi_busy_buffers_size           128k;
+    fastcgi_temp_file_write_size        128k;
+
+    gzip                                on;
+    gzip_min_length                     1k;
+    gzip_buffers                        4            16k;
+    gzip_http_version                   1.1;
+    gzip_comp_level                     2;
+    gzip_types                          text/plain    application/x-javascript    text/css    application/xml;
+    gzip_vary                           on;
+
+
+    <%- nginx.upstreams.each do|up| -%>
+    upstream <%= up[:name] %> {
+        <%- up[:servers].each do|config| -%>
+        server  <%= config %>;
+        <%- end -%>
+    }
+    <%- end -%>
+
+    server {
+        listen                          <%= nginx.www_http_port %>;
+        server_name                     <%= nginx.server_name || "localhost" %>;
+        access_log                      http.access.log  main;
+
+        index                           index.html index.htm index.php;
+
+        include                         sites-enabled/*.http.conf;
+    }
+
+    <%- if nginx.use_ssl -%>
+    server {
+        listen                          <%= nginx.www_https_port %>;
+        server_name                     <%= nginx.server_name || "localhost" %>;
+        access_log                      https.access.log  main;
+        ssl                             on;
+        ssl_certificate                 <%= nginx.ssl_certificate %>;
+        ssl_certificate_key             <%= nginx.ssl_certificate_key %>;
+        ssl_session_timeout             5m;
+        ssl_protocols                   SSLv2 SSLv3 TLSv1;
+        ssl_ciphers                     ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
+        ssl_prefer_server_ciphers       on;
+
+        include                         sites-enabled/*.https.conf;
+    }
     <%- end -%>
-  }
-<%- end -%>
-
-	server {
-    listen							          <%= www_http_port %>;
-    server_name						        <%= server_name || "localhost" %>;
-    access_log						        http.access.log  main;
-
-    index							            index.html index.htm index.php;    
-    
-    include							          sites-enabled/*.http.conf;
-  }
-
-<%- if use_ssl -%>
-	server {
-		listen							          <%= www_https_port %>;
-		server_name						        <%= server_name || "localhost" %>;
-    access_log						        https.access.log  main;
-    ssl 							            on;
-    ssl_certificate 			        <%= ssl_certificate %>;
-    ssl_certificate_key 	        <%= ssl_certificate_key %>;
-    ssl_session_timeout           5m;
-    ssl_protocols  				        SSLv2 SSLv3 TLSv1;
-    ssl_ciphers  					        ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
-    ssl_prefer_server_ciphers   	on;    
-    
-    include							          sites-enabled/*.https.conf;     	
-  }
-<%- end -%>		
 }
 

data/templates/redis.conf.erb

@@ -14,15 +14,15 @@
 
 # By default Redis does not run as a daemon. Use 'yes' if you need it.
 # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize <%= redis_daemonize %>
+daemonize <%= redis.daemonize %>
 
 # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
 # default. You can specify a custom pid file location here.
-pidfile <%= redis_pid %>
+pidfile <%= redis.pid_file %>
 
 # Accept connections on the specified port, default is 6379.
 # If port 0 is specified Redis will not listen on a TCP socket.
-port <%= redis_port %>
+port <%= redis.port %>
 
 # If you want you can bind a single interface, if the bind option is not
 # specified all the interfaces will listen for incoming connections.
@@ -37,7 +37,7 @@ port <%= redis_port %>
 # unixsocketperm 755
 
 # Close the connection after a client is idle for N seconds (0 to disable)
-timeout <%= redis_timeout %>
+timeout <%= redis.timeout %>
 
 # Set server verbosity to 'debug'
 # it can be one of:
@@ -45,12 +45,12 @@ timeout <%= redis_timeout %>
 # verbose (many rarely useful info, but not a mess like the debug level)
 # notice (moderately verbose, what you want in production probably)
 # warning (only very important / critical messages are logged)
-loglevel <%= redis_loglevel %>
+loglevel <%= redis.loglevel %>
 
 # Specify the log file name. Also 'stdout' can be used to force
 # Redis to log on the standard output. Note that if you use standard
 # output for logging but daemonize, logs will be sent to /dev/null
-logfile <%= redis_logfile %>
+logfile <%= redis.logfile %>
 
 # To enable logging to the system logger, just set 'syslog-enabled' to yes,
 # and optionally update the other syslog parameters to suit your needs.
@@ -65,7 +65,7 @@ logfile <%= redis_logfile %>
 # Set the number of databases. The default database is DB 0, you can select
 # a different one on a per-connection basis using SELECT <dbid> where
 # dbid is a number between 0 and 'databases'-1
-databases <%= redis_databases %>
+databases <%= redis.databases %>
 
 ################################ SNAPSHOTTING  #################################
 #
@@ -112,7 +112,7 @@ stop-writes-on-bgsave-error yes
 # For default that's set to 'yes' as it's almost always a win.
 # If you want to save some CPU in the saving child set it to 'no' but
 # the dataset will likely be bigger if you have compressible values or keys.
-rdbcompression <%= rdbcompression %>
+rdbcompression <%= redis.rdbcompression %>
 
 # Since verison 5 of RDB a CRC64 checksum is placed at the end of the file.
 # This makes the format more resistant to corruption but there is a performance
@@ -121,10 +121,10 @@ rdbcompression <%= rdbcompression %>
 #
 # RDB files created with checksum disabled have a checksum of zero that will
 # tell the loading code to skip the check.
-rdbchecksum <%= rdbchecksum %>
+rdbchecksum <%= redis.rdbchecksum %>
 
 # The filename where to dump the DB
-dbfilename <%= redis_dbfilename %>
+dbfilename <%= redis.dbfilename %>
 
 # The working directory.
 #
@@ -135,7 +135,7 @@ dbfilename <%= redis_dbfilename %>
 # 
 # Note that you must specify a directory here, not a file name.
 #dir ./
-dir <%= redis_dir %>
+dir <%= redis.data_dir %>
 
 ################################# REPLICATION #################################
 
@@ -333,7 +333,7 @@ slave-priority 100
 # Please check http://redis.io/topics/persistence for more information.
 
 #appendonly no
-appendonly  <%= redis_appendonly %>
+appendonly  <%= redis.appendonly %>
 
 # The name of the append only file (default: "appendonly.aof")
 appendfilename appendonly.aof
@@ -557,7 +557,7 @@ zset-max-ziplist-value 64
 #
 # use "activerehashing yes" if you don't have such hard requirements but
 # want to free memory asap when possible.
-activerehashing <%= redis_activerehashing %>
+activerehashing <%= redis.activerehashing %>
 
 # The client output buffer limits can be used to force disconnection of clients
 # that are not reading data from the server fast enough for some reason (a

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peony
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.3.0
 platform: ruby
 authors:
 - James Zhan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,18 +70,19 @@ files:
 - lib/peony.rb
 - lib/peony/actions.rb
 - lib/peony/application.rb
+- lib/peony/configure.rb
 - lib/peony/default.rb
 - lib/peony/line_editor.rb
 - lib/peony/line_editor/basic.rb
 - lib/peony/line_editor/readline.rb
 - lib/peony/parse_arguments.rb
 - lib/peony/rake.rb
+- lib/peony/scope.rb
 - lib/peony/settings.rb
 - lib/peony/shell.rb
 - lib/peony/shell/basic.rb
 - lib/peony/shell/color.rb
 - lib/peony/shell/html.rb
-- lib/peony/utils.rb
 - lib/peony/version.rb
 - peony.gemspec
 - recipes/db/mongo.rake
@@ -94,6 +95,7 @@ files:
 - recipes/nginx/www.rake
 - recipes/php.rake
 - spec/peony_spec.rb
+- spec/scope_spec.rb
 - spec/settings_in_rake_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb
@@ -156,6 +158,7 @@ specification_version: 4
 summary: Local Script Management System Using Rake.
 test_files:
 - spec/peony_spec.rb
+- spec/scope_spec.rb
 - spec/settings_in_rake_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb