negroku 2.0.0.pre2 → 2.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ad1fba31167094369325cf2980996a35237559f
-  data.tar.gz: 0623e3ffd944c40f4a2de602acbd9f8021381d62
+  metadata.gz: d2304543c710a4d86a60f368a026e53ae593f8d5
+  data.tar.gz: e9046a6bfcffe5db9bfc4c55262b9d030b08537e
 SHA512:
-  metadata.gz: 891b5c5f10131ce652b7a6fc9520f72f5db7a9f87a054240b518dcdcd555b156e48c44cf9088bb8254c5d2364499c027e19e2b19f138f6a5c073113475cbe003
-  data.tar.gz: abcaa6b4e7f80dba7c389a1479440bfc2ffd1283b571e600bb65fe204a044400f793fd3b87994de4ed106523b9565c73603141a8710cfc2789cc03cf6c3c7fce
+  metadata.gz: 26513388eb619bcb04ee854a1a24831e1ee90f6cca7ce9a4264d6fb4af35eff5bd37f27a4a8c1adc79d4ff0b0711cfed4a8f4f80ae01e29af95532071ccc4cf6
+  data.tar.gz: 502dbf0589cbc762fd46ab1c1b1bf02455665cb2edc1ffe8c6f6dbb7a46668e8c2c4a578fa3c44450e3dec558dbd59751d48a4666819cda82a7b150ccd62f6ef

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format=doc

data/Rakefile

@@ -1,44 +1 @@
-require 'rake/clean'
-require 'rubygems'
-require 'rubygems/package_task'
-require 'rdoc/task'
-require 'cucumber'
-require 'cucumber/rake/task'
-Rake::RDocTask.new do |rd|
-  rd.main = "README.rdoc"
-  rd.rdoc_files.include("README.rdoc","lib/**/*.rb","bin/**/*")
-  rd.title = 'Negroku'
-end
-
-spec = eval(File.read('negroku.gemspec'))
-
-Gem::PackageTask.new(spec) do |pkg|
-end
-CUKE_RESULTS = 'results.html'
-CLEAN << CUKE_RESULTS
-desc 'Run features'
-Cucumber::Rake::Task.new(:features) do |t|
-  opts = "features --format html -o #{CUKE_RESULTS} --format progress -x"
-  opts += " --tags #{ENV['TAGS']}" if ENV['TAGS']
-  t.cucumber_opts =  opts
-  t.fork = false
-end
-
-desc 'Run features tagged as work-in-progress (@wip)'
-Cucumber::Rake::Task.new('features:wip') do |t|
-  tag_opts = ' --tags ~@pending'
-  tag_opts = ' --tags @wip'
-  t.cucumber_opts = "features --format html -o #{CUKE_RESULTS} --format pretty -x -s#{tag_opts}"
-  t.fork = false
-end
-
-task :cucumber => :features
-task 'cucumber:wip' => 'features:wip'
-task :wip => 'features:wip'
-require 'rake/testtask'
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/*_test.rb']
-end
-
-task :default => [:test,:features]
+require "bundler/gem_tasks"

data/lib/negroku/cli/bootstrap.rb

@@ -1,6 +1,3 @@
-require 'erb'
-require 'pathname'
-
 module Negroku::Bootstrap
   extend self
 
@@ -10,103 +7,40 @@ module Negroku::Bootstrap
     data[:application_name] = ask_name
     data[:repo_url] = select_repo
 
-    custom_capify select_stages, data
-
-  end
-
-  def add_stage(stage=nil)
-
-    if stage.nil?
-      name = ask_stage
-    end
-
-    custom_stage(name)
+    custom_capify data
 
   end
 
-  def remove_stage(stage=nil)
-
-    current_stages = Dir[File.join(@deploy_dir, '*.rb')].map(){|f| File.basename(f)}
-
-    if stage.nil?
-      selections = Ask.checkbox "What stages you want to remove", current_stages
-      stages_to_delete = selections.map.with_index { |v, i| current_stages[i] if v}.compact
-    else
-      stages_to_delete = ["#{stage}.rb"]
-    end
-
-    if stages_to_delete.count > 0
-      stages_to_delete.each do |s|
-        path_to_delete = File.join(@deploy_dir, s)
-        begin
-          FileUtils.rm(path_to_delete)
-        rescue
-          puts "The stage '#{s}' doesn't exist"
-        end
-      end
-    else
-      puts "Nothing to do"
-    end
-
-  end
 
   private
 
-  @tasks_dir = Pathname.new('lib/capistrano/tasks')
-  @config_dir = Pathname.new('config')
-  @deploy_dir = @config_dir.join('deploy')
-
-  @deploy_rb = File.expand_path("../../templates/negroku/deploy.rb.erb", __FILE__)
-  @stage_rb = File.expand_path("../../templates/negroku/stage.rb.erb", __FILE__)
-  @capfile = File.expand_path("../../templates/negroku/Capfile.erb", __FILE__)
-
   # This code was exatracted from capistrano to be used with our own templates
   # https://github.com/capistrano/capistrano/blob/68e7632c5f16823a09c324d556a208e096abee62/lib/capistrano/tasks/install.rake
-  def custom_capify(stages, data={})
-
-    FileUtils.mkdir_p @deploy_dir
+  def custom_capify(data={})
+    # defaults
+    data[:server_url] = ""
+    data[:branch] = "master"
 
-    template = File.read(@deploy_rb)
-    file = @config_dir.join('deploy.rb')
-    File.open(file, 'w+') do |f|
-      f.write(ERB.new(template).result(binding))
-      puts I18n.t(:written_file, scope: :negroku, file: file)
-    end
+    FileUtils.mkdir_p AppDirectory.deploy
 
-    template = File.read(@stage_rb)
-    stages.each do |stage|
-      file = @deploy_dir.join("#{stage}.rb")
-      File.open(file, 'w+') do |f|
-        f.write(ERB.new(template).result(binding))
-        puts I18n.t(:written_file, scope: :negroku, file: file)
-      end
-    end
+    deploy_rb = AppDirectory.config.join('deploy.rb')
+    capfile = AppDirectory.root.join('Capfile')
+    build_template("negroku/deploy.rb.erb", deploy_rb, binding)
+    build_template('negroku/Capfile.erb', capfile, binding)
 
-    FileUtils.mkdir_p @tasks_dir
-
-    FileUtils.cp(@capfile, 'Capfile')
+    FileUtils.mkdir_p AppDirectory.tasks
 
 
     puts I18n.t :capified, scope: :negroku
 
   end
 
-  def custom_stage(stage, data={})
-
-  end
-
   # Ask the application name
   def ask_name
     question = I18n.t :application_name, scope: :negroku
     Ask.input question, default: File.basename(Dir.getwd)
   end
 
-  # Ask the stage name
-  def ask_stage
-    question = I18n.t :ask_stage_name, scope: :negroku
-    Ask.input question
-  end
-
   # Get git remotes from current git and ask to select one
   def select_repo
     remote_urls = %x(git remote -v 2> /dev/null | awk '{print $2}' | uniq).split("\n")
@@ -121,19 +55,4 @@ module Negroku::Bootstrap
     else remote_urls[selected_idx] end
   end
 
-  # Ask which stages to setup
-  def select_stages
-    default_stages = %w(staging production other)
-
-    question = I18n.t :choose_stages, scope: :negroku
-    selected_idx = Ask.checkbox question, default_stages
-
-    stages = selected_idx.map.with_index { |v, i| default_stages[i] if v}.compact
-
-    if selected_idx.last
-      question = "List the extra stages (comma separated)"
-      stages[0...-1].concat (Ask.input question).split(",").map(&:strip)
-    else stages end
-  end
-
 end

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

@@ -12,28 +12,5 @@ module Negroku::CLI
       end
     end
 
-    app.desc 'Bootstrap your application with capistrano and negroku'
-    app.command :stage do |stage|
-
-      stage.desc 'Bootstrap your application with capistrano and negroku'
-      stage.command :add do |add|
-        add.action do |global_options,options,args|
-
-          Negroku::Bootstrap.add_stage
-
-        end
-      end
-
-      stage.desc 'Bootstrap your application with capistrano and negroku'
-      stage.command :remove do |remove|
-        remove.action do |global_options,options,args|
-
-          Negroku::Bootstrap.remove_stage args.first
-
-        end
-      end
-
-    end
-
   end
 end

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

@@ -0,0 +1,14 @@
+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.command :bulk do |bulk|
+      bulk.action do |global_options,options,args|
+        Negroku::Env.bulk
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,16 @@
+module Negroku::CLI
+
+  desc 'Create and manage stages'
+  command :stage do |stage|
+
+    stage.desc 'Adds a new stage'
+    stage.command :add do |add|
+      add.action do |global_options,options,args|
+
+        Negroku::Stage.add
+
+      end
+    end
+  end
+
+end

data/lib/negroku/cli/env.rb

@@ -0,0 +1,57 @@
+module Negroku::Env
+  extend self
+
+  ENV_FILE = ".rbenv-vars"
+
+  def bulk(selected_stage = nil)
+    if stage = selected_stage || select_stage
+      variables = select_variables
+      if variables.empty?
+        puts I18n.t(:no_variables_added, scope: :negroku)
+      else
+        add_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)
+    # 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)
+  end
+
+  # build a list of variables from ENV_FILE and yeilds it
+  def get_variables
+    return unless File.exists?(ENV_FILE)
+
+    File.open(ENV_FILE).each do |line|
+      var_name = line.split("=").first
+      yield var_name unless line =~ /^\#/
+    end
+  end
+
+  # Returns a hash of selected variables and values
+  def select_variables
+    selection = {}
+    puts I18n.t(:ask_variables_message, scope: :negroku)
+    get_variables do |var_name|
+      selection[var_name] = Ask.input(var_name)
+    end
+    selection.reject {|key, value| value.empty? }
+  end
+
+  def select_stage
+    if current_stages.empty?
+      puts I18n.t(:no_stages_found, scope: :negroku)
+    else
+      selection = Ask.list I18n.t(:select_stages_question, scope: :negroku), current_stages
+      current_stages[selection]
+    end
+  end
+
+  def current_stages
+    @current_stages ||= Capistrano::Application.stages
+  end
+end

data/lib/negroku/cli/stage.rb

@@ -0,0 +1,88 @@
+module Negroku::Stage
+  extend self
+
+  def add
+    config = {
+      stage_name: ask_stage,
+      branch: select_branch,
+      domains: ask_domains,
+      server_url: ask_server_url
+    }
+
+    add_stage_file config
+    Negroku::Env.bulk(config[:stage_name]) if ask_add_vars
+  end
+
+  def ask_add_vars
+    question = I18n.t :ask_add_vars, scope: :negroku
+    Ask.confirm question, default: false
+  end
+
+  def add_stage_file(data)
+    destination = AppDirectory.deploy.join("#{data[:stage_name]}.rb")
+
+    build_template("negroku/stage.rb.erb", destination, binding)
+  end
+
+  def ask_server_url
+    question = I18n.t :ask_server_url, scope: :negroku
+    Ask.input question
+  end
+
+  def ask_domains
+    question = I18n.t :ask_domains, scope: :negroku
+    Ask.input question
+  end
+
+  def select_branch
+    question = I18n.t :select_branch, scope: :negroku
+    branches = get_remote_branches
+    answer = Ask.list question, branches
+    return branches[answer] unless branches.empty?
+  end
+
+  def get_remote_branches(fetch: false)
+    %x(git fetch) if fetch
+
+    branches = []
+    %x(git branch -r).split.each do |branch|
+      next unless branch.start_with? 'origin'
+      branches << branch.split('/', 2)[1] unless branch =~ /HEAD/
+    end
+    branches.uniq
+  end
+
+  # Ask the stage name
+  def ask_stage
+    question = I18n.t :ask_stage_name, scope: :negroku
+    stage_name = Ask.input question
+    raise "Stage name required" if stage_name.empty?
+    stage_name
+  end
+
+  def remove_stage(stage=nil)
+
+    current_stages = Dir[File.join(@deploy_dir, '*.rb')].map(){|f| File.basename(f)}
+
+    if stage.nil?
+      selections = Ask.checkbox "What stages you want to remove", current_stages
+      stages_to_delete = selections.map.with_index { |v, i| current_stages[i] if v}.compact
+    else
+      stages_to_delete = ["#{stage}.rb"]
+    end
+
+    if stages_to_delete.count > 0
+      stages_to_delete.each do |s|
+        path_to_delete = File.join(@deploy_dir, s)
+        begin
+          FileUtils.rm(path_to_delete)
+        rescue
+          puts "The stage '#{s}' doesn't exist"
+        end
+      end
+    else
+      puts "Nothing to do"
+    end
+
+  end
+end

data/lib/negroku/cli.rb

@@ -1,8 +1,23 @@
+require 'capistrano/all'
+require 'capistrano/setup'
+require 'capistrano/deploy'
+
+# Load applications deploy config if it exists
+require './config/deploy' if File.exists? "./config/deploy"
+
 require 'gli'
 require 'inquirer'
 require 'negroku/i18n'
 require 'negroku/version'
 require 'negroku/cli/bootstrap'
+require 'negroku/cli/stage'
+require 'negroku/cli/env'
+require 'negroku/helpers/app_directory'
+require 'negroku/helpers/templates'
+
+require 'capistrano/rbenv'
+require 'negroku/deploy'
+
 
 module Negroku::CLI
 

data/lib/negroku/formatters/simple.rb

@@ -1,4 +1,3 @@
-require 'pry'
 module SSHKit
 
   module Formatter
@@ -6,7 +5,6 @@ module SSHKit
     class Simple < Abstract
 
       def write(obj)
-        binding.pry
         original_output << "Deploying..."
         return if obj.verbosity < SSHKit.config.output_verbosity
         case obj

data/lib/negroku/helpers/app_directory.rb

@@ -0,0 +1,22 @@
+require 'pathname'
+
+module AppDirectory
+  extend self
+
+  def config
+    @config ||= Pathname.new('config')
+  end
+
+  def root
+    @root ||= Pathname.new('')
+  end
+
+  def deploy
+    config.join('deploy')
+  end
+
+  def tasks
+    @tasks ||= Pathname.new('lib/capistrano/tasks')
+  end
+
+end

data/lib/negroku/helpers/env.rb

@@ -0,0 +1,10 @@
+# helper to build the add VAR cmd
+def build_add_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};"
+  cmd += "else echo '#{key}=#{value}' >> #{vars_file};"
+  cmd += "fi"
+  cmd
+end
+

data/lib/negroku/helpers/logs.rb

@@ -0,0 +1,9 @@
+# Define los
+#
+def define_logs(namespace, hash)
+  logs = fetch(:negroku_logs, {})
+
+  logs[namespace] = hash
+
+  set :negroku_logs, logs
+end

data/lib/negroku/helpers/templates.rb

@@ -0,0 +1,35 @@
+require "erb"
+
+# Build the template
+def build_template(template, destination, binding)
+  template_file = get_template_file(template)
+
+  result = ERB.new(template_file, nil, '-').result(binding)
+
+  if destination
+    File.open(destination.to_s, 'w+') do |f|
+      f.write(result)
+    end
+
+    puts I18n.t(:written_file, scope: :negroku, file: destination)
+  else
+    return StringIO.new(result)
+  end
+end
+
+# Render one nested error partial
+def partial(filename, binding)
+  template_file = get_template_file(filename)
+  ERB.new(template_file, nil, '-', '_erbout2').result(binding)
+end
+
+# Get the template file from the project and fallback to the gem
+def get_template_file(filename)
+  if File.exists?(filename)
+    templateFile = filename
+  else
+    templateFile = File.expand_path("../../templates/#{filename}", __FILE__)
+  end
+
+  File.read(templateFile)
+end

data/lib/negroku/helpers.rb

@@ -1,3 +1,7 @@
+require 'negroku/helpers/templates'
+require 'negroku/helpers/logs'
+require 'negroku/helpers/env'
+
 # Find out if a specific library file was already required
 def was_required?(file)
   rex = Regexp.new("/#{Regexp.quote(file)}\.(so|o|sl|rb)?")
@@ -7,12 +11,3 @@ end
 def load_task(name)
   load File.join(File.dirname(__FILE__), 'tasks', "#{name}.rake")
 end
-
-# Define los
-def define_logs(namespace, hash)
-  logs = fetch(:negroku_logs, {})
-
-  logs[namespace] = hash
-
-  set :negroku_logs, logs
-end

data/lib/negroku/i18n.rb

@@ -1,17 +1,9 @@
 require 'i18n'
 require 'set'
 
-en = {
-  capified:                    'Capified',
-  written_file:                'create %{file}',
-  application_name:            'Give your application a name',
-  other:                       'Other',
-  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'
-}
-
-I18n.backend.store_translations(:en, { negroku: en })
+locale_path = File.join(File.dirname(__FILE__), 'locales')
+I18n.load_path = Dir[File.join(locale_path, '*.yml')]
+I18n.backend.load_translations
 
 if I18n.respond_to?(:enforce_available_locales=)
   I18n.enforce_available_locales = true

data/lib/negroku/locales/en.yml

@@ -0,0 +1,19 @@
+en:
+  negroku:
+    capified:                   "Capified"
+    written_file:                'create %{file}'
+    application_name:            'Give your application a name'
+    other:                       'Other'
+    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'
+    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"
+    ask_stage_name:               "Stage name"
+    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?"

data/lib/negroku/tasks/rails.rake

@@ -9,6 +9,28 @@ namespace :load do
   end
 end
 
+namespace :rails do
+  desc "Open the rails console on the primary remote app server"
+  task :console do
+    on roles(:app), :primary => true do |host|
+      execute_interactively host, "console #{fetch(:rails_env)}"
+    end
+  end
+
+  desc "Open the rails dbconsole on the primary remote app server"
+  task :dbconsole do
+    on roles(:app), :primary => true do |host|
+      execute_interactively host, "dbconsole #{fetch(:rails_env)}"
+    end
+  end
+
+  def execute_interactively(host, command)
+    command = "cd #{fetch(:deploy_to)}/current && #{SSHKit.config.command_map[:bundle]} exec rails #{command}"
+    puts command if fetch(:log_level) == :debug
+    exec "ssh -l #{host.user} #{host.hostname} -p #{host.port || 22} -t '#{command}'"
+  end
+end
+
 namespace :negroku do
 
   namespace :rails do

data/lib/negroku/tasks/rbenv.rake

@@ -25,22 +25,24 @@ namespace :rbenv do
       end
     end
 
-    desc "Add environmental variable"
-    task :add, [:key, :value] do |t, args|
-      key = args[:key]
-      value = args[:value]
+    desc "Add environmental variables in the form VAR=value"
+    task :add, :variable do |t, args|
+
+      vars = [args.variable] + args.extras
+
       on release_roles :app do
         within shared_path do
           unless test "[ ! -f .rbenv-vars ]"
             execute :touch, ".rbenv-vars"
           end
-          cmd = "if awk < #{shared_path}/.rbenv-vars -F= '{print $1}' | grep --quiet -w #{key}; then "
-          cmd += "sed -i 's/^#{key}=.*/#{key}=#{value.gsub("\/", "\\/")}/g' #{shared_path}/.rbenv-vars;"
-          cmd += "else echo '#{key}=#{value}' >> #{shared_path}/.rbenv-vars;"
-          cmd += "fi"
-          execute cmd
+          vars.compact.each do |var|
+            key, value = var.split('=')
+            cmd = build_add_var_cmd("#{shared_path}/.rbenv-vars", key, value)
+            execute cmd
+          end
         end
       end
+
     end
 
     desc "Remove environmental variable"

data/lib/negroku/tasks/unicorn.rake

@@ -60,12 +60,15 @@ namespace :negroku do
     task :setup do
       on release_roles fetch(:unicorn_roles) do
         within "#{shared_path}/config" do
-          config_file = fetch(:unicorn_template)
-          unless File.exists?(config_file)
-            config_file = File.expand_path("../../templates/tasks/unicorn_#{fetch(:unicorn_template_type)}.rb.erb", __FILE__)
+          template_path = fetch(:unicorn_template)
+
+          # user a build in template if the template doesn't exists in the project
+          unless File.exists?(template_path)
+            template_path = "tasks/unicorn_#{fetch(:unicorn_template_type)}.rb.erb"
           end
-          config = ERB.new(File.read(config_file)).result(binding)
-          upload! StringIO.new(config), '/tmp/unicorn.rb'
+
+          config = build_template(template_path, nil, binding)
+          upload! config, '/tmp/unicorn.rb'
 
           execute :mv, '/tmp/unicorn.rb', 'unicorn.rb'
         end