bebox 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 886423855b71a864742480b34b9a13809cebd033
-  data.tar.gz: fef0a3dbcc6cf4122f83514933e044edf0510227
+  metadata.gz: 7dbcd794821165fbd1d616c747b8ba8125fd255b
+  data.tar.gz: 36cf6cbe8f4c35d2b21e49e61ceb648ada9b903a
 SHA512:
-  metadata.gz: 4f493c919fba06dce468d5b0ca50af84404f45e00d3e8f5cb7b5f24990e3a8316cf8d97ea8221a514a09db34218e0e2e32ee8b405a740d1ea7a7324fed1f6e69
-  data.tar.gz: 1ec1b8514c512cc454900568885381874626951ad437be9f945da7cbe926a581ea386eed987e4c2001e68d659a9aa8f78ff2922c9de62fc308fba72286a6a4f0
+  metadata.gz: 2eb096841311aa6c652aeabfe79eda7faac54f091a7b615d0cf4af72d5b31b973631b0fc8e4b08a04c3de65a5dce76b215067051833f125fba5b7b9ab4a518ea
+  data.tar.gz: 0aeaf4a6e8cc853373856e4011f6f256555a961133c55917b8b83a7474749d6412ec25f79272c039ee483d79ad19bdefd28a28f073096a163f47fd2bb755a674

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    bebox (0.1.3)
+    bebox (0.1.4)
       colorize (= 0.6.0)
+      fast_gettext (= 0.9.0)
       gli (= 2.10.0)
       highline (= 1.6.21)
       progressbar (= 0.21.0)
@@ -26,28 +27,16 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    aruba (0.5.4)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
     awesome_print (1.2.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
-    childprocess (0.5.3)
-      ffi (~> 1.0, >= 1.0.11)
     codeclimate-test-reporter (0.4.0)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     colorize (0.6.0)
     columnize (0.8.9)
     coolline (0.4.3)
-    cucumber (1.3.14)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
     debug_inspector (0.0.2)
     debugger (1.6.6)
       columnize (>= 0.3.1)
@@ -61,9 +50,7 @@ GEM
     erubis (2.7.0)
     factory_girl (4.3.0)
       activesupport (>= 3.0.0)
-    ffi (1.9.3)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
+    fast_gettext (0.9.0)
     gli (2.10.0)
     grit (2.5.0)
       diff-lcs (~> 1.1)
@@ -89,7 +76,6 @@ GEM
     mime-types (1.25.1)
     minitest (5.3.3)
     multi_json (1.9.2)
-    multi_test (0.1.1)
     net-ssh (2.9.1)
     posix-spawn (0.3.8)
     progressbar (0.21.0)
@@ -155,7 +141,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (= 0.5.4)
   bebox!
   codeclimate-test-reporter (= 0.4.0)
   factory_girl (= 4.3.0)

data/bebox.gemspec

@@ -26,7 +26,6 @@ spec = Gem::Specification.new do |s|
   s.executables << 'bebox'
   s.required_ruby_version = '>= 1.9.2'
   s.add_development_dependency('rake', '10.3.1')
-  s.add_development_dependency('aruba', '0.5.4')
   s.add_development_dependency('rspec', '2.14.1')
   s.add_development_dependency('jazz_hands', '0.5.2')
   s.add_development_dependency('serverspec', '1.6.0')
@@ -38,4 +37,5 @@ spec = Gem::Specification.new do |s|
   s.add_runtime_dependency('highline', '1.6.21')
   s.add_runtime_dependency('progressbar', '0.21.0')
   s.add_runtime_dependency('colorize', '0.6.0')
+  s.add_runtime_dependency('fast_gettext', '0.9.0')
 end

data/lib/bebox.rb

@@ -1,3 +1,4 @@
+require 'fast_gettext'
 require 'progressbar'
 require 'colorize'
 require 'gli'

data/lib/bebox/cli.rb

@@ -6,10 +6,16 @@ module Bebox
     attr_accessor :project_root
 
     def initialize(*args)
+
+      # Configure the i18n directory and locale
+      FastGettext.add_text_domain('bebox', path: File.join((File.expand_path '..', File.dirname(__FILE__)), 'i18n'), type: :yaml)
+      FastGettext.set_locale('en')
+      FastGettext.text_domain = 'bebox'
+
       # add the GLI magic on to the Bebox::Cli instance
       self.extend GLI::App
 
-      program_desc 'Create basic provisioning of remote servers.'
+      program_desc _('cli.desc')
       version Bebox::VERSION
 
       if inside_project?

data/lib/bebox/commands/commands_helper.rb

@@ -8,9 +8,9 @@ module Bebox
     def get_environment(options)
       environment = options[:environment]
       # Ask for environment of node if flag environment not set
-      environment ||= choose_option(Environment.list(project_root), 'Choose an existing environment:')
+      environment ||= choose_option(Environment.list(project_root), _('cli.choose_environment'))
       # Check environment existence
-      Bebox::Environment.environment_exists?(project_root, environment) ? (return environment) : exit_now!(error("The '#{environment}' environment does not exist."))
+      Bebox::Environment.environment_exists?(project_root, environment) ? (return environment) : exit_now!(error(_('cli.not_exist_environment')%{environment: environment}))
     end
 
     # Obtain the default environment for a project

data/lib/bebox/commands/environment_commands.rb

@@ -8,11 +8,11 @@ module Bebox
 
     def load_commands
       # Environment management phase commands
-      desc 'Manage environments for the project. The \'vagrant\', \'production\' and \'staging\' environments are present by default.'
+      desc _('cli.environment.desc')
       command :environment do |environment_command|
         environment_list_command(environment_command)
-        generate_environment_command(environment_command, :new, :create_new_environment, 'Add a remote environment to the project')
-        generate_environment_command(environment_command, :remove, :remove_environment, 'Remove a remote environment in the project')
+        generate_environment_command(environment_command, :new, :create_new_environment, _('cli.environment.new.desc'))
+        generate_environment_command(environment_command, :remove, :remove_environment, _('cli.environment.remove.desc'))
       end
     end
 
@@ -21,7 +21,7 @@ module Bebox
       environment_command.arg_name "[environment]"
       environment_command.command command do |generated_command|
         generated_command.action do |global_options,options,args|
-          help_now!(error('You did not supply an environment')) if args.count == 0
+          help_now!(error(_('cli.environment.name_arg_missing'))) if args.count == 0
           Bebox::EnvironmentWizard.new.send(send_command, project_root, args.first)
         end
       end
@@ -33,9 +33,9 @@ module Bebox
       environment_command.command :list do |environment_list_command|
         environment_list_command.action do |global_options,options,args|
           environments = Bebox::Environment.list(project_root)
-          title 'Current environments:'
+          title _('cli.environment.list.current_envs')
           environments.map{|environment| msg(environment)}
-          warn('There are not environments yet. You can create a new one with: \'bebox environment new\' command.') if environments.empty?
+          warn(_('cli.environment.list.no_envs')) if environments.empty?
         end
       end
     end

data/lib/bebox/commands/general_commands.rb

@@ -7,14 +7,14 @@ module Bebox
 
     def load_commands
       # Project creation phase command
-      desc 'Create a new bebox project through a simple wizard'
+      desc _('cli.project.new.desc')
       arg_name '[project_name]'
       command :new do |project_command|
         project_command.action do |global_options,options,args|
           if args.count > 0
             Bebox::ProjectWizard.new.create_new_project("bebox-#{args.first}")
           else
-            help_now!(error('You did not supply a project name'))
+            help_now!(error(_('cli.project.new.name_arg_missing')))
           end
         end
       end

data/lib/bebox/commands/node_commands.rb

@@ -8,31 +8,26 @@ module Bebox
 
     def load_commands
       # Nodes management phase commands
-      desc 'Manage nodes for a environment in the project.'
+      desc _('cli.node.desc')
       command :node do |node_command|
         node_list_command(node_command)
-        generate_node_command(node_command, :new, :create_new_node, 'Add a node to a environment')
+        generate_node_command(node_command, :new, :create_new_node, _('cli.node.new.desc'))
         node_remove_command(node_command)
         # These commands are available if there is at least one role and one node
-        generate_node_command(node_command, :set_role, :set_role, 'Associate a node with a role in a environment') if (Bebox::Role.roles_count(project_root) > 0 && Bebox::Node.count_all_nodes_by_type(project_root, 'nodes') > 0)
+        generate_node_command(node_command, :set_role, :set_role, _('cli.node.set_role.desc')) if (Bebox::Role.roles_count(project_root) > 0 && Bebox::Node.count_all_nodes_by_type(project_root, 'nodes') > 0)
       end
     end
 
     def node_list_command(node_command)
       # Node list command
-      node_command.flag :environment, desc: 'Set the environment for nodes', default_value: default_environment
-      node_command.desc 'list the nodes in a environment'
+      node_command.flag :environment, desc: _('cli.node.list.env_flag_desc'), default_value: default_environment
+      node_command.desc _('cli.node.list.desc')
       node_command.command :list do |node_list_command|
         node_list_command.switch :all
         node_list_command.action do |global_options,options,args|
           # Call to list nodes
           environments = options[:all] ? Bebox::Environment.list(project_root) : [get_environment(options)]
-          environments.each do |environment|
-            nodes = Node.list(project_root, environment, 'nodes')
-            title "Nodes for '#{environment}' environment:"
-            nodes.map{|node| msg("#{node}     (#{Bebox::Node.node_provision_state(project_root, environment, node)})")}
-            warn('There are not nodes yet in the environment. You can create a new one with: \'bebox node new\' command.') if nodes.empty?
-          end
+          list_environments(environments)
           linebreak
         end
       end
@@ -44,21 +39,30 @@ module Bebox
       node_command.command command do |generated_command|
         generated_command.action do |global_options,options,args|
           environment = get_environment(options)
-          info "Environment: #{environment}"
+          info _('cli.current_environment')%{environment: environment}
           Bebox::NodeWizard.new.send(send_command, project_root, environment)
         end
       end
     end
 
     def node_remove_command(node_command)
-      node_command.desc "Remove a node in a environment"
+      node_command.desc _('cli.node.remove.desc')
       node_command.command :remove do |node_remove_command|
         node_remove_command.action do |global_options,options,args|
           environment = get_environment(options)
-          info "Environment: #{environment}"
+          info _('cli.current_environment')%{environment: environment}
           Bebox::NodeWizard.new.remove_node(project_root, environment, args.first)
         end
       end
     end
+
+    def list_environments(environments)
+      environments.each do |environment|
+        nodes = Node.list(project_root, environment, 'nodes')
+        title _('cli.node.list.env_nodes_title')%{environment: environment}
+        nodes.map{|node| msg("#{node}     (#{Bebox::Node.node_provision_state(project_root, environment, node)})")}
+        warn(_('cli.node.list.no_nodes')) if nodes.empty?
+      end
+    end
   end
 end

data/lib/bebox/commands/prepare_commands.rb

@@ -7,43 +7,46 @@ module Bebox
     end
 
     def load_commands
-      # Prepare nodes phase commands
-      desc 'Prepare the nodes for the environment.'
+      load_prepare_command
+      # These commands are available if there are at least one node in the vagrant environment
+      (Bebox::Node.list(project_root, 'vagrant', 'prepared_nodes').count > 0) ? load_vagrant_commands : return
+    end
+
+    def load_prepare_command
+      desc _('cli.prepare.desc')
       command :prepare do |prepare_command|
-        prepare_command.flag :environment, :desc => 'Set the environment of node', default_value: default_environment
+        prepare_command.flag :environment, :desc => _('cli.prepare.env_flag_desc'), default_value: default_environment
         prepare_command.action do |global_options,options,args|
           environment = get_environment(options)
           # Check if vagrant is installed
-          return error('Vagrant is not installed in the system. No changes were made.') unless Bebox::CommandsHelper.vagrant_installed?
-          title "Environment: #{environment}"
+          return error(_('cli.prepare.not_vagrant')) unless Bebox::CommandsHelper.vagrant_installed?
+          title _('cli.current_environment')%{environment: environment}
           Bebox::NodeWizard.new.prepare(project_root, environment)
         end
       end
-      # These commands are available if there are at least one node in the vagrant environment
-      (Bebox::Node.list(project_root, 'vagrant', 'prepared_nodes').count > 0) ? load_vagrant_commands : return
     end
 
     def load_vagrant_commands
-      desc 'Halt the nodes for vagrant environment.'
+      desc _('cli.prepare.vagrant_halt.desc')
       command :vagrant_halt do |vagrant_halt_command|
         vagrant_halt_command.action do |global_options,options,args|
-          vagrant_command(:halt_vagrant_nodes, 'Halting nodes:')
+          vagrant_command(:halt_vagrant_nodes, _('cli.prepare.vagrant_halt.halt_title'))
         end
       end
-      desc 'Up the nodes for vagrant environment.'
+      desc _('cli.prepare.vagrant_up.desc')
       command :vagrant_up do |vagrant_up_command|
         vagrant_up_command.action do |global_options,options,args|
-          vagrant_command(:up_vagrant_nodes, 'Running up nodes:')
+          vagrant_command(:up_vagrant_nodes, _('cli.prepare.vagrant_up.up_title'))
         end
       end
     end
 
     def vagrant_command(command, message)
       # Check if vagrant is installed
-      return error('Vagrant is not installed in the system. No changes were made.') unless Bebox::CommandsHelper.vagrant_installed?
+      return error(_('cli.prepare.not_vagrant')) unless Bebox::CommandsHelper.vagrant_installed?
       nodes = Bebox::Node.nodes_in_environment(project_root, 'vagrant', 'nodes')
-      environment = 'vagrant'
-      title "Environment: #{environment}\n#{message}"
+      title _('cli.current_environment')%{environment: 'vagrant'}
+      title message
       nodes.each{|node| msg(node.hostname)}
       linebreak
       Bebox::VagrantHelper.send(command, project_root)

data/lib/bebox/commands/profile_commands.rb

@@ -7,7 +7,7 @@ module Bebox
     end
 
     def load_commands
-      desc 'Manage profiles for the node provisioning phase.'
+      desc _('cli.profile.desc')
       command :profile do |profile_command|
         profile_new_command(profile_command)
         profile_remove_command(profile_command)
@@ -17,13 +17,13 @@ module Bebox
 
     # Profile new command
     def profile_new_command(profile_command)
-      profile_command.desc 'Add a profile to the project'
+      profile_command.desc _('cli.profile.new.desc')
       profile_command.arg_name "[name]"
       profile_command.command :new do |profile_new_command|
-        profile_new_command.flag :p, :arg_name => 'path', :desc => 'A relative path of the category folders tree to store the profile. Ex. basic/security/iptables'
+        profile_new_command.flag :p, :arg_name => 'path', :desc => _('cli.profile.new.path_flag_desc')
         profile_new_command.action do |global_options,options,args|
           path = options[:p] || ''
-          help_now!(error('You did not supply a name')) if args.count == 0
+          help_now!(error(_('cli.profile.new.name_arg_missing'))) if args.count == 0
           Bebox::ProfileWizard.new.create_new_profile(project_root, args.first, path)
         end
       end
@@ -31,7 +31,7 @@ module Bebox
 
     # Profile remove command
     def profile_remove_command(profile_command)
-      profile_command.desc "Remove a profile from the project"
+      profile_command.desc _('cli.profile.remove.desc')
       profile_command.command :remove do |profile_remove_command|
         profile_remove_command.action do |global_options,options,args|
           Bebox::ProfileWizard.new.remove_profile(project_root)
@@ -41,13 +41,13 @@ module Bebox
 
     # Profile list command
     def profile_list_command(profile_command)
-      profile_command.desc 'List the profiles in the project'
+      profile_command.desc _('cli.profile.list.desc')
       profile_command.command :list do |profile_list_command|
         profile_list_command.action do |global_options,options,args|
           profiles = Bebox::ProfileWizard.new.list_profiles(project_root)
-          title 'Current profiles:'
+          title _('cli.profile.list.current_profiles')
           profiles.map{|profile| msg(profile)}
-          warn('There are not profiles yet. You can create a new one with: \'bebox profile new\' command.') if profiles.empty?
+          warn(_('cli.profile.list.no_profiles')) if profiles.empty?
           linebreak
         end
       end

data/lib/bebox/commands/provision_commands.rb

@@ -11,21 +11,21 @@ module Bebox
     end
 
     def load_provision_commands
-      desc 'Apply the Puppet step for the nodes in a environment. (step-0: Fundamental, step-1: User layer, step-2: Service layer, step-3: Security layer)'
+      desc _('cli.provision.desc')
       arg_name "[step]"
       command :apply do |apply_command|
-        apply_command.switch :all, :desc => 'Apply all steps in sequence.', :negatable => false
-        apply_command.flag :environment, :desc => 'Set the environment of nodes', default_value: default_environment
+        apply_command.switch :all, :desc => _('cli.provision.all_switch_desc'), :negatable => false
+        apply_command.flag :environment, :desc => _('cli.provision.env_flag_desc'), default_value: default_environment
         apply_command.action do |global_options,options,args|
           environment = get_environment(options)
-          title "Environment: #{environment}"
+          title _('cli.current_environment')%{environment: environment}
           options[:all] ? apply_all(environment) : apply(environment, args)
         end
       end
     end
 
     def apply_all(environment)
-      title "Provisioning all steps..."
+      title _('cli.provision.title')
       Bebox::PROVISION_STEPS.each do |step|
         Bebox::ProvisionWizard.new.apply_step(project_root, environment, step)
       end
@@ -33,8 +33,8 @@ module Bebox
 
     def apply(environment, args)
       step = args.first
-      help_now!(error('You did not specify an step')) if args.count == 0
-      help_now!(error('You did not specify a valid step')) unless Bebox::CommandsHelper.valid_step?(step)
+      help_now!(error(_('cli.provision.name_missing'))) if args.count == 0
+      help_now!(error(_('cli.provision.name_invalid'))) unless Bebox::CommandsHelper.valid_step?(step)
       Bebox::ProvisionWizard.new.apply_step(project_root, environment, step)
     end
   end

data/lib/bebox/commands/role_commands.rb

@@ -7,10 +7,10 @@ module Bebox
     end
 
     def load_commands
-      desc 'Manage roles for the node provisioning phase.'
+      desc _('cli.role.desc')
       command :role do |role_command|
         role_new_command(role_command)
-        generate_role_command(role_command, :remove, :remove_role, 'Remove a role from the project')
+        generate_role_command(role_command, :remove, :remove_role, _('cli.role.remove.desc'))
         role_list_command(role_command)
         # These commands are available if there are at least one role and one profile
         load_role_profile_commands(role_command) if (Bebox::Role.roles_count(project_root) > 0 && Bebox::Profile.profiles_count(project_root) > 0)
@@ -19,13 +19,13 @@ module Bebox
 
     # Role list command
     def role_list_command(role_command)
-      role_command.desc 'List the roles in the project'
+      role_command.desc _('cli.role.list.desc')
       role_command.command :list do |role_list_command|
         role_list_command.action do |global_options,options,args|
           roles = Bebox::Role.list(project_root)
-          title 'Current roles:'
+          title _('cli.role.list.current_roles')
           roles.map{|role| msg(role)}
-          warn('There are not roles yet. You can create a new one with: \'bebox role new\' command.') if roles.empty?
+          warn(_('cli.role.list.no_roles')) if roles.empty?
           linebreak
         end
       end
@@ -33,19 +33,19 @@ module Bebox
 
     # Role new command
     def role_new_command(role_command)
-      role_command.desc 'Add a role to the project'
+      role_command.desc _('cli.role.new.desc')
       role_command.arg_name "[name]"
       role_command.command :new do |role_new_command|
         role_new_command.action do |global_options,options,args|
-          help_now!(error('You did not supply a name')) if args.count == 0
+          help_now!(error(_('cli.role.new.name_arg_missing'))) if args.count == 0
           Bebox::RoleWizard.new.create_new_role(project_root, args.first)
         end
       end
     end
 
     def load_role_profile_commands(role_command)
-      generate_role_command(role_command, :add_profile, :add_profile, 'Add a profile to a role')
-      generate_role_command(role_command, :remove_profile, :remove_profile, 'Remove a profile from a role')
+      generate_role_command(role_command, :add_profile, :add_profile, _('cli.role.add_profile.desc'))
+      generate_role_command(role_command, :remove_profile, :remove_profile, _('cli.role.remove_profile.desc'))
       role_list_profiles_command(role_command)
     end
 
@@ -61,22 +61,22 @@ module Bebox
 
     # Role list profiles command
     def role_list_profiles_command(role_command)
-      role_command.desc 'List the profiles in a role'
+      role_command.desc _('cli.role.list_profiles.desc')
       role_command.arg_name "[role_name]"
       role_command.command :list_profiles do |list_profiles_command|
         list_profiles_command.action do |global_options,options,args|
-          help_now!(error('You did not supply a role name.')) if args.count == 0
+          help_now!(error(_('cli.role.list_profiles.name_arg_missing'))) if args.count == 0
           role = args.first
-          exit_now!(error("The '#{role}' role does not exist.")) unless Bebox::RoleWizard.new.role_exists?(project_root, role)
           print_profiles(role, Bebox::Role.list_profiles(project_root, role))
         end
       end
     end
 
     def print_profiles(role, profiles)
-      title "Current profiles in '#{role}' role:"
+      exit_now!(error(_('cli.role.list_profiles.name_not_exist')%{role: role})) unless Bebox::RoleWizard.new.role_exists?(project_root, role)
+      title _('cli.role.list_profiles.current_profiles')%{role: role}
       profiles.map{|profile| msg(profile)}
-      warn("There are not profiles in role '#{role}'. You can add a new one with: 'bebox role add_profile' command.") if profiles.empty?
+      warn(_('cli.role.list_profiles.no_profiles')%{role: role}) if profiles.empty?
       linebreak
     end
   end