nginxinator 0.1.0 → 0.1.1

data/lib/nginxinator/config.rb

@@ -3,7 +3,7 @@ namespace :nginxinator do
   desc 'Write example config files'
   task :write_example_configs do
     run_locally do
-      execute "mkdir -p config/deploy templates/nginx/sites-enabled"
+      execute "mkdir", "-p", "config/deploy", "templates/nginx/sites-enabled"
       {
         'examples/Capfile'                              => 'Capfile_example',
         'examples/config/deploy.rb'                     => 'config/deploy_example.rb',

data/lib/nginxinator/examples/config/deploy/staging_nginxinator.rb

@@ -26,16 +26,16 @@ set :internal_conf_path,          "/etc/nginx"
 set :internal_sites_enabled_path, "/etc/nginx/sites-enabled"
 set :internal_logs_path,          "/var/log/nginx"
 set :internal_sock_path,          "/var/run/unicorn"
-set :ssh_user,                    ENV["USER"]
+set :ssh_user,                    -> { ENV["USER"] }
 
 
 
 ## The values below are not meant to be changed and shouldn't
 ##  need to be under the majority of circumstances:
-set :nginx_container_name,        "#{fetch(:domain)}-nginx-#{fetch(:publish_ports).collect { |p| p['external'] }.join('-')}"
-set :external_conf_path,          "/#{fetch(:nginx_container_name)}-conf"
-set :external_sites_enabled_path, "#{fetch(:external_conf_path)}/sites-enabled"
-set :external_sock_path,          "#{fetch(:external_conf_path)}/run"
+set :nginx_container_name,        -> { "#{fetch(:domain)}-nginx-#{fetch(:publish_ports).collect { |p| p['external'] }.join('-')}" }
+set :external_conf_path,          -> { "/#{fetch(:nginx_container_name)}-conf" }
+set :external_sites_enabled_path, -> { "#{fetch(:external_conf_path)}/sites-enabled" }
+set :external_sock_path,          -> { "#{fetch(:external_conf_path)}/run" }
 set :ports_options,               -> {
   options = []
   fetch(:publish_ports).each do |port_set|

data/lib/nginxinator/nginx.rb

@@ -114,8 +114,8 @@ namespace :nginx do
       as 'root' do
         execute("mkdir", "-p", args.config_path) unless test("test", "-d", args.config_path)
         generated_config_file = nginx_generate_config_file("#{args.template_path}/#{args.config_file}.erb")
-        upload! StringIO.new(generated_config_file), "/tmp/#{args.config_file}"
-        execute("mv", "/tmp/#{args.config_file}", "#{args.config_path}/#{args.config_file}")
+        upload! StringIO.new(generated_config_file), "/tmp/#{args.config_file}.file"
+        execute("mv", "/tmp/#{args.config_file}.file", "#{args.config_path}/#{args.config_file}")
         execute("chown", "-R", "root:root", args.config_path)
         execute("chmod", "-R", "700", args.config_path)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nginxinator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano