cuken 0.1.11 → 0.1.12

data/features/chef_examples/zenoss/02_monitor_vm_setup.feature

@@ -0,0 +1,139 @@
+@announce
+Feature: Zenoss Monitoring
+  In order to launch a Zenoss server
+  As a admin/developer
+  I want to define the VM configuration via executable features
+
+  Background:
+    Given the Chef root directory "/tmp/chef" exists
+      And the state of VM "chef" is "running"
+      And I switch Vagrant environment
+      And the Chef root directory "/tmp/monitor" exists
+      And the state of VM "monitor" is not "running"
+
+  Scenario: Clone a Chef skeleton repository
+    Given the remote Chef repository "git://github.com/cookbooks/chef-repo.git"
+     When I clone the remote Chef repository branch "master" to "monitor"
+      And the local Chef repository exists
+     Then I place all in "monitor" in "/tmp/monitor"
+
+  Scenario: Migrate the previously generated private keys
+     Then I successfully run `cp /tmp/chef/.chef/monitor.pem /tmp/monitor/.chef`
+      And I successfully run `cp /tmp/chef/.chef/monitor.pem /tmp/monitor/mnt/etc`
+
+  Scenario: Create some shared Vagrant configuration details
+    Given the directory "hobos"
+      And the file "hobos/vm.bo" contains nothing
+     When I write to "hobos/vm.bo":
+      """
+      vm.customize do |cvm|
+        cvm.memory_size = 1024
+        cvm.vram_size = 12
+        cvm.cpu_count = 2
+        cvm.accelerate_3d_enabled = false
+        cvm.accelerate_2d_video_enabled = false
+        cvm.monitor_count = 1
+
+        cvm.bios.acpi_enabled = true
+        cvm.bios.io_apic_enabled = false
+
+        cvm.cpu.pae = true
+
+        cvm.hw_virt.enabled = false
+        cvm.hw_virt.nested_paging = false
+        # STORAGE
+      end
+      """
+    And I place "hobos/vm.bo" in "/tmp/monitor"
+
+    Scenario: Create the Monitor Node's Vagrantfile
+     Given the file "Vagrantfile" contains nothing
+      When I write to "Vagrantfile":
+      """
+      Vagrant::Config.run do |config|
+
+        @cc_root_path = File.dirname(File.absolute_path(__FILE__))
+        @cc_box_name  = "monitor"
+        @cc_node_name = "monitor"
+        @cc_box_url   = (Pathname(@cc_root_path) + 'lucid64.box').to_s
+        @cc_ip        = "33.33.33.2"
+        @cc_http_port = 48625
+        @cc_ssh_port  = 48624
+        @cc_chef_server_url     = "http://33.33.33.254:4000"
+        @cc_host_mount          = "#{@cc_root_path}/mnt"
+        @cc_chefserver_path     = Pathname(@cc_root_path).parent + 'chef'
+        @cc_validation_key_path = "#{@cc_chefserver_path}/mnt/etc/validation.pem"
+
+        config.vm.define :monitor do |cfg|
+
+          cfg.send :eval, IO.read("#{@cc_root_path}/hobos/vm.bo")
+
+          cfg.vm.box = @cc_box_name
+          cfg.vm.box_url = @cc_box_url
+          cfg.vm.boot_mode = :vrdp # :vrdp (headless) or :gui
+
+          cfg.vm.network @cc_ip                           # host-only network IP
+          cfg.vm.forward_port "http", 80, @cc_http_port   # Accessible outside the host-only network
+          cfg.vm.forward_port "ssh", 22, @cc_ssh_port, :auto => true
+
+          cfg.vm.share_folder("chef", "~/chef", "#{@cc_host_mount}/chef" )
+          cfg.vm.share_folder( "chef-client-etc", "/etc/chef", "#{@cc_host_mount}/etc", :nfs => false ) # name, /vm/path, /real/path
+
+          cfg.vm.provision :chef_server do |chef|
+            chef.log_level = :debug
+            chef.node_name = @cc_node_name
+            chef.chef_server_url = @cc_chef_server_url
+            chef.validation_key_path = @cc_validation_key_path
+            chef.validation_client_name = "chef-validator"
+            chef.client_key_path = "/etc/chef/monitor.pem"
+          end
+        end
+      end
+      """
+       And I place "Vagrantfile" in "/tmp/monitor"
+       And I run `bash -c 'cp ~/chef/vagrant/lucid64.box /tmp/monitor'`
+
+    Scenario: Configure Knife file for the Monitor's client certificate
+        Given the directory ".chef"
+          And a file named ".chef/knife.rb" with:
+              """
+              current_dir = File.dirname(__FILE__)
+              user = ENV['CHEF_USER'] || ENV['OPSCODE_USER'] || ENV['USER'] || `whoami`
+              org = ENV['CHEF_ORGNAME'] || 'Private'
+              email =  ENV['CHEF_EMAIL'] || "#{user}@mailinator.com"
+              log_path = "#{current_dir}/../log"
+
+              node_name                'monitor'
+              chef_server_url          "http://localhost:4000"
+              log_level                :debug
+              log_location             "#{log_path}/client_#{node_name}.log"
+              verbose_logging          true
+              client_key               "#{current_dir}/#{node_name}.pem"
+              cache_type               'BasicFile'
+              cache_options            :path => "#{log_path}/checksums"
+              cookbook_path            ["#{current_dir}/../cookbooks", "#{current_dir}/../site-cookbooks"]
+              cookbook_copyright       user
+              cookbook_license         "apachev2"
+              cookbook_email           email
+
+              # Amazon Web Services:
+              knife[:aws_access_key_id]     = ENV['AWS_ACCESS_KEY']  if ENV['AWS_ACCESS_KEY']
+              knife[:aws_secret_access_key] =  ENV['AWS_SECRET_KEY'] if ENV['AWS_SECRET_KEY']
+
+              # Rackspace:
+              knife[:rackspace_api_key]      = ENV['RS_API_KEY']      if ENV['RS_API_KEY']
+              knife[:rackspace_api_username] = ENV['RS_API_USERNAME'] if ENV['RS_API_USERNAME']
+
+              # Slicehost
+              knife[:slicehost_password] = ENV['SH_PASSWORD'] if ENV['SH_PASSWORD']
+
+              # Terremark
+              knife[:terremark_password] = ENV['TM_PASSWORD'] if ENV['TM_PASSWORD']
+              knife[:terremark_username] = ENV['TM_USERNAME'] if ENV['TM_USERNAME']
+              knife[:terremark_service]  = ENV['TM_SERVICE']  if ENV['TM_SERVICE']
+
+              """
+        And I place ".chef/knife.rb" in "/tmp/monitor"
+        And I place ".chef/knife.rb" in "/tmp/monitor/mnt/chef"
+
+

data/features/chef_examples/zenoss/03_monitor_chef_setup.feature

@@ -0,0 +1,109 @@
+@announce
+Feature: Zenoss Monitoring
+  In order to launch a Zenoss server
+  As a admin/developer
+  I want to define the Chef configuration via executable features
+
+  Background:
+    Given the Chef root directory "/tmp/chef" exists
+      And the state of VM "chef" is "running"
+      And I switch Vagrant environment
+      And the Chef root directory "/tmp/monitor" exists
+      And the state of VM "monitor" is not "running"
+
+  Scenario: Download Cookbooks from one Cookbooks URI
+    Given the remote Cookbooks URI "git://github.com/cookbooks/"
+     When I clone the Cookbooks:
+          | cookbook | branch | tag    | ref        | destination                |
+          | apt      | master |        |            | monitor/cookbooks/apt      |
+          | openssh  | master |        | 9a8ce8ce44 | monitor/cookbooks/openssh  |
+          | openssl  | master |        |            | monitor/cookbooks/openssl  |
+          | yum      | master |        |            | monitor/cookbooks/yum      |
+      And these local Cookbooks exist:
+          | cookbook  |
+          | apt       |
+          | openssh   |
+          | openssl   |
+          | yum       |
+     Then I place all in "monitor" in "/tmp/monitor"
+
+  Scenario: Download Site-Cookbooks from another Cookbooks URI
+    Given the remote Cookbooks URI "git@github.com:hedgehog/"
+     When I clone the Cookbooks:
+          | cookbook | branch    | destination                   |
+          | zenoss   | qa        | monitor/site-cookbooks/zenoss |
+      And these local Cookbooks exist:
+          | site-cookbook  |
+          | zenoss         |
+     Then I place all in "monitor" in "/tmp/monitor"
+
+  Scenario: Load Roles from Cookbooks
+     Given the Chef root directory "/tmp/monitor" exists
+       And a Cookbooks path "/tmp/monitor/cookbooks/"
+       And a Cookbooks path "/tmp/monitor/site-cookbooks/"
+       And the Knife file "/tmp/monitor/.chef/knife.rb"
+      When I load the Cookbook Roles:
+           | site-cookbook | role                            |
+           | zenoss        | Class_Server-SSH-Linux.rb       |
+           | zenoss        | Class_Server-SSH-Linux-MySQL.rb |
+           | zenoss        | Location_Austin.rb              |
+           | zenoss        | Location_Seattle.rb             |
+           | zenoss        | ZenossServer.rb                 |
+      Then these Roles exist:
+           | role                |
+           | ServerSSHLinux      |
+           | ServerSSHLinuxMySQL |
+           | Austin              |
+           | Seattle             |
+           | ZenossServer        |
+
+  Scenario: Load Data Bag from Cookbooks
+    Given the Chef root directory "/tmp/monitor" exists
+      And a Cookbooks path "/tmp/monitor/cookbooks/"
+      And a Cookbooks path "/tmp/monitor/site-cookbooks/"
+      And I create the Data Bag "users"
+     When I add these Cookbook Data Bag items:
+          | site-cookbook | data_bag | item                       |
+          | zenoss        | users    | Zenoss_User.json           |
+          | zenoss        | users    | Zenoss_Readonly_User.json  |
+     Then these Data Bags exist:
+          | data_bag |
+          | users    |
+      And these Data Bags contain:
+          | data_bag | item        |
+          | users    | readonly    |
+          | users    | zenossadmin |
+
+  Scenario: Build Node Run Lists
+    Given the Chef root directory "/tmp/monitor" exists
+      And the Node "monitor" exists
+     When I add these Roles to the Nodes:
+          | node     | role                       |
+          | monitor  | ZenossServer               |
+
+  Scenario: Upload the Cookbooks
+    Given the Chef root directory "/tmp/monitor" exists
+     When I load the Cookbooks:
+          | cookbook  | site-cookbook  |
+          | apt       |                |
+          | openssh   |                |
+          | openssl   |                |
+          |           | zenoss         |
+          | yum       |                |
+     Then these remote Cookbooks exist:
+          | cookbook  | site-cookbook  |
+          | apt       |                |
+          | openssh   |                |
+          | openssl   |                |
+          |           | zenoss         |
+          | yum       |                |
+
+  @cosmic
+  Scenario: Launch the Vagrant VM Monitor
+    Given the state of VM "monitor" is not "running"
+      And the Chef root directory "/tmp/monitor" exists
+      And the Vagrantfile "/tmp/monitor/Vagrantfile" exists
+     When I launch the VM "monitor"
+     Then the state of VM "monitor" is "running"
+
+

data/features/step_definitions/cuken_steps.rb

@@ -1,3 +1,19 @@
+#
+# Author:: Hedgehog (<hedgehogshiatus@gmail.com>)
+# Copyright:: Copyright (c) 2011 Hedgehog.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 Given /^the Gem "([^\"]*)" has been required$/ do |gem|
   Gem.loaded_specs.key?(gem).should be_true
 end

data/features/support/env.rb

@@ -12,5 +12,6 @@ require 'cuken/ssh'
 require 'cuken/cmd'
 require 'cuken/file'
 require 'cuken/chef'
+require 'cuken/vagrant'
 
 require 'rspec/expectations'

data/lib/cuken/api/chef/common.rb

@@ -68,6 +68,21 @@ module ::Cuken
           'knife '
         end
 
+        def run_knife(argv=[])
+          argv << '--config' << chef.knife_config_file.to_s
+          with_args *argv do
+            ::Chef::Application::Knife.new.run
+          end
+          ::Chef::Knife.cuken
+        end
+
+        def knife_config_file_error_handling
+          unless chef.knife_config_file && Pathname(chef.knife_config_file).exist?
+            chef.knife_config_file = Pathname(chef.local_chef_repo).ascend { |d| h=d+'.chef'+'knife.rb'; break h if h.file? }
+          end
+          raise(RuntimeError, "chef.knife_config_file is required", caller) unless chef.knife_config_file
+        end
+
         def knife_debug
           @knife_debug ||= true
         end
@@ -116,6 +131,11 @@ module ::Cuken
           end
         end
 
+        def check_chef_root_presence(directory, expect_presence = true)
+          chef.root_dir = directory
+          check_placed_directory_presence([chef.root_dir], expect_presence)
+        end
+
       end
     end
   end

data/lib/cuken/api/chef/cookbook.rb

@@ -1,3 +1,19 @@
+#
+# Author:: Hedgehog (<hedgehogshiatus@gmail.com>)
+# Copyright:: Copyright (c) 2011 Hedgehog.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 module ::Cuken
   module Api
     module Chef
@@ -17,7 +33,7 @@ module ::Cuken
           return ckbk, ckbk_src
         end
 
-        def check_cookbooks_table_presence(table, expect_presence = true)
+        def check_cookbook_table_presence(table, expect_presence = true)
           table.hashes.each do |hsh|
             ckbk, ckbk_src = parse_to_cookbooks_path(hsh)
             full_cookbook_src = find_path_in_cookbook_folders(ckbk, ckbk_src, ckbk)
@@ -26,6 +42,19 @@ module ::Cuken
           end
         end
 
+        def check_remote_cookbook_table_presence(table, expect_presence = true)
+          books = cookbooks_list
+          table.hashes.each do |hsh|
+            if expect_presence
+              books.should include(hsh['cookbook']) if not (hsh['cookbook'].nil? || hsh['cookbook'].empty?)
+              books.should include(hsh['site-cookbook']) if not (hsh['site-cookbook'].nil? || hsh['site-cookbook'].empty?)
+            else
+              books.should_not include(hsh['cookbook']) if not (hsh['cookbook'].nil? || hsh['cookbook'].empty?)
+              books.should_not include(hsh['site-cookbook']) if not (hsh['site-cookbook'].nil? || hsh['site-cookbook'].empty?)
+            end
+          end
+        end
+
         def find_path_in_cookbook_folders(ckbk, ckbk_src, path_fragment1, path_fagment2='')
           verify_cookbook_folders
           full_data_bag_src = nil
@@ -74,6 +103,38 @@ module ::Cuken
           end
         end
 
+        def cookbooks_load(table)
+          table.hashes.each do |hsh|
+            ckbk, ckbk_src = parse_to_cookbooks_path(hsh)
+            full_cookbook_src = find_path_in_cookbook_folders(ckbk, ckbk_src, ckbk)
+            cookbook_load(ckbk)
+          end
+        end
+
+        def cookbook_load(ckbk)
+
+          knife_config_file_error_handling()
+
+          ckbk_pth = nil
+          in_chef_root do
+            ckbk_pth = unless chef.cookbooks_paths.empty?
+                  (chef.cookbooks_paths.collect { |pn| pn.expand_path.to_s }).join(':')
+              end
+          end
+
+          argv = ['cookbook', 'upload', ckbk]
+          ( argv << '--cookbook-path' << ckbk_pth ) if ckbk_pth
+          run_knife(argv)
+        end
+
+        def cookbooks_list
+
+          knife_config_file_error_handling()
+
+          argv = ['cookbook', 'list']
+          run_knife(argv)
+        end
+
       end
     end
   end

data/lib/cuken/api/chef/data_bag.rb

@@ -0,0 +1,89 @@
+#
+# Author:: Hedgehog (<hedgehogshiatus@gmail.com>)
+# Copyright:: Copyright (c) 2011 Hedgehog.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module ::Cuken
+  module Api
+    module Chef
+      module DataBag
+
+        include ::Cuken::Api::Common
+
+        def load_data_bag_item_table(table)
+          table.hashes.each do |hsh|
+            data_bag_load(hsh)
+          end
+        end
+
+        def check_data_bag_table_presence(table, expect_presence = true)
+          bags = data_bag_list
+          table.hashes.each do |hsh|
+            if expect_presence
+              bags.should include(hsh['data_bag'])
+            else
+              bags.should include(hsh['data_bag'])
+            end
+          end
+        end
+
+        def check_data_bag_content_table(table, expect_match = true)
+          table.hashes.each do |hsh|
+            items = data_bag_show(hsh['data_bag'])
+            if expect_match
+              items.should include(hsh['item'])
+            else
+              items.should_not include(hsh['item'])
+            end
+          end
+        end
+
+        def data_bag_create(data_bag_name)
+
+          knife_config_file_error_handling()
+
+          argv = ['data', 'bag', 'create', data_bag_name]
+          run_knife(argv)
+        end
+
+        def data_bag_load(hsh)
+
+          knife_config_file_error_handling()
+
+          ckbk, ckbk_src = parse_to_cookbooks_path(hsh)
+          full_data_bag_src = find_path_in_cookbook_folders(ckbk, ckbk_src, ckbk, "data_bags/#{hsh['item']}")
+          argv = ['data', 'bag', 'from', 'file', hsh[:data_bag], full_data_bag_src]
+          run_knife(argv)
+        end
+
+        def data_bag_list
+
+          knife_config_file_error_handling()
+
+          argv = ['data', 'bag', 'list']
+          run_knife(argv)
+        end
+
+        def data_bag_show(data_bag)
+
+          knife_config_file_error_handling()
+
+          argv = ['data', 'bag', 'show', data_bag]
+          run_knife(argv)
+        end
+
+      end
+    end
+  end
+end

data/lib/cuken/api/chef/knife.rb

@@ -1,3 +1,19 @@
+#
+# Author:: Hedgehog (<hedgehogshiatus@gmail.com>)
+# Copyright:: Copyright (c) 2011 Hedgehog.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 require 'chef/application/knife'
 
 module ::Cuken

data/lib/cuken/api/chef/role.rb

@@ -0,0 +1,71 @@
+#
+# Author:: Hedgehog (<hedgehogshiatus@gmail.com>)
+# Copyright:: Copyright (c) 2011 Hedgehog.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module ::Cuken
+  module Api
+    module Chef
+      module Role
+
+        include ::Cuken::Api::Common
+
+        def load_role_table(table)
+          in_chef_root do
+            table.hashes.each do |hsh|
+              case
+                when not(hsh['cookbook'].nil? || hsh['cookbook'].empty?)
+                  src = "cookbooks/#{hsh['cookbook']}/roles/#{hsh['role']}"
+                when not(hsh['site-cookbook'].nil? || hsh['site-cookbook'].empty?)
+                  src = "site-cookbooks/#{hsh['site-cookbook']}/roles/#{hsh['role']}"
+                else
+                  src =""
+              end
+              role_load(src)
+            end
+          end
+        end
+
+        def role_load(src)
+
+          knife_config_file_error_handling()
+
+          argv = ['role', 'from', 'file', src]
+          run_knife(argv)
+        end
+
+        def role_list
+
+          knife_config_file_error_handling()
+
+          argv = ['role', 'list']
+          run_knife(argv)
+        end
+
+        def check_role_table_presence(table, expect_presence = true)
+          roles = role_list
+          table.hashes.each do |hsh|
+            if expect_presence
+              roles.should include(hsh['role'])
+            else
+              roles.should_not include(hsh['role'])
+            end
+          end
+        end
+
+      end
+    end
+  end
+end
+

data/lib/cuken/api/chef.rb

@@ -1,11 +1,29 @@
-require 'aruba/api' unless defined? Aruba::Api
-require 'chef'  unless defined? Chef
-require 'grit' unless defined? Grit
-require 'vagrant' unless defined? Vagrant
+#
+# Author:: Hedgehog (<hedgehogshiatus@gmail.com>)
+# Copyright:: Copyright (c) 2011 Hedgehog.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require 'aruba/api' unless defined? ::Aruba::Api
+require 'chef'  unless defined? ::Chef
+require 'grit' unless defined? ::Grit
+require 'vagrant' unless defined? ::Vagrant
 require 'cuken/api/common'
 require 'cuken/api/chef/common'
 require 'cuken/api/chef/cookbook'
 require 'cuken/api/chef/knife'
+require 'cuken/api/chef/role'
+require 'cuken/api/chef/data_bag'
 
 module ::Cuken
   module Api
@@ -43,10 +61,14 @@ module ::Cuken
         end
       end
 
-      def clone_pull_error_check(repo, res)
-        if res[/Could not find Repository /]
-          raise RuntimeError, "Could not find Cookbook in Repository #{repo}", caller
+      def clone_pull_error_check(res)
+        if repo = res[/Could not find Repository /]
+          raise RuntimeError, "Could not find Repository #{repo}", caller
         end
+        if repo = res[/ERROR: (.*) doesn't exist. Did you enter it correctly?/,1]
+          raise RuntimeError, "ERROR: #{repo} doesn't exist. Did you enter it correctly? #{repo}", caller
+        end
+
       end
 
       def chef_clone_repo(ckbk_path, cookbook = false, repo = chef.remote_chef_repo, type = {'branch' => 'master'})
@@ -55,9 +77,10 @@ module ::Cuken
           gritty = ::Grit::Git.new(current_dir)
           announce_or_puts gritty.inspect
           clone_opts = {:quiet => false, :verbose => true, :progress => true}
-          clone_opts[:branch] = type['branch'].empty? ? 'master' : type['branch']
+          type['branch'] = type['branch'].nil? ? '' : type['branch']
           type['tag'] = type['tag'].nil? ? '' : type['tag']
           type['ref'] = type['ref'].nil? ? '' : type['ref']
+          clone_opts[:branch] = type['branch'].empty? ? 'master' : type['branch']
           if pth.directory?
             announce_or_puts "Pulling: #{repo} into #{pth}"
             res = gritty.pull(clone_opts, repo, pth.to_s)
@@ -65,7 +88,7 @@ module ::Cuken
             announce_or_puts "Cloning: #{repo} into #{pth}"
             res = gritty.clone(clone_opts, repo, pth.to_s)
           end
-          clone_pull_error_check(repo, res) if res
+          clone_pull_error_check(res) if res
           update_cookbook_paths(pth, cookbook)
           unless chef.cookbooks_paths.empty?   # is empty after cloning default chef-repo
             grotty = ::Grit::Git.new((pth + '.git').to_s)
@@ -175,3 +198,22 @@ module ::Cuken
     end
   end
 end
+
+class ::Chef
+  class Knife
+  class << self
+    attr_accessor :cuken
+  end
+  private
+    def output(data)
+      ::Chef::Knife.cuken = data
+    end
+    module Core
+      class GenericPresenter
+        def format_cookbook_list_for_display(data)
+          ::Chef::Knife.cuken = data
+        end
+      end
+    end
+  end
+end