knife-essentials 1.5.2 → 1.5.3

data/lib/chef/knife/converge_essentials.rb

@@ -87,12 +87,12 @@ class Chef
                   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."
+                  ui.error "arguments must be cookbooks, recipes or roles!  #{format_path(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}."
+              "#{format_path(e.entry)} #{e.reason}."
               self.exit_code = 1
             rescue ChefFS::FileSystem::NotFoundError => e
               ui.error "#{format_path(e.entry)}: No such file or directory"

data/lib/chef/knife/diff_essentials.rb

@@ -32,6 +32,10 @@ class Chef
         :description => "Select only files that are Added (A), Deleted (D), Modified (M), or have their type (i.e. regular file, directory) changed (T). Any combination of the filter characters (including none) can be used. When * (All-or-none) is added to the combination, all paths are selected if
            there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected."
 
+      option :cookbook_version,
+        :long => '--cookbook-version VERSION',
+        :description => 'Version of cookbook to download (if there are multiple versions and cookbook_versions is false)'
+
       def run
         if config[:name_only]
           output_mode = :name_only

data/lib/chef/knife/download_essentials.rb

@@ -42,6 +42,10 @@ class Chef
         :default => true,
         :description => 'Turn off to avoid uploading existing files; only new (and possibly deleted) files with --no-diff'
 
+      option :cookbook_version,
+        :long => '--cookbook-version VERSION',
+        :description => 'Version of cookbook to download (if there are multiple versions and cookbook_versions is false)'
+
       def run
         if name_args.length == 0
           show_usage

data/lib/chef_fs/config.rb

@@ -24,12 +24,17 @@ module ChefFS
   # Helpers to take Chef::Config and create chef_fs and local_fs from it
   #
   class Config
-    def initialize(chef_config = Chef::Config, cwd = Dir.pwd)
+    def initialize(chef_config = Chef::Config, cwd = Dir.pwd, options = {})
       @chef_config = chef_config
       @cwd = cwd
+      @cookbook_version = options[:cookbook_version]
       configure_repo_paths
     end
 
+    attr_reader :chef_config
+    attr_reader :cwd
+    attr_reader :cookbook_version
+
     PATH_VARIABLES = %w(acl_path client_path cookbook_path container_path data_bag_path environment_path group_path node_path role_path user_path)
 
     def chef_fs
@@ -38,7 +43,7 @@ module ChefFS
 
     def create_chef_fs
       require 'chef_fs/file_system/chef_server_root_dir'
-      ChefFS::FileSystem::ChefServerRootDir.new("remote", @chef_config)
+      ChefFS::FileSystem::ChefServerRootDir.new("remote", @chef_config, :cookbook_version => @cookbook_version)
     end
 
     def local_fs
@@ -170,6 +175,9 @@ module ChefFS
       if @chef_config[:role_path] == @chef_config.platform_specific_path('/var/chef/roles')
         @chef_config[:role_path] = nil
       end
+      if @chef_config[:environment_path] == @chef_config.platform_specific_path('/var/chef/environments')
+        @chef_config[:environment_path] = nil
+      end
 
       # Infer chef_repo_path from cookbook_path if not speciifed
       if !@chef_config[:chef_repo_path]

data/lib/chef_fs/file_system/chef_server_root_dir.rb

@@ -33,7 +33,7 @@ require 'chef_fs/data_handler/container_data_handler'
 module ChefFS
   module FileSystem
     class ChefServerRootDir < BaseFSDir
-      def initialize(root_name, chef_config)
+      def initialize(root_name, chef_config, options = {})
         super("", nil)
         @chef_server_url = chef_config[:chef_server_url]
         @chef_username = chef_config[:node_name]
@@ -41,6 +41,7 @@ module ChefFS
         @environment = chef_config[:environment]
         @repo_mode = chef_config[:repo_mode]
         @root_name = root_name
+        @cookbook_version = options[:cookbook_version] # Used in knife diff and download for server cookbook version
       end
 
       attr_reader :chef_server_url
@@ -48,6 +49,7 @@ module ChefFS
       attr_reader :chef_private_key
       attr_reader :environment
       attr_reader :repo_mode
+      attr_reader :cookbook_version
 
       def fs_description
         "Chef server at #{chef_server_url} (user #{chef_username}), repo_mode = #{repo_mode}"

data/lib/chef_fs/file_system/cookbook_dir.rb

@@ -40,6 +40,7 @@ module ChefFS
           end
         else
           @cookbook_name = name
+          @version = root.cookbook_version # nil unless --cookbook-version specified in download/diff
         end
       end
 

data/lib/chef_fs/knife.rb

@@ -67,7 +67,7 @@ module ChefFS
         end
       end
 
-      @chef_fs_config = ChefFS::Config.new(Chef::Config)
+      @chef_fs_config = ChefFS::Config.new(Chef::Config, Dir.pwd, config)
 
       ChefFS::Parallelizer.threads = (Chef::Config[:concurrency] || 10) - 1
 

data/lib/chef_fs/version.rb

@@ -1,3 +1,3 @@
 module ChefFS
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

data/spec/integration/converge_spec.rb

@@ -0,0 +1,75 @@
+require 'support/integration_helper'
+require 'chef/knife/converge_essentials'
+
+describe 'knife converge' do
+  let(:sample_cookbook) do
+    return 
+  end
+
+  when_the_repository 'has a cookbook' do
+    file 'cookbooks/x/recipes/default.rb', <<EOM
+file #{path_to('x.txt')} do
+  content 'x::default'
+end
+EOM
+    file 'cookbooks/x/recipes/y.rb', <<EOM
+file #{path_to('x.txt')} do
+  content 'x::y'
+end
+EOM
+    file 'cookbooks/x/recipes/fromrole.rb', <<EOM
+file #{path_to('x.txt')} do
+  content 'x::fromrole'
+end
+EOM
+    file 'roles/r.json', { 'run_list' => [ 'recipe[x::r]' ] }
+
+    context 'and current directory is at the top of the repository' do
+      cwd '.'
+      it 'knife converge creates .chef/knife.rb' do
+      end
+    end
+
+    it 'knife converge /cookbooks/x converges x::default' do
+    end
+
+    it 'knife converge recipe[x] converges x::default' do
+    end
+
+    it 'knife converge /cookbooks/x/recipes/y.rb converges x::y' do
+    end
+
+    it 'knife converge recipe[x::y] converges x::y' do
+    end
+
+    it 'knife converge /roles/ converges x::fromrole' do
+    end
+
+    it 'knife converge role[r] converges x::fromrole' do
+    end
+
+    context 'and current directory is cookbooks/x/default' do
+      cwd 'cookbooks/x/default'
+
+      it 'knife converge creates .chef/knife.rb' do
+      end
+      it 'knife converge y.rb converges x::y' do
+      end
+    end
+
+    context 'and a .chef/knife.rb' do
+      it 'knife converge converges' do
+      end
+    end
+  end
+
+  when_the_repository 'has a cookbook' do
+    it 'knife converge with no arguments runs the node\'s run list' do
+    end
+  end
+
+  when_the_chef_server 'has cookbooks' do
+    it 'knife converge converges them' do
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -197,6 +197,7 @@ files:
 - spec/integration/chef_repo_path_spec.rb
 - spec/integration/chef_repository_file_system_spec.rb
 - spec/integration/chefignore_spec.rb
+- spec/integration/converge_spec.rb
 - spec/integration/delete_spec.rb
 - spec/integration/deps_spec.rb
 - spec/integration/diff_spec.rb