gemlock 0.0.11 → 0.0.12

data/lib/gemlock.rb

@@ -70,8 +70,8 @@ module Gemlock
     end
 
     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)
+      major_a, minor_a, patch_a = process_version(version_a)
+      major_b, minor_b, patch_b = process_version(version_b)
 
       if (major_a - major_b).abs > 0
         "major"
@@ -85,7 +85,8 @@ module Gemlock
     end
 
     # By default, check for updates every 2 weeks
-    def initializer(update_interval = 60*60*24*7*2)
+    def initializer
+      update_interval = Gemlock.update_interval
       Thread.new(update_interval) do |interval|
         loop do
           puts "Checking for gem updates..."
@@ -108,6 +109,44 @@ module Gemlock
       end
     end
 
+    def update_interval
+      if parsed_config
+        if interval = parsed_config["interval"][0]
+          num_hours = interval.match(/\d*/)[0].to_i
+          if interval =~ /hour/
+            delay = 60*60
+          elsif interval =~ /day/
+            delay = 60*60*24
+          elsif interval =~ /week/
+            delay = 60*60*24*7
+          elsif interval =~ /month/
+            delay = 60*60*24*30
+          end
+          if delay && num_hours > 0
+            delay *= num_hours
+            return delay
+          elsif delay
+            return delay
+          end
+        end
+      end
+      60*60*24*7 #Seconds in a week
+    end
+
+  private
+
+    def process_version(version_string)
+      version = version_string.split('.').collect(&:to_i)
+
+      if version.length < 3
+        (3 - version.length).times do
+          version << 0
+        end
+      end
+
+      version
+    end
+
     def sleep(length)
       Kernel.sleep(length)
     end

data/lib/gemlock/version.rb

@@ -1,3 +1,3 @@
 module Gemlock
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/spec/fixtures/gemlock.yml

@@ -2,3 +2,5 @@ email: tester@example.com
 releases:
   - major
   - patch
+interval:
+  - 2 weeks

data/spec/gemlock_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gemlock do
-  describe "#locked_gemfile_specs" do
+  describe ".locked_gemfile_specs" do
     it "outputs the list of gems & version requirements" do
       Gemlock.stubs(:lockfile).returns((File.join(File.dirname(__FILE__), 'fixtures', 'Gemfile.lock')))
 
@@ -16,7 +16,7 @@ describe Gemlock do
     end
   end
 
-  describe "#lockfile" do
+  describe ".lockfile" do
     it "loads Gemfile.lock from the Rails root if Rails is defined" do
       module Rails
         def self.root
@@ -39,7 +39,7 @@ describe Gemlock do
     end
   end
 
-  describe "#lookup_version" do
+  describe ".lookup_version" do
     use_vcr_cassette
 
     it "looks up and return the latest version of a given gem" do
@@ -48,7 +48,7 @@ describe Gemlock do
     end
   end
 
-  describe "#outdated" do
+  describe ".outdated" do
     use_vcr_cassette
 
     before do
@@ -82,7 +82,7 @@ describe Gemlock do
     end
   end
 
-  describe "#config" do
+  describe ".config" do
     it "loads gemlock.yml from the config directory if Rails is defined" do
       module Rails
         def self.root
@@ -116,7 +116,7 @@ describe Gemlock do
     end
   end
 
-  describe "#parsed_config" do
+  describe ".parsed_config" do
     it "returns nil if the config file is not present" do
       Gemlock.parsed_config.should be_nil
     end
@@ -128,11 +128,12 @@ describe Gemlock do
     end
   end
 
-  describe "#difference" do
+  describe ".difference" 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"
+      Gemlock.difference("3.0",    "2.0"  ).should eql "major"
     end
 
     it "returns 'minor' if there is a minor version difference between the two gem versions" do
@@ -154,7 +155,7 @@ describe Gemlock do
     end
   end
 
-  describe '#initializer' do
+  describe '.initializer' do
     it "makes a thread" do
       Gemlock.stubs(:outdated).returns([])
 
@@ -178,15 +179,42 @@ describe Gemlock do
         @thread.kill
       end
     end
+  end
 
-    it "sleeps for the given amount of time" do
-      Gemlock.stubs(:outdated).returns([])
-      Gemlock.expects(:sleep).with(1).at_least(1)
+  describe ".process_version" do
+    it "splits a version string into an array" do
+      Gemlock.send(:process_version, "3.0.0").class.should eql Array
+    end
 
-      capture_stdout do
-        @thread = Gemlock.initializer(1)
-        sleep 1
-      end
+    it "appends missing zeros to the end of a version if not given" do
+      Gemlock.send(:process_version, "3").should eql [3, 0, 0]
+      Gemlock.send(:process_version, "3.0").should eql [3, 0, 0]
+    end
+  end
+
+  describe ".update_interval" do
+    it "returns the number of seconds in a week if config_file is not present, or interval is not specified" do
+      Gemlock.update_interval.should eql 60*60*24*7
+    end
+
+    it "returns the number of seconds until the next number of hours as given" do
+      Gemlock.stubs(:parsed_config).returns({"interval" => ["8 hours"]})
+      Gemlock.update_interval.should eql 60*60*8
+    end
+
+    it "returns the number of seconds until the next number of days as given" do
+      Gemlock.stubs(:parsed_config).returns({"interval" => ["4 days"]})
+      Gemlock.update_interval.should eql 60*60*24*4
+    end
+
+    it "returns the number of seconds until the next number of weeks as given" do
+      Gemlock.stubs(:parsed_config).returns({"interval" => ["2 weeks"]})
+      Gemlock.update_interval.should eql 60*60*24*7*2
+    end
+
+    it "returns the number of seconds unil the next number of months as given" do
+      Gemlock.stubs(:parsed_config).returns({"interval" => ["3 months"]})
+      Gemlock.update_interval.should eql 60*60*24*30*3
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemlock
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00.000000000Z
+date: 2011-10-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70207373857980 !ruby/object:Gem::Requirement
+  requirement: &70118047777300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *70207373857980
+  version_requirements: *70118047777300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70207373857480 !ruby/object:Gem::Requirement
+  requirement: &70118047776780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70207373857480
+  version_requirements: *70118047776780
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70207373857080 !ruby/object:Gem::Requirement
+  requirement: &70118047776400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70207373857080
+  version_requirements: *70118047776400
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70207373856540 !ruby/object:Gem::Requirement
+  requirement: &70118047775940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70207373856540
+  version_requirements: *70118047775940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70207373856020 !ruby/object:Gem::Requirement
+  requirement: &70118047775420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70207373856020
+  version_requirements: *70118047775420
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70207373855460 !ruby/object:Gem::Requirement
+  requirement: &70118047774880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70207373855460
+  version_requirements: *70118047774880
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70207373854900 !ruby/object:Gem::Requirement
+  requirement: &70118047774260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70207373854900
+  version_requirements: *70118047774260
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70207373854340 !ruby/object:Gem::Requirement
+  requirement: &70118047771980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: 1.11.0
   type: :development
   prerelease: false
-  version_requirements: *70207373854340
+  version_requirements: *70118047771980
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70207373853820 !ruby/object:Gem::Requirement
+  requirement: &70118047770800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,7 +112,7 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70207373853820
+  version_requirements: *70118047770800
 description: When installed, allows a user to check for updates in their Rails application
 email:
 - mskalnik@gatech.edu