negroku 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: accb88c6c482562486a58084a3332c11802901b0
-  data.tar.gz: c0ef5bd982d5ccc6368a36c99dae246a0bb316f0
+  metadata.gz: 70fad1ba6b8f3e5c56fe4f49b17b50d9a24ea1e6
+  data.tar.gz: 9fc4ac570ac41df75efc285a236907c7d5614630
 SHA512:
-  metadata.gz: 0ab47d7730072926eac54b66983d7e67b44168ed350df88365b3fb664479f8438f4bd6bbb660559425c7d374dbe90412b683c970b7814423891f3cef5c13a2f2
-  data.tar.gz: d3b25a20f14c65c4cd393cf6c98b9ba53196bed154c07c75f358a028bab42e780bbf0d21bd064ca86f23608011b0b61727563b39eca7c2d76f8988a118e65c40
+  metadata.gz: 90027311309f1a5c4467b08f4bfc0c4aec730cdac900938e159aee779d9a5b81d203bc56835adf44920ae565ba54cc530acd45f52959472176c8a4ac2ba18e47
+  data.tar.gz: 73f3bb2df20a4ec1c90d28335128b4ebf4edc5f46ba8ced0ad61555c4f9439ff6bf7b9a246d4b4df926869e8a54d122109b5910885ccc21369efc2f34a8013ec

data/lib/negroku/cli.rb

@@ -1,6 +1,7 @@
 require 'thor'
 require 'rainbow'
 require 'highline/import'
+require 'negroku'
 
 trap('INT') { exit }
 
@@ -157,10 +158,11 @@ end
 
 class RemoteEnv < Thor
   namespace "env"
+  class_option :stage, :type => :string, :default => "staging", :aliases => "-s", :desc => "Set the capistrano stage to be used", :banner => "STAGE"
 
   desc "show", "Show the current remote variables"
   def show
-    `cap rbenv:vars:show`
+    %x(cap #{options[:stage]} rbenv:vars:show)
   end
 
   desc "add", "Adds env variables to the remote server"
@@ -192,12 +194,24 @@ class RemoteEnv < Thor
       end
     end
 
-    `cap rbenv:vars:add -s key=#{key} -s value=#{value}`
+    %x(cap #{options[:stage]} rbenv:vars:add -s key=#{key} -s value=#{value})
   end
 end
 
 module Negroku
   class CLI < Thor
+    class_option :version, :type => :boolean, :aliases => "-v"
+
+    def initialize(*)
+      super
+
+      # Show the version
+      if options[:version]
+        puts Negroku::VERSION
+        exit 0
+      end
+    end
+
     register(App, 'app', 'app [COMMAND]', 'Application')
     register(Target, 'target', 'target [COMMAND]', 'Target servers')
     register(Konfig, 'config', 'config [COMMAND]', 'Configuration')

data/lib/negroku/tasks/nginx.rb

@@ -39,9 +39,15 @@ namespace :nginx do
   after "deploy:setup", "nginx:setup"
   desc "Setup nginx configuration for this application."
   task :setup, roles: :web do
-    template "nginx.erb", "/tmp/nginx.conf"
+    config_file = "config/deploy/nginx.conf.erb"
+    if File.exists?(config_file)
+        config = ERB.new(File.read(config_file)).result(binding)
+        put config, "/tmp/nginx.conf"
+    else
+      template "nginx.erb", "/tmp/nginx.conf"
+    end
     run "#{sudo} mv /tmp/nginx.conf /etc/nginx/sites-available/#{fetch(:application)}"
-    run "#{sudo} ln -s /etc/nginx/sites-available/#{fetch(:application)} /etc/nginx/sites-enabled/#{fetch(:application)}"
+    run "#{sudo} ln -nfs /etc/nginx/sites-available/#{fetch(:application)} /etc/nginx/sites-enabled/#{fetch(:application)}"
     run "mkdir -p /home/#{fetch(:user)}/log"
     reload
   end

data/lib/negroku/tasks/rbenv.rb

@@ -4,9 +4,7 @@ namespace :rbenv do
   namespace :vars do
     desc "Show current rbenv vars"
     task :show, :roles => :app do
-      run "sh -c 'cd #{shared_path} && cat .rbenv-vars'"  do |channel, stream, data|
-        puts data
-      end
+      run "sh -c 'cd #{shared_path} && cat .rbenv-vars'"
     end
 
     desc "Add rbenv vars"

data/lib/negroku/version.rb

@@ -1,3 +1,3 @@
 module Negroku
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: negroku
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Juan Ignacio Donoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -130,3 +130,4 @@ signing_key:
 specification_version: 4
 summary: '["Capistrano Wrapper"]'
 test_files: []
+has_rdoc: