mit-ldap 0.3.0 → 0.3.2

data/lib/mit-ldap.rb

@@ -7,17 +7,14 @@ module MIT
   class << self
 
     def on_campus?
-      ip_addresses.split(/\n/).map { |ip| !(ip =~ /^18\./).nil? }.any?
+      ip_addresses.map { |ip| !(ip =~ /^18\./).nil? }.any?
     end
 
     private
 
     def ip_addresses
-      if RbConfig::CONFIG['host_os'] =~ /darwin/
-        `ifconfig | awk '/inet / {print $2}'`
-      else
-        `ifconfig | sed -rn 's/.*r:([^ ]+) .*/\1/p'`
-      end
+      ifconfig = `ifconfig`
+      @ip_addresses ||= ifconfig.split(/\n/).grep(/inet (?:addr:)?((?:\d{1,3}\.){3}\d{1,3})/) { $1 }
     end
   end
 end

data/lib/mit/ldap.rb

@@ -19,7 +19,7 @@ module MIT
       end
 
       def reconnect!
-        if adapter_present? && !connected?
+        if adapter_present?
           adapter.instance_variable_set(:@connection, ::LDAP::Conn.new('ldap-too.mit.edu'))
         elsif !adapter_present?
           connect!

data/lib/mit/ldap/version.rb

@@ -1,5 +1,5 @@
 module MIT
   module LDAP
-    VERSION = "0.3.0"
+    VERSION = "0.3.2"
   end
 end

data/spec/ldap_spec.rb

@@ -27,13 +27,13 @@ module MIT
     end
 
     describe ".reconnect!" do
-      it "reloads connection object if nil" do
+      it "reloads connection object" do
         LDAP.adapter.instance_variable_set(:@connection, nil)
         LDAP.reconnect!
         LDAP.adapter.instance_variable_get(:@connection).should be_a ::LDAP::Conn
       end
 
-      it "calls .connect! if not connected" do
+      it "calls .connect! if not connected already" do
         LDAP.stub(:adapter_present?).and_return(false)
         LDAP.should_receive(:connect!)
         LDAP.reconnect!

data/spec/mit_spec.rb

@@ -4,12 +4,12 @@ describe MIT do
 
   describe ".on_campus?" do
     it "returns true if IP starts with 18" do
-      MIT.stub(:ip_addresses).and_return("18.0.0.0\n127.0.0.1")
+      MIT.stub(:ip_addresses).and_return(['18.0.0.0', '127.0.0.1'])
       MIT.on_campus?.should be_true
     end
 
     it "returns false if no network device has a campus address" do
-      MIT.stub(:ip_addresses).and_return("192.168.1.2\n127.0.0.1")
+      MIT.stub(:ip_addresses).and_return(['192.168.0.2', '127.0.0.1'])
       MIT.on_campus?.should be_false
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mit-ldap
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-14 00:00:00.000000000 Z
+date: 2012-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ldaptic
-  requirement: &70320703308640 !ruby/object:Gem::Requirement
+  requirement: &70295147816060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70320703308640
+  version_requirements: *70295147816060
 - !ruby/object:Gem::Dependency
   name: ruby-ldap
-  requirement: &70320703308140 !ruby/object:Gem::Requirement
+  requirement: &70295147813080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70320703308140
+  version_requirements: *70295147813080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70320703307680 !ruby/object:Gem::Requirement
+  requirement: &70295147810340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70320703307680
+  version_requirements: *70295147810340
 description: Ruby interface for querying MIT LDAP server (only if you're on MITnet)
 email:
 - edd_d@mit.edu