negroku 0.0.1 → 0.0.2

data/lib/negroku/cli.rb

@@ -2,6 +2,8 @@ require 'thor'
 require 'rainbow'
 require 'highline/import'
 
+trap('INT') { exit }
+
 class App < Thor
 
   say "\n\n#############################################".bright()
@@ -12,6 +14,23 @@ class App < Thor
   method_option :local_recipes, :type => :boolean, :aliases => "-l"
   method_option :path, :type => :string, :aliases => "-p"
   def create(name=nil)
+    # Get configuration
+    config = getConfig
+
+    # Test for config
+    if config.empty?
+      say "[WARNING]".foreground(:red)
+      say "It's recommended that you add some default settings to negroku before you create your app deployment\n\n"
+      say "For example you can add your most common git urls using:\n"
+      say "negroku repo add git@github.com:yourusername.git\n".foreground(:yellow)
+      say "Also you can add your deployment servers urls using:\n"
+      say "negroku target add my.deployment.com".foreground(:yellow)
+      say "negroku target add 104.284.3.1\n".foreground(:yellow)
+      unless yes? "Do you want to continue without adding default settings? [y/N]"
+        exit
+      end
+    end
+
     say "We're about to create your application deploy setup\n".foreground(:green)
 
     # Hash to hold the app info
@@ -25,43 +44,86 @@ class App < Thor
     end
 
     # The application code repository
-    config = YAML.load_file(CONFIG_FILE) || {}
     choose do |menu|
 
-      say "\nREPOSITORIES".foreground(:yellow)
+      say "\nREPOSITORIES"
+      say "============"
       menu.prompt = "Please choose your repository?".bright()
+      menu.select_by = :index
 
-      config["repo"].each do |val|
-        menu.choice(val) do |command|
-          say("Using #{command}/#{data[:application_name]}.git")
+      # find local remote from git repo
+      if File.directory?(".git")
+        say "[INFO] The first repo was taken from the local git checkout remotes".color(:yellow)
+        local_repo = %x(git remote -v | grep origin | grep push | awk '{print $2}').gsub(/\n/,"")
+        menu.choice("#{local_repo}") do |command|
+          say("Using #{command}")
           data[:repo] = command;
         end
       end
 
+      # adds the repos in the config file if there is one
+      if config[:repo]
+        config[:repo].each do |val|
+          repo_url = "#{val}/#{data[:application_name]}.git"
+          # skip if the repo url is the same as the local one
+          unless repo_url == local_repo
+            menu.choice(repo_url) do |command|
+              say("Using #{command}/#{data[:application_name]}.git")
+              data[:repo] = command;
+            end
+          end
+        end
+      else
+        say "[INFO] There are no repos in the default settings".color(:yellow)
+      end
+
+      # add other repo choice
       menu.choice(:other) {
-        data[:repo] = ask "Type the url and username e.g. git@github.com:username".bright()
+        data[:repo] = ask "Type the url and username e.g. git@github.com:username: ".bright()
       }
     end
 
     # The application target deploy server
     choose do |menu|
 
-      say "\nTARGET SERVERS".foreground(:yellow)
+      say "\nTARGET SERVERS"
+      say "=============="
       menu.prompt = "Please choose your deployment server?".bright()
-
-      config["target"].each do |val|
-        menu.choice(val) do |command|
-          say("Using #{command}")
-          data[:target_server] = command;
+      menu.select_by = :index
+
+      # Adds the targets in the config file if there is one
+      if config[:repo]
+        config[:target].each do |val|
+          menu.choice(val) do |command|
+            say("Using #{command}")
+            data[:target_server] = command;
+          end
         end
+      else
+        say "[INFO] There are no target urls in the default settings".color(:yellow)
       end
 
       menu.choice(:other) {
-        data[:target_server] = ask "Type the hostname or ip of the server to deploy to".bright()
+        data[:target_server] = ask "Type the hostname or ip of the server to deploy to:".bright()
       }
     end
 
+    # Add custom domain
+    say "\nCUSTOM DOMAIN"
+    say "============="
+    if yes? "Do you want to use  #{data[:target_server].gsub(/^([a-z\d]*)/, data[:application_name])}? [Y/n]"
+      data[:domains] = data[:target_server].gsub(/^([a-z\d]*)/, data[:application_name])
+    else
+      data[:domains] = ask "Please enter the domains separated by spaces"
+    end
+
+
     init(".", data)
+
+    say "\n\nWhat to do next?\n".bright()
+    say "You can try with     cap -T    to see the available tasks"
+    say "Also you can check the config/deploy.rb file, you may want to change some things there"
+    say "\n HAPPY DEPLOY".foreground(:green)
   end
 
   desc "deploy", "Deploy the application"
@@ -77,7 +139,7 @@ class Repo < Thor
     if url.nil?
       url = ask("Type the url and username e.g.  git@github.com:username")
     end
-    saveConfig("add", "repo", url)
+    saveConfig(:add, :repo, url)
   end
 
   desc "remove", "remove some repo"
@@ -97,7 +159,7 @@ class Target < Thor
     if host.nil?
       host = ask("Type the host or ip for the target machine")
     end
-    saveConfig("add", "target", host)
+    saveConfig(:add, :target, host)
   end
 
   desc "remove", "remove some target"
@@ -111,21 +173,6 @@ class Target < Thor
   end
 end
 
-class Hosts < Thor
-  desc "add", "add new default target server"
-  def add(host=nil)
-    if host.nil?
-      host = ask("Type the host or ip for the target machine")
-    end
-    saveConfig("add", "target", host)
-  end
-
-  desc "remove", "remove some target"
-  def remove
-    puts "I will remove a target"
-  end
-end
-
 class Konfig < Thor
   namespace "config"
 
@@ -136,12 +183,53 @@ class Konfig < Thor
   end
 end
 
+class RemoteEnv < Thor
+  namespace "env"
+
+  desc "show", "Show the current remote variables"
+  def show
+    `cap rbenv:vars:show`
+  end
+
+  desc "add", "Adds env variables to the remote server"
+  method_option :local, :type => :boolean, :aliases => "-l"
+  def add(key=nil, value=nil)
+
+    # Check if the paramenter were sent in the call
+    # Ask for the value if only the key was sent
+    if !key.nil? && value.nil?
+      value = ask("Please enter the value for #{key}:")
+    # If nothing was sent
+    elsif key.nil? && value.nil?
+      # Check if the .rbenv-vars file exists and offer get the info from there
+      if File.exist?(".rbenv-vars") && (yes? "Do you want to add variables from your local .rbenv-vars file  [y/N]")
+        choose do |menu|
+          menu.prompt = "Please choose variable you want to add?".bright()
+          menu.select_by = :index
+
+          File.readlines(".rbenv-vars").each do |line|
+            menu.choice(line.gsub("\n","")) do |command|
+              key = command.split("=")[0]
+              value = command.split("=")[1]
+            end
+          end
+        end
+      else
+        key = ask("Please enter the variable key:")
+        value = ask("Please enter the value for #{key}:")
+      end
+    end
+
+    `cap rbenv:vars:add -s key=#{key} -s value=#{value}`
+  end
+end
+
 module Negroku
   class CLI < Thor
     register(App, 'app', 'app [COMMAND]', 'Application')
     register(Repo, 'repo', 'repo [COMMAND]', 'Repositories')
     register(Target, 'target', 'target [COMMAND]', 'Target servers')
-    register(Hosts, 'host', 'host [COMMAND]', 'Hosts')
     register(Konfig, 'config', 'config [COMMAND]', 'Configuration')
+    register(RemoteEnv, 'env', 'env [COMMAND]', 'Remote environmental variables')
   end
 end

data/lib/negroku/config.rb

@@ -1,36 +1,36 @@
 require 'yaml'
 
-# the yaml file where we'll write the settings
-CONFIG_FILE = File.join(ENV['HOME'], ".negroku", "config.yaml")
-
 def saveConfig(action, type, data)
-  # create the ~/.negroku folder
-  unless File.directory?(File.join(ENV['HOME'], ".negroku"))
-    puts "[Negroku] => Creating config file in #{ENV['HOME']}/.negroku"
-    %x(mkdir #{File.join(ENV['HOME'], ".negroku")})
-  end
-
-  # create an empty config.yaml file
-  unless File.exist?(CONFIG_FILE)
-    %x(touch #{CONFIG_FILE})
-  end
-
   # Load the yaml file
-  config = YAML.load_file(CONFIG_FILE) || {}
+  config_file = File.join(ENV['HOME'], ".negroku")
+  config = getConfig
 
   # If I need to add some multiple values
-  if action == "add"
+  if action === :add
     newData = config[type] || []
     newData.push(data)
     newData.uniq!
     config = config.merge({ type => newData })
-  elsif action == "remove"
+  elsif action === :remove
     #..
-  elsif action == "replace"
+  elsif action === :replace
     #..
   end
 
-  File.open(CONFIG_FILE, 'w') do |f|
+  File.open(config_file, 'w') do |f|
     f.write config.to_yaml
   end
+end
+
+def getConfig
+  # load config from file
+  config_file = File.join(ENV['HOME'], ".negroku")
+
+  # create an empty .negroku file
+  unless File.exist?(config_file)
+    %x(touch #{config_file})
+  end
+
+  # base config
+  YAML.load_file(config_file) || {}
 end

data/lib/negroku/helpers.rb

@@ -52,7 +52,7 @@ end
 
 def showConfig()
   # Load the yaml file
-  config = YAML.load_file(CONFIG_FILE) || {}
+  config = getConfig
   puts config
 end
 

data/lib/negroku/tasks/base.rb

@@ -33,7 +33,7 @@ namespace :deploy do
   desc "Sets up additional symlinks after deploy."
   task :symlinks do
     # Exmaple:
-    # run "ln -nfs '#{shared_path}/db/production.sqlite3' '#{release_path}/db/production.sqlite3'"
+    run "ln -nfs '#{shared_path}/.rbenv-vars' '#{release_path}/.rbenv-vars'"
   end
 
   after "deploy:setup", "deploy:setup_shared"

data/lib/negroku/tasks/nginx.rb

@@ -6,12 +6,12 @@
 # Feel free to further modify the template to your needs as it doesn't cover every use-case of course,
 # but tries to get all the common requirements out of the way to lessen research time (if any).
 
-set_default :domains, ["empty.platan.us"]
+set_default :domains, ["your.domain.com"]
 set_default :static_dir, "public"
 
 set_default :app_server, true
 #set_default :app_server_port, 8080
-set_default :app_server_socket, "/home/#{fetch(:user)}/tmp/platanus.#{fetch(:application)}.sock"
+set_default :app_server_socket, "/home/#{fetch(:user)}/tmp/negroku.#{fetch(:application)}.sock"
 
 # set_default :use_ssl, true
 # set_default :ssl_key, "/path/to/local/ssh.key"

data/lib/negroku/tasks/rbenv.rb

@@ -4,9 +4,17 @@
 set_default :ruby_version, "1.9.3-p125"
 
 namespace :rbenv do
-  desc "Upload rbenv vars"
-  task :upload, :roles => :app do
-    puts ".rbenv-vars #{shared_path}/config"
-    upload ".rbenv-vars"
+  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
+    end
+
+    desc "Add rbenv vars"
+    task :add, :roles => :app do
+      run "echo '#{key}=#{value}' >> #{shared_path}/.rbenv-vars"
+    end
   end
 end

data/lib/negroku/tasks/templates/nginx.erb

@@ -11,8 +11,8 @@ upstream <%= fetch(:application) %>-app-server {
 
 # HTTP Server
 server {
-  listen      80 deferred;
-  server_name <%= fetch(:domains, ["platan.us", "www.platan.us"]).join(" ") %>;
+  listen      80;
+  server_name <%= fetch(:domains) %>;
   root        <%= fetch(:deploy_to) %>/current/<%= fetch(:static_dir) %>;
 
   access_log /home/<%= fetch(:user) %>/log/<%= fetch(:application) %>-nginx-access.log;

data/lib/negroku/templates/deploy.rb.erb

@@ -8,11 +8,14 @@ set :deploy_to,   "/home/#{user}/applications/#{application}"
 
 # Repository (if any) configuration.
 set :deploy_via, :remote_cache
-set :repository, "<%= data[:repo] %>/#{application}.git"
+set :repository, "<%= data[:repo] %>"
 set :branch,     "production"   # Optional, defaults to master
 # set :remote,   "negroku"      # Optional, defaults to origin
 # set :git_enable_submodules, 1
 
+# Web server configuration
+set :domains, "<%= data[:domains] %>"
+
 # Use the bundler capistrano task to deploy to the shared folder
 require "bundler/capistrano"
 set :bundle_flags,    "--deployment --binstubs"

data/lib/negroku/version.rb

@@ -1,3 +1,3 @@
 module Negroku
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: negroku
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -75,22 +75,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.17.0
-- !ruby/object:Gem::Dependency
-  name: parseconfig
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.2
 description: ! '["To deploy application"]'
 email:
 - jidonoso@gmail.com