patch_life 0.0.3 → 0.0.4

data/lib/patch_life.rb

@@ -4,9 +4,10 @@ module PatchLife
     raise(ArgumentError, "define_patch requires a :patch argument to be set") unless options[:patch]
     raise(ArgumentError, "define_patch requires either a :message argument, a block to yield, or both") unless options[:message] || block_given?
   
-    past_due_version = Gem::Version.new(ruby_version) >= Gem::Version.new(options[:version])
+    past_due_version = Gem::Version.new(ruby_version) > Gem::Version.new(options[:version])
+    equivalent_version = Gem::Version.new(ruby_version) == Gem::Version.new(options[:version])
     past_due_patch = ruby_patch_level >= options[:patch].to_i 
-    past_due = past_due_version && past_due_patch
+    past_due = past_due_version || (equivalent_version && past_due_patch)
 
     Kernel.warn(options[:message]) if past_due && options[:message]
     yield if !past_due && block_given?

data/lib/version.rb

@@ -2,7 +2,7 @@ module PatchLife
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 3
+    PATCH = 4
 
     STRING = [ MAJOR, MINOR, PATCH ].join('.')
   end

data/spec/print_patch_warning_spec.rb

@@ -34,52 +34,141 @@ describe PatchLife do
   context "when comparing ruby versions" do
     context "and the current ruby version is less than the declared version" do
       let (:version) {"9.9.9"}
-      let (:patch) {999}
       let (:message) {"You're outdated"}
+      context "and the current ruby patch level is less than the declared patch" do
+        let (:patch) {999}
+        it "will not print a message if defined" do
+          Kernel.should_not_receive(:warn).with(message)
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {nil}
+        end
+  
+        it "will yield a block if given" do
+          block_called = false
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {block_called=true}
+          block_called.should == true
+        end
+      end
 
-      it "will not print a message if defined" do
-        Kernel.should_not_receive(:warn).with(message)
-        subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {nil}
+      context "and the current ruby patch level is equal to the declared patch" do
+        let (:patch) {RUBY_PATCHLEVEL}
+        it "will not print a message if defined" do
+          Kernel.should_not_receive(:warn).with(message)
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {nil}
+        end
+  
+        it "will yield a block if given" do
+          block_called = false
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {block_called=true}
+          block_called.should == true
+        end
       end
 
-      it "will yield a block if given" do
-        block_called = false
-        subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {block_called=true}
-        block_called.should == true
+      context "and the current ruby patch level is greater than the declared patch" do
+        let (:patch) {0}
+        it "will not print a message if defined" do
+          Kernel.should_not_receive(:warn).with(message)
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {nil}
+        end
+  
+        it "will yield a block if given" do
+          block_called = false
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {block_called=true}
+          block_called.should == true
+        end
       end
     end
 
     context "and the current ruby version is equal to the declared version" do
       let (:version) {RUBY_VERSION.dup}
-      let (:patch) {RUBY_PATCHLEVEL}
       let (:message) {"You're outdated"}
-      
-      it "will print a message if defined" do
-        Kernel.should_receive(:warn).with(message)
-        subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {nil}
+
+      context "and the current ruby patch level is less than the declared patch" do
+        let (:patch) {999}
+        it "will not print a message if defined" do
+          Kernel.should_not_receive(:warn).with(message)
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {nil}
+        end
+  
+        it "will yield a block if given" do
+          block_called = false
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {block_called=true}
+          block_called.should == true
+        end
+      end
+
+      context "and the current ruby patch level is equal to the declared patch" do
+        let (:patch) {RUBY_PATCHLEVEL}
+        it "will print a message if defined" do
+          Kernel.should_receive(:warn).with(message)
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {nil}
+        end
+  
+        it "will not yield a block if given" do
+          block_called = false
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {block_called=true}
+          block_called.should == false
+        end
       end
 
-      it "will not yield a block if given" do
-        block_called = false
-        subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {block_called=true}
-        block_called.should == false
+      context "and the current ruby patch level is greater than the declared patch" do
+        let (:patch) {0}
+        it "will print a message if defined" do
+          Kernel.should_receive(:warn).with(message)
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {nil}
+        end
+  
+        it "will not yield a block if given" do
+          block_called = false
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {block_called=true}
+          block_called.should == false
+        end
       end
     end
 
     context "and the current ruby version is greater than the declared version" do
       let (:version) {"1.0.0"}
-      let (:patch) {1}
       let (:message) {"You're outdated"}
 
-      it "will print a message if defined" do
-        Kernel.should_receive(:warn).with(message)
-        subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {nil}
+      context "and the current ruby patch level is less than the declared patch" do
+        let(:patch) {999}
+        it "will print a message if defined" do
+          Kernel.should_receive(:warn).with(message)
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {nil}
+        end
+  
+        it "will not yield a block if given" do
+          block_called = false
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {block_called=true}
+          block_called.should == false
+        end
+      end
+
+      context "and the current ruby patch level is equal to the declared patch" do
+        let (:patch) {RUBY_PATCHLEVEL}
+        it "will print a message if defined" do
+          Kernel.should_receive(:warn).with(message)
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {nil}
+        end
+  
+        it "will not yield a block if given" do
+          block_called = false
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {block_called=true}
+          block_called.should == false
+        end
       end
 
-      it "will not yield a block if given" do
-        block_called = false
-        subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {block_called=true}
-        block_called.should == false
+      context "and the current ruby patch level is greater than the declared patch" do
+        let (:patch) {0}
+        it "will print a message if defined" do
+          Kernel.should_receive(:warn).with(message)
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {nil}
+        end
+  
+        it "will not yield a block if given" do
+          block_called = false
+          subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {block_called=true}
+          block_called.should == false
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: patch_life
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: