patch_life 0.0.1 → 0.0.3

data/README.md

@@ -7,7 +7,7 @@ But, as often happens, large scale ecosystems tend to collect dust, and hide sec
 The first, uses a Warning, printed every time your application starts, when the patch is loaded. If your defined Ruby Version and Patch level are equal to or older than the version of Ruby you're running the application with, you'll receive a Warning.
 
 ```ruby
-define_patch_life :version => '1.9.3', :patch=> 448, :message => "It's time to remove me, as you've upgraded to a version of ruby where this code is no longer needed"
+define_patch :version => '1.9.3', :patch=> 448, :message => "It's time to remove me, as you've upgraded to a version of ruby where this code is no longer needed"
 
 #Dirty hack that is considered a bold move
 ```
@@ -15,7 +15,7 @@ define_patch_life :version => '1.9.3', :patch=> 448, :message => "It's time to r
 The second, allows you to pass the patch into define_patch_life as a block, only to be executed if the defined version / patch level of Ruby is not equal to or higher than the Ruby Version the application is running with.
 
 ```ruby
-define_patch_life :version => '1.9.3', :patch=> 448 do
+define_patch :version => '1.9.3', :patch=> 448 do
   #World saving code
 end
 ```
@@ -23,7 +23,7 @@ end
 You can also combine the two, and have the patch execute only if ruby is beneath it's defined version, and have the message emitted as a Warning as well
 
 ```ruby
-define_patch_life :version => '1.9.3', :patch=> 448, :message => "It's time to remove me, as you've upgraded to a version of ruby where this code is no longer needed" do
+define_patch :version => '1.9.3', :patch=> 448, :message => "It's time to remove me, as you've upgraded to a version of ruby where this code is no longer needed" do
   #There will be much scorn and derision when this bites someone in the ass
 end
 ```

data/lib/patch_life.rb

@@ -1,10 +1,13 @@
 module PatchLife
-  def define_patch_life(options={})
-    raise(ArgumentError, "print_patch_warning requires a :version argument to be set") unless options[:version]
-    raise(ArgumentError, "print_patch_warning requires a :patch argument to be set") unless options[:patch]
-    raise(ArgumentError, "print_patch_warning requires either a :message argument, a block to yield, or both") unless options[:message] || block_given?
+  def define_patch_life(options={}, &blk)
+    raise(ArgumentError, "define_patch requires a :version argument to be set") unless options[:version]
+    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 = Gem::Version.new(ruby_version) >= Gem::Version.new(options[:version]) && ruby_patch_level >= options[:patch].to_i
+    past_due_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
+
     Kernel.warn(options[:message]) if past_due && options[:message]
     yield if !past_due && block_given?
     #Don't want to return anything at all...
@@ -23,6 +26,6 @@ module PatchLife
   module_function :ruby_patch_level
 end
 
-def patch_life(options={})
-  PatchLife.define_patch_life(options)
+def define_patch(options={}, &blk)
+  PatchLife.define_patch_life(options, &blk)
 end

data/lib/version.rb

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

data/spec/print_patch_warning_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe PrintPatchWarning do
+describe PatchLife do
   before(:each) do
     #Don't wanna actually fire it...
     Kernel.stub(:warn)
@@ -11,23 +11,23 @@ describe PrintPatchWarning do
     let (:patch) {1}
     let (:message) {"You're outdated"}
     it "requires a version to be delcared" do
-      expect {subject.print_patch_warning}.to raise_error(ArgumentError)
+      expect {subject.define_patch_life}.to raise_error(ArgumentError)
     end
 
     it "requires a patch level to be declared" do
-      expect {subject.print_patch_warning(:version=>version)}.to raise_error(ArgumentError)
+      expect {subject.define_patch_life(:version=>version)}.to raise_error(ArgumentError)
     end
 
     it "requires a message when no block has been yielded" do
-      expect {subject.print_patch_warning(:version=>version, :patch=>patch, :message=>message)}.not_to raise_error
+      expect {subject.define_patch_life(:version=>version, :patch=>patch, :message=>message)}.not_to raise_error
     end
 
     it "requires a block when no message was declared" do
-      expect {subject.print_patch_warning(:version=>version, :patch=>patch) {nil} }.not_to raise_error
+      expect {subject.define_patch_life(:version=>version, :patch=>patch) {nil} }.not_to raise_error
     end
 
     it "allows both a message and a block at the same time" do
-      expect {subject.print_patch_warning(:version=>version, :patch=>patch, :message=>message) {nil} }.not_to raise_error
+      expect {subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {nil} }.not_to raise_error
     end
   end
 
@@ -39,12 +39,12 @@ describe PrintPatchWarning do
 
       it "will not print a message if defined" do
         Kernel.should_not_receive(:warn).with(message)
-        subject.print_patch_warning(:version=>version, :patch=>patch, :message=>message) {nil}
+        subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {nil}
       end
 
       it "will yield a block if given" do
         block_called = false
-        subject.print_patch_warning(:version=>version, :patch=>patch, :message=>message) {block_called=true}
+        subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {block_called=true}
         block_called.should == true
       end
     end
@@ -56,12 +56,12 @@ describe PrintPatchWarning do
       
       it "will print a message if defined" do
         Kernel.should_receive(:warn).with(message)
-        subject.print_patch_warning(:version=>version, :patch=>patch, :message=>message) {nil}
+        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.print_patch_warning(:version=>version, :patch=>patch, :message=>message) {block_called=true}
+        subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {block_called=true}
         block_called.should == false
       end
     end
@@ -73,12 +73,12 @@ describe PrintPatchWarning do
 
       it "will print a message if defined" do
         Kernel.should_receive(:warn).with(message)
-        subject.print_patch_warning(:version=>version, :patch=>patch, :message=>message) {nil}
+        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.print_patch_warning(:version=>version, :patch=>patch, :message=>message) {block_called=true}
+        subject.define_patch_life(:version=>version, :patch=>patch, :message=>message) {block_called=true}
         block_called.should == false
       end
     end

data/spec/spec_helper.rb

@@ -1,2 +1,2 @@
 require 'rspec'
-require 'print_patch_warning'
+require 'patch_life'

metadata

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