knife-essentials 0.8.5 → 0.8.6

data/lib/chef/knife/list_essentials.rb

@@ -1,5 +1,6 @@
 require 'chef_fs/knife'
 require 'chef_fs/file_system'
+require 'highline'
 
 class Chef
   class Knife
@@ -117,8 +118,7 @@ class Chef
         if config[:one_column] || !stdout.isatty
           columns = 0
         else
-          # TODO: tput cols is not cross platform
-          columns = Integer(`tput cols`)
+          columns = HighLine::SystemExtensions.terminal_size[0]
         end
         current_line = ''
         results.each do |result|

data/lib/chef_fs.rb

@@ -1,9 +1,7 @@
-require 'chef_fs/file_system/chef_server_root_dir'
-require 'chef/config'
-require 'chef/rest'
+require 'chef/platform'
 
 module ChefFS
   def self.windows?
-    false
+    Chef::Platform.windows?
   end
 end

data/lib/chef_fs/file_system/chef_repository_file_system_cookbooks_dir.rb

@@ -27,6 +27,7 @@ module ChefFS
         begin
           @chefignore = Chef::Cookbook::Chefignore.new(self.file_path)
         rescue Errno::EISDIR
+        rescue Errno::EACCES
           # Work around a bug in Chefignore when chefignore is a directory
         end
       end

data/lib/chef_fs/file_system/chef_server_root_dir.rb

@@ -22,6 +22,7 @@ require 'chef_fs/file_system/cookbooks_dir'
 require 'chef_fs/file_system/data_bags_dir'
 require 'chef_fs/file_system/nodes_dir'
 require 'chef_fs/file_system/environments_dir'
+require 'chef/rest'
 
 module ChefFS
   module FileSystem

data/lib/chef_fs/path_utils.rb

@@ -56,7 +56,7 @@ module ChefFS
     end
 
     def self.regexp_path_separator
-      ChefFS::windows? ? '[/\\]' : '/'
+      ChefFS::windows? ? '[\/\\\\]' : '/'
     end
 
     # Given a path which may only be partly real (i.e. /x/y/z when only /x exists,

data/lib/chef_fs/version.rb

@@ -1,4 +1,4 @@
 module ChefFS
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end
 

data/spec/chef_fs/file_pattern_spec.rb

@@ -157,7 +157,7 @@ describe ChefFS::FilePattern do
     end
   end
 
-  context 'with simple pattern "a\*\b"' do
+  context 'with simple pattern "a\*\b"', :pending => (Chef::Platform.windows?) do
     let(:pattern) { ChefFS::FilePattern.new('a\*\b') }
     it 'match?' do
       pattern.match?('a*b').should be_true
@@ -264,7 +264,7 @@ describe ChefFS::FilePattern do
     end
   end
 
-  context 'with star pattern "/abc/d[a-z][0-9]f/ghi"' do
+  context 'with star pattern "/abc/d[a-z][0-9]f/ghi"', :pending => (Chef::Platform.windows?) do
     let(:pattern) { ChefFS::FilePattern.new('/abc/d[a-z][0-9]f/ghi') }
     it 'match?' do
       pattern.match?('/abc/de1f/ghi').should be_true

data/spec/chef_fs/file_system/cookbooks_dir_spec.rb

@@ -565,6 +565,7 @@ describe ChefFS::FileSystem::CookbooksDir do
       nonexistent_child.dir?.should be_false
     end
     it 'read returns NotFoundError' do
+      should_list_cookbooks
       expect { nonexistent_child.read }.to raise_error(ChefFS::FileSystem::NotFoundError)
     end
   end

data/spec/integration/list_spec.rb

@@ -344,7 +344,7 @@ EOM
         end
       end
 
-      when_the_repository 'has a cookbooks directory and a symlinked cookbooks directory' do
+      when_the_repository 'has a cookbooks directory and a symlinked cookbooks directory', :pending => (Chef::Platform.windows?) do
         directory 'cookbooks'
         symlink 'symlinked', 'cookbooks'
 
@@ -379,7 +379,7 @@ EOM
         end
       end
 
-      when_the_repository 'has a real_cookbooks directory and a cookbooks symlink to it' do
+      when_the_repository 'has a real_cookbooks directory and a cookbooks symlink to it', :pending => (Chef::Platform.windows?) do
         directory 'real_cookbooks'
         symlink 'cookbooks', 'real_cookbooks'
 

data/spec/support/knife_support.rb

@@ -105,11 +105,16 @@ module KnifeSupport
       else
         stderr_actual.should == expected[:stderr]
       end
+      stdout_actual = @stdout
+      if Chef::Platform.windows?
+        stderr_actual = stderr_actual.gsub("\r\n", "\n")
+        stdout_actual = stdout_actual.gsub("\r\n", "\n")
+      end
       @exit_code.should == expected[:exit_code]
       if expected[:stdout].is_a?(Regexp)
-        @stdout.should =~ expected[:stdout]
+        stdout_actual.should =~ expected[:stdout]
       else
-        @stdout.should == expected[:stdout]
+        stdout_actual.should == expected[:stdout]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero