choosy 0.4.3 → 0.4.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    choosy (0.3.5)
+    choosy (0.4.3)
 
 GEM
   remote: http://rubygems.org/

data/Rakefile

@@ -2,12 +2,8 @@ require 'rubygems'
 require 'rake'
 require 'rspec/core/rake_task'
 
-begin
-  require 'choosy/rake'
-rescue LoadError => e
-  $LOAD_PATH.unshift File.join(File.dirname(__FILE__), 'lib')
-  require 'choosy/rake'
-end
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), 'lib')
+require 'choosy/rake'
 
 desc "Default task"
 task :default => [:spec]

data/lib/VERSION.yml

@@ -1,6 +1,6 @@
 --- 
-date: 29/03/2011
+date: 31/03/2011
 version: 
-  tiny: 3
+  tiny: 4
   major: 0
   minor: 4

data/lib/choosy/rake.rb

@@ -55,7 +55,7 @@ namespace :version do
     if ENV['VERSION_FILE']
       $version = Choosy::Version.new(ENV['VERSION_FILE'])
     else
-      $version = Choosy::Version.load(:dir => Dir.pwd, :relpath => 'lib')
+      $version = Choosy::Version.load_from_lib Dir.pwd
     end
   end
 

data/lib/choosy/version.rb

@@ -60,26 +60,48 @@ module Choosy
       "#{major}.#{minor}.#{tiny}"
     end
 
-    def self.load(options)
-      basepath = if options[:file] && options[:relpath]
-                   File.join(File.dirname(options[:file]), options[:relpath])
-                 elsif options[:dir]
-                   if options[:relpath]
-                     File.join(options[:dir], options[:relpath])
-                   else
-                     options[:dir]
-                   end
-                 else
-                   Choosy::ConfigurationError.new("No file given.")
-                 end
+    def ==(other)
+      major == other.major && minor == other.minor && tiny == other.tiny
+    end
 
-      [File.join(basepath, 'VERSION.yml'), File.join(basepath, 'version.yml')].each do |path|
-        if File.exist?(path)
-          return Version.new(path)
-        end
+    def eql?(other)
+      self == other
+    end
+
+    def <=>(other)
+      if major >= other.major || minor >= other.minor || tiny >= other.tiny
+        1
+      elsif major <= other.major || minor <= other.minor || tiny <= other.tiny
+        -1
+      else
+        0
       end
+    end
 
-      raise Choosy::ConfigurationError.new("No version file given from: #{basepath}")
+    def self.method_missing(method, *args, &block)
+      if method.to_s =~ /^load_from_(.*)$/
+        parts = $1.split(/_/)
+        parts.map! do |part|
+          case part
+          when 'here'   then '.'
+          when 'parent' then '..'
+          else part
+          end
+        end
+
+        basedir = if args.length == 0
+                    # Find the path to the calling file
+                    # How awesome is this !?
+                    File.dirname(caller(1)[0].split(/:/)[0])
+                  else
+                    args.join(File::Separator)
+                  end
+
+        path = File.join(basedir, *parts)
+        load_from(path)
+      else
+        super
+      end
     end
 
     private
@@ -89,5 +111,15 @@ module Choosy
     MAJOR = 'major'
     VERSIONS = [TINY, MINOR, MAJOR]
     DATE = 'date'
+
+    def self.load_from(basepath)
+      [File.join(basepath, 'VERSION.yml'), File.join(basepath, 'version.yml')].each do |path|
+        if File.exist?(path)
+          return Version.new(path)
+        end
+      end
+
+      raise Choosy::ConfigurationError.new("No version file given from: #{basepath}")
+    end
   end
 end

data/spec/choosy/version_spec.rb

@@ -27,6 +27,23 @@ module Choosy
       end
     end
 
+    describe "attempting to load a file" do
+      it "should allow you to specify a search path via a method" do
+        version = Version.load_from_parent_parent_spec_choosy
+        @version.should eql(version)
+      end
+
+      it "should allow you to specify the current directory" do
+        version = Version.load_from_here
+        @version.should eql(version)
+      end
+
+      it "should allow you to load from a specific directory" do
+        version = Version.load_from_spec_choosy Dir.pwd
+        @version.should eql(version)
+      end
+    end
+
     describe "while altering the config file" do
       before :each do
         @tmp = Tempfile.new('version.yml')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Gabe McArthur
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -07:00
+date: 2011-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,12 +23,11 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
-        - 5
-        version: "2.5"
+        - 0
+        version: "0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -66,10 +65,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 4
-        - 5
         - 0
-        version: 4.5.0
+        version: "0"
   type: :development
   version_requirements: *id004
 description: This is a DSL for creating more complicated command line tools.