negroku 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27fa5f7e91a90a0727f5030182c467dee507258f
-  data.tar.gz: a978002eef4ca9e34cd8631a74d609e99a678d3a
+  metadata.gz: d2c4e0a3ac3d5965ba4fe44d8d0e037f4d0d15be
+  data.tar.gz: 2d1265284143fe3f7a91b36b04be377a1ba2e89c
 SHA512:
-  metadata.gz: ff78fa461580329961d0d8c5c8a0455f58e746e09853119f6a4f60ff9a34b95fdec22d2597d75d44d6701754ca527ba1174b2a83a5b69bc2295ade0155aa2004
-  data.tar.gz: df1dea28babd7ea4b6168702bdff50fa3a163b695a9a5b26ff21ab05d97ac61e43c56de2e0b5c5391d6cc7baa95285192f55bb8efb9c421277b08124eebb5b5a
+  metadata.gz: 4b6f4de35703e0a13af39d15596e74c5a764ef65114ae4a678dbdf504de49297db8ecc1f9f7710daacce7e4a60240bb8a04ede61fd7f78494bcf08943edc3fd7
+  data.tar.gz: 86503258bc8023da9d0732e19053007fa2d33a899c2b9a13e0d27769c3eac54c9651e2eb9334b12a29bb24f2590075d3a5fa423304fa014205b8f8d3a3b0b74e

data/lib/negroku/cli/commands/env.rb

@@ -3,7 +3,7 @@ module Negroku::CLI
   desc 'Manage your apps env variables'
   command :env do |app|
 
-    app.desc 'Adds multiple variables from rbenv-vars to a server'
+    app.desc 'Sets multiple variables from rbenv-vars to a server'
     app.command :bulk do |bulk|
       bulk.action do |global_options,options,args|
         Negroku::Env.bulk

data/lib/negroku/cli/env.rb

@@ -7,19 +7,19 @@ module Negroku::Env
     if stage = selected_stage || select_stage
       variables = select_variables
       if variables.empty?
-        puts I18n.t(:no_variables_added, scope: :negroku)
+        puts I18n.t(:no_variables_setted, scope: :negroku)
       else
-        add_vars_to_stage(stage, variables)
+        set_vars_to_stage(stage, variables)
       end
     end
   end
 
-  # Adds the variables to the selected stage using cap rbenv add
-  def add_vars_to_stage(stage, variables)
+  # Sets the variables to the selected stage using cap rbenv set
+  def set_vars_to_stage(stage, variables)
     # convert to array using VAR=value
     vars_array = variables.map{|k,v| "#{k}=#{v}" }
     Capistrano::Application.invoke(stage)
-    Capistrano::Application.invoke("rbenv:vars:add", *vars_array)
+    Capistrano::Application.invoke("rbenv:vars:set", *vars_array)
   end
 
   # build a list of variables from ENV_FILE and yeilds it

data/lib/negroku/cli/stage.rb

@@ -10,11 +10,11 @@ module Negroku::Stage
     }
 
     add_stage_file config
-    Negroku::Env.bulk(config[:stage_name]) if ask_add_vars
+    Negroku::Env.bulk(config[:stage_name]) if ask_set_vars
   end
 
-  def ask_add_vars
-    question = I18n.t :ask_add_vars, scope: :negroku
+  def ask_set_vars
+    question = I18n.t :ask_set_vars, scope: :negroku
     Ask.confirm question, default: false
   end
 

data/lib/negroku/deploy.rb

@@ -22,6 +22,7 @@ end
 
 # Load Negroku tasks
 load_task "negroku"
+load_task "env"
 load_task "rbenv"             if required? 'capistrano/rbenv'
 load_task "nodenv"            if required? 'capistrano/nodenv'
 load_task "bower"             if required? 'capistrano/bower'

data/lib/negroku/helpers/env.rb

@@ -1,5 +1,5 @@
-# helper to build the add VAR cmd
-def build_add_var_cmd(vars_file, key, value)
+# helper to build the set VAR cmd
+def build_set_var_cmd(vars_file, key, value)
   puts "#{vars_file} #{key} #{value}"
   cmd = "if awk < #{vars_file} -F= '{print $1}' | grep --quiet -w #{key}; then "
   cmd += "sed -i 's/^#{key}=.*/#{key}=#{value.gsub("\/", "\\/")}/g' #{vars_file};"

data/lib/negroku/locales/en.yml

@@ -7,8 +7,8 @@ en:
     choose_repo_url:             'Choose the repository url'
     type_repo_url:               'Type the url and username e.g. git@github.com:username/app-name.git'
     choose_stages:               'Select the stages you are going to use'
-    select_stages_question:      'Select stages you want to add variables to'
-    no_variables_added:           'No variables added'
+    select_stages_question:      'Select stages you want to set variables to'
+    no_variables_setted:           'No variables setted'
     ask_variables_message:        "Give the variables values, if empty, it will be ignored"
     rbenv_vars_not_found:         ".rbenv-vars does not exists"
     no_stages_found:              "There are no stages available"
@@ -16,4 +16,4 @@ en:
     select_branch:                "Select the branch to use"
     ask_domains:                  "Type the domains to use"
     ask_server_url:               "Type the server url to deploy to"
-    ask_add_vars:                 "Do you want to add rbenv-vars to the server now?"
+    ask_set_vars:                 "Do you want to set rbenv-vars to the server now?"

data/lib/negroku/tasks/env.rake

@@ -0,0 +1,8 @@
+## env.rake
+#
+
+namespace :env do
+  desc 'Env variables changed'
+  task :changed do
+  end
+end

data/lib/negroku/tasks/eye.rake

@@ -1,5 +1,4 @@
 require 'negroku/helpers/templates'
-
 ## eye.rb
 #
 # Adds eye variables and tasks
@@ -21,6 +20,11 @@ namespace :load do
   end
 end
 
+namespace :env do
+  desc 'Env variables changed'
+  task :changed do
+  end
+end
 
 namespace :eye do
 
@@ -79,6 +83,12 @@ namespace :negroku do
     before "deploy:published", "negroku:eye:setup"
     after "negroku:eye:setup", "eye:load"
 
+    after 'env:changed', 'hard-restart' do
+      invoke 'eye:stop'
+      invoke 'eye:load'
+      invoke 'eye:start'
+    end
+
     define_logs(:eye, {
       app: 'eye.log'
     })

data/lib/negroku/tasks/rbenv.rake

@@ -17,12 +17,6 @@ namespace :load do
   end
 end
 
-namespace :env do
-  desc 'Env variables changed'
-  task :changed do
-  end
-end
-
 namespace :rbenv do
   namespace :vars do
     desc "Show current environmental variables"
@@ -34,8 +28,8 @@ namespace :rbenv do
       end
     end
 
-    desc "Add environmental variables in the form VAR=value"
-    task :add, [:variable] => 'deploy:check:directories' do |t, args|
+    desc "Sets environmental variables in the form VAR=value"
+    task :set, [:variable] => 'deploy:check:directories' do |t, args|
 
       vars = [args.variable] + args.extras
 
@@ -43,7 +37,7 @@ namespace :rbenv do
         within shared_path do
           vars.compact.each do |var|
             key, value = var.split('=')
-            cmd = build_add_var_cmd("#{shared_path}/.rbenv-vars", key, value)
+            cmd = build_set_var_cmd("#{shared_path}/.rbenv-vars", key, value)
             execute cmd
           end
         end
@@ -55,8 +49,8 @@ namespace :rbenv do
 
     end
 
-    desc "Remove environmental variable"
-    task :remove, [:key] do |t, args|
+    desc "Unset environmental variable"
+    task :unset, [:key] do |t, args|
       on release_roles :app do
         within shared_path do
           execute :sed, "-i", "/^#{args[:key]}=/d", ".rbenv-vars"

data/lib/negroku/tasks/unicorn.rake

@@ -83,12 +83,6 @@ namespace :negroku do
       invoke 'unicorn:restart'
     end
 
-    after 'env:changed', 'hard-restart' do
-      invoke 'unicorn:stop'
-      sleep 5
-      invoke 'unicorn:start'
-    end
-
     # Ensure the folders needed exist
     after 'deploy:check', 'deploy:check:directories' do
       on release_roles fetch(:unicorn_roles) do

data/lib/negroku/version.rb

@@ -1,3 +1,3 @@
 module Negroku
-  VERSION = '2.0.3'
+  VERSION = '2.1.0'
 end

data/spec/lib/cli/stage_spec.rb

@@ -18,7 +18,7 @@ describe "stage cli" do
       allow(Negroku::Stage).to receive(:ask_server_url).and_return("server_url")
       allow(Negroku::Stage).to receive(:add_stage_file)
 
-      expect(Negroku::Stage).to receive(:ask_add_vars).and_return(true)
+      expect(Negroku::Stage).to receive(:ask_set_vars).and_return(true)
       expect(Negroku::Env).to receive(:bulk).with("deleteme")
 
       expect{Negroku::Stage.add}.not_to raise_error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: negroku
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Juan Ignacio Donoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -317,6 +317,7 @@ files:
 - lib/negroku/tasks/bower.rake
 - lib/negroku/tasks/bundler.rake
 - lib/negroku/tasks/delayed_job.rake
+- lib/negroku/tasks/env.rake
 - lib/negroku/tasks/eye.rake
 - lib/negroku/tasks/eye/delayed_job.rake
 - lib/negroku/tasks/eye/unicorn.rake