bebox 0.1.3 → 0.1.4

data/lib/bebox/logger.rb

@@ -3,6 +3,8 @@
 module Bebox
   module Logger
 
+    include FastGettext::Translation
+
     def self.included(base)
       base.extend(self)
     end

data/lib/bebox/node.rb

@@ -2,7 +2,6 @@
 module Bebox
   class Node
 
-    include Bebox::Logger
     include Bebox::FilesHelper
     include Bebox::VagrantHelper
 

data/lib/bebox/profile.rb

@@ -65,7 +65,7 @@ module Bebox
       #Split the name and validate each path part
       pathname.split('/').each do |path_child|
         valid_name = (path_child =~ /\A[a-z][a-z0-9_]*\Z/).nil? ? false : true
-        valid_name && !Bebox::RESERVED_WORDS.include?(path_child)
+        valid_name &&= !Bebox::RESERVED_WORDS.include?(path_child)
         return false unless valid_name
       end
       # Return true if all parts are valid

data/lib/bebox/project.rb

@@ -25,7 +25,6 @@ module Bebox
       create_puppet_base
       create_project_config
       create_checkpoints
-      info "Bundle project ..."
       bundle_project
     end
 
@@ -200,6 +199,7 @@ module Bebox
 
     # Bundle install packages for project
     def bundle_project
+      info _('model.project.bundle')
       system("cd #{self.path} && BUNDLE_GEMFILE=Gemfile bundle install")
     end
 

data/lib/bebox/vagrant_helper.rb

@@ -30,7 +30,7 @@ module Bebox
 
     # Backup and add the vagrant hosts to local hosts file
     def configure_local_hosts(project_name, node)
-      info "\nPlease provide your local password, if asked, to configure the local hosts file."
+      info _('model.vagrant_helper.local_password_advice')
       backup_local_hosts(project_name)
       add_to_local_hosts(node)
     end
@@ -64,8 +64,8 @@ module Bebox
     def add_vagrant_node(project_name, vagrant_box_base, node)
       already_installed_boxes = installed_vagrant_box_names(node)
       box_name = "#{project_name}-#{node.hostname}"
-      info "Adding server to vagrant: #{node.hostname}"
-      info "Please enter the network interface number if asked, and wait until the machine is up."
+      info _('model.vagrant_helper.add_to_vagrant')%{node: node.hostname}
+      info _('model.vagrant_helper.network_interface_advice')
       `cd #{node.project_root} && vagrant box add #{box_name} #{vagrant_box_base}` unless already_installed_boxes.include? box_name
     end
 
@@ -73,11 +73,13 @@ module Bebox
     def self.up_vagrant_nodes(project_root)
       pid = fork {exec("cd #{project_root} && vagrant up --provision")}
       Process.wait(pid)
+      ok _('model.vagrant_helper.nodes_running')
     end
 
     # Halt the vagrant boxes running
     def self.halt_vagrant_nodes(project_root)
       `cd #{project_root} && vagrant halt`
+      ok _('model.vagrant_helper.nodes_halted')
     end
 
     # Generate the Vagrantfile

data/lib/bebox/version.rb

@@ -1,3 +1,3 @@
 module Bebox
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/bebox/wizards/environment_wizard.rb

@@ -7,24 +7,24 @@ module Bebox
     # Create a new environment
     def create_new_environment(project_root, environment_name)
       # Check if the environment exist
-      return error("The '#{environment_name}' environment already exist!.") if Bebox::Environment.environment_exists?(project_root, environment_name)
+      return error(_('wizard.environment.name_exist')%{environment: environment_name}) if Bebox::Environment.environment_exists?(project_root, environment_name)
       # Environment creation
       environment = Bebox::Environment.new(environment_name, project_root)
       output = environment.create
-      ok 'Environment created!.'
+      ok _('wizard.environment.creation_success')
       return output
     end
 
     # Removes an existing environment
     def remove_environment(project_root, environment_name)
       # Check if the environment exist
-      return error("The '#{environment_name}' environment do not exist!.") unless Bebox::Environment.environment_exists?(project_root, environment_name)
+      return error(_('wizard.environment.name_not_exist')%{environment: environment_name}) unless Bebox::Environment.environment_exists?(project_root, environment_name)
       # Confirm deletion
-      return warn('No changes were made.') unless confirm_action?('Are you sure that you want to delete the environment?')
+      return warn(_('wizard.no_changes')) unless confirm_action?(_('wizard.environment.confirm_deletion'))
       # Environment deletion
       environment = Bebox::Environment.new(environment_name, project_root)
       output = environment.remove
-      ok 'Environment removed!.'
+      ok _('wizard.environment.deletion_success')
       return output
     end
   end

data/lib/bebox/wizards/node_wizard.rb

@@ -14,7 +14,7 @@ module Bebox
       # Node creation
       node = Bebox::Node.new(environment, project_root, hostname, ip)
       output = node.create
-      ok 'Node created!.'
+      ok _('wizard.node.creation_success')
       return output
     end
 
@@ -23,17 +23,17 @@ module Bebox
       # Ask for a node to remove
       nodes = Bebox::Node.list(project_root, environment, 'nodes')
       if nodes.count > 0
-        hostname = choose_option(nodes, 'Choose the node to remove:')
+        hostname = choose_option(nodes, _('wizard.node.choose_node'))
       else
-        error "There are no nodes in the '#{environment}' environment to remove. No changes were made."
+        error _('wizard.node.no_nodes')%{environment: environment}
         return true
       end
       # Ask for deletion confirmation
-      return warn('No changes were made.') unless confirm_action?('Are you sure that you want to delete the node?')
+      return warn(_('wizard.no_changes')) unless confirm_action?(_('wizard.node.confirm_deletion'))
       # Node deletion
       node = Bebox::Node.new(environment, project_root, hostname, nil)
       output = node.remove
-      ok 'Node removed!.'
+      ok _('wizard.node.deletion_success')
       return output
     end
 
@@ -41,10 +41,10 @@ module Bebox
     def set_role(project_root, environment)
       roles = Bebox::Role.list(project_root)
       nodes = Bebox::Node.list(project_root, environment, 'nodes')
-      node = choose_option(nodes, 'Choose an existing node:')
-      role = choose_option(roles, 'Choose an existing role:')
+      node = choose_option(nodes, _('wizard.choose_node'))
+      role = choose_option(roles, _('wizard.choose_role'))
       output = Bebox::Provision.associate_node_role(project_root, environment, node, role)
-      ok 'Role associated to node!.'
+      ok _('wizard.node.role_set_success')
       return output
     end
 
@@ -54,28 +54,30 @@ module Bebox
       nodes_to_prepare = check_nodes_to_prepare(project_root, environment)
       # Output the nodes to be prepared
       if nodes_to_prepare.count > 0
-        title 'Preparing nodes:'
+        title _('wizard.node.prepare_title')
         nodes_to_prepare.each{|node| msg(node.hostname)}
         linebreak
         # For all environments regenerate the deploy file
         Bebox::Node.regenerate_deploy_file(project_root, environment, nodes_to_prepare)
         # If environment is 'vagrant' Prepare and Up the machines
-        if environment == 'vagrant'
-          Bebox::VagrantHelper.generate_vagrantfile(nodes_to_prepare)
-          nodes_to_prepare.each{|node| prepare_vagrant(node)}
-          Bebox::VagrantHelper.up_vagrant_nodes(project_root)
-        end
+        up_vagrant_machines(project_root, nodes_to_prepare) if environment == 'vagrant'
         # For all the environments do the preparation
         nodes_to_prepare.each do |node|
           node.prepare
-          ok 'Node prepared!.'
+          ok _('wizard.node.preparation_success')
         end
       else
-        warn 'There are no nodes to prepare. No changes were made.'
+        warn _('wizard.node.no_prepare_nodes')
       end
       return true
     end
 
+    def up_vagrant_machines(project_root, nodes_to_prepare)
+      Bebox::VagrantHelper.generate_vagrantfile(nodes_to_prepare)
+      nodes_to_prepare.each{|node| prepare_vagrant(node)}
+      Bebox::VagrantHelper.up_vagrant_nodes(project_root)
+    end
+
     # Check the nodes already prepared and ask confirmation to re-do-it
     def check_nodes_to_prepare(project_root, environment)
       nodes_to_prepare = []
@@ -83,8 +85,7 @@ module Bebox
       prepared_nodes = Bebox::Node.list(project_root, environment, 'prepared_nodes')
       nodes.each do |node|
         if prepared_nodes.include?(node.hostname)
-          checkpoint_status = "(start: #{node.checkpoint_parameter_from_file('prepared_nodes', 'started_at')} - end: #{node.checkpoint_parameter_from_file('prepared_nodes', 'finished_at')})"
-          message = "The node '#{node.hostname}' was already prepared #{checkpoint_status}.\nDo you want to re-prepare it?"
+          message = _('wizard.node.confirm_preparation')%{hostname: node.hostname, start: node.checkpoint_parameter_from_file('prepared_nodes', 'started_at'), end: node.checkpoint_parameter_from_file('prepared_nodes', 'finished_at')}
           nodes_to_prepare << node if confirm_action?(message)
         else
           nodes_to_prepare << node
@@ -103,7 +104,7 @@ module Bebox
       hostname = ask_hostname(project_root, environment)
       # Check if the node not exist
       if node_exists?(project_root, environment, hostname)
-        error 'A hostname with that name already exist. Try a new one.'
+        error _('wizard.node.hostname_exist')
         ask_hostname(project_root, environment)
       else
         return hostname
@@ -112,19 +113,19 @@ module Bebox
 
     # Ask for the hostname
     def ask_hostname(project_root, environment)
-      write_input('Write the hostname for the node:', nil, /\.(.*)/, 'Enter valid hostname. Ex. host.server1.com')
+      write_input(_('wizard.node.ask_hostname'), nil, /\.(.*)/, _('wizard.node.valid_hostname'))
     end
 
     # Ask for the ip until is valid
     def ask_ip(environment)
-      ip = write_input('Write the IP address for the node:', nil, /\.(.*)/, 'Enter a valid IP address. Ex. 192.168.0.50')
+      ip = write_input(_('wizard.node.ask_ip'), nil, /\.(.*)/, _('wizard.node.valid_ip'))
       # If the environment is not vagrant don't check ip free
       return ip if environment != 'vagrant'
       # Check if the ip address is free
       if free_ip?(ip)
         return ip
       else
-        error 'The IP address is not free. Try a new one.'
+        error _('wizard.node.non_free_ip')
         ask_ip(environment)
       end
     end

data/lib/bebox/wizards/profile_wizard.rb

@@ -6,54 +6,53 @@ module Bebox
 
     # Create a new profile
     def create_new_profile(project_root, profile_name, profile_base_path)
+      # Clean the profile_path to make it a valid path
+      profile_base_path = Bebox::Profile.cleanpath(profile_base_path)
       # Check if the profile name is valid
-      return error "The profile name can only contain:\n
-      \n* Lowercase letters
-      \n* Numbers
-      \n* Underscores
-      \n* Must begin with an Lowercase letter
-      \n* Can not be any of: #{Bebox::RESERVED_WORDS.join(', ')}
-      \n\nNo changes were made." unless valid_puppet_class_name?(profile_name)
-      unless profile_base_path.empty?
-        # Clean the profile_path to make it a valid path
-        profile_base_path = Bebox::Profile.cleanpath(profile_base_path)
-        # Check if the path name is valid
-        return error "Each part of the path can only contain:\n
-          \n* Lowercase letters
-          \n* Numbers
-          \n* Underscores
-          \n* Must begin with an Lowercase letter
-          \n* Can not be any of: #{Bebox::RESERVED_WORDS.join(', ')}
-          \n\nNo changes were made." unless Bebox::Profile.valid_pathname?(profile_base_path)
-      end
+      return unless name_valid?(profile_name, profile_base_path)
       # Check if the profile exist
       profile_path = profile_base_path.empty? ? profile_name : profile_complete_path(profile_base_path, profile_name)
-      return error("The profile '#{profile_path}' already exist. No changes were made.") if profile_exists?(project_root, profile_path)
+      return error(_('wizard.profile.name_exist')%{profile: profile_path}) if profile_exists?(project_root, profile_path)
       # Profile creation
       profile = Bebox::Profile.new(profile_name, project_root, profile_base_path)
       output = profile.create
-      ok "Profile '#{profile_path}' created!."
+      ok _('wizard.profile.creation_success')%{profile: profile_path}
       return output
     end
 
+    # Check if the profile name is valid
+    def name_valid?(profile_name, profile_base_path)
+      unless valid_puppet_class_name?(profile_name)
+        error _('wizard.profile.invalid_name')%{words: Bebox::RESERVED_WORDS.join(', ')}
+        return false
+      end
+      return true if profile_base_path.empty?
+      # Check if the path name is valid
+      unless Bebox::Profile.valid_pathname?(profile_base_path)
+        error _('wizard.profile.invalid_path')%{words: Bebox::RESERVED_WORDS.join(', ')}
+        return false
+      end
+      true
+    end
+
     # Removes an existing profile
     def remove_profile(project_root)
       # Choose a profile from the availables
       profiles = Bebox::Profile.list(project_root)
       # Get a profile if exist
       if profiles.count > 0
-        profile = choose_option(profiles, 'Choose the profile to remove:')
+        profile = choose_option(profiles, _('wizard.choose_remove_profile'))
       else
-        return error "There are no profiles to remove. No changes were made."
+        return error _('wizard.profile.no_deletion_profiles')
       end
       # Ask for deletion confirmation
-      return warn('No changes were made.') unless confirm_action?('Are you sure that you want to delete the profile?')
+      return warn(_('wizard.no_changes')) unless confirm_action?(_('wizard.profile.confirm_deletion'))
       # Profile deletion
       profile_name = profile.split('/').last
       profile_base_path = profile.split('/')[0...-1].join('/')
       profile = Bebox::Profile.new(profile_name, project_root, profile_base_path)
       output = profile.remove
-      ok 'Profile removed!.'
+      ok _('wizard.profile.deletion_success')
       return output
     end
 

data/lib/bebox/wizards/project_wizard.rb

@@ -9,20 +9,20 @@ module Bebox
     # Asks for the project parameters and create the project skeleton
     def create_new_project(project_name)
       # Check project existence
-      (error('Project not created. There is already a project with that name in the current directory.'); return false) if project_exists?(Dir.pwd, project_name)
+      (error(_('wizard.project.name_exist')); return false) if project_exists?(Dir.pwd, project_name)
       # Setup the bebox boxes directory
       bebox_boxes_setup
       # Asks to choose an existing box
       current_box = choose_box(get_existing_boxes)
       vagrant_box_base = "#{BEBOX_BOXES_PATH}/#{get_valid_box_uri(current_box)}"
       # Asks user to choose vagrant box provider
-      vagrant_box_provider = choose_option(%w{virtualbox vmware}, 'Choose the vagrant box provider')
+      vagrant_box_provider = choose_option(%w{virtualbox vmware}, _('wizard.project.choose_box_provider'))
       # Set default environments
       default_environments = %w{vagrant staging production}
       # Project creation
       project = Bebox::Project.new(project_name, vagrant_box_base, Dir.pwd, vagrant_box_provider, default_environments)
       output = project.create
-      ok "Project '#{project_name}' created!.\nMake: cd #{project_name}\nNow you can add new environments or new nodes to your project.\nSee bebox help."
+      ok _('wizard.project.creation_success')%{project_name: project_name}
       return output
     end
 
@@ -35,7 +35,7 @@ module Bebox
         # Asks vagrant box location to user if not choose an existing box
         valid_box_uri = ask_uri
         # Confirm if the box already exist
-        confirm = box_exists?(valid_box_uri) ? confirm_action?('There is already a box with that name, do you want to overwrite it?') : true
+        confirm = box_exists?(valid_box_uri) ? confirm_action?(_('wizard.project.box_exist')) : true
       end while !confirm
       # Setup the box with the valid uri
       set_box(valid_box_uri)
@@ -56,7 +56,7 @@ module Bebox
 
     # Asks vagrant box location to user until is valid
     def ask_uri
-      vbox_uri = write_input('Write the URI (http, local_path) for the vagrant box to be used in the project:', 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box')
+      vbox_uri = write_input(_('wizard.project.ask_box_uri'), 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box')
       # If valid return uri if not keep asking for uri
       uri_valid?(vbox_uri) ? (return vbox_uri) : ask_uri
     end
@@ -66,7 +66,7 @@ module Bebox
       require 'uri'
       uri = URI.parse(box_uri)
       if %w{http https}.include?(uri.scheme)
-        info 'Downloading box ...'
+        info _('wizard.project.downloading_box')
         download_box(uri)
       else
         `ln -fs #{uri.path} #{BEBOX_BOXES_PATH}/#{uri.path.split('/').last}`
@@ -84,12 +84,12 @@ module Bebox
       require 'net/http'
       request = Net::HTTP.new uri.host
       response = request.request_head uri.path
-      error('Redirections not supported.') if response.code.to_i == 302
-      ( response.code.to_i == 200) ? (return true) : error('Download link not valid!.')
+      error(_('wizard.project.no_redirections')) if response.code.to_i == 302
+      ( response.code.to_i == 200) ? (return true) : error(_('wizard.project.not_valid_link'))
     end
 
     def file_uri_valid?(uri)
-      File.file?(uri.path) ? (return true) : error('File path not exist!.')
+      File.file?(uri.path) ? (return true) : error(_('wizard.project.not_exist_file'))
     end
 
     # Check if a box with the same name already exist
@@ -111,36 +111,42 @@ module Bebox
     # Asks to choose an existing box in the bebox boxes directory
     def choose_box(boxes)
       # Menu to choose vagrant box provider
-      other_box_message = 'Download/Select a new box'
+      other_box_message = _('wizard.project.download_select_box')
       boxes << other_box_message
-      current_box = choose_option(boxes, 'Choose an existing box or download/select a new box')
+      current_box = choose_option(boxes, _('wizard.project.choose_box'))
       current_box = (current_box == other_box_message) ? nil : current_box
     end
 
     # Download a box by the specified uri
     def download_box(uri)
-      @counter = 0
-      url = uri.path
-      file_name = uri.path.split('/').last
-      expanded_directory = File.expand_path(BEBOX_BOXES_PATH)
-      # Download file to bebox boxes tmp
       require 'net/http'
       require 'uri'
+      url = uri.path
+      # Download file to bebox boxes tmp
       Net::HTTP.start(uri.host) do |http|
         response = http.request_head(URI.escape(url))
-        ProgressBar
-        pbar = ProgressBar.new('file name:', response['content-length'].to_i)
-        File.open("#{expanded_directory}/tmp/#{file_name}", 'w') {|f|
-          http.get(URI.escape(url)) do |str|
-            f.write str
-            @counter += str.length
-            pbar.set(@counter)
-          end
-        }
-        # In download completion move from tmp to bebox boxes dir
-        pbar.finish
-        `mv #{BEBOX_BOXES_PATH}/tmp/#{file_name} #{BEBOX_BOXES_PATH}/`
+        write_remote_file(uri, http, response)
       end
     end
+
+    def write_remote_file(uri, http, response)
+      @counter = 0
+      url = uri.path
+      file_name = uri.path.split('/').last
+      expanded_directory = File.expand_path(BEBOX_BOXES_PATH)
+
+      ProgressBar
+      pbar = ProgressBar.new('file name:', response['content-length'].to_i)
+      File.open("#{expanded_directory}/tmp/#{file_name}", 'w') {|f|
+        http.get(URI.escape(url)) do |str|
+          f.write str
+          @counter += str.length
+          pbar.set(@counter)
+        end
+      }
+      # In download completion move from tmp to bebox boxes dir
+      pbar.finish
+      `mv #{BEBOX_BOXES_PATH}/tmp/#{file_name} #{BEBOX_BOXES_PATH}/`
+    end
   end
 end

data/lib/bebox/wizards/provision_wizard.rb

@@ -6,10 +6,10 @@ module Bebox
     # Apply a step for the nodes in a environment
     def apply_step(project_root, environment, step)
       # Check if environment has configured the ssh keys
-      (return warn "Please add a ssh key pair (id_rsa, id_rsa.pub) in config/keys/environments/#{environment} to do this step.") unless Bebox::Environment.check_environment_access(project_root, environment)
+      (return warn _('wizard.provision.ssh_key_advice')%{environment: environment}) unless Bebox::Environment.check_environment_access(project_root, environment)
       nodes_to_step = Bebox::Node.nodes_in_environment(project_root, environment, previous_checkpoint(step))
       # Check if there are nodes for provisioning step-N
-      (return warn "There are no nodes for provision in #{step}. No changes were made.") unless nodes_to_step.count > 0
+      (return warn _('wizard.provision.no_provision_nodes')%{step: step}) unless nodes_to_step.count > 0
       nodes_for_provisioning(nodes_to_step, step)
       # Apply the nodes provisioning for step-N
       in_step_nodes = Bebox::Node.list(project_root, environment, "steps/#{step}")
@@ -22,29 +22,30 @@ module Bebox
     end
 
     def provision_step_in_node(project_root, environment, step, in_step_nodes, node)
-      title "Provisioning #{step} in node #{node.hostname}:"
+      title _('wizard.provision.title')%{step: step, hostname: node.hostname}
+      generate_pre_provision_files(project_root, step, node)
+      provision = Bebox::Provision.new(project_root, environment, node, step)
+      output = provision.apply.success?
+      output ? (ok _('wizard.provision.apply_success')%{hostname: node.hostname, step: step}) : (error _('wizard.provision.apply_failure')%{step: step, hostname: node.hostname})
+      return output
+    end
+
+    def generate_pre_provision_files(project_root, step, node)
       role = Bebox::Provision.role_from_node(project_root, step, node.hostname)
       profiles = Bebox::Provision.profiles_from_role(project_root, role) unless role.nil?
       # Before apply generate the Puppetfile with modules from all associated profiles
       Bebox::Provision.generate_puppetfile(project_root, step, profiles) unless profiles.nil?
       # Before apply generate the roles and profiles modules structure for puppet step
       Bebox::Provision.generate_roles_and_profiles(project_root, step, role, profiles)
-      provision = Bebox::Provision.new(project_root, environment, node, step)
-      output = provision.apply.success?
-      output ? (ok "Node '#{node.hostname}' provisioned to #{step}.") : (error "An error ocurred in the provision of #{step} for node '#{node.hostname}'")
-      return output
     end
 
     def check_node_to_step(node, in_step_nodes, step)
       return true unless in_step_nodes.include?(node.hostname)
-      message = "The node '#{node.hostname}' was already provisioned in #{step}"
-      message += " (start: #{node.checkpoint_parameter_from_file('steps/' + step, 'started_at')} - end: #{node.checkpoint_parameter_from_file('steps/' + step, 'finished_at')})."
-      message += "\nDo you want to re-provision it?"
-      confirm_action?(message)
+      confirm_action?(_('wizard.provision.confirm_reprovision')%{hostname: node.hostname, step: step, start: node.checkpoint_parameter_from_file('steps/' + step, 'started_at'), end: node.checkpoint_parameter_from_file('steps/' + step, 'finished_at')})
     end
 
     def nodes_for_provisioning(nodes, step)
-      title "Nodes for provisioning #{step}:"
+      title _('wizard.provision.nodes_title')%{step: step}
       nodes.each{|node| msg(node.hostname)}
       linebreak
     end