toft 0.0.6 → 0.0.11

data/Gemfile.lock

@@ -1,54 +1,62 @@
 PATH
   remote: .
   specs:
-    toft (0.0.6)
+    toft (0.0.11)
       net-ssh
 
 GEM
   remote: http://rubygems.org/
   specs:
     archive-tar-minitar (0.5.2)
+    arr-pm (0.0.7)
+      cabin (> 0)
+    backports (2.3.0)
     builder (3.0.0)
-    cucumber (1.1.0)
+    cabin (0.4.4)
+      json
+    childprocess (0.3.2)
+      ffi (~> 1.0.6)
+    clamp (0.4.0)
+    cucumber (1.2.0)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.5.0)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.10.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    ffi (1.0.9)
-    fpm (0.3.10)
+    ffi (1.0.11)
+    fpm (0.4.6)
+      arr-pm (~> 0.0.7)
+      backports (= 2.3.0)
+      cabin (~> 0.4.3)
+      clamp
       json
-    gherkin (2.5.1)
+    gherkin (2.10.0)
       json (>= 1.4.6)
     i18n (0.6.0)
     json (1.5.4)
+    log4r (1.1.10)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.1.4)
-    rake (0.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    term-ansicolor (1.0.6)
-    thor (0.14.6)
-    vagrant (0.8.7)
+    net-ssh (2.2.2)
+    rake (0.9.2.2)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.0)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    vagrant (1.0.3)
       archive-tar-minitar (= 0.5.2)
+      childprocess (~> 0.3.1)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
       json (~> 1.5.1)
+      log4r (~> 1.1.9)
       net-scp (~> 1.0.4)
-      net-ssh (~> 2.1.4)
-      thor (~> 0.14.6)
-      virtualbox (~> 0.9.1)
-    virtualbox (0.9.2)
-      ffi (~> 1.0.9)
+      net-ssh (~> 2.2.2)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -103,6 +103,7 @@ eos
     -d sudo \
     -d bind-utils \
     -d bridge-utils \
+    -d dhclient \
     -d dhcp \
     -d bind \
     -d ntp \

data/features/chef.feature

@@ -57,6 +57,14 @@ Scenario: Attributes table should override attributes in json file
 	Then Node "n1" should have file or directory "/tmp/stub/two_two"
 	Then Node "n1" should have file or directory "/tmp/stub/three"
 
+Scenario: Run chef recipe with data bags
+	Given I have a clean running node n1
+	When I run "recipe[test::data_bag]" on node "n1"
+	Then Node "n1" should have file or directory "/tmp/stub/bag1item1"
+	Then Node "n1" should have file or directory "/tmp/stub/bag1item2"
+	Then Node "n1" should have file or directory "/tmp/stub/bag2item1"
+	Then Node "n1" should have file or directory "/tmp/stub/bag2item2"
+
 Scenario: Run non-exist recipe
 
 Scenario: Run non-exist role

data/features/node.feature

@@ -35,3 +35,7 @@ Scenario: Create or destroy node
 	When I destroy node "n2"
 	Then There should be 1 nodes in the environment	
 	
+Scenario: Change hostname used internally for a specific host
+  Given I have a clean running node n1
+  And I change the internal hostname for "n1" to "correct.puppet.com"
+  Then the result of running ssh command "hostname" on "n1" should contain "correct.puppet.com"

data/features/puppet.feature

@@ -0,0 +1,49 @@
+Feature: Puppet support
+
+Scenario: Run Puppet manifest on nodes
+  Given I have a clean running node n1
+  When I run puppet manifest "manifests/test.pp" on node "n1"
+  Then Node "n1" should have file or directory "/tmp/puppet_test"
+
+Scenario: Run puppet manifest with included nodes
+  Given I have a clean running node n1
+  And I change the internal hostname for "n1" to "correct.puppet.com"
+  And I run puppet manifest "manifests/site.pp" on node "n1"
+  Then Node "n1" should have file or directory "/tmp/puppet_test_correct"
+  And Node "n1" should have file or directory "/tmp/puppet_test_default"
+  And Node "n1" should have not file or directory "/tmp/puppet_test_incorrect"
+
+Scenario: Run puppet manifest with modules
+  Given I have a clean running node n1
+  When I run puppet manifest "manifests/test_module.pp" with config file "puppet_modules.conf" on node "n1"
+  Then Node "n1" should have file or directory "/tmp/puppet_test_module"
+
+Scenario: Run puppet manifest with static files being served by fileserver
+  Given I have a clean running node n1
+  When I run puppet manifest "manifests/test_fileserver.pp" with config file "puppet_fileserver.conf" on node "n1"
+  Then Node "n1" should have file or directory "/tmp/puppet_test_fileserver"
+
+Scenario: Run puppet manifest with template dir configuration
+  Given I have a clean running node n1
+  When I run puppet manifest "manifests/test_template.pp" with config file "puppet_template.conf" on node "n1"
+  Then Node "n1" should have file or directory "/tmp/puppet_test_template"
+
+Scenario: Check that package was installed on centos box
+  Given I have a clean running node n1
+  When I run puppet manifest "manifests/test_install.pp" on node "n1"
+  Then Node "n1" should have package "zip" installed in the centos box
+
+Scenario: Check that service is running on centos box
+  Given I have a clean running node n1
+  When I run puppet manifest "manifests/test_service.pp" on node "n1"
+  Then Node "n1" should have service "named" running in the centos box
+
+Scenario: Run puppet manifest overriding conf settings
+  Given I have a clean running node n1
+  And node "n1" has the configuration settings:
+    |key|value|
+    |modulepath|/tmp/toft-puppet-tmp/modules|
+  When I run puppet manifest "manifests/test_module.pp" on node "n1"
+  Then Node "n1" should have file or directory "/tmp/puppet_test_module"
+  
+

data/features/step_definitions/centos/checks.rb

@@ -0,0 +1,9 @@
+Then /^Node "([^"]*)" should have package "([^"]*)" installed in the centos box$/ do |node, package|
+  result = find(node).run_ssh("rpm -qa #{package}")
+  result.stdout.should include(package)
+end
+
+Then /^Node "([^"]*)" should have service "([^"]*)" running in the centos box$/ do |node, service|
+  result = find(node).run_ssh("ps -ef | grep -v grep | grep #{service} | wc -l")
+  result.stdout.strip!.should == "1"
+end

data/features/step_definitions/node.rb

@@ -53,6 +53,13 @@ When /^I remove cname "([^"]*)" from "([^"]*)"$/ do |cname, node|
   find(node).remove_cname cname
 end
 
+When /^I change the internal hostname for "([^"]*)" to "([^"]*)"$/ do |node_hostname, internal_hostname|
+  r = find(node_hostname)
+  r.run_ssh("hostname #{internal_hostname}")
+  r.run_ssh("echo 127.0.0.1 #{internal_hostname} >> /etc/hosts")
+end
+
+
 Then /^Hostname of Node "([^"]*)" should match its name$/ do |node|
   find(node).hostname.should == node
-end
+end

data/features/step_definitions/puppet.rb

@@ -0,0 +1,15 @@
+When /^I run puppet manifest "([^"]*)" on node "([^"]*)"$/ do |run_list, node|
+  find(node).run_puppet run_list
+end
+
+When /^I run puppet manifest "([^"]*)" with config file "([^"]*)" on node "([^"]*)"$/  do |run_list, conf_file, node|
+  find(node).run_puppet(run_list, :conf_file => conf_file)
+end
+
+When /^node "([^"]*)" has the configuration settings:$/ do |node, table|
+  r = find(node)
+  r.run_ssh("echo '[user]'  >> /etc/puppet/puppet.conf")
+  table.hashes.each do |hash|
+    r.run_ssh("echo '#{hash[:key]} = #{hash[:value]}' >> /etc/puppet/puppet.conf")
+  end
+end

data/features/support/env.rb

@@ -3,7 +3,9 @@ require 'rspec/expectations'
 require 'toft'
 
 CHEF_FIXTURE_PATH = File.dirname(__FILE__) + '/../../fixtures/chef'
-CONTAINER_TYPE = "natty"
+PUPPET_FIXTURE_PATH = File.dirname(__FILE__) + '/../../fixtures/puppet'
+
+CONTAINER_TYPE = "centos-6"
 
 World(Toft)
 
@@ -13,10 +15,12 @@ n1 = create_node "n1", {:ip => "192.168.20.2", :type => CONTAINER_TYPE}
 Before do
   Toft.cookbook_path = CHEF_FIXTURE_PATH + '/cookbooks'
   Toft.role_path = CHEF_FIXTURE_PATH + '/roles'
+  Toft.data_bag_path = CHEF_FIXTURE_PATH + '/data_bags'
+  Toft.manifest_path = PUPPET_FIXTURE_PATH
 
   @n1 = n1
 end
 
 at_exit do
   n1.destroy
-end
+end

data/fixtures/chef/cookbooks/test/recipes/data_bag.rb

@@ -0,0 +1,9 @@
+%w{bag1 bag2}.each do |bag_name|
+  %w{item1 item2}.each do |item_name|
+    item = data_bag_item(bag_name, item_name)
+    directory "/tmp/stub/#{item['value']}" do
+      action :create
+      recursive true
+    end
+  end
+end

data/fixtures/chef/data_bags/bag1/item1.json

@@ -0,0 +1,4 @@
+{
+  "id": "item1",
+  "value": "bag1item1"
+}

data/fixtures/chef/data_bags/bag1/item2.json

@@ -0,0 +1,4 @@
+{
+  "id": "item2",
+  "value": "bag1item2"
+}

data/fixtures/chef/data_bags/bag2/item1.json

@@ -0,0 +1,4 @@
+{
+  "id": "item1",
+  "value": "bag2item1"
+}

data/fixtures/chef/data_bags/bag2/item2.json

@@ -0,0 +1,4 @@
+{
+  "id": "item2",
+  "value": "bag2item2"
+}

data/fixtures/puppet/conf/fileserver.conf

@@ -0,0 +1,3 @@
+[conf]
+  path /tmp/toft-puppet-tmp/manifests/fileserver/conf
+  allow *

data/fixtures/puppet/conf/puppet.conf

@@ -0,0 +1,15 @@
+[main]
+  modulepath = /tmp/puppet/modules
+	templatedir = /tmp/puppet/manifests/templates
+	node_terminus = exec
+	external_nodes = /tmp/puppet/tools/extnode.pl
+	fileserverconfig = /tmp/puppet/conf/fileserver.conf 
+	logdir = /var/log/puppet
+  vardir = /var/lib/puppet
+  ssldir = /var/lib/puppet/ssl
+  rundir = /var/run/puppet
+  report = true
+  server = puppet.dev.int.realestate.com.au
+  reportserver = puppet.dev.int.realestate.com.au
+  diff = diff 
+	diff_args = -u

data/fixtures/puppet/conf/puppet_exec.conf

@@ -0,0 +1,9 @@
+[main]
+	node_terminus = exec
+	external_nodes = /tmp/puppet/tools/extnode.pl
+	
+  logdir = /var/log/puppet
+  vardir = /var/lib/puppet
+  ssldir = /var/lib/puppet/ssl
+  rundir = /var/run/puppet
+  report = true

data/fixtures/puppet/conf/puppet_fileserver.conf

@@ -0,0 +1,8 @@
+[main]
+	fileserverconfig = /tmp/toft-puppet-tmp/conf/fileserver.conf 
+	
+  logdir = /var/log/puppet
+  vardir = /var/lib/puppet
+  ssldir = /var/lib/puppet/ssl
+  rundir = /var/run/puppet
+  report = true

data/fixtures/puppet/conf/puppet_modules.conf

@@ -0,0 +1,7 @@
+[main]
+  modulepath = /tmp/toft-puppet-tmp/modules
+	
+  logdir = /var/log/puppet
+  vardir = /var/lib/puppet
+  ssldir = /var/lib/puppet/ssl
+  rundir = /var/run/puppet

data/fixtures/puppet/conf/puppet_template.conf

@@ -0,0 +1,8 @@
+[main]
+	templatedir = /tmp/toft-puppet-tmp/manifests/templates
+	
+  logdir = /var/log/puppet
+  vardir = /var/lib/puppet
+  ssldir = /var/lib/puppet/ssl
+  rundir = /var/run/puppet
+  report = true

data/fixtures/puppet/manifests/fileserver/conf/test_fileserver

@@ -0,0 +1 @@
+This is a test for the fileserver config

data/fixtures/puppet/manifests/nodes/test_node.pp

@@ -0,0 +1,26 @@
+node /^correct.*/ inherits default_node {
+  
+  file { "/tmp/puppet_test_correct":
+	  ensure => present,
+    mode  => '0666',
+  }
+
+}
+
+node /^incorrect.*/ inherits default_node {
+
+  file { "/tmp/puppet_test_incorrect":
+	  ensure => present,
+    mode  => '0666',
+  }
+
+}
+
+node default_node {
+
+  file { "/tmp/puppet_test_default":
+	  ensure => present,
+    mode  => '0666',
+  }
+
+}

data/fixtures/puppet/manifests/site.pp

@@ -0,0 +1 @@
+import "nodes/*.pp"

data/fixtures/puppet/manifests/templates/template_test

@@ -0,0 +1,2 @@
+This is a test for the template config
+Here is the variable <%= variable %>

data/fixtures/puppet/manifests/test.pp

@@ -0,0 +1,8 @@
+class { 'test': }
+
+class test {
+  file { "/tmp/puppet_test":
+	  ensure => present,
+    mode  => '0666',
+  }
+}

data/fixtures/puppet/manifests/test_fileserver.pp

@@ -0,0 +1,14 @@
+class { 'test': }
+
+class test {
+  file { "test_fileserver":
+		path => "/tmp/puppet_test_fileserver",
+		owner => "root",
+		group => "root",
+		mode => 0440,
+		source => "puppet:///conf/test_fileserver",
+	}
+}
+  
+
+

data/fixtures/puppet/manifests/test_install.pp

@@ -0,0 +1,5 @@
+class { 'test': }
+
+class test {
+  package { "zip": ensure => installed }
+}

data/fixtures/puppet/manifests/test_module.pp

@@ -0,0 +1,5 @@
+class { 'test': }
+
+class test {
+  include test_module
+}

data/fixtures/puppet/manifests/test_service.pp

@@ -0,0 +1,11 @@
+class { 'test': }
+
+class test {
+  package { "bind": ensure => installed }
+
+  service { "named":
+    enable  => true,
+    ensure  => running,
+    require => Package["bind"],
+   } 
+}

data/fixtures/puppet/manifests/test_template.pp

@@ -0,0 +1,12 @@
+class { 'test': }
+
+class test {
+  
+  $variable = "BLAH"
+
+  file { "/tmp/puppet_test_template":
+	  ensure => present,
+    mode  => '0666',
+    content => template(template_test)
+  }
+}

data/fixtures/puppet/modules/test_module/manifests/init.pp

@@ -0,0 +1,8 @@
+class test_module {
+
+  file { "/tmp/puppet_test_module":
+	  ensure => present,
+    mode  => '0666',
+  }
+
+}

data/lib/toft/chef/chef_runner.rb

@@ -9,6 +9,7 @@ module Toft
       DEST_CHEF_TMP = "/tmp/toft-chef-tmp"
       DEST_COOKBOOK_PATH = "#{DEST_CHEF_TMP}/cookbooks"
       DEST_ROLE_PATH = "#{DEST_CHEF_TMP}/roles"
+      DEST_DATA_BAG_PATH = "#{DEST_CHEF_TMP}/data_bags"
       DEST_CHEF_SOLO_PATH = "#{DEST_CHEF_TMP}/solo.rb" 
       DEST_CHEF_JSON_PATH = "#{DEST_CHEF_TMP}/solo.json" 
 
@@ -43,18 +44,25 @@ module Toft
         mkdir_p "#{@root_dir}#{DEST_CHEF_TMP}"
         cp_r Toft.cookbook_path, "#{@root_dir}#{DEST_COOKBOOK_PATH}"
         cp_r Toft.role_path, "#{@root_dir}#{DEST_ROLE_PATH}" unless roles_missing?
+        cp_r Toft.data_bag_path, "#{@root_dir}#{DEST_DATA_BAG_PATH}" unless data_bags_missing?
       end
 
       def roles_missing?
         Toft.role_path.blank?
       end
 
+      def data_bags_missing?
+        Toft.data_bag_path.blank?
+      end
+
       def generate_solo_rb
+        mkdir_p "#{@root_dir}/tmp/chef-file-cache"
         solo = <<-EOF
 file_cache_path "/tmp/chef-file-cache"
 cookbook_path ["#{DEST_COOKBOOK_PATH}"]
         EOF
         solo += "role_path [\"#{DEST_ROLE_PATH}\"]" unless roles_missing?
+        solo += "\ndata_bag_path \"#{DEST_DATA_BAG_PATH}\"" unless data_bags_missing?
 
         File.open("#{@root_dir}#{DEST_CHEF_SOLO_PATH}", 'w') do |f|
           f.write(solo);
@@ -74,4 +82,4 @@ cookbook_path ["#{DEST_COOKBOOK_PATH}"]
       end
     end
   end
-end
+end

data/lib/toft/node.rb

@@ -36,7 +36,7 @@ CQWv13UgQjiHgQILXSb7xdzpWK1wpDoqIEWQugRyPQDeZhPWVbB4Lg==
 -----END RSA PRIVATE KEY-----    
     EOF
     
-    TIMOUT_IN_SECONDS = 60
+    TIMEOUT_IN_SECONDS = 120
     TRY_INTERVAL = 0.5
     
     include Observable
@@ -54,6 +54,11 @@ CQWv13UgQjiHgQILXSb7xdzpWK1wpDoqIEWQugRyPQDeZhPWVbB4Lg==
       @chef_runner = Toft::Chef::ChefRunner.new("#{rootfs}") do |chef_command|
         run_ssh chef_command
       end
+
+      @puppet_runner = options[:runner]
+      @puppet_runner ||= Toft::Puppet::PuppetRunner.new("#{rootfs}") do |puppet_command|
+        run_ssh puppet_command
+      end
     end
     
     def hostname
@@ -65,6 +70,7 @@ CQWv13UgQjiHgQILXSb7xdzpWK1wpDoqIEWQugRyPQDeZhPWVbB4Lg==
     end
 
     def start
+      puts "Starting host node..."
       cmd "lxc-start -n #{@hostname} -d" # system + sudo lxc-start does not work on centos-6, but back-quote does(no clue on why)
       cmd! "lxc-wait -n #{@hostname} -s RUNNING"
       wait_ssh_ready
@@ -135,6 +141,10 @@ CQWv13UgQjiHgQILXSb7xdzpWK1wpDoqIEWQugRyPQDeZhPWVbB4Lg==
       @chef_runner.run run_list, params
     end
 
+    def run_puppet(run_list, params = {})
+      @puppet_runner.run run_list, params
+    end
+
     def file(path)
       FileChecker.new(rootfs, path)
     end
@@ -149,31 +159,46 @@ CQWv13UgQjiHgQILXSb7xdzpWK1wpDoqIEWQugRyPQDeZhPWVbB4Lg==
     end
     
     def wait_sshd_running
-      while true
+      wait_for do
         netstat = cmd("lxc-netstat --name #{@hostname} -ta")        
         return if netstat =~ /ssh/
       end
     end
     
     def wait_remote_host_reachable
-      max_try = TIMOUT_IN_SECONDS / TRY_INTERVAL
-      try = 0
-      while try < max_try
+      wait_for do
         begin
-          break if Ping.pingecho fqdn, 0.1
+          return if Ping.pingecho fqdn, 0.1
         rescue Exception
           # fix the strange pingcho exception
         end
-        sleep TRY_INTERVAL
-        try += 1
       end
       raise RuntimeError, "Remote machine not responding." if try >= max_try
     end
 
+    def wait_for
+      return if !block_given?
+      max_try = TIMEOUT_IN_SECONDS / TRY_INTERVAL
+      try = 0
+      while try < max_try
+        output_progress
+        yield
+        sleep TRY_INTERVAL
+        try += 1        
+      end
+    end
+
+    def output_progress
+      print "."
+      STDOUT.flush
+    end
+
     def wait_ssh_ready
+      print "Waiting for host sshd ready"
       wait_sshd_running
+      print "\nWaiting for host to be reachable"
       wait_remote_host_reachable
-      puts "SSH connection on '#{@hostname}/#{@ip}' is ready..."
+      puts "\nSSH connection on '#{@hostname}/#{@ip}' is ready."
     end
 
     def generate_lxc_config

data/lib/toft/puppet/puppet_runner.rb

@@ -0,0 +1,38 @@
+require 'fileutils'
+
+module Toft
+  module Puppet 
+    class PuppetRunner
+      include FileUtils
+      
+      DEST_PUPPET_TMP = "/tmp/toft-puppet-tmp"
+      DEST_CONF_PATH = "/etc/puppet/puppet.conf"
+
+      def initialize(root_dir, &command_runner)
+        @root_dir = root_dir
+        @command_runner = command_runner
+      end
+
+      def run(run_list, params = {})
+        copy_puppet_material
+        copy_conf_file(params[:conf_file]) if params[:conf_file]
+        @command_runner.call "puppet apply #{DEST_PUPPET_TMP}/#{run_list}"
+      end
+
+      private 
+
+      def copy_conf_file(conf_file)
+        @command_runner.call "cp #{DEST_PUPPET_TMP}/conf/#{conf_file} #{DEST_CONF_PATH}"
+      end
+    
+      def copy_puppet_material
+        raise ArgumentError, "Toft.manifest_path can not be empty!" if Toft.manifest_path.blank?
+        rm_rf "#{@root_dir}#{DEST_PUPPET_TMP}"  
+        mkdir_p "#{@root_dir}#{DEST_PUPPET_TMP}"
+
+        cp_r "#{Toft.manifest_path}/.", "#{@root_dir}#{DEST_PUPPET_TMP}"
+      end
+
+    end
+  end
+end

data/lib/toft/version.rb

@@ -1,3 +1,3 @@
 module Toft
-  VERSION = "0.0.6"
+  VERSION = "0.0.11"
 end

data/lib/toft.rb

@@ -2,13 +2,14 @@ require 'toft/node_controller'
 require 'toft/file_checker'
 require 'toft/chef/chef_attributes'
 require 'toft/chef/chef_runner'
+require 'toft/puppet/puppet_runner'
 
 module Toft
   DYNAMIC_IP = "0.0.0.0"
   DOMAIN = "foo"
   
   class << self
-    attr_accessor :cookbook_path, :role_path
+    attr_accessor :manifest_path, :cookbook_path, :role_path, :data_bag_path
   end
   
   def create_node(hostname, options = {})
@@ -35,4 +36,4 @@ class String
   def blank?
     empty?
   end
-end
+end

data/scripts/bin/centos/lxc-prepare-host

@@ -6,6 +6,12 @@ if [ ! "$username" = "root" ]; then
 	exit 1
 fi
 
+# sudo yum -y install wget
+# wget http://dl.dropbox.com/u/43220259/toft-lxc-0.0.6.noarch.rpm
+# sudo yum erase -y dhclient
+# sudo yum install -y --nogpgcheck toft-lxc-0.0.6.noarch.rpm
+# sudo yum install -y bind dhcp dhclient bridge-utils
+
 gateway_ip="192.168.20.1"
 subnet="192.168.20.0"
 netmask="255.255.255.0"

data/scripts/bin/centos/provision_vagrant

@@ -0,0 +1,11 @@
+cd /vagrant
+sudo yum -y install wget
+wget http://dl.dropbox.com/u/43220259/toft-lxc-0.0.6.noarch.rpm
+sudo yum erase -y dhclient
+sudo yum install -y --nogpgcheck toft-lxc-0.0.6.noarch.rpm
+sudo yum install -y bind dhcp dhclient bridge-utils
+sudo ./scripts/bin/centos/lxc-prepare-host
+sudo yum install -y ruby ruby-devel ruby-docs ruby-ri ruby-irb ruby-rdoc rubygems
+sudo gem install bundler --no-ri --no-rdoc
+sudo bundle install
+sudo cp natty-i386-puppet.tar.gz /var/cache/lxc/natty-i386.tar.gz

data/scripts/bin/share/lxc-create-centos-image

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ $# -eq 0 ]; then
-	echo "Usage: `basename $0` <centos-6|centos-5|centos-4>"
+	echo "Usage: `basename $0` <centos-6>"
 	exit 1
 fi
 
@@ -30,8 +30,12 @@ fi
 
 # clean the cache dir
 rm -rf $cache/$suite-$arch
+mkdir -p $cache/$suite-$arch
 
 # install latest rinse
+if [ -f /etc/redhat-release ]; then # on centos
+  yum install -y perl perl-CPAN perl-libwww-perl 
+fi
 if [[ ! `type rinse` ]]; then
 	echo "Rinse does not exist. Installing..."
 	(cd /tmp && \
@@ -42,9 +46,33 @@ if [[ ! `type rinse` ]]; then
 fi
 
 # create centos image using rinse
+epel_arch=$arch
+if [ "$arch" == "amd64" ]; then
+    epel_arch="x86_64"
+fi
 cat <<EOF > /tmp/after_post_install
+## chef rpms
 chroot $cache/$suite-$arch rpm -Uvh http://rbel.co/rbel6
-chroot $cache/$suite-$arch yum -y install tar man sudo bind-utils openssh-server openssh-clients rubygem-chef
+## ruby-shadow and other libs that puppet requires
+chroot $cache/$suite-$arch rpm -Uvh http://download.fedoraproject.org/pub/epel/6/$epel_arch/epel-release-6-5.noarch.rpm
+## puppet repo
+cat <<EOFF > $cache/$suite-$arch/etc/yum.repos.d/puppet.repo
+[puppetlabs]
+name=Puppet Labs Packages
+baseurl=http://yum.puppetlabs.com/el/\\\$releasever/products/\\\$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
+
+[puppetlabs-deps]
+name=Puppet Labs Packages Dependency
+baseurl=http://yum.puppetlabs.com/el/\\\$releasever/dependencies/\\\$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
+EOFF
+chroot $cache/$suite-$arch yum -y install tar man sudo bind-utils openssh-server openssh-clients rubygem-chef puppet
+chroot $cache/$suite-$arch yum clean all
 EOF
 chmod +x /tmp/after_post_install
 

data/scripts/bin/ubuntu/lxc-create-ubuntu-image

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ $# -eq 0 ]; then
-	echo "Usage: `basename $0` <lenny|lucid|natty>"
+	echo "Usage: `basename $0` <lenny|lucid|natty|oneiric>"
 	exit 1
 fi
 
@@ -30,27 +30,25 @@ fi
 
 # clean the cache dir
 rm -rf $cache/$suite-$arch
+mkdir -p $cache/$suite-$arch
+
 
 lenny_packages=ifupdown,locales,libui-dialog-perl,netbase,net-tools,dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,dnsutils,dhcp3-client,ssh,lsb-release,wget,gpgv,gnupg,sudo,ruby,rubygems1.8,ruby-dev,libopenssl-ruby,build-essential,ssl-cert
+squeeze_packages=$lenny_packages
 lucid_packages=dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,dnsutils,dhcp3-client,ssh,lsb-release,wget,gpgv,gnupg,sudo,ruby,rubygems1.8,ruby-dev,libopenssl-ruby,build-essential,ssl-cert
 natty_packages=dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,dnsutils,isc-dhcp-client,isc-dhcp-common,ssh,lsb-release,gnupg,netbase,lxcguest,sudo,ruby,rubygems1.8,ruby-dev,libruby,build-essential,wget,ssl-cert
-# check the mini ubuntu was not already downloaded
-rm -rf "$cache/$suite-$arch"
-mkdir -p "$cache/$suite-$arch"
-if [ $? -ne 0 ]; then
-	echo "Failed to create '$cache/$suite-$arch' directory"
-	exit 1
-fi
+oneiric_packages=$natty_packages
 
 # download a mini ubuntu into a cache
+apt-get install -y debootstrap
 echo "Downloading ubuntu minimal ..."
 eval "packages=\$${suite}_packages"
 cmd="debootstrap --verbose --variant=minbase --components=main,universe --arch=$arch --include=$packages $suite $cache/$suite-$arch"
 echo $cmd
 eval $cmd
 if [ $? -ne 0 ]; then
-	echo "Failed to download the rootfs, aborting."
-	exit 1
+  echo "Failed to download the rootfs, aborting."
+  exit 1
 fi
 
 echo "Download complete."
@@ -71,6 +69,18 @@ apt-get install chef --force-yes -qy
 EOF
 chroot "$cache/$suite-$arch" bash /tmp/install-chef-ubuntu.sh
 
+# install puppet
+cat <<EOF > "$cache/$suite-$arch/tmp/install-puppet-ubuntu.sh"
+echo -e "deb http://apt.puppetlabs.com/ $suite main\ndeb-src http://apt.puppetlabs.com/ $suite main" >> /etc/apt/sources.list.d/puppet.list
+apt-key adv --keyserver keyserver.ubuntu.com --recv 4BD6EC30
+apt-get update
+apt-get install -y puppet
+EOF
+chroot "$cache/$suite-$arch" bash /tmp/install-puppet-ubuntu.sh
+
+#clean apt caches
+rm -rf $cache/$suite-$arch/var/cache/apt
+
 # compress root image
 echo "Packaging rootfs ..."
 (cd $cache/$suite-$arch && tar --exclude=$suite-$arch.tar.gz -zcf $suite-$arch.tar.gz .)

data/scripts/bin/ubuntu/lxc-prepare-host

@@ -8,7 +8,6 @@ fi
 
 OS=`cat /etc/issue | cut -f 1 -d " " -s`
 
-
 gateway_ip="192.168.20.1"
 subnet="192.168.20.0"
 netmask="255.255.255.0"
@@ -189,4 +188,3 @@ subnet $subnet netmask $netmask {
 }
 EOF
 sudo /etc/init.d/$dhcp_daemon restart
-

data/scripts/bin/ubuntu/provision_vagrant

@@ -0,0 +1,9 @@
+cd /vagrant
+wget http://dl.dropbox.com/u/43220259/toft-lxc_0.0.6_all.deb
+sudo apt-get -y remove apparmor
+sudo dpkg -i toft-lxc_0.0.6_all.deb
+sudo apt-get -fy install
+sudo ./scripts/bin/ubuntu/lxc-prepare-host
+sudo gem install bundler --no-ri --no-rdoc
+sudo bundle install
+sudo cp natty-i386.tar.gz /var/cache/lxc/

data/spec/toft/{chef_runner_spec.rb → chef/chef_runner_spec.rb}

@@ -31,4 +31,4 @@ describe "ChefRunner" do
     lambda { cf.run "run list" }.should raise_error RuntimeError
   end
 
-end
+end

data/spec/toft/node_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe "Node" do
+
+  describe 'run_puppet' do
+
+    it 'should run block with puppet runner' do
+      puppet_runner = mock Toft::Puppet::PuppetRunner.class
+      puppet_runner.should_receive(:run).with('manifest', {})
+      
+      node = Toft::Node.new("my_host", {:runner => puppet_runner})
+      node.run_puppet('manifest')
+
+    end
+
+  end
+
+end

data/spec/toft/puppet/puppet_runner_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe "PuppetRunner" do
+
+  it "should run puppet apply to manifest" do
+    Toft.manifest_path = "#{PROJECT_ROOT}/fixtures/puppet/manifests"
+    runner = Toft::Puppet::PuppetRunner.new("whatever") do |command|
+      command.include?("puppet apply").should be_true
+    end    
+    lambda { runner.run "test" }.should_not raise_error
+  end
+
+  it "should throw exception if manifest path not set" do
+    Toft.manifest_path = ""
+    runner = Toft::Puppet::PuppetRunner.new "whatever"
+    lambda { runner.run "test" }.should raise_error ArgumentError, "Toft.manifest_path can not be empty!"
+  end
+
+
+  it "should throw exception if cookbook not exist" do
+    Toft.manifest_path = "non-exist-manifest"
+    cf = Toft::Puppet::PuppetRunner.new "whatever"
+    lambda { cf.run "test" }.should raise_error RuntimeError
+  end
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: toft
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Huang Liang
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-04 00:00:00 Z
+date: 2012-05-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -103,7 +103,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id006
-description: toft currently support testing chef, shell scripts using cucumber on lxc on ubuntu
+description: toft currently support testing chef, puppet, shell scripts using cucumber on lxc on ubuntu
 email: 
 - exceedhl@gmail.com
 executables: []
@@ -120,17 +120,42 @@ files:
 - features/chef.feature
 - features/command.feature
 - features/node.feature
+- features/puppet.feature
+- features/step_definitions/centos/checks.rb
 - features/step_definitions/checker.rb
 - features/step_definitions/chef.rb
 - features/step_definitions/command.rb
 - features/step_definitions/node.rb
+- features/step_definitions/puppet.rb
 - features/support/env.rb
 - fixtures/chef/attributes.json
 - fixtures/chef/cookbooks/test/attributes/default.rb
 - fixtures/chef/cookbooks/test/recipes/attribute.rb
+- fixtures/chef/cookbooks/test/recipes/data_bag.rb
 - fixtures/chef/cookbooks/test/recipes/default.rb
 - fixtures/chef/cookbooks/test/recipes/role.rb
+- fixtures/chef/data_bags/bag1/item1.json
+- fixtures/chef/data_bags/bag1/item2.json
+- fixtures/chef/data_bags/bag2/item1.json
+- fixtures/chef/data_bags/bag2/item2.json
 - fixtures/chef/roles/test.rb
+- fixtures/puppet/conf/fileserver.conf
+- fixtures/puppet/conf/puppet.conf
+- fixtures/puppet/conf/puppet_exec.conf
+- fixtures/puppet/conf/puppet_fileserver.conf
+- fixtures/puppet/conf/puppet_modules.conf
+- fixtures/puppet/conf/puppet_template.conf
+- fixtures/puppet/manifests/fileserver/conf/test_fileserver
+- fixtures/puppet/manifests/nodes/test_node.pp
+- fixtures/puppet/manifests/site.pp
+- fixtures/puppet/manifests/templates/template_test
+- fixtures/puppet/manifests/test.pp
+- fixtures/puppet/manifests/test_fileserver.pp
+- fixtures/puppet/manifests/test_install.pp
+- fixtures/puppet/manifests/test_module.pp
+- fixtures/puppet/manifests/test_service.pp
+- fixtures/puppet/manifests/test_template.pp
+- fixtures/puppet/modules/test_module/manifests/init.pp
 - lib/toft.rb
 - lib/toft/chef/chef_attributes.rb
 - lib/toft/chef/chef_runner.rb
@@ -138,12 +163,15 @@ files:
 - lib/toft/file_checker.rb
 - lib/toft/node.rb
 - lib/toft/node_controller.rb
+- lib/toft/puppet/puppet_runner.rb
 - lib/toft/version.rb
 - scripts/bin/centos/lxc-prepare-host
+- scripts/bin/centos/provision_vagrant
 - scripts/bin/share/install-chef-ubuntu.sh
 - scripts/bin/share/lxc-create-centos-image
 - scripts/bin/ubuntu/lxc-create-ubuntu-image
 - scripts/bin/ubuntu/lxc-prepare-host
+- scripts/bin/ubuntu/provision_vagrant
 - scripts/lxc-templates/files/rc.local
 - scripts/lxc-templates/lxc-centos-6
 - scripts/lxc-templates/lxc-lenny
@@ -151,8 +179,10 @@ files:
 - scripts/lxc-templates/lxc-natty
 - spec/fixtures/illegal_syntax.json
 - spec/spec_helper.rb
-- spec/toft/chef_attributes_spec.rb
-- spec/toft/chef_runner_spec.rb
+- spec/toft/chef/chef_attributes_spec.rb
+- spec/toft/chef/chef_runner_spec.rb
+- spec/toft/node_spec.rb
+- spec/toft/puppet/puppet_runner_spec.rb
 homepage: https://github.com/exceedhl/toft
 licenses: []
 
@@ -185,18 +215,23 @@ rubyforge_project: toft
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: toft aims to help test infrastructure code such as chef
+summary: toft aims to help test infrastructure code such as chef, puppet
 test_files: 
 - features/checker.feature
 - features/chef.feature
 - features/command.feature
 - features/node.feature
+- features/puppet.feature
+- features/step_definitions/centos/checks.rb
 - features/step_definitions/checker.rb
 - features/step_definitions/chef.rb
 - features/step_definitions/command.rb
 - features/step_definitions/node.rb
+- features/step_definitions/puppet.rb
 - features/support/env.rb
 - spec/fixtures/illegal_syntax.json
 - spec/spec_helper.rb
-- spec/toft/chef_attributes_spec.rb
-- spec/toft/chef_runner_spec.rb
+- spec/toft/chef/chef_attributes_spec.rb
+- spec/toft/chef/chef_runner_spec.rb
+- spec/toft/node_spec.rb
+- spec/toft/puppet/puppet_runner_spec.rb