gemlock 0.0.8 → 0.0.9

data/lib/gemlock.rb

@@ -59,30 +59,28 @@ module Gemlock
       return_hash
     end
 
-    def config_file
-      config_file = nil
-      config_file = if defined?(Rails)
-                      Rails.root.join('config', 'gemlock.yml')
-                    end
+    def config
+      if defined?(Rails) && File.exists?(Rails.root.join('config', 'gemlock.yml'))
+        Rails.root.join('config', 'gemlock.yml')
+      end
     end
 
     def parsed_config
-      parsed_config = nil
-      if(config_file)
-        parsed_config = YAML.load_file(config_file)
-      end
+      YAML.load_file(config) if config
     end
 
-    def difference(local_version, gem_version)
-      lock_major, lock_minor, lock_patch = local_version.split('.')
-      gem_major, gem_minor, gem_patch = gem_version.split('.')
+    def difference(version_a, version_b)
+      major_a, minor_a, patch_a = version_a.split('.').collect(&:to_i)
+      major_b, minor_b, patch_b = version_b.split('.').collect(&:to_i)
 
-      if gem_major > lock_major
+      if (major_a - major_b).abs > 0
         "major"
-      elsif gem_minor > lock_minor
+      elsif (minor_a - minor_b).abs > 0
         "minor"
-      elsif gem_patch>lock_patch
+      elsif (patch_a - patch_b).abs > 0
         "patch"
+      else
+        "none"
       end
     end
   end

data/lib/gemlock/version.rb

@@ -1,3 +1,3 @@
 module Gemlock
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/gemlock_spec.rb

@@ -69,7 +69,7 @@ describe Gemlock do
     end
 
     it "returns a hash of outdated gems & versions specificed in config" do
-      Gemlock.stubs(:config_file).returns((File.join(File.dirname(__FILE__), 'fixtures', 'gemlock.yml')))
+      Gemlock.stubs(:config).returns((File.join(File.dirname(__FILE__), 'fixtures', 'gemlock.yml')))
 
       expected = {'coffee-rails' => { :current => '3.1.0',
                                       :latest  => '3.1.1' },
@@ -82,34 +82,47 @@ describe Gemlock do
     end
   end
 
-  describe "#config_file" do
+  describe "#config" do
     it "loads gemlock.yml from the config directory if Rails is defined" do
       module Rails
         def self.root
           Pathname.new(File.dirname(__FILE__))
         end
       end
-
       expected_path = Pathname.new(File.dirname(__FILE__)).join('config', 'gemlock.yml')
-      Gemlock.config_file.should eql expected_path
+      File.stubs(:exists?).with(expected_path).returns(true)
+
+      Gemlock.config.should eql expected_path
 
       # Undefine Rails module
       Object.send(:remove_const, :Rails)
 
     end
 
-    it "is nil if Rails is not defined" do
-      Gemlock.config_file.should be_nil
+    it "is nil if Rails is defined and the files does not exist" do
+      module Rails
+        def self.root
+          Pathname.new(File.dirname(__FILE__))
+        end
+      end
+
+      Gemlock.parsed_config.should be_nil
+
+      Object.send(:remove_const, :Rails)
+    end
+
+    it "is nil if Rails is not defined and the file exists" do
+      Gemlock.config.should be_nil
     end
   end
 
   describe "#parsed_config" do
-    it "returns nil if the config_file is not defined" do
+    it "returns nil if the config file is not present" do
       Gemlock.parsed_config.should be_nil
     end
 
-    it "returns a hash containing the user's email if config_file is defined" do
-      Gemlock.stubs(:config_file).returns((File.join(File.dirname(__FILE__), 'fixtures', 'gemlock.yml')))
+    it "returns a hash containing the user's email if config file is present" do
+      Gemlock.stubs(:config).returns((File.join(File.dirname(__FILE__), 'fixtures', 'gemlock.yml')))
 
       Gemlock.parsed_config["email"].should eql "tester@example.com"
     end
@@ -119,15 +132,25 @@ describe Gemlock do
     it "returns 'major' if there is a major version difference between the two gem versions" do
       Gemlock.difference("2.0.0",  "3.0.0").should eql "major"
       Gemlock.difference("2.5.10", "3.1.0").should eql "major"
+      Gemlock.difference("3.1.10", "2.5.8").should eql "major"
     end
 
     it "returns 'minor' if there is a minor version difference between the two gem versions" do
       Gemlock.difference("3.0.0", "3.1.0").should eql "minor"
       Gemlock.difference("3.1.0", "3.2.1").should eql "minor"
+      Gemlock.difference("3.1.0", "3.0.0").should eql "minor"
     end
 
     it "returns 'patch' if there is a patch version difference between the two gem versions" do
       Gemlock.difference("3.1.0", "3.1.1").should eql "patch"
+      Gemlock.difference("0.0.2", "0.0.1").should eql "patch"
+    end
+
+    it "returns 'none' if there is no difference" do
+      Gemlock.difference("0.0.0", "0.0.0").should eql "none"
+      Gemlock.difference("0.0.1", "0.0.1").should eql "none"
+      Gemlock.difference("0.1.0", "0.1.0").should eql "none"
+      Gemlock.difference("1.0.0", "1.0.0").should eql "none"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemlock
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000Z
+date: 2011-10-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70120938963580 !ruby/object:Gem::Requirement
+  requirement: &70252669943040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *70120938963580
+  version_requirements: *70252669943040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70120938963080 !ruby/object:Gem::Requirement
+  requirement: &70252669942540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70120938963080
+  version_requirements: *70252669942540
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70120938962700 !ruby/object:Gem::Requirement
+  requirement: &70252669942160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70120938962700
+  version_requirements: *70252669942160
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70120938962240 !ruby/object:Gem::Requirement
+  requirement: &70252669941700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70120938962240
+  version_requirements: *70252669941700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70120938961740 !ruby/object:Gem::Requirement
+  requirement: &70252669972160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70120938961740
+  version_requirements: *70252669972160
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70120938961240 !ruby/object:Gem::Requirement
+  requirement: &70252669971660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70120938961240
+  version_requirements: *70252669971660
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70120938989440 !ruby/object:Gem::Requirement
+  requirement: &70252669971200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70120938989440
+  version_requirements: *70252669971200
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70120938988980 !ruby/object:Gem::Requirement
+  requirement: &70252669970740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: 1.11.0
   type: :development
   prerelease: false
-  version_requirements: *70120938988980
+  version_requirements: *70252669970740
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70120938988520 !ruby/object:Gem::Requirement
+  requirement: &70252669970280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,7 +112,7 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70120938988520
+  version_requirements: *70252669970280
 description: When installed, allows a user to check for updates in their Rails application
 email:
 - mskalnik@gatech.edu