bebox 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69912bd5c8001b5268585d2e588209842de9714b
-  data.tar.gz: 8361cf2dc44a3e28bbc6c93991d1cffe68d662d6
+  metadata.gz: bb82ff2a6726fcc8b3d4ccd7a64fe23c593c71b7
+  data.tar.gz: a46d4bde8d6db798ff9b2d8b0011bb4008221b4d
 SHA512:
-  metadata.gz: 3dad9691f0bff82bf147b9cd09f28bdcbcb143019ce960b99b325ad619393d71c6aca7ab5968cd6c4acf867e28194f2159bad044dd564e5ddaba241801823e0d
-  data.tar.gz: 4865599e35c7ed4b6b8028d73b080bfa5a120ec62167434a580fc0a706d7ad9c3be5a58cadf075e0a2d3f6dd24a00fcf65994af99a989c65ec93753d7e0cee4d
+  metadata.gz: ac94dff23adf6866b9739d96891ec41d42b6d36423c26836101dca0b5e7ba41f350fca81dc8c08f680c71bb59d052e6eb4e413096d2a0e7c7308aeba27cc4b3b
+  data.tar.gz: 33ba1cfcb5f89871b01b6e54f7937113f50f1a73cab8b6ab01d5028aea191906b60ef00e88e4e93415d181459bd7b326fc1453d6e6e8564ce9e405e79dc1aaec

data/.gitignore

@@ -71,6 +71,7 @@ pkg/
 
 # Spec tests
 spec/support/config_specs.yaml
+coverage/
 
 # Local
 TODO

data/.rspec

@@ -0,0 +1 @@
+--colour

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bebox (0.1.0)
+    bebox (0.1.1)
       colorize (= 0.6.0)
       gli (= 2.10.0)
       highline (= 1.6.21)
@@ -36,6 +36,8 @@ GEM
     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)
@@ -55,6 +57,7 @@ GEM
     debugger-ruby_core_source (1.3.2)
     diff-lcs (1.2.5)
     diffy (3.0.4)
+    docile (1.1.5)
     erubis (2.7.0)
     factory_girl (4.3.0)
       activesupport (>= 3.0.0)
@@ -134,6 +137,11 @@ GEM
       net-ssh
       rspec (~> 2.13)
       specinfra (~> 1.11)
+    simplecov (0.9.0)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     slop (3.5.0)
     specinfra (1.12.0)
     thor (0.19.1)
@@ -149,8 +157,10 @@ PLATFORMS
 DEPENDENCIES
   aruba (= 0.5.4)
   bebox!
+  codeclimate-test-reporter (= 0.4.0)
   factory_girl (= 4.3.0)
   jazz_hands (= 0.5.2)
   rake (= 10.3.1)
   rspec (= 2.14.1)
   serverspec (= 1.6.0)
+  simplecov (= 0.9.0)

data/README.md

@@ -2,6 +2,7 @@ Bebox
 =====
 
 [![Code Climate](https://codeclimate.com/github/codescrum/bebox/badges/gpa.svg)](https://codeclimate.com/github/codescrum/bebox)
+[![Test Coverage](https://codeclimate.com/github/codescrum/bebox/badges/coverage.svg)](https://codeclimate.com/github/codescrum/bebox)
 
 Introduction
 ------------

data/bebox.gemspec

@@ -31,6 +31,8 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('jazz_hands', '0.5.2')
   s.add_development_dependency('serverspec', '1.6.0')
   s.add_development_dependency('factory_girl', '4.3.0')
+  s.add_development_dependency('codeclimate-test-reporter', '0.4.0')
+  s.add_development_dependency('simplecov', '0.9.0')
   s.add_runtime_dependency('gli','2.10.0')
   s.add_runtime_dependency('tilt', '2.0.1')
   s.add_runtime_dependency('highline', '1.6.21')

data/lib/bebox/node.rb

@@ -170,7 +170,7 @@ module Bebox
       end
     end
 
-    # Obtain the node creation_at of finished_at parameter of a node
+    # Obtain the node creation_at parameter for a node
     def self.node_creation_date(project_root, environment, node_type, node)
       node_config = YAML.load_file("#{project_root}/.checkpoints/environments/#{environment}/#{node_type}/#{node}.yml")
       (node_type == 'nodes') ? node_config['created_at'] : node_config['finished_at']

data/lib/bebox/provision.rb

@@ -42,27 +42,6 @@ module Bebox
       `cp -R #{Bebox::FilesHelper::templates_path}/puppet/#{self.step}/modules/* #{self.project_root}/puppet/steps/#{step_name}/modules/`
     end
 
-    # Generate the hiera data for step from the template
-    def generate_hiera
-      generate_hiera_yaml
-      generate_hiera_data_common
-    end
-
-    def generate_hiera_yaml
-      generate_file_from_template("#{Bebox::FilesHelper::templates_path}/puppet/#{self.step}/hiera/hiera.yaml.erb", "#{self.project_root}/puppet/steps/#{step_name}/hiera/hiera.yaml", {step_dir: step_name})
-    end
-
-    def generate_hiera_data_common
-      ssh_key = Bebox::Project.public_ssh_key_from_file(self.project_root, self.environment)
-      project_name = Bebox::Project.shortname_from_file(self.project_root)
-      generate_file_from_template("#{Bebox::FilesHelper::templates_path}/puppet/#{self.step}/hiera/data/common_apply.yaml.erb", "#{self.project_root}/puppet/steps/#{step_name}/hiera/data/common.yaml", {ssh_key: ssh_key, project_name: project_name})
-    end
-
-    # Generate the site.pp manifests file for step
-    def self.generate_manifests(project_root, step, nodes)
-      generate_file_from_template("#{Bebox::FilesHelper::templates_path}/puppet/#{step}/manifests/site_apply.pp.erb", "#{project_root}/puppet/steps/#{Bebox::Provision.step_name(step)}/manifests/site.pp", {nodes: nodes})
-    end
-
     # Generate the hiera templates for each step
     def self.generate_hiera_for_steps(project_root, template_file, filename, options)
       Bebox::PROVISION_STEPS.each do |step|
@@ -123,12 +102,6 @@ module Bebox
 
     # Set a role for a node in the step-2 manifests file
     def self.associate_node_role(project_root, environment, node_name, role_name)
-      # Create the manifests site.pp file for step-2 if not exist
-      unless Bebox::Provision.manifests_exists?(project_root, 'step-2')
-        nodes = Bebox::Node.nodes_in_environment(project_root, environment, 'nodes')
-        Bebox::Provision.generate_manifests(project_root, self.step, nodes)
-      end
-      # Set the role for a node
       Bebox::Provision.remove_role(project_root, node_name, 'step-2')
       Bebox::Provision.add_role(project_root, node_name, role_name)
     end
@@ -190,11 +163,6 @@ module Bebox
       File.open(manifest_path, 'wb') { |file| file.write(content) }
     end
 
-    # Check if a manifests for a step exist
-    def self.manifests_exists?(project_root, step)
-      File.exist?("#{project_root}/puppet/steps/#{Bebox::Provision.step_name(step)}/manifests/site.pp")
-    end
-
     # Apply step via capistrano in the machine
     def apply_step
       # Create deploy directories

data/lib/bebox/vagrant_helper.rb

@@ -43,8 +43,8 @@ module Bebox
 
     # Add the vagrant hosts to the local hosts file
     def add_to_local_hosts(node)
-      host_command = `echo '#{node.ip} #{node.hostname}     # Added by bebox' >> #{local_hosts_path}/hosts`
-      host_command if (file_content_trimmed("#{local_hosts_path}/hosts") =~ /#{node.ip}\s+#{node.hostname}/)
+      host_command = "sudo echo '#{node.ip} #{node.hostname}     # Added by bebox' >> #{local_hosts_path}/hosts"
+      `#{host_command}` unless (file_content_trimmed("#{local_hosts_path}/hosts") =~ /#{node.ip}\s+#{node.hostname}/)
     end
 
     # Obtain the local hosts file for the OS
@@ -64,13 +64,15 @@ 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 "Adding server to vagrant: #{node.hostname}"
+      info "Please enter the network interface number if asked, and wait until the machine is up."
       `cd #{node.project_root} && vagrant box add #{box_name} #{vagrant_box_base}` unless already_installed_boxes.include? box_name
     end
 
     # Up the vagrant boxes in Vagrantfile
     def self.up_vagrant_nodes(project_root)
-      `cd #{project_root} && vagrant up --provision`
+      pid = fork {exec("cd #{project_root} && vagrant up --provision")}
+      Process.wait(pid)
     end
 
     # Halt the vagrant boxes running

data/lib/bebox/version.rb

@@ -1,3 +1,3 @@
 module Bebox
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/bebox/wizards/environment_wizard.rb

@@ -10,8 +10,9 @@ module Bebox
       return error("The '#{environment_name}' environment already exist!.") if Bebox::Environment.environment_exists?(project_root, environment_name)
       # Environment creation
       environment = Bebox::Environment.new(environment_name, project_root)
-      environment.create
+      output = environment.create
       ok 'Environment created!.'
+      return output
     end
 
     # Removes an existing environment
@@ -22,8 +23,9 @@ module Bebox
       return warn('No changes were made.') unless confirm_action?('Are you sure that you want to delete the environment?')
       # Environment deletion
       environment = Bebox::Environment.new(environment_name, project_root)
-      environment.remove
+      output = environment.remove
       ok 'Environment removed!.'
+      return output
     end
   end
 end

data/lib/bebox/wizards/node_wizard.rb

@@ -13,8 +13,9 @@ module Bebox
       ip = ask_ip(environment)
       # Node creation
       node = Bebox::Node.new(environment, project_root, hostname, ip)
-      node.create
+      output = node.create
       ok 'Node created!.'
+      return output
     end
 
     # Removes an existing node
@@ -24,14 +25,16 @@ module Bebox
       if nodes.count > 0
         hostname = choose_option(nodes, 'Choose the node to remove:')
       else
-        return error "There are no nodes in the '#{environment}' environment to remove. No changes were made."
+        error "There are no nodes in the '#{environment}' environment to remove. No changes were made."
+        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?')
       # Node deletion
       node = Bebox::Node.new(environment, project_root, hostname, nil)
-      node.remove
+      output = node.remove
       ok 'Node removed!.'
+      return output
     end
 
     # Associate a role with a node in a environment
@@ -40,8 +43,9 @@ module Bebox
       nodes = Bebox::Node.list(project_root, environment, 'nodes')
       node = choose_option(nodes, 'Choose an existing node:')
       role = choose_option(roles, 'Choose an existing role:')
-      Bebox::Provision.associate_node_role(project_root, environment, node, role)
+      output = Bebox::Provision.associate_node_role(project_root, environment, node, role)
       ok 'Role associated to node!.'
+      return output
     end
 
     # Prepare the nodes in a environment
@@ -69,6 +73,7 @@ module Bebox
       else
         warn 'There are no nodes to prepare. No changes were made.'
       end
+      return true
     end
 
     # Check the nodes already prepared and ask confirmation to re-do-it

data/lib/bebox/wizards/profile_wizard.rb

@@ -31,8 +31,9 @@ module Bebox
       return error("The profile '#{profile_path}' already exist. No changes were made.") if profile_exists?(project_root, profile_path)
       # Profile creation
       profile = Bebox::Profile.new(profile_name, project_root, profile_base_path)
-      profile.create
+      output = profile.create
       ok "Profile '#{profile_path}' created!."
+      return output
     end
 
     # Removes an existing profile
@@ -51,8 +52,9 @@ module Bebox
       profile_name = profile.split('/').last
       profile_base_path = profile.split('/')[0...-1].join('/')
       profile = Bebox::Profile.new(profile_name, project_root, profile_base_path)
-      profile.remove
+      output = profile.remove
       ok 'Profile removed!.'
+      return output
     end
 
     # Lists existing profiles

data/lib/bebox/wizards/project_wizard.rb

@@ -21,13 +21,14 @@ module Bebox
       default_environments = %w{vagrant staging production}
       # Project creation
       project = Bebox::Project.new(project_name, vagrant_box_base, Dir.pwd, vagrant_box_provider, default_environments)
-      project.create
+      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."
+      return output
     end
 
     # If choose to download/select new box get a valid uri
     def get_valid_box_uri(current_box)
-      return (valid_box_uri = current_box) unless current_box.nil?
+      return current_box unless current_box.nil?
       # Keep asking for valid uri or overwriting until confirmation
       confirm = false
       begin
@@ -64,7 +65,7 @@ module Bebox
     def set_box(box_uri)
       require 'uri'
       uri = URI.parse(box_uri)
-      if uri.scheme == ('http' || 'https')
+      if %w{http https}.include?(uri.scheme)
         info 'Downloading box ...'
         download_box(uri)
       else

data/lib/bebox/wizards/provision_wizard.rb

@@ -13,10 +13,12 @@ module Bebox
       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}")
+      outputs = []
       nodes_to_step.each do |node|
         next unless check_node_to_step(node, in_step_nodes, step)
-        provision_step_in_node(project_root, environment, step, in_step_nodes, node)
+        outputs << provision_step_in_node(project_root, environment, step, in_step_nodes, node)
       end
+      return outputs
     end
 
     def provision_step_in_node(project_root, environment, step, in_step_nodes, node)
@@ -28,7 +30,9 @@ module Bebox
       # 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)
-      provision.apply.success? ? (ok "Node '#{node.hostname}' provisioned to #{step}.") : (error "An error ocurred in the provision of #{step} for node '#{node.hostname}'")
+      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)

data/lib/bebox/wizards/role_wizard.rb

@@ -18,8 +18,9 @@ module Bebox
       return error("The '#{role_name}' role already exist. No changes were made.") if role_exists?(project_root, role_name)
       # Role creation
       role = Bebox::Role.new(role_name, project_root)
-      role.create
+      output = role.create
       ok 'Role created!.'
+      return output
     end
 
     # Removes an existing role
@@ -36,8 +37,9 @@ module Bebox
       return warn('No changes were made.') unless confirm_action?('Are you sure that you want to delete the role?')
       # Role deletion
       role = Bebox::Role.new(role_name, project_root)
-      role.remove
+      output = role.remove
       ok 'Role removed!.'
+      return output
     end
 
     # Add a profile to a role
@@ -47,11 +49,13 @@ module Bebox
       role = choose_option(roles, 'Choose an existing role:')
       profile = choose_option(profiles, 'Choose the profile to add:')
       if Bebox::Role.profile_in_role?(project_root, role, profile)
-        return warn("Profile '#{profile}' already in the Role '#{role}'. No changes were made.")
+        warn "Profile '#{profile}' already in the Role '#{role}'. No changes were made."
+        output = false
       else
-        Bebox::Role.add_profile(project_root, role, profile)
-        return ok("Profile '#{profile}' added to Role '#{role}'.")
+        output = Bebox::Role.add_profile(project_root, role, profile)
+        ok "Profile '#{profile}' added to Role '#{role}'."
       end
+      return output
     end
 
     # Remove a profile in a role
@@ -61,12 +65,13 @@ module Bebox
       role = choose_option(roles, 'Choose an existing role:')
       profile = choose_option(profiles, 'Choose the profile to remove:')
       if Bebox::Role.profile_in_role?(project_root, role, profile)
-        Bebox::Role.remove_profile(project_root, role, profile)
-        return ok("Profile '#{profile}' removed from Role '#{role}'.")
+        output = Bebox::Role.remove_profile(project_root, role, profile)
+        ok "Profile '#{profile}' removed from Role '#{role}'."
       else
-        return warn("Profile '#{profile}' is not in the Role '#{role}'. No changes were made.")
+        warn "Profile '#{profile}' is not in the Role '#{role}'. No changes were made."
+        output = false
       end
-
+      return output
     end
 
     # Check if there's an existing role in the project

data/lib/bebox/wizards/wizards_helper.rb

@@ -1,5 +1,6 @@
 module Bebox
   module WizardsHelper
+
     # Ask for confirmation of any action
     def confirm_action?(message)
       require 'highline/import'

data/spec/environment_spec.rb

@@ -1,24 +1,33 @@
 require 'spec_helper'
 require_relative '../spec/factories/environment.rb'
 
-describe 'Test 02: Bebox::Environment' do
+describe 'Test 07: Bebox::Environment' do
 
   describe 'Environment management' do
 
     subject { build(:environment) }
 
-    it 'should list the current environments' do
+    it 'list the current environments' do
       current_environments = %w{vagrant staging production}
       environments = Bebox::Environment.list(subject.project_root)
       expect(environments).to include(*current_environments)
     end
 
     context 'environment creation' do
+      before :all do
+        subject.create
+      end
 
-      it 'should create checkpoints' do
+      it 'generates SSH keys for a given environment' do
+        subject.generate_puppet_user_keys(subject.name)
+        %w{id_rsa id_rsa.pub}.each do |key|
+          expect(File.exist?("#{subject.project_root}/config/keys/environments/#{subject.name}/#{key}")).to be (true)
+        end
+      end
+
+      it 'creates checkpoints' do
         expected_directories = [subject.name, 'nodes', 'prepared_nodes',
           'steps', 'step-0', 'step-1', 'step-2', 'step-3']
-        subject.create_checkpoints
         directories = []
         directories << Dir["#{subject.project_root}/.checkpoints/environments/#{subject.name}/"].map { |f| File.basename(f) }
         directories << Dir["#{subject.project_root}/.checkpoints/environments/#{subject.name}/*/"].map { |f| File.basename(f) }
@@ -26,20 +35,17 @@ describe 'Test 02: Bebox::Environment' do
         expect(directories.flatten).to include(*expected_directories)
       end
 
-      it 'should generate capistrano base' do
-        subject.create_capistrano_base
+      it 'generates a capistrano base' do
         expect(Dir.exist?("#{subject.project_root}/config/keys/environments/#{subject.name}")).to be (true)
       end
 
-      it 'should generate deploy file' do
-        subject.generate_deploy_file
+      it 'generates a deploy file' do
         deploy_content = File.read("#{subject.project_root}/config/deploy/#{subject.name}.rb").gsub(/\s+/, ' ').strip
         deploy_output_content = File.read("spec/fixtures/config/deploy/environment.test").gsub(/\s+/, ' ').strip
         expect(deploy_content).to eq(deploy_output_content)
       end
 
-      it 'should generate hiera data file' do
-        subject.generate_hiera_template
+      it 'generates a hiera data file' do
         Bebox::PROVISION_STEPS.each do |step|
           content = File.read("spec/fixtures/puppet/steps/#{step}/hiera/data/#{subject.name}.yaml.test")
           output = File.read("#{subject.project_root}/puppet/steps/#{Bebox::Provision.step_name(step)}/hiera/data/#{subject.name}.yaml")
@@ -49,11 +55,13 @@ describe 'Test 02: Bebox::Environment' do
     end
 
     context 'environment deletion' do
+      before :all do
+        subject.remove
+      end
 
-      it 'should remove checkpoints' do
+      it 'removes checkpoints' do
         environment_directories = [subject.name, 'nodes', 'prepared_nodes',
           'steps', 'step-0', 'step-1', 'step-2', 'step-3']
-        subject.remove_checkpoints
         directories = []
         directories << Dir["#{subject.project_root}/.checkpoints/environments/#{subject.name}/"].map { |f| File.basename(f) }
         directories << Dir["#{subject.project_root}/.checkpoints/environments/#{subject.name}/*/"].map { |f| File.basename(f) }
@@ -61,22 +69,31 @@ describe 'Test 02: Bebox::Environment' do
         expect(directories.flatten).to_not include(*environment_directories)
       end
 
-      it 'should remove capistrano base' do
-        subject.remove_capistrano_base
+      it 'removes the capistrano base' do
         expect(Dir.exist?("#{subject.project_root}/config/keys/environments/#{subject.name}")).to be (false)
       end
 
-      it 'should remove deploy file' do
-        subject.remove_deploy_file
+      it 'removes the deploy file' do
         expect(File.exist?("#{subject.project_root}/config/deploy/#{subject.name}.rb")).to be (false)
       end
 
-      it 'should remove deploy file' do
-        subject.remove_hiera_template
+      it 'removes the hiera node files' do
         Bebox::PROVISION_STEPS.each do |step|
           expect(File.exist?("#{subject.project_root}/puppet/steps/#{Bebox::Provision.step_name(step)}/hiera/data/#{subject.name}.yaml")).to be (false)
         end
       end
     end
+
+    context 'self methods' do
+      it 'checks for environment access keys' do
+        access = Bebox::Environment.check_environment_access(subject.project_root, 'vagrant')
+        expect(access).to eq(true)
+      end
+
+      it 'obtains a vagrant box base' do
+        environment_existence = Bebox::Environment.environment_exists?(subject.project_root, 'vagrant')
+        expect(environment_existence).to eq(true)
+      end
+    end
   end
 end