bebox 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dbcd794821165fbd1d616c747b8ba8125fd255b
-  data.tar.gz: 36cf6cbe8f4c35d2b21e49e61ceb648ada9b903a
+  metadata.gz: b6d6e63c580f4a2ce092b13f27c67e6906eee555
+  data.tar.gz: 43e1bc3876660c08b4cf27fbb3c4a708379a10bf
 SHA512:
-  metadata.gz: 2eb096841311aa6c652aeabfe79eda7faac54f091a7b615d0cf4af72d5b31b973631b0fc8e4b08a04c3de65a5dce76b215067051833f125fba5b7b9ab4a518ea
-  data.tar.gz: 0aeaf4a6e8cc853373856e4011f6f256555a961133c55917b8b83a7474749d6412ec25f79272c039ee483d79ad19bdefd28a28f073096a163f47fd2bb755a674
+  metadata.gz: 6bd27c4308d206439a8e148b841c289f60f30c781e3ea041f2331de72f1ea9a132c9f08e0a74ed53a4da5a91ad8c7e74e0c149c9af0ca349072f704344457f3f
+  data.tar.gz: 99be29307448b98834086e5b38e336c986cec6d632164a713f0aea0d4138aabb5f242a6e26e411d47efc885c68bb053fc32436a9c62ec0b023176ecf73eb144d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bebox (0.1.4)
+    bebox (0.1.5)
       colorize (= 0.6.0)
       fast_gettext (= 0.9.0)
       gli (= 2.10.0)

data/lib/bebox/environment.rb

@@ -34,8 +34,13 @@ module Bebox
 
     # Create checkpoints base directories
     def create_checkpoints
-      `cd #{self.project_root} && mkdir -p .checkpoints/environments/#{self.name}/{nodes,prepared_nodes,steps}`
-      (0..3).each{|i| `cd #{self.project_root} && mkdir -p .checkpoints/environments/#{self.name}/steps/step-#{i}`}
+      Bebox::Environment.create_checkpoint_directories(project_root, name)
+    end
+
+    # Create checkpoints base directories
+    def self.create_checkpoint_directories(project_root, environment)
+      `cd #{project_root} && mkdir -p .checkpoints/environments/#{environment}/{nodes,prepared_nodes,steps}`
+      (0..3).each{|i| `cd #{project_root} && mkdir -p .checkpoints/environments/#{environment}/steps/step-#{i}`}
     end
 
     # Remove checkpoints base directories
@@ -47,6 +52,7 @@ module Bebox
     def create_capistrano_base
       # Create keys directory for environment
       `cd #{self.project_root} && mkdir -p config/keys/environments/#{self.name}`
+      `cd #{self.project_root}/config/keys/environments/#{self.name} && touch .keep`
       # Create ssh key for puppet user if environment is vagrant
       generate_puppet_user_keys('vagrant') if self.name == 'vagrant'
     end

data/lib/bebox/node.rb

@@ -74,6 +74,7 @@ module Bebox
     def create_prepare_checkpoint(started_at)
       self.started_at = started_at
       self.finished_at = DateTime.now.to_s
+      Bebox::Environment.create_checkpoint_directories(project_root, environment)
       generate_file_from_template("#{Bebox::FilesHelper::templates_path}/node/prepared_node.yml.erb", "#{self.project_root}/.checkpoints/environments/#{self.environment}/prepared_nodes/#{self.hostname}.yml", {node: self})
     end
 
@@ -105,6 +106,7 @@ module Bebox
       # Set the creation time for the node
       self.created_at = DateTime.now.to_s
       # Create the checkpoint file from template
+      Bebox::Environment.create_checkpoint_directories(project_root, environment)
       generate_file_from_template("#{Bebox::FilesHelper::templates_path}/node/node.yml.erb", "#{project_root}/.checkpoints/environments/#{environment}/nodes/#{hostname}.yml", {node: self})
     end
 

data/lib/bebox/profile.rb

@@ -74,6 +74,7 @@ module Bebox
 
     # Clean a path to make it valid
     def self.cleanpath(path_name)
+      return path_name if path_name.empty?
       valid_path = Pathname.new(path_name).cleanpath.to_path.split('/').reject{|c| c.empty? }
       return valid_path.nil? ? '' : valid_path.join('/')
     end

data/lib/bebox/project.rb

@@ -154,7 +154,10 @@ module Bebox
 
     # Generate steps directories
     def generate_steps_directories
-      Bebox::PROVISION_STEP_NAMES.each{|step| `cd #{self.path} && mkdir -p puppet/steps/#{step}/{hiera/data,manifests,modules}`}
+      Bebox::PROVISION_STEP_NAMES.each do |step|
+        `cd #{self.path} && mkdir -p puppet/steps/#{step}/{hiera/data,manifests,modules}`
+        `cd puppet/steps/#{step}/modules && touch .keep`
+      end
       `cd #{self.path} && mkdir -p puppet/{roles,profiles}`
     end
 

data/lib/bebox/provision.rb

@@ -185,6 +185,7 @@ module Bebox
     def create_step_checkpoint(started_at)
       self.node.started_at = started_at
       self.node.finished_at = DateTime.now.to_s
+      Bebox::Environment.create_checkpoint_directories(project_root, environment)
       generate_file_from_template("#{Bebox::FilesHelper::templates_path}/node/provisioned_node.yml.erb", "#{self.project_root}/.checkpoints/environments/#{self.environment}/steps/#{self.step}/#{self.node.hostname}.yml", {node: self.node})
     end
 

data/lib/bebox/version.rb

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

data/lib/templates/project/gitignore.erb

@@ -1,7 +1,8 @@
 .vagrant/
 .bundle/
 .checkpoints/
-config/keys/
+config/keys/**/id_rsa
+config/keys/**/id_rsa.pub
 <% steps.each do |step_name| %>
 puppet/steps/<%=step_name%>/hiera/data/
 <% end %>

data/spec/fixtures/dot_gitignore.test

@@ -1,7 +1,8 @@
 .vagrant/
 .bundle/
 .checkpoints/
-config/keys/
+config/keys/**/id_rsa
+config/keys/**/id_rsa.pub
 puppet/steps/0-fundamental/hiera/data/
 puppet/steps/1-users/hiera/data/
 puppet/steps/2-services/hiera/data/

data/spec/wizards/project_wizard_spec.rb

@@ -12,12 +12,12 @@ describe 'Test 01: Bebox::ProjectWizard' do
     let(:project_name) { 'bebox-pname' }
     let(:parent_path) { "#{Dir.pwd}/tmp" }
     let(:http_box_uri) {'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box'}
-    let(:local_box_uri) {"#{Dir.pwd}/spec/fixtures/test_box.box"}
+    let(:local_box_uri) {"#{Dir.pwd}/spec/fixtures/box.test"}
     let(:bebox_boxes_path) {File.expand_path(Bebox::ProjectWizard::BEBOX_BOXES_PATH)}
 
     before :all do
       `mkdir -p #{bebox_boxes_path}/tmp`
-      `rm #{bebox_boxes_path}/test_box.box`
+      `rm #{bebox_boxes_path}/box.test`
       `rm -rf #{Dir.pwd}/tmp/bebox-pname`
     end
 
@@ -26,7 +26,7 @@ describe 'Test 01: Bebox::ProjectWizard' do
     end
 
     after :all do
-      `rm #{bebox_boxes_path}/test_box.box`
+      `rm #{bebox_boxes_path}/box.test`
     end
 
     it 'not create a project that already exist' do
@@ -38,8 +38,8 @@ describe 'Test 01: Bebox::ProjectWizard' do
     it 'creates a project with wizard' do
       Bebox::Project.any_instance.stub(:create) { true }
       subject.stub(:bebox_boxes_setup)
-      subject.stub(:choose_box) { 'test_box.box' }
-      subject.stub(:get_valid_box_uri) { 'test_box.box' }
+      subject.stub(:choose_box) { 'box.test' }
+      subject.stub(:get_valid_box_uri) { 'box.test' }
       subject.stub(:choose_option) { 'virtualbox' }
       $stdin.stub(:gets).and_return('1')
       output = subject.create_new_project(project_name)
@@ -59,13 +59,13 @@ describe 'Test 01: Bebox::ProjectWizard' do
 
     it 'chooses a box from a menu' do
       $stdin.stub(:gets).and_return('1')
-      output = subject.choose_box(['test_box.box'])
-      expect(output).to eq('test_box.box')
+      output = subject.choose_box(['box.test'])
+      expect(output).to eq('box.test')
     end
 
     it 'not chooses a box from a menu' do
       $stdin.stub(:gets).and_return('2')
-      output = subject.choose_box(['test_box.box'])
+      output = subject.choose_box(['box.test'])
       expect(output).to eq(nil)
     end
 
@@ -105,7 +105,7 @@ describe 'Test 01: Bebox::ProjectWizard' do
 
     it 'links to a local file box' do
       subject.set_box(local_box_uri)
-      expect(File.symlink?("#{bebox_boxes_path}/test_box.box")).to eq(true)
+      expect(File.symlink?("#{bebox_boxes_path}/box.test")).to eq(true)
     end
 
     it 'checks for a local file box existence' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bebox
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Codescrum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -345,6 +345,7 @@ files:
 - spec/factories/role.rb
 - spec/fixtures/Capfile.test
 - spec/fixtures/Gemfile.test
+- spec/fixtures/box.test
 - spec/fixtures/commands/environment_help.erb.test
 - spec/fixtures/commands/general_help.erb.test
 - spec/fixtures/commands/in_project_help.erb.test