knife-essentials 1.0.0.beta5 → 1.0.0

data/lib/chef_fs/file_system/chef_repository_file_system_entry.rb

@@ -82,7 +82,7 @@ module ChefFS
 
       def children
         @children ||=
-          Dir.entries(file_path).
+          Dir.entries(file_path).sort.
               select { |entry| entry != '.' && entry != '..' }.
               map { |entry| ChefRepositoryFileSystemEntry.new(entry, self) }.
               select { |entry| !ignored?(entry) }

data/lib/chef_fs/file_system/file_system_entry.rb

@@ -39,7 +39,7 @@ module ChefFS
 
       def children
         begin
-          @children ||= Dir.entries(file_path).select { |entry| entry != '.' && entry != '..' }.map { |entry| FileSystemEntry.new(entry, self) }
+          @children ||= Dir.entries(file_path).sort.select { |entry| entry != '.' && entry != '..' }.map { |entry| FileSystemEntry.new(entry, self) }
         rescue Errno::ENOENT
           raise ChefFS::FileSystem::NotFoundError.new(self, $!)
         end

data/lib/chef_fs/version.rb

@@ -1,3 +1,3 @@
 module ChefFS
-  VERSION = "1.0.0.beta5"
+  VERSION = "1.0.0"
 end

data/spec/integration/show_spec.rb

@@ -109,7 +109,7 @@ EOM
       'description' => 'woo',
       'name' => 'x'
     }
-    it 'knife show shows the attributes in a predetermined order', :pending => (RUBY_VERSION < "1.8") do
+    it 'knife show shows the attributes in a predetermined order', :pending => (RUBY_VERSION < "1.9") do
       knife('show /environments/x.json').should_succeed <<EOM
 /environments/x.json:
 {

data/spec/support/knife_support.rb

@@ -1,3 +1,4 @@
+require 'chef/config'
 require 'chef/knife'
 require 'chef/application/knife'
 require 'logger'
@@ -18,43 +19,53 @@ module KnifeSupport
     # Make output stable
     Chef::Config[:concurrency] = 1
 
-    # This is Chef::Knife.run without load_commands and load_deps--we'll
-    # load stuff ourselves, thank you very much
-    stdout = StringIO.new
-    stderr = StringIO.new
-    old_loggers = Chef::Log.loggers
-    old_log_level = Chef::Log.level
-    begin
-      puts "knife: #{args.join(' ')}" if DEBUG
-      subcommand_class = Chef::Knife.subcommand_class_from(args)
-      subcommand_class.options = Chef::Application::Knife.options.merge(subcommand_class.options)
-      instance = subcommand_class.new(args)
-
-      # Capture stdout/stderr
-      instance.ui = Chef::Knife::UI.new(stdout, stderr, STDIN, {})
-
-      # Don't print stuff
-      Chef::Config[:verbosity] = ( DEBUG ? 2 : 0 )
-      instance.configure_chef
-      logger = Logger.new(stderr)
-      logger.formatter = proc { |severity, datetime, progname, msg| "#{severity}: #{msg}\n" }
-      Chef::Log.use_log_devices([logger])
-      Chef::Log.level = ( DEBUG ? :debug : :warn )
-      Chef::Log::Formatter.show_time = false
-
-      instance.run
-
-      exit_code = 0
-
-    # This is how rspec catches exit()
-    rescue SystemExit => e
-      exit_code = e.status
-    ensure
-      Chef::Log.use_log_devices(old_loggers)
-      Chef::Log.level = old_log_level
-    end
+    # Work on machines where we can't access /var
+    checksums_cache_dir = Dir.mktmpdir('checksums') do |checksums_cache_dir|
+      old_cache_options = Chef::Config[:cache_options]
+      Chef::Config[:cache_options] = {
+        :path => checksums_cache_dir,
+        :skip_expires => true
+      }
+
+      # This is Chef::Knife.run without load_commands and load_deps--we'll
+      # load stuff ourselves, thank you very much
+      stdout = StringIO.new
+      stderr = StringIO.new
+      old_loggers = Chef::Log.loggers
+      old_log_level = Chef::Log.level
+      begin
+        puts "knife: #{args.join(' ')}" if DEBUG
+        subcommand_class = Chef::Knife.subcommand_class_from(args)
+        subcommand_class.options = Chef::Application::Knife.options.merge(subcommand_class.options)
+        instance = subcommand_class.new(args)
+
+        # Capture stdout/stderr
+        instance.ui = Chef::Knife::UI.new(stdout, stderr, STDIN, {})
+
+        # Don't print stuff
+        Chef::Config[:verbosity] = ( DEBUG ? 2 : 0 )
+        instance.configure_chef
+        logger = Logger.new(stderr)
+        logger.formatter = proc { |severity, datetime, progname, msg| "#{severity}: #{msg}\n" }
+        Chef::Log.use_log_devices([logger])
+        Chef::Log.level = ( DEBUG ? :debug : :warn )
+        Chef::Log::Formatter.show_time = false
+
+        instance.run
+
+        exit_code = 0
+
+      # This is how rspec catches exit()
+      rescue SystemExit => e
+        exit_code = e.status
+      ensure
+        Chef::Log.use_log_devices(old_loggers)
+        Chef::Log.level = old_log_level
+        Chef::Config[:cache_options] = old_cache_options
+      end
 
-    KnifeResult.new(stdout.string, stderr.string, exit_code)
+      KnifeResult.new(stdout.string, stderr.string, exit_code)
+    end
   end
 
   private

metadata

@@ -1,16 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta5
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
@@ -43,6 +59,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Universal knife verbs that work with your Chef repository
 email: jkeiser@opscode.com
 executables: []
@@ -151,9 +215,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23