From a9486935dcc9909386ecbe537304f0964655df1e Mon Sep 17 00:00:00 2001
From: mihai-aupeo <mihai@aupeo.com>
Date: Tue, 14 Oct 2014 13:18:30 +0200
Subject: [PATCH] Upgraded to rspec3; added rspec-its.

Spec edits for rspec3 compliance: replaced be_false with be_falsey, be_true with be_truthy; changes should's to expect's.
---
 Gemfile                             |   5 +-
 spec/spec_helper.rb                 |   1 +
 spec/threaded/yell_spec.rb          |   6 +-
 spec/yell/adapters/datefile_spec.rb |  14 ++--
 spec/yell/dsl_spec.rb               |  10 +--
 spec/yell/level_spec.rb             | 140 ++++++++++++++++++------------------
 spec/yell/repository_spec.rb        |  26 ++++---
 spec/yell_spec.rb                   |  30 +++++---
 8 files changed, 128 insertions(+), 104 deletions(-)

--- ruby-yell.orig/Gemfile
+++ ruby-yell/Gemfile
@@ -6,8 +6,9 @@
 group :development, :test do
   gem "rake"
 
-  gem 'rspec-core', '~> 2'
-  gem 'rspec-expectations', '~> 2'
+  gem 'rspec-core', '~> 3'
+  gem 'rspec-expectations', '~> 3'
+  gem 'rspec-its'
   gem "rr"
 
   if RUBY_VERSION < "1.9"
--- ruby-yell.orig/spec/spec_helper.rb
+++ ruby-yell/spec/spec_helper.rb
@@ -5,6 +5,7 @@
 
 require 'rspec/core'
 require 'rspec/expectations'
+require 'rspec/its'
 require 'rr'
 require 'timecop'
 
--- ruby-yell.orig/spec/threaded/yell_spec.rb
+++ ruby-yell/spec/threaded/yell_spec.rb
@@ -19,7 +19,7 @@
     end
 
     it "should write all messages" do
-      lines.should == 10*threads
+      expect(lines).to eq(10*threads)
     end
   end
 
@@ -51,7 +51,7 @@
         Thread.new { 10.times { Yell['threaded'].info count } }
       end.each(&:join)
 
-      lines.should == 10*threads
+      expect(lines).to eq(10*threads)
     end
   end
 
@@ -83,7 +83,7 @@
         sleep 0.3
 
         files = Dir[ fixture_path + '/*.*.log' ]
-        files.size.should == 2
+        expect(files.size).to eq(2)
 
         # files.last.should match( datefile_pattern_for(Time.now) ) # today
         # files.first.should match( datefile_pattern_for(Time.now-86400) ) # yesterday
--- ruby-yell.orig/spec/yell/adapters/datefile_spec.rb
+++ ruby-yell/spec/yell/adapters/datefile_spec.rb
@@ -28,7 +28,7 @@
     end
 
     it "should be output to filename with date pattern" do
-      expect(File.exist?(today_filename)).to be_true
+      expect(File.exist?(today_filename)).to be_truthy
 
       expect(today_lines.size).to eq(2) # includes header line
       expect(today_lines.last).to match(message)
@@ -37,7 +37,7 @@
     it "should output to the same file" do
       adapter.write(event)
 
-      expect(File.exist?(today_filename)).to be_true
+      expect(File.exist?(today_filename)).to be_truthy
       expect(today_lines.size).to eq(3) # includes header line
     end
 
@@ -55,7 +55,7 @@
       end
 
       it "should rotate file" do
-        expect(File.exist?(tomorrow_filename)).to be_true
+        expect(File.exist?(tomorrow_filename)).to be_truthy
 
         expect(tomorrow_lines.size).to eq(2) # includes header line
         expect(tomorrow_lines.last).to match(message)
@@ -89,14 +89,14 @@
       end
 
       it "should be created on the original filename" do
-        expect(File.symlink?(filename)).to be_true
+        expect(File.symlink?(filename)).to be_truthy
         expect(File.readlink(filename)).to eq(today_filename)
       end
 
       it "should be recreated upon rollover" do
         Timecop.freeze(tomorrow) { adapter.write(event) }
 
-        expect(File.symlink?(filename)).to be_true
+        expect(File.symlink?(filename)).to be_truthy
         expect(File.readlink(filename)).to eq(tomorrow_filename)
       end
     end
@@ -109,7 +109,7 @@
       it "should not create the sylink the original filename" do
         adapter.write( event )
 
-        expect(File.symlink?(filename)).to be_false
+        expect(File.symlink?(filename)).to be_falsey
       end
     end
   end
@@ -129,7 +129,7 @@
       it "should be rewritten upon rollover" do
         Timecop.freeze(tomorrow) { adapter.write(event) }
 
-        expect(File.symlink?(filename)).to be_true
+        expect(File.symlink?(filename)).to be_truthy
         expect(File.readlink(filename)).to eq(tomorrow_filename)
       end
     end
--- ruby-yell.orig/spec/yell/dsl_spec.rb
+++ ruby-yell/spec/yell/dsl_spec.rb
@@ -23,7 +23,7 @@
 
   it "should perform #setup" do
     adapter = DSLAdapter.new
-    expect(adapter.test_setup?).to be_true
+    expect(adapter.test_setup?).to be_truthy
   end
 
   it "should perform #write" do
@@ -31,18 +31,18 @@
     stub(event).level { 0 }
 
     adapter = DSLAdapter.new
-    expect(adapter.test_write?).to be_false
+    expect(adapter.test_write?).to be_falsey
 
     adapter.write(event)
-    expect(adapter.test_write?).to be_true
+    expect(adapter.test_write?).to be_truthy
   end
 
   it "should perform #close" do
     adapter = DSLAdapter.new
-    expect(adapter.test_close?).to be_false
+    expect(adapter.test_close?).to be_falsey
 
     adapter.close
-    expect(adapter.test_close?).to be_true
+    expect(adapter.test_close?).to be_truthy
   end
 
 end
--- ruby-yell.orig/spec/yell/level_spec.rb
+++ ruby-yell/spec/yell/level_spec.rb
@@ -6,11 +6,11 @@
     let(:level) { Yell::Level.new }
 
     it "should should return correctly" do
-      expect(level.at?(:debug)).to be_true
-      expect(level.at?(:info)).to be_true
-      expect(level.at?(:warn)).to be_true
-      expect(level.at?(:error)).to be_true
-      expect(level.at?(:fatal)).to be_true
+      expect(level.at?(:debug)).to be_truthy
+      expect(level.at?(:info)).to be_truthy
+      expect(level.at?(:warn)).to be_truthy
+      expect(level.at?(:error)).to be_truthy
+      expect(level.at?(:fatal)).to be_truthy
     end
   end
 
@@ -21,11 +21,11 @@
       let(:severity) { :debug }
 
       it "should should return correctly" do
-        expect(level.at?(:debug)).to be_true
-        expect(level.at?(:info)).to be_true
-        expect(level.at?(:warn)).to be_true
-        expect(level.at?(:error)).to be_true
-        expect(level.at?(:fatal)).to be_true
+        expect(level.at?(:debug)).to be_truthy
+        expect(level.at?(:info)).to be_truthy
+        expect(level.at?(:warn)).to be_truthy
+        expect(level.at?(:error)).to be_truthy
+        expect(level.at?(:fatal)).to be_truthy
       end
     end
 
@@ -33,11 +33,11 @@
       let(:severity) { :info }
 
       it "should should return correctly" do
-        expect(level.at?(:debug)).to be_false
-        expect(level.at?(:info)).to be_true
-        expect(level.at?(:warn)).to be_true
-        expect(level.at?(:error)).to be_true
-        expect(level.at?(:fatal)).to be_true
+        expect(level.at?(:debug)).to be_falsey
+        expect(level.at?(:info)).to be_truthy
+        expect(level.at?(:warn)).to be_truthy
+        expect(level.at?(:error)).to be_truthy
+        expect(level.at?(:fatal)).to be_truthy
       end
     end
 
@@ -45,11 +45,11 @@
       let(:severity) { :warn }
 
       it "should should return correctly" do
-        expect(level.at?(:debug)).to be_false
-        expect(level.at?(:info)).to be_false
-        expect(level.at?(:warn)).to be_true
-        expect(level.at?(:error)).to be_true
-        expect(level.at?(:fatal)).to be_true
+        expect(level.at?(:debug)).to be_falsey
+        expect(level.at?(:info)).to be_falsey
+        expect(level.at?(:warn)).to be_truthy
+        expect(level.at?(:error)).to be_truthy
+        expect(level.at?(:fatal)).to be_truthy
       end
     end
 
@@ -57,11 +57,11 @@
       let(:severity) { :error }
 
       it "should should return correctly" do
-        expect(level.at?(:debug)).to be_false
-        expect(level.at?(:info)).to be_false
-        expect(level.at?(:warn)).to be_false
-        expect(level.at?(:error)).to be_true
-        expect(level.at?(:fatal)).to be_true
+        expect(level.at?(:debug)).to be_falsey
+        expect(level.at?(:info)).to be_falsey
+        expect(level.at?(:warn)).to be_falsey
+        expect(level.at?(:error)).to be_truthy
+        expect(level.at?(:fatal)).to be_truthy
       end
     end
 
@@ -69,11 +69,11 @@
       let(:severity) { :fatal }
 
       it "should should return correctly" do
-        expect(level.at?(:debug)).to be_false
-        expect(level.at?(:info)).to be_false
-        expect(level.at?(:warn)).to be_false
-        expect(level.at?(:error)).to be_false
-        expect(level.at?(:fatal)).to be_true
+        expect(level.at?(:debug)).to be_falsey
+        expect(level.at?(:info)).to be_falsey
+        expect(level.at?(:warn)).to be_falsey
+        expect(level.at?(:error)).to be_falsey
+        expect(level.at?(:fatal)).to be_truthy
       end
     end
   end
@@ -85,11 +85,11 @@
       let(:severity) { 'error' }
 
       it "should should return correctly" do
-        expect(level.at?(:debug)).to be_false
-        expect(level.at?(:info)).to be_false
-        expect(level.at?(:warn)).to be_false
-        expect(level.at?(:error)).to be_true
-        expect(level.at?(:fatal)).to be_true
+        expect(level.at?(:debug)).to be_falsey
+        expect(level.at?(:info)).to be_falsey
+        expect(level.at?(:warn)).to be_falsey
+        expect(level.at?(:error)).to be_truthy
+        expect(level.at?(:fatal)).to be_truthy
       end
     end
 
@@ -97,11 +97,11 @@
       let(:severity) { 'gte.info lte.error' }
 
       it "should should return correctly" do
-        expect(level.at?(:debug)).to be_false
-        expect(level.at?(:info)).to be_true
-        expect(level.at?(:warn)).to be_true
-        expect(level.at?(:error)).to be_true
-        expect(level.at?(:fatal)).to be_false
+        expect(level.at?(:debug)).to be_falsey
+        expect(level.at?(:info)).to be_truthy
+        expect(level.at?(:warn)).to be_truthy
+        expect(level.at?(:error)).to be_truthy
+        expect(level.at?(:fatal)).to be_falsey
       end
     end
 
@@ -109,11 +109,11 @@
       let(:severity) { 'gt.info lt.error' }
 
       it "should be valid" do
-        expect(level.at?(:debug)).to be_false
-        expect(level.at?(:info)).to be_false
-        expect(level.at?(:warn)).to be_true
-        expect(level.at?(:error)).to be_false
-        expect(level.at?(:fatal)).to be_false
+        expect(level.at?(:debug)).to be_falsey
+        expect(level.at?(:info)).to be_falsey
+        expect(level.at?(:warn)).to be_truthy
+        expect(level.at?(:error)).to be_falsey
+        expect(level.at?(:fatal)).to be_falsey
       end
     end
 
@@ -121,11 +121,11 @@
       let(:severity) { 'at.info at.error' }
 
       it "should be valid" do
-        expect(level.at?(:debug)).to be_false
-        expect(level.at?(:info)).to be_true
-        expect(level.at?(:warn)).to be_false
-        expect(level.at?(:error)).to be_true
-        expect(level.at?(:fatal)).to be_false
+        expect(level.at?(:debug)).to be_falsey
+        expect(level.at?(:info)).to be_truthy
+        expect(level.at?(:warn)).to be_falsey
+        expect(level.at?(:error)).to be_truthy
+        expect(level.at?(:fatal)).to be_falsey
       end
     end
 
@@ -133,11 +133,11 @@
       let(:severity) { 'gte.error at.debug' }
 
       it "should be valid" do
-        expect(level.at?(:debug)).to be_true
-        expect(level.at?(:info)).to be_false
-        expect(level.at?(:warn)).to be_false
-        expect(level.at?(:error)).to be_true
-        expect(level.at?(:fatal)).to be_true
+        expect(level.at?(:debug)).to be_truthy
+        expect(level.at?(:info)).to be_falsey
+        expect(level.at?(:warn)).to be_falsey
+        expect(level.at?(:error)).to be_truthy
+        expect(level.at?(:fatal)).to be_truthy
       end
     end
   end
@@ -146,11 +146,11 @@
     let(:level) { Yell::Level.new( [:debug, :warn, :fatal] ) }
 
     it "should return correctly" do
-      expect(level.at?(:debug)).to be_true
-      expect(level.at?(:info)).to be_false
-      expect(level.at?(:warn)).to be_true
-      expect(level.at?(:error)).to be_false
-      expect(level.at?(:fatal)).to be_true
+      expect(level.at?(:debug)).to be_truthy
+      expect(level.at?(:info)).to be_falsey
+      expect(level.at?(:warn)).to be_truthy
+      expect(level.at?(:error)).to be_falsey
+      expect(level.at?(:fatal)).to be_truthy
     end
   end
 
@@ -158,11 +158,11 @@
     let(:level) { Yell::Level.new( (1..3) ) }
 
     it "should return correctly" do
-      expect(level.at?(:debug)).to be_false
-      expect(level.at?(:info)).to be_true
-      expect(level.at?(:warn)).to be_true
-      expect(level.at?(:error)).to be_true
-      expect(level.at?(:fatal)).to be_false
+      expect(level.at?(:debug)).to be_falsey
+      expect(level.at?(:info)).to be_truthy
+      expect(level.at?(:warn)).to be_truthy
+      expect(level.at?(:error)).to be_truthy
+      expect(level.at?(:fatal)).to be_falsey
     end
   end
 
@@ -170,11 +170,11 @@
     let(:level) { Yell::Level.new(:warn) }
 
     it "should return correctly" do
-      expect(level.at?(:debug)).to be_false
-      expect(level.at?(:info)).to be_false
-      expect(level.at?(:warn)).to be_true
-      expect(level.at?(:error)).to be_true
-      expect(level.at?(:fatal)).to be_true
+      expect(level.at?(:debug)).to be_falsey
+      expect(level.at?(:info)).to be_falsey
+      expect(level.at?(:warn)).to be_truthy
+      expect(level.at?(:error)).to be_truthy
+      expect(level.at?(:fatal)).to be_truthy
     end
   end
 
--- ruby-yell.orig/spec/yell/repository_spec.rb
+++ ruby-yell/spec/yell/repository_spec.rb
@@ -14,7 +14,9 @@
     context "when logger with :name exists" do
       let!(:logger) { Yell.new(:stdout, :name => name) }
 
-      it { should eq(logger) }
+      it "should eq(logger)" do
+        expect(subject).to eq(logger)
+      end
     end
 
     context "given a Class" do
@@ -22,29 +24,33 @@
 
       it "should raise with the correct :name when logger not found" do
         mock.proxy(Yell::LoggerNotFound).new(String)
-        lambda { Yell::Repository[String] }.should raise_error(Yell::LoggerNotFound)
+        expect{ Yell::Repository[String] }.to raise_error(Yell::LoggerNotFound)
       end
 
       it "should return the logger" do
-        Yell::Repository[Numeric].should eq(logger)
+        expect(Yell::Repository[Numeric]).to eq(logger)
       end
 
       it "should return the logger when superclass has it defined" do
-        Yell::Repository[Integer].should eq(logger)
+        expect(Yell::Repository[Integer]).to eq(logger)
       end
     end
   end
 
   context ".[]=" do
     before { Yell::Repository[name] = logger }
-    it { should eq(logger) }
+    it "should eq(logger)" do
+      expect(subject).to eq(logger)
+    end
   end
 
   context ".[]= with a named logger" do
     let!(:logger) { Yell.new(:stdout, :name => name) }
     before { Yell::Repository[name] = logger }
 
-    it { should eq(logger) }
+    it "should eq(logger)" do
+      expect(subject).to eq(logger)
+    end
   end
 
   context ".[]= with a named logger of a different name" do
@@ -53,8 +59,8 @@
     before { Yell::Repository[name] = logger }
 
     it "should add logger to both repositories" do
-      Yell::Repository[name].should eq(logger)
-      Yell::Repository[other].should eq(logger)
+      expect(Yell::Repository[name]).to eq(logger)
+      expect(Yell::Repository[other]).to eq(logger)
     end
   end
 
@@ -63,7 +69,9 @@
     subject { Yell::Repository.loggers }
     before { Yell::Repository[name] = logger }
 
-    it { should eq(loggers) }
+    it "should eq(loggers)" do
+      expect(subject).to eq(loggers)
+    end
   end
 
 end
--- ruby-yell.orig/spec/yell_spec.rb
+++ ruby-yell/spec/yell_spec.rb
@@ -5,7 +5,9 @@
 
   subject { logger }
 
-  it { should be_kind_of Yell::Logger }
+  it "should be_kind_of Yell::Logger" do
+    expect(subject).to be_a_kind_of(Yell::Logger)
+  end
 
   it "should raise AdapterNotFound when adapter cant be loaded" do
     expect {
@@ -15,12 +17,16 @@
 
   context ".level" do
     subject { Yell.level }
-    it { should be_kind_of Yell::Level }
+    it "should be_kind_of Yell::Level" do
+      expect(subject).to be_a_kind_of(Yell::Level)
+    end
   end
 
   context ".format" do
     subject { Yell.format( "%m" ) }
-    it { should be_kind_of Yell::Formatter }
+    it "should be_kind_of Yell::Formatter" do
+      expect(subject).to be_a_kind_of(Yell::Formatter)
+    end
   end
 
   context ".load!" do
@@ -30,7 +36,9 @@
       mock(Yell::Configuration).load!('yell.yml') { {} }
     end
 
-    it { should be_kind_of Yell::Logger }
+    it "should be_kind_of Yell::Logger" do
+      expect(subject).to be_a_kind_of(Yell::Logger)
+    end
   end
 
   context ".[]" do
@@ -57,7 +65,7 @@
     subject { Yell.env }
 
     it "should default to YELL_ENV" do
-      subject.should == 'test'
+      expect(subject).to eq('test')
     end
 
     context "fallback to RACK_ENV" do
@@ -70,7 +78,9 @@
 
       after { ENV.delete 'RACK_ENV' }
 
-      it { should == 'rack' }
+      it "should == 'rack'" do
+        expect(subject).to eq('rack')
+      end
     end
 
     context "fallback to RAILS_ENV" do
@@ -84,7 +94,9 @@
 
       after { ENV.delete 'RAILS_ENV' }
 
-      it { should == 'rails' }
+      it "should == 'rails'" do
+        expect(subject).to eq('rails')
+      end
     end
 
     context "fallback to development" do
@@ -94,7 +106,9 @@
         stub(ENV).key?('RAILS_ENV') { false }
       end
 
-      it { should == 'development' }
+      it "should == 'development'" do
+        expect(subject).to eq('development')
+      end
     end
   end
 
