toft 0.0.12 → 0.0.13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    toft (0.0.11)
+    toft (0.0.12)
       net-ssh
 
 GEM

data/features/chef.feature

@@ -38,7 +38,7 @@ Scenario: Toft should not deal with empty cookbook and role path
   Then Running chef "recipe[test]" on node "n1" should succeed
   When I set the cookbook path to empty
   Then Running chef "recipe[test]" on node "n1" should fail
-	
+  
 Scenario: Run chef recipe with json attributes file
   Given I have a clean running node n1
   When I run "recipe[test::attribute]" on node "n1" and overwrite attributes with json file "attributes.json"
@@ -65,6 +65,14 @@ Scenario: Run chef recipe with data bags
   Then Node "n1" should have file or directory "/tmp/stub/bag2item1"
   Then Node "n1" should have file or directory "/tmp/stub/bag2item2"
 
+Scenario: Toft should deal with multiple cookbook, roles and databag paths
+  Given I have a clean running node n1
+  When I add another cookbook "cookbooks2"
+  And I add another role dir "roles2"
+  And I add another databag dir "data_bags2"
+  Then Running chef "role[test2]" on node "n1" should succeed
+  And Node "n1" should have file or directory "/tmp/test2/bag3item3"
+	
 Scenario: Run non-exist recipe
 
 Scenario: Run non-exist role

data/features/step_definitions/chef.rb

@@ -41,3 +41,15 @@ end
 When /^I run "([^"]*)" on node "([^"]*)" and overwrite attributes with json file "([^"]*)" and chef attributes:$/ do |run_list, node, json_file, table|
   find(node).run_chef run_list, {:json => CHEF_FIXTURE_PATH + '/attributes.json', :attributes => Toft::ChefAttributes.new(table)}
 end
+
+When /^I add another cookbook "(.*?)"$/ do |cookbook_path|
+  Toft.cookbook_path = [CHEF_FIXTURE_PATH + '/cookbooks', CHEF_FIXTURE_PATH + "/#{cookbook_path}"]
+end
+
+When /^I add another role dir "(.*?)"$/ do |role_path|
+  Toft.role_path = [CHEF_FIXTURE_PATH + '/roles', CHEF_FIXTURE_PATH + "/#{role_path}"]
+end
+
+When /^I add another databag dir "(.*?)"$/ do |databag_path|
+  Toft.data_bag_path = [CHEF_FIXTURE_PATH + '/data_bags', CHEF_FIXTURE_PATH + "/#{databag_path}"]
+end

data/features/support/env.rb

@@ -22,5 +22,5 @@ Before do
 end
 
 at_exit do
-  n1.destroy
+  # n1.destroy
 end

data/fixtures/chef/cookbooks2/test2/recipes/default.rb

@@ -0,0 +1,5 @@
+item = data_bag_item("bag3", "item3")
+directory "/tmp/test2/#{item['value']}" do
+  action :create
+  recursive true
+end

data/fixtures/chef/data_bags2/bag3/item3.json

@@ -0,0 +1,4 @@
+{
+  "id": "item3",
+  "value": "bag3item3"
+}

data/fixtures/chef/roles2/test2.rb

@@ -0,0 +1,3 @@
+name 'test'
+description 'Test!'
+run_list "recipe[test2]"

data/lib/ping.rb

@@ -0,0 +1,18 @@
+require 'timeout'
+require 'socket'
+
+class Ping 
+  def self.pingecho(host, timeout=5, service="echo")
+    begin
+      timeout(timeout) do
+        s = TCPSocket.new(host, service)
+        s.close
+      end
+    rescue Errno::ECONNREFUSED
+      return true
+    rescue   Timeout::Error, StandardError 
+      return false 
+    end
+    return true
+  end
+end

data/lib/toft.rb

@@ -37,3 +37,9 @@ class String
     empty?
   end
 end
+
+class Array
+  def blank?
+    empty?
+  end
+end

data/lib/toft/chef/chef_runner.rb

@@ -42,9 +42,16 @@ module Toft
         raise ArgumentError, "Toft.cookbook_path can not be empty!" if Toft.cookbook_path.blank?
         rm_rf "#{@root_dir}#{DEST_CHEF_TMP}"  
         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?
+        copy_resources Toft.cookbook_path, "#{@root_dir}#{DEST_COOKBOOK_PATH}"
+        copy_resources Toft.role_path, "#{@root_dir}#{DEST_ROLE_PATH}" unless roles_missing?
+        copy_resources Toft.data_bag_path, "#{@root_dir}#{DEST_DATA_BAG_PATH}" unless data_bags_missing?
+      end
+
+      def copy_resources(src_dir, dest_dir)
+        src_dir = [src_dir] if src_dir.is_a? String
+        src_dir.each do |dir|
+          cp_r dir + "/.", dest_dir
+        end
       end
 
       def roles_missing?

data/lib/toft/version.rb

@@ -1,3 +1,3 @@
 module Toft
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/spec/toft/chef/chef_runner_spec.rb

@@ -31,4 +31,11 @@ describe "ChefRunner" do
     lambda { cf.run "run list" }.should raise_error RuntimeError
   end
 
+  it "should throw exception if data bags not exist" do
+    Toft.cookbook_path = "#{PROJECT_ROOT}/fixtures/chef/cookbookse"
+    Toft.data_bag_path = "non-exist-data-bags"
+    cf = Toft::Chef::ChefRunner.new "#{PROJECT_ROOT}/tmp"
+    lambda { cf.run "run list" }.should raise_error RuntimeError
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: toft
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Huang Liang
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-04 00:00:00 Z
+date: 2012-06-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -134,11 +134,14 @@ files:
 - fixtures/chef/cookbooks/test/recipes/data_bag.rb
 - fixtures/chef/cookbooks/test/recipes/default.rb
 - fixtures/chef/cookbooks/test/recipes/role.rb
+- fixtures/chef/cookbooks2/test2/recipes/default.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/data_bags2/bag3/item3.json
 - fixtures/chef/roles/test.rb
+- fixtures/chef/roles2/test2.rb
 - fixtures/puppet/conf/fileserver.conf
 - fixtures/puppet/conf/puppet.conf
 - fixtures/puppet/conf/puppet_exec.conf
@@ -156,6 +159,7 @@ files:
 - fixtures/puppet/manifests/test_service.pp
 - fixtures/puppet/manifests/test_template.pp
 - fixtures/puppet/modules/test_module/manifests/init.pp
+- lib/ping.rb
 - lib/toft.rb
 - lib/toft/chef/chef_attributes.rb
 - lib/toft/chef/chef_runner.rb