berkshelf 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4cf647b41dbb16847bda378125caeca33f742be
-  data.tar.gz: 09fde5aa92aa7142ed6654d67c707877e136efd0
+  metadata.gz: 8f5a7d0c79975c9b1f6c2a3407a1d649b68e9d1f
+  data.tar.gz: 409e94aa67b4fc4ca58bf3cbfc4ba394307c4bf0
 SHA512:
-  metadata.gz: 6dedd78fd2dc5890ceb8cb7319e84d91a1203f00fd698c8a77712dba2bf044026649ab814909a7f684f0defaf60054f70f5577322e866d918694f6971e232cdc
-  data.tar.gz: 82e54f6a02f0c0e6d5b7f5f63c84e09864b8d9ea2e9d12f08460cb2ccfcd5c769d1807bf6f91f377d9f7ce4bee1c7baf6f314d253fe0e002901131ae0923f231
+  metadata.gz: 4f25d4557214df0297c370439d06ff22f3c8da2b94b72176cd086ad3461c441c68f7bf482e5b28be4f651731a8b9498d83c455ac050ed8b78d607bfcf1e5574f
+  data.tar.gz: c571c05d0bb93b8c85524c22a06d8fb38cf4c470c346d419908baf10db1c15922dc0dad0c74b3c2518682cdd907f4de7e5dbd3ed3cd5917b7f029418f64140a0

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
 notifications:
   irc:
     channels:

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+> This is a high level digest of changes. For the complete CHANGELOG diff two tags in the project's [commit history](https://github.com/berkshelf/berkshelf/commits/master).
+
+# 3.1.2
+
+* Enhancements
+  * SCM history is now stripped from cookbooks retrieved from an SCM location which will conserve disk space for cookbooks with a large history
+* Bug Fixes
+  * Fix formatting issue with console output on some systems
+  * Handle crash on install on some machines which do not properly report their number of CPU cores
+  * Fix infinite loop in checking if the lockfile is synced under certain conditions
+  * Fix console output crash on Windows
+  * Fix issue where updating a cookbook would result in a non resolvable lockfile
+  * Various spelling mistakes in console output
+
 # 3.1.1
 
 * Bug Fixes
@@ -36,6 +50,18 @@
 * Backwards incompatible changes
   * `berks package` has had it's argument and options list updated. The first argument is now the name, or fulle path, of the archive file that will be generated. As with before, the first argument is not required.
 
+# 2.0.16
+
+* Update constraint on Ridley
+
+# 2.0.14
+
+* Backport changes from master to allow detecting cookbooks by metadata.json
+
+# 2.0.13
+
+* Lock transitive dependency on Faraday
+
 # 2.0.10
 
 * Huge performance increase when resolving a Berksfile when the Berkshelf contains a lot of cookbooks

data/PLUGINS.md

@@ -7,7 +7,8 @@ This is a list of community-contributed plugins for Berkshelf. A few notes:
 
 Plugins
 -------
-- [berkshelf-shims](https://github.com/JeffBellegarde/berkshelf-shims) - Provide shims functionality for Berkshelf.
+- [berkshelf-bzr](https://github.com/berkshelf/berkshelf-bzr) - Add support for downloading cookbooks from Bazaar locations.
+- [berkshelf-hg](https://github.com/berkshelf/berkshelf-hg) - Add support for downloading cookbooks from Mercurial locations.
 - [vagrant-berkshelf](https://github.com/berkshelf/vagrant-berkshelf) - A Vagrant plugin to add Berkshelf integration to the Chef provisioners.
 
 I want to add my plugin!

data/README.md

@@ -11,12 +11,6 @@ Manage a Cookbook or an Application's Cookbook dependencies
 
 Berkshelf is now included as part of the [Chef-DK](http://getchef.com/downloads/chef-dk). This is fastest, easiest, and the recommended installation method for getting up and running with Berkshelf.
 
-Add the Chef-DK binaries directory to your path once you've installed the Chef-DK.
-
-    $ export PATH=/opt/chefdk/embedded/bin:$PATH
-    $ which berks
-    /opt/chefdk/embedded/bin/berks
-
 > note: You may need to uninstall the Berkshelf gem especially if you are using a Ruby version manager you may need to uninstall all Berkshelf gems from each Ruby installation.
 
 ### From Rubygems

data/berkshelf.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'addressable',          '~> 2.3.4'
   s.add_dependency 'berkshelf-api-client', '~> 1.2'
-  s.add_dependency 'buff-config',          '~> 0.2'
+  s.add_dependency 'buff-config',          '~> 0.4'
   s.add_dependency 'buff-extensions',      '~> 0.4'
   s.add_dependency 'buff-shell_out',       '~> 0.1'
   s.add_dependency 'faraday',              '~> 0.9.0'

data/features/commands/install.feature

@@ -54,11 +54,8 @@ Feature: berks install
       | elixir | 1.0.0 |
     And the Berkshelf API server's cache is up to date
     When I successfully run `berks install`
-    Then the output should contain:
-      """
-      Installing elixir (1.0.0) from http://0.0.0.0:26210 ([chef_server] http://localhost:26310/)
-      Installing ruby (1.0.0) from http://0.0.0.0:26210 ([chef_server] http://localhost:26310/)
-      """
+    Then the output should contain "Installing elixir (1.0.0)"
+    And the output should contain "Installing ruby (1.0.0)"
     And the cookbook store should have the cookbooks:
       | ruby   | 1.0.0 |
       | elixir | 1.0.0 |
@@ -242,6 +239,19 @@ Feature: berks install
       Using berkshelf-cookbook-fixture (1.0.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at rel/cookbooks/berkshelf-cookbook-fixture)
       """
 
+  Scenario: installing a Berksfile that contains a Git location
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'berkshelf-cookbook-fixture', 
+        git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git', 
+        tag: 'v0.2.0'
+      """
+    When I successfully run `berks install`
+    Then the cookbook store should have the git cookbooks:
+      | berkshelf-cookbook-fixture | 0.2.0 | 70a527e17d91f01f031204562460ad1c17f972ee |
+    And the git cookbook "berkshelf-cookbook-fixture-70a527e17d91f01f031204562460ad1c17f972ee" should not have the following directories:
+      | .git | 
+
   Scenario: installing a Berksfile that contains a Git location with a tag
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """

data/features/commands/viz.feature

@@ -1,3 +1,4 @@
+@graphviz
 Feature: berks viz
   Scenario: With no options
     * I have a Berksfile pointing at the local Berkshelf API with:

data/features/step_definitions/filesystem_steps.rb

@@ -224,6 +224,10 @@ Then /^the cookbook "(.*?)" should not have the following files:$/ do |name, fil
   check_file_presence(files.raw.map{|file_row| ::File.join(name, file_row[0])}, false)
 end
 
+Then /^the git cookbook "(.*?)" should not have the following directories:$/ do |name, directories|
+  check_directory_presence(directories.raw.map{|directory_row| ::File.join(cookbook_store.storage_path.to_path, name, directory_row[0])}, false)
+end
+
 Then /^the file "(.*?)" in the cookbook "(.*?)" should contain:$/ do |file_name, cookbook_name, content|
   expect(Pathname.new(current_dir).join(cookbook_name)).to have_structure {
     file "Berksfile" do

data/generator_files/README.md.erb

@@ -41,7 +41,7 @@ Include `<%= name %>` in your node's `run_list`:
 
 1. Fork the repository on Github
 2. Create a named feature branch (i.e. `add-new-recipe`)
-3. Write you change
+3. Write your change
 4. Write tests for your change (if applicable)
 5. Run the tests, ensuring they all pass
 6. Submit a Pull Request

data/lib/berkshelf.rb

@@ -25,6 +25,7 @@ module Berkshelf
     autoload :Logging, 'berkshelf/mixin/logging'
   end
 
+  autoload :Shell,      'berkshelf/shell'
   autoload :Uploader,   'berkshelf/uploader'
   autoload :Visualizer, 'berkshelf/visualizer'
 
@@ -52,10 +53,9 @@ module Berkshelf
       @root ||= Pathname.new(File.expand_path('../', File.dirname(__FILE__)))
     end
 
-    # @return [Thor::Shell::Color, Thor::Shell::Basic]
-    #   A basic shell on Windows, colored everywhere else
+    # @return [Berkshelf::Shell]
     def ui
-      @ui ||= Thor::Base.shell.new
+      @ui ||= Berkshelf::Shell.new
     end
 
     # Returns the filepath to the location Berkshelf will use for
@@ -217,7 +217,6 @@ require_relative 'berkshelf/logger'
 require_relative 'berkshelf/resolver'
 require_relative 'berkshelf/source'
 require_relative 'berkshelf/source_uri'
-require_relative 'berkshelf/ui'
 
 Ridley.logger          = Berkshelf.logger
 Berkshelf.logger.level = Logger::WARN

data/lib/berkshelf/berksfile.rb

@@ -207,7 +207,7 @@ module Berkshelf
       if args.first == :opscode
         Berkshelf.formatter.deprecation "Your Berksfile contains a site location pointing to the Opscode Community " +
           "Site (site :opscode). Site locations have been replaced by the source location. Change this to: " +
-          "'source \"http://api.berkshelf.com\"' to remove this warning. For more information visit " +
+          "'source \"https://api.berkshelf.com\"' to remove this warning. For more information visit " +
           "https://github.com/berkshelf/berkshelf/wiki/deprecated-locations"
         source(DEFAULT_API_URL)
         return

data/lib/berkshelf/commands/shelf.rb

@@ -19,7 +19,7 @@ module Berkshelf
     end
 
     method_option :version, aliases: '-v', type: :string, desc: 'Version to show'
-    desc 'show', 'Display showrmation about a cookbook in the Berkshelf shelf'
+    desc 'show', 'Display information about a cookbook in the Berkshelf shelf'
     def show(name)
       cookbooks = find(name, options[:version])
 

data/lib/berkshelf/installer.rb

@@ -10,7 +10,7 @@ module Berkshelf
     def initialize(berksfile)
       @berksfile  = berksfile
       @lockfile   = berksfile.lockfile
-      @worker     = Worker.pool(size: [(Celluloid.cores - 1), 2].max, args: [berksfile])
+      @worker     = Worker.pool(size: [(Celluloid.cores.to_i - 1), 2].max, args: [berksfile])
     end
 
     def build_universe

data/lib/berkshelf/locations/git.rb

@@ -91,6 +91,10 @@ module Berkshelf
       # If we got this far, we should copy
       FileUtils.rm_rf(install_path) if install_path.exist?
       FileUtils.cp_r(scratch_path, install_path)
+
+      # Remove the git history
+      FileUtils.rm_rf(File.join(install_path, '.git')) 
+
       install_path.chmod(0777 & ~File.umask)
     ensure
       # Ensure the scratch directory is cleaned up

data/lib/berkshelf/lockfile.rb

@@ -174,12 +174,12 @@ module Berkshelf
           return false
         end
 
+        checked[name] = true
+
         unless satisfies_transitive?(graphed, checked, level + 2)
           Berkshelf.log.debug "#{indent}  Transitive are not satisifed"
           return false
         end
-
-        checked[name] = true
       end
     end
 
@@ -723,7 +723,7 @@ module Berkshelf
 
           cookbooks.each do |cookbook|
             @graph[cookbook.cookbook_name.to_s] = GraphItem.new(
-              cookbook.name,
+              cookbook.cookbook_name,
               cookbook.version,
               cookbook.dependencies,
             )

data/lib/berkshelf/shell.rb

@@ -0,0 +1,31 @@
+require 'thor'
+
+module Berkshelf
+  # Subclass the current shell (which is different based on the OS)
+  Shell = Class.new(Thor::Base.shell) do
+    # Mute the output of this instance of UI until {#unmute!} is called
+    def mute!
+      @mute = true
+    end
+
+    # Unmute the output of this instance of UI until {#mute!} is called
+    def unmute!
+      @mute = false
+    end
+
+    def say(*args)
+      return if quiet?
+      super(*args)
+    end
+    alias_method :info, :say
+
+    def warn(message, color = :yellow)
+      say(message, color)
+    end
+
+    def error(message, color = :red)
+      message = set_color(message, *color) if color
+      super(message)
+    end
+  end
+end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = '3.1.1'
+  VERSION = '3.1.2'
 end

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -92,6 +92,32 @@ describe Berkshelf::Lockfile do
       expect(subject.trusted?).to be_true
     end
 
+    it 'returns true when the lockfile is trusted with cyclic transitive dependencies' do
+      cookbook = double('apt-1.0.0', dependencies: { 'bacon' => '1.0.0' })
+      apt = double('apt',
+        name: 'apt',
+        version_constraint: Semverse::Constraint.new('>= 0.0.0'),
+        version: '1.0.0',
+        location: 'api',
+        dependencies: { 'bacon' => '1.0.0' },
+        cached_cookbook: cookbook,
+      )
+      bacon = double('bacon',
+        name: 'bacon',
+        version_constraint: Semverse::Constraint.new('>= 0.0.0'),
+        version: '1.0.0',
+        location: 'api',
+        dependencies: { 'apt' => '1.0.0' }
+      )
+      berksfile = double('berksfile', dependencies: [apt])
+      subject.instance_variable_set(:@berksfile, berksfile)
+      subject.stub(:find).with(apt).and_return(apt)
+      subject.graph.stub(:find).with('bacon').and_return(bacon)
+      subject.graph.stub(:find).with(apt).and_return(apt)
+
+      expect(subject.trusted?).to be_true
+    end
+
     it 'returns false when the lockfile is not trusted because of transitive dependencies' do
       cookbook = double('apt-1.0.0', dependencies: { 'bacon' => '1.0.0', 'flip' => '2.0.0' })
       apt = double('apt',
@@ -253,3 +279,23 @@ describe Berkshelf::Lockfile do
     end
   end
 end
+
+describe Berkshelf::Lockfile::Graph do
+  let(:filepath) { fixtures_path.join('lockfiles/empty.lock').to_s }
+  let(:lockfile) { Berkshelf::Lockfile.new(filepath: filepath) }
+  subject { described_class.new(lockfile) }
+
+  describe '#update' do
+    it 'uses cookbook_name as GraphItem name' do
+      cookbook = double('test',
+        name: 'test-0.0.1',
+        version: '0.0.1',
+        cookbook_name: 'test',
+        dependencies: {}
+      )
+      subject.update([cookbook])
+
+      expect(subject.locks.keys).to include(cookbook.cookbook_name)
+    end
+  end
+end

data/spec/unit/berkshelf/shell_spec.rb

@@ -0,0 +1,127 @@
+require 'spec_helper'
+
+module Berkshelf
+  describe Shell do
+    let(:stdout) { double('stdout', tty?: true) }
+    let(:stderr) { double('stderr') }
+
+    before do
+      described_class.any_instance.stub(:stdout).and_return(stdout)
+      described_class.any_instance.stub(:stderr).and_return(stderr)
+    end
+
+    describe '#mute!' do
+      it 'sets @mute to true' do
+        subject.mute!
+        expect(subject.instance_variable_get(:@mute)).to be_true
+      end
+    end
+
+    describe '#unmute!' do
+      it 'sets @mute to false' do
+        subject.unmute!
+        expect(subject.instance_variable_get(:@mute)).to be_false
+      end
+    end
+
+    describe '#say' do
+      context 'when quiet?' do
+        before do
+          subject.stub(:quiet?).and_return(true)
+        end
+
+        it 'does not output anything', :not_supported_on_windows do
+          stdout.should_not_receive(:print)
+          subject.say 'message'
+        end
+      end
+
+      context 'with not quiet?' do
+        before do
+          subject.stub(:quiet?).and_return(false)
+        end
+
+        it 'prints to stdout' do
+          stdout.should_receive(:print).once
+          stdout.should_receive(:flush).with(no_args())
+          subject.say 'message'
+        end
+      end
+    end
+
+    describe '#say_status' do
+      context 'when quiet?' do
+        before do
+          subject.stub(:quiet?).and_return(true)
+        end
+
+        it 'does not output anything' do
+          stdout.should_not_receive(:puts)
+          subject.say_status 5, 'message'
+        end
+      end
+
+      context 'with not quiet?' do
+        before do
+          subject.stub(:quiet?).and_return(false)
+        end
+
+        it 'prints to stdout' do
+          stdout.should_receive(:print).once
+          stdout.should_receive(:flush).with(no_args())
+          subject.say_status 5, 'message'
+        end
+      end
+    end
+
+    describe '#warn' do
+      context 'when quiet?' do
+        before do
+          subject.stub(:quiet?).and_return(true)
+        end
+
+        it 'does not output anything' do
+          stdout.should_not_receive(:print)
+          subject.warn 'warning'
+        end
+      end
+
+      context 'with not quiet?' do
+        before do
+          subject.stub(:quiet?).and_return(false)
+        end
+
+        it 'calls #say with yellow coloring' do
+          stdout.should_receive(:print)
+          stdout.should_receive(:flush).with(no_args())
+          subject.warn 'warning'
+        end
+      end
+    end
+
+    context '#error' do
+      context 'when quiet?' do
+        before do
+          subject.stub(:quiet?).and_return(true)
+        end
+
+        it "outputs an error message", :not_supported_on_windows do
+          stderr.should_receive(:puts)
+          subject.error 'error!'
+        end
+      end
+
+      context 'with not quiet?' do
+        before do
+          subject.stub(:quiet?).and_return(false)
+        end
+
+        it 'prints to stderr' do
+          stderr.should_receive(:puts).with(windows? ? "error!" : "\e[31merror!\e[0m")
+          subject.error 'error!'
+        end
+      end
+    end
+  end
+
+end

data/spec/unit/berkshelf/visualizer_spec.rb

@@ -15,7 +15,7 @@ module Berkshelf
         end
       end
 
-      context 'when the graphviz command fails' do
+      context 'when the graphviz command fails', :graphviz do
         before do
           response = double(success?: false, stderr: 'Something happened!')
           subject.stub(:shell_out).and_return(response)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-20 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -48,14 +48,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: buff-extensions
   requirement: !ruby/object:Gem::Requirement
@@ -451,13 +451,12 @@ files:
 - lib/berkshelf/packager.rb
 - lib/berkshelf/resolver.rb
 - lib/berkshelf/resolver/graph.rb
+- lib/berkshelf/shell.rb
 - lib/berkshelf/source.rb
 - lib/berkshelf/source_uri.rb
 - lib/berkshelf/thor.rb
 - lib/berkshelf/thor_ext.rb
 - lib/berkshelf/thor_ext/hash_with_indifferent_access.rb
-- lib/berkshelf/thor_ext/shell.rb
-- lib/berkshelf/ui.rb
 - lib/berkshelf/uploader.rb
 - lib/berkshelf/version.rb
 - lib/berkshelf/visualizer.rb
@@ -518,9 +517,9 @@ files:
 - spec/unit/berkshelf/packager_spec.rb
 - spec/unit/berkshelf/resolver/graph_spec.rb
 - spec/unit/berkshelf/resolver_spec.rb
+- spec/unit/berkshelf/shell_spec.rb
 - spec/unit/berkshelf/source_spec.rb
 - spec/unit/berkshelf/source_uri_spec.rb
-- spec/unit/berkshelf/ui_spec.rb
 - spec/unit/berkshelf/uploader_spec.rb
 - spec/unit/berkshelf/visualizer_spec.rb
 - spec/unit/berkshelf_spec.rb
@@ -643,9 +642,9 @@ test_files:
 - spec/unit/berkshelf/packager_spec.rb
 - spec/unit/berkshelf/resolver/graph_spec.rb
 - spec/unit/berkshelf/resolver_spec.rb
+- spec/unit/berkshelf/shell_spec.rb
 - spec/unit/berkshelf/source_spec.rb
 - spec/unit/berkshelf/source_uri_spec.rb
-- spec/unit/berkshelf/ui_spec.rb
 - spec/unit/berkshelf/uploader_spec.rb
 - spec/unit/berkshelf/visualizer_spec.rb
 - spec/unit/berkshelf_spec.rb

data/lib/berkshelf/thor_ext/shell.rb

@@ -1,4 +0,0 @@
-require 'berkshelf/ui'
-
-# Include the Berkshelf UI methods - this is used by both Vagrant and Berkshelf
-Thor::Base.shell.send(:include, Berkshelf::UI)

data/lib/berkshelf/ui.rb

@@ -1,46 +0,0 @@
-module Berkshelf
-  module UI
-    # Mute the output of this instance of UI until {#unmute!} is called
-    def mute!
-      @mute = true
-    end
-
-    # Unmute the output of this instance of UI until {#mute!} is called
-    def unmute!
-      @mute = false
-    end
-
-    def say(message = '', color = nil, force_new_line = (message.to_s !~ /( |\t)\Z/))
-      return if quiet?
-
-      super(message, color, force_new_line)
-    end
-
-    # @see {say}
-    def info(message = '', color = nil, force_new_line = (message.to_s !~ /( |\t)\Z/))
-      say(message, color, force_new_line)
-    end
-
-    def say_status(status, message, log_status = true)
-      return if quiet?
-
-      super(status, message, log_status)
-    end
-
-    def warn(message, color = :yellow)
-      return if quiet?
-
-      say(message, color)
-    end
-
-    def deprecated(message)
-      warn("[DEPRECATION] #{message}")
-    end
-
-    def error(message, color = :red)
-      message = set_color(message, *color) if color
-      super(message)
-    end
-    alias_method :fatal, :error
-  end
-end

data/spec/unit/berkshelf/ui_spec.rb

@@ -1,131 +0,0 @@
-require 'spec_helper'
-
-describe Thor::Base.shell do
-  let(:stdout) { double('stdout', tty?: true) }
-  let(:stderr) { double('stderr') }
-
-  before do
-    described_class.any_instance.stub(:stdout).and_return(stdout)
-    described_class.any_instance.stub(:stderr).and_return(stderr)
-  end
-
-  describe '#mute!' do
-    it 'sets @mute to true' do
-      subject.mute!
-      expect(subject.instance_variable_get(:@mute)).to be_true
-    end
-  end
-
-  describe '#unmute!' do
-    it 'sets @mute to false' do
-      subject.unmute!
-      expect(subject.instance_variable_get(:@mute)).to be_false
-    end
-  end
-
-  describe '#say' do
-    context 'when quiet?' do
-      before do
-        subject.stub(:quiet?).and_return(true)
-      end
-
-      it 'does not output anything', :not_supported_on_windows do
-        stdout.should_not_receive(:print)
-        subject.say 'message'
-      end
-    end
-
-    context 'with not quiet?' do
-      before do
-        subject.stub(:quiet?).and_return(false)
-      end
-
-      it 'prints to stdout' do
-        stdout.should_receive(:print).once
-        stdout.should_receive(:flush).with(no_args())
-        subject.say 'message'
-      end
-    end
-  end
-
-  describe '#say_status' do
-    context 'when quiet?' do
-      before do
-        subject.stub(:quiet?).and_return(true)
-      end
-
-      it 'does not output anything' do
-        stdout.should_not_receive(:puts)
-        subject.say_status 5, 'message'
-      end
-    end
-
-    context 'with not quiet?' do
-      before do
-        subject.stub(:quiet?).and_return(false)
-      end
-
-      it 'prints to stdout' do
-        stdout.should_receive(:print).once
-        stdout.should_receive(:flush).with(no_args())
-        subject.say_status 5, 'message'
-      end
-    end
-  end
-
-  describe '#warn' do
-    context 'when quiet?' do
-      before do
-        subject.stub(:quiet?).and_return(true)
-      end
-
-      it 'does not output anything' do
-        stdout.should_not_receive(:print)
-        subject.warn 'warning'
-      end
-    end
-
-    context 'with not quiet?' do
-      before do
-        subject.stub(:quiet?).and_return(false)
-      end
-
-      it 'calls #say with yellow coloring' do
-        stdout.should_receive(:print)
-        stdout.should_receive(:flush).with(no_args())
-        subject.warn 'warning'
-      end
-    end
-  end
-
-  describe '#deprecated' do
-    it 'prefixes the message with "[DEPRECATED]"' do
-      subject.should_receive(:warn).with('[DEPRECATION] That was deprecated!')
-      subject.deprecated 'That was deprecated!'
-    end
-  end
-
-  context '#error' do
-    context 'when quiet?' do
-      before do
-        subject.stub(:quiet?).and_return(true)
-      end
-
-      it "outputs an error message", :not_supported_on_windows do
-        stderr.should_receive(:puts)
-        subject.error 'error!'
-      end
-    end
-
-    context 'with not quiet?' do
-      before do
-        subject.stub(:quiet?).and_return(false)
-      end
-
-      it 'prints to stderr' do
-        stderr.should_receive(:puts).with(windows? ? "error!" : "\e[31merror!\e[0m")
-        subject.error 'error!'
-      end
-    end
-  end
-end