Permalink
Browse files

Merge pull request #62 from seomoz/project_name

Project name updates
  • Loading branch information...
2 parents 1d3e90f + 623baca commit 55db1c4f198815becee866f8df84155268d25b5b @delano delano committed Jun 1, 2011
Showing with 3 additions and 2 deletions.
  1. +2 −1 bin/rudy
  2. +1 −1 lib/rudy/huxtable.rb
View
@@ -42,7 +42,7 @@ class RudyCLI < Rudy::CLI::Base
global :t, :testrun, "Test run. Don't execute action (PARTIALLY SUPPORTED)."
global :P, :parallel, "Execute remote commands in parallel (PARTIALLY SUPPORTED)."
global :F, :force, "Force an action despite warnings"
- global :p, :project, String, "Project name. Used in group and machine names."
+ global :N, :project, String, "Project name. Used in group and machine names."
global :positions, Integer, "Override positions number for the current role"
@@ -238,6 +238,7 @@ class RudyCLI < Rudy::CLI::Base
command :init do |obj|
Rudy::Huxtable.update_config
+ Rudy::Huxtable.update_global obj.global # Pull in any command line globals
unless File.exists? Rudy::CONFIG_FILE
Rudy::Config.init_config_dir
@@ -58,7 +58,7 @@ def self.domain_exists?
def self.domain
name = @@global.project.to_s.gsub(/\W/, '_').downcase
- [name, Rudy::DEFAULT_DOMAIN].join('_')
+ [name, Rudy::DEFAULT_DOMAIN].reject(&:empty?).join('_')
end
# Puts +msg+ to +@@logger+

0 comments on commit 55db1c4

Please sign in to comment.