cuken 0.1.4 → 0.1.7

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

@@ -3,15 +3,37 @@ module ::Cuken
     module Chef
       module Common
 
-        include Grit
+        include ::Grit
+        ::Grit.debug = true
 
-        attr_accessor :recipe, :cookbook, :api_response, :inflated_response, :log_level,
-                      :chef_args, :config_file, :stdout, :stderr, :status, :exception,
-                      :gemserver_thread, :sandbox_url,
-                      :uri, :client_private_key_path, :admin_client_name,
-                      :client_name, :client_knife_path, :cookbook_paths, :cookbooks_paths,
-                      :knife_debug, :local_cookbook_repo, :remote_cookbook_repo,
-                      :local_chef_repo, :remote_chef_repo
+        attr_accessor :admin_client_name,
+                      :api_response,
+                      :exception,
+                      :chef_args,
+                      :client_knife_path,
+                      :client_name,
+                      :client_private_key_path,
+                      :config_file,
+                      :cookbook,
+                      :cookbook_paths,
+                      :cookbooks_paths,
+                      :cookbooks_uri,
+                      :knife_debug,
+                      :gemserver_thread,
+                      :inflated_response,
+                      :local_chef_repo,
+                      :local_cookbook_repo,
+                      :local_site_cookbook_repo,
+                      :log_level,
+                      :recipe,
+                      :remote_chef_repo,
+                      :remote_cookbook_repo,
+                      :root_dir,
+                      :sandbox_url,
+                      :status,
+                      :stderr,
+                      :stdout,
+                      :uri
 
         def self.ohai
           # ohai takes a while, so only ever run it once.
@@ -34,7 +56,15 @@ module ::Cuken
           @chef ||= self
         end
 
+        def in_chef_root(&block)
+          ::Dir.chdir(chef.root_dir, &block)
+        end
+
         def knife
+          ::Cuken::Api::Chef::Knife.new
+        end
+
+        def knife_command
           'knife '
         end
 
@@ -50,6 +80,14 @@ module ::Cuken
           end
         end
 
+        def root_dir
+         @root_dir ||= Pathname.getwd
+        end
+
+        def config_file
+          @config_file ||= (chef.root_dir + '/.chef/knife.rb')
+        end
+
         def make_admin
           admin_client
           @rest = ::Chef::REST.new(Chef::Config[:registration_url], 'bobo', "#{tmpdir}/bobo.pem")

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

@@ -0,0 +1,107 @@
+require 'chef/application/knife'
+
+module ::Cuken
+  module Api
+    module Chef
+      module Knife
+
+        include ::Cuken::Api::Common
+
+        class CliTemplate
+          include Mixlib::CLI
+        end
+
+        # Ripped from Grit: https://github.com/mojombo/grit
+
+        class CommandTimeout < RuntimeError
+          attr_accessor :command
+          attr_accessor :bytes_read
+
+          def initialize(command = nil, bytes_read = nil)
+            @command = command
+            @bytes_read = bytes_read
+          end
+        end
+
+        # Raised when a command exits with non-zero.
+        class CommandFailed < StandardError
+          # The full command that failed as a String.
+          attr_reader :command
+
+          # The integer exit status.
+          attr_reader :exitstatus
+
+          # Everything output on the command's stderr as a String.
+          attr_reader :err
+
+          def initialize(command, exitstatus=nil, err='')
+            if exitstatus
+              @command = command
+              @exitstatus = exitstatus
+              @err = err
+              message = "Command failed [#{exitstatus}]: #{command}"
+              message << "\n\n" << err unless err.nil? || err.empty?
+              super message
+            else
+              super command
+            end
+          end
+        end
+
+
+        def set_cli_options_template(data)
+          conf = data[:config]||'/etc/chef/knife.rb'
+          CliTemplate.option(:config_file, :long => '--config CONFIG', :default => conf)
+          CliTemplate.option(:no_editor, :long => "--no-editor", :boolean => true, :default => true)
+          CliTemplate.option(:yes, :long => "--yes", :boolean => true, :default => true)
+        end
+
+        def create_client(client_name)
+          chef.client_private_key_path = chef.root_dir + "/.chef/#{client_name}.pem"
+          data = {:name => client_name,
+                  :admin => true,
+                  :file => chef.client_private_key_path,
+                  :no_editor => true,
+                  :config_file => chef.config_file}
+          argv = ['client', 'create', data[:name], '--file', data[:file], '--config', data[:config_file],'--no-editor']
+          argv << '--admin' if data[:admin]
+          unless Pathname(chef.client_private_key_path).exist?
+            with_args *argv do
+              ::Chef::Application::Knife.new.run # (args, CliTemplate.options)
+            end
+          else
+            #TODO: Verify client exists on the Chef server, and has matching public key.
+          end
+        end
+
+        def show_client(client_name)
+          chef.client_private_key_path = chef.root_dir + "/.chef/#{client_name}.pem"
+          data = {:name => client_name,
+                  :config_file => chef.config_file}
+          argv = ['client', 'show', data[:name], '--config', data[:config_file],'--no-editor']
+          argv << '--admin' if data[:admin]
+          with_args *argv do
+            ::Chef::Application::Knife.new.run # (args, CliTemplate.options)
+          end
+        end
+
+        def delete_client(client_name)
+          chef.client_private_key_path = chef.root_dir + "/.chef/#{client_name}.pem"
+          data = {:name => client_name,
+                  :file => chef.client_private_key_path,
+                  :no_editor => true,
+                  :yes => true,
+                  :print_after => true,
+                  :config_file => chef.config_file}
+          argv = ['client', 'delete', data[:name], '--no-editor', '--yes' ]
+          with_args *argv do
+            ::Chef::Application::Knife.new.run
+          end
+        end
+
+      end # class knife
+
+    end # module Chef
+  end # module Api
+end # module Cuken
+

data/lib/cuken/api/chef.rb

@@ -1,6 +1,9 @@
 require 'aruba/api' unless defined? Aruba::Api
 require 'chef'  unless defined? Chef
+require 'grit' unless defined? Grit
+require 'cuken/api/common'
 require 'cuken/api/chef/common'
+require 'cuken/api/chef/knife'
 
 module ::Cuken
   module Api
@@ -39,22 +42,24 @@ module ::Cuken
 
       def chef_clone_repo(ckbk_path, cookbook = false, repo = chef.remote_chef_repo, brnch = 'master')
         in_current_dir do
+          pth = Pathname(ckbk_path).expand_path
           gritty = ::Grit::Git.new(current_dir)
+          $stdout.puts gritty.inspect
           clone_opts = {:quiet => false, :verbose => true, :progress => true, :branch => brnch}
-          if Dir.exists?(ckbk_path)
-            $stdout.puts "Pulling: #{repo} into #{ckbk_path}"
-            gritty.pull(clone_opts, repo, ckbk_path)
+          if pth.directory?
+            $stdout.puts "Pulling: #{repo} into #{pth}"
+            gritty.pull(clone_opts, repo, pth.to_s)
           else
-            $stdout.puts "Cloning: #{repo} into #{ckbk_path}"
-            gritty.clone(clone_opts, repo, ckbk_path)
+            $stdout.puts "Cloning: #{repo} into #{pth}"
+            res = gritty.clone(clone_opts, repo, pth.to_s)
           end
-          update_cookbook_paths(ckbk_path, cookbook)
-          Pathname(ckbk_path)
+          update_cookbook_paths(pth, cookbook)
+          pth
         end
       end
 
       def run_knife_command(cmd, interactive=false)
-        no_ckbk_pth_opt = ['cookbook delete'].each{|str| break true if cmd[/#{str}/]}
+        no_ckbk_pth_opt = ['cookbook delete', 'role from file'].each{|str| break true if cmd[/#{str}/]}
         no_ckbk_pth = chef.cookbooks_paths.empty?
         if no_ckbk_pth
           ckbk_pth_opt = false
@@ -68,13 +73,16 @@ module ::Cuken
             chef.client_knife_path = Pathname(chef.local_chef_repo).ascend { |d| h=d+'.chef'+'knife.rb'; break h if h.file? }
           end
           raise(RuntimeError, "chef.client_knife_path is required", caller) unless chef.client_knife_path
-          cmd += " -c #{chef.client_knife_path.expand_path.to_s}" if chef.client_knife_path.expand_path.exist?
-          cmd += " -o #{ckbk_pth}" if ckbk_pth_opt
-          cmd += " --log_level debug" if chef.knife_debug
+        end
+        cmd += " -c #{chef.client_knife_path.expand_path.to_s}" if chef.client_knife_path.expand_path.exist?
+        cmd += " -o #{ckbk_pth}" if ckbk_pth_opt
+        cmd += " --log_level debug" if chef.knife_debug
+        chef.root_dir ||= current_dir
+        in_chef_root do
           if interactive
-            run_interactive(unescape("#{chef.knife}" + cmd))
+            run_interactive(unescape("#{chef.knife_command}" + cmd))
           else
-            run_simple(unescape("#{chef.knife}" + cmd))
+            run_simple(unescape("#{chef.knife_command}" + cmd))
           end
         end
       end

data/lib/cuken/api/common.rb

@@ -4,6 +4,18 @@ module ::Cuken
   module Api
     module Common
 
+      def with_args(*args)
+        backup = ARGV.dup
+        begin
+          ARGV.replace(args)
+          yield
+        rescue Exception => e
+          puts e.backtrace.join("\n") if $!.respond_to?(:status) && $!.status && $!.status > 0
+        ensure
+          ARGV.replace(backup)
+        end
+      end
+
     end
   end
 end