knife-essentials 1.4 → 1.5

data/lib/chef/knife/converge_essentials.rb

@@ -0,0 +1,99 @@
+require 'chef_fs/knife'
+
+class Chef
+  class Knife
+    remove_const(:Converge) if const_defined?(:Converge) && Converge.name == 'Chef::Knife::Converge' # override Chef's version
+    class Converge < ::ChefFS::Knife
+      ChefFS = ::ChefFS
+      banner "knife converge [PATTERN1 ... PATTERNn]"
+
+      deps do
+        require 'chef'
+        require 'chef/log'
+        require 'chef/application/client'
+        require 'chef_fs/file_system'
+      end
+
+      option :port,
+        :short => '-p',
+        :long => '--port=PORT',
+        :description => "Port to listen on (default: 8889)"
+
+      attr_accessor :exit_code
+
+      def configure_chef
+        super
+
+        self.exit_code = 0
+      end
+
+      def run
+        self.exit_code = 0
+        # Figure out the run list based on the passed-in objects
+        run_list = get_run_list(name_args)
+
+        if exit_code != 0
+          exit exit_code
+        end
+
+        # Configure and run chef client
+        if config[:config_file]
+          dot_chef = File.dirname(config[:config_file])
+          if File.basename(dot_chef) == '.chef'
+            # Override default locations to go in the .chef directory, since we are knife.
+            Chef::Config[:client_key] = File.join(dot_chef, 'client.pem') if !Chef::Config[:client_key] || Chef::Config[:client_key] == Chef::Config.platform_specific_path("/etc/chef/client.pem")
+            Chef::Config[:file_cache_path] = File.join(dot_chef, 'cache') if Chef::Config[:file_cache_path] == Chef::Config.platform_specific_path("/var/chef/cache")
+            Chef::Config[:file_backup_path] = File.join(dot_chef, 'backups') if Chef::Config[:file_backup_path] == Chef::Config.platform_specific_path("/var/chef/backup")
+            Chef::Config[:file_checksum_path] = File.join(dot_chef, 'checksums') if Chef::Config[:file_checksum_cache] == "/var/chef/checksums"
+          end
+        end
+        client = Chef::Application::Client.new
+        if run_list != ''
+          client.config[:override_runlist] = run_list
+        end
+        client.configure_logging # Bypass configure_chef, which we've already done adequately.
+        client.setup_application
+        client.run_application
+      end
+
+      def get_run_list(args)
+        result = []
+        args.each do |arg|
+          if arg.start_with?('recipe[') || arg.start_with?('role[')
+            result += arg.split(',')
+
+          else
+            begin
+              ChefFS::FileSystem.list(chef_fs, pattern_arg_from(arg)).each do |entry|
+                if entry.parent && entry.parent.path == '/cookbooks'
+                  result << "recipe[#{entry.name}]"
+
+                elsif entry.parent && entry.parent.name == 'recipes' &&
+                      entry.parent.parent && entry.parent.parent.parent && entry.parent.parent.parent.name == 'cookbooks' &&
+                      entry.name[-3..-1] == '.rb'
+                  cookbook_name = entry.parent.parent.name
+                  recipe_name = entry.name[0..-4]
+                  result << "recipe[#{cookbook_name}::#{recipe_name}]"
+
+                elsif entry.parent && entry.parent.name == 'roles'
+                  result << "role[#{entry.name}]"
+
+                else
+                  ui.error "arguments must be cookbooks, recipes or roles!  #{format_path{e.entry}} is not a cookbook, recipe or role."
+                  self.exit_code = 1
+                end
+              end
+            rescue ChefFS::FileSystem::OperationFailedError => e
+              "#{format_path_with_root(e.entry)} #{e.reason}."
+              self.exit_code = 1
+            rescue ChefFS::FileSystem::NotFoundError => e
+              ui.error "#{format_path(e.entry)}: No such file or directory"
+              self.exit_code = 1
+            end
+          end
+        end
+        result.join(',')
+      end
+    end
+  end
+end

data/lib/chef_fs/file_system/chef_repository_file_system_root_dir.rb

@@ -52,7 +52,9 @@ module ChefFS
         child_paths[name].each do |path|
           Dir.mkdir(path)
         end
-        make_child_entry(name)
+        child = make_child_entry(name)
+        @children << child
+        child
       end
 
       def json_class

data/lib/chef_fs/knife.rb

@@ -67,6 +67,13 @@ module ChefFS
       @chef_fs_config = ChefFS::Config.new(Chef::Config)
 
       ChefFS::Parallelizer.threads = (Chef::Config[:concurrency] || 10) - 1
+
+      if Chef::Config[:chef_server_url].to_sym == :local
+        local_url = start_local_server
+        Chef::Config[:chef_server_url] = local_url
+        Chef::Config[:client_key] = nil
+        Chef::Config[:validation_key] = nil
+      end
     end
 
     def chef_fs
@@ -90,17 +97,19 @@ module ChefFS
     end
 
     def pattern_args_from(args)
+      args.map { |arg| pattern_arg_from(arg) }
+    end
+
+    def pattern_arg_from(arg)
       # TODO support absolute file paths and not just patterns?  Too much?
       # Could be super useful in a world with multiple repo paths
-      args.map do |arg|
-        if !@chef_fs_config.base_path && !ChefFS::PathUtils.is_absolute?(arg)
-          # Check if chef repo path is specified to give a better error message
-          @chef_fs_config.require_chef_repo_path
-          ui.error("Attempt to use relative path '#{arg}' when current directory is outside the repository path")
-          exit(1)
-        end
-        ChefFS::FilePattern.relative_to(@chef_fs_config.base_path, arg)
+      if !@chef_fs_config.base_path && !ChefFS::PathUtils.is_absolute?(arg)
+        # Check if chef repo path is specified to give a better error message
+        @chef_fs_config.require_chef_repo_path
+        ui.error("Attempt to use relative path '#{arg}' when current directory is outside the repository path")
+        exit(1)
       end
+      ChefFS::FilePattern.relative_to(@chef_fs_config.base_path, arg)
     end
 
     def format_path(entry)
@@ -110,5 +119,67 @@ module ChefFS
     def parallelize(inputs, options = {}, &block)
       ChefFS::Parallelizer.parallelize(inputs, options, &block)
     end
+
+    def locate_config_file
+      super
+      if !config[:config_file]
+        # If the config file doesn't already exist, find out where it should be,
+        # and create it.
+        repo_dir = discover_repo_dir(Dir.pwd)
+        if repo_dir
+          dot_chef = File.join(repo_dir, ".chef")
+          if !File.directory?(dot_chef)
+            Dir.mkdir(dot_chef)
+          end
+          knife_rb = File.join(dot_chef, "knife.rb")
+          if !File.exist?(knife_rb)
+            ui.warn("No configuration found.  Creating .chef/knife.rb in #{repo_dir} ...")
+            File.open(knife_rb, "w") do |file|
+              file.write <<EOM
+chef_server_url 'local'
+chef_repo_path File.dirname(File.dirname(__FILE__))
+cookbook_path File.join(chef_repo_path, "cookbooks")
+EOM
+            end
+          end
+          config[:config_file] = knife_rb
+        end
+      end
+    end
+
+    def discover_repo_dir(dir)
+      %w(.chef cookbooks data_bags environments roles).each do |subdir|
+        return dir if File.directory?(File.join(dir, subdir))
+      end
+      # If this isn't it, check the parent
+      parent = File.dirname(dir)
+      if parent && parent != dir
+        discover_repo_dir(parent)
+      else
+        nil
+      end
+    end
+
+    def start_local_server
+      begin
+        require 'chef_zero/server'
+      rescue LoadError
+        STDERR.puts <<EOM
+ERROR: chef-zero must be installed to use local-server mode!  To install:
+
+    gem install chef-zero
+
+EOM
+        exit(1)
+      end
+      require 'chef_fs/chef_fs_data_store'
+      server_options = {}
+      server_options[:data_store] = ChefFS::ChefFSDataStore.new(local_fs)
+      server_options[:log_level] = Chef::Log.level
+      server_options[:port] = 8889
+      server = ChefZero::Server.new(server_options)
+      server.start_background
+      server.url
+    end
   end
 end

data/lib/chef_fs/version.rb

@@ -1,3 +1,3 @@
 module ChefFS
-  VERSION = "1.4"
+  VERSION = "1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.5'
   prerelease: 
 platform: ruby
 authors:
@@ -118,6 +118,7 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- lib/chef/knife/converge_essentials.rb
 - lib/chef/knife/delete_essentials.rb
 - lib/chef/knife/deps_essentials.rb
 - lib/chef/knife/diff_essentials.rb