sane 0.23.6 → 0.24.0

data/ChangeLog

@@ -1,4 +1,7 @@
-0.25.6 add Socket.get_host_ips, remove dependency on andand until I need it again.
+0.24.0
+ remove __dir__ (deemed too confusing, since it would seem to imply that __file__ also exists, which it doesn't)
+ change __DIR__ from /a/b/ to /a/b (also confused me once, can't have that!)
+ add Numeric#group_digits(',')
 
 #     3: add hash_set_operators
   # 0.2.2: add Regex+Regex, bug fixes

data/Rakefile

@@ -7,5 +7,5 @@ Jeweler::Tasks.new do |s|
   s.description = s.summary =  %q{Helpers for ruby core to make it easier to work with--things that are missing from core but should arguably be there}
   s.email = ["rogerdpack@gmail.com"]
   s.add_dependency 'os'
-  #s.add_dependency 'andand' # turns out to be pretty useful...
+  s.add_dependency 'andand' # turns out to be pretty useful...
 end

data/VERSION

@@ -1 +1 @@
-0.23.6
+0.24.0

data/lib/sane/float.rb

@@ -5,8 +5,8 @@ if RUBY_VERSION < '1.9.2'
       small = "%f" % self
       
       if small.to_f == self
-        small.sub! /0+$/, ''
-        small.sub /\.$/, '.0'
+        small.sub!(/0+$/, '')
+        small.sub(/\.$/, '.0') # reformat, see spec
       else
         big
       end

data/lib/sane/sane_random.rb

@@ -65,7 +65,9 @@ module Kernel
     dir += '/' if dir
     dir
   end unless defined?(__DIR__)
-  alias __dir__ __DIR__ unless defined?(__dir__)
+  # deemed too unfriendly since it would
+  # seem to imply that _file__ also exists
+  # alias __dir__ __DIR__ unless defined?(__dir__)
 end
 
 if RUBY_VERSION >= '1.9.2'

data/spec/spec.sane.rb

@@ -30,6 +30,7 @@ describe Sane do
 
   it "should have working __DIR__" do
     __DIR__.should_not == nil
+    __DIR__[-1].should_not == '/' # not ending slash, that feels weird in real use.
   end
 
   it "should write to files" do
@@ -42,10 +43,6 @@ describe Sane do
    File.delete filename
   end
 
-  it "should have __dir__ too" do
-    __dir__.should_not be_nil
-  end
-
   class A
     def go; 3; end
   end
@@ -179,14 +176,9 @@ describe Sane do
   end
 
   it "should have an insert commas operator on numbers" do
-    1_000_000.comma_format.should == '1,000,000'
-    1_000_000.0.comma_format.should == '1,000,000.0'
-    1_000_000.0.comma_format.should == '1,000,000.0'
+    1_000_000.group_digits.should == '1,000,000'
+    1_000_000.0.group_digits.should == '1,000,000.0'
+    1_000_000.03555.group_digits.should == '1,000,000.03555'
   end
   
-  it 'should have socket ips' do
-    Socket.get_host_ips.length.should be > 0
-  end
-  
-  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sane
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 127
   prerelease: 
   segments: 
   - 0
-  - 23
-  - 6
-  version: 0.23.6
+  - 24
+  - 0
+  version: 0.24.0
 platform: ruby
 authors: 
 - Roger Pack
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 Z
+date: 2011-07-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: os
@@ -31,6 +31,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: andand
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: Helpers for ruby core to make it easier to work with--things that are missing from core but should arguably be there
 email: 
 - rogerdpack@gmail.com
@@ -68,7 +82,6 @@ files:
 - lib/sane/pps.rb
 - lib/sane/require_relative.rb
 - lib/sane/sane_random.rb
-- lib/sane/socket_ips.rb
 - lib/sane/string_blank.rb
 - lib/sane/test.rb
 - lib/sane/test/assertions.rb
@@ -112,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Helpers for ruby core to make it easier to work with--things that are missing from core but should arguably be there

data/lib/sane/socket_ips.rb

@@ -1,34 +0,0 @@
-class Numeric
-   def ord; self; end unless RUBY_VERSION[0..2] == '1.9' # helper for 1.8/1.9
-end
-
-require 'socket' # sane already loads it for BasicSocket.reverse_lookup
-
-class Socket
- class << self
-   def get_host_ips
-     get_ips(Socket.gethostname)
-   end
-
-   def get_ips hostname
-     begin
-
-       socket_info = Socket.getaddrinfo(hostname, nil,
-         Socket::AF_UNSPEC, Socket::SOCK_STREAM, nil,
-         Socket::AI_CANONNAME).select{|type| type[0] == 'AF_INET'}
-
-       raise if socket_info.length == 0
-       ips = socket_info.map{|info| info[3]}
-       return ips
-     rescue => e # getaddrinfo failed...
-       begin
-          ipInt = gethostbyname(hostname)[3] # do a DNS lookup
-          return ["%d.%d.%d.%d" % [ipInt[0].ord, ipInt[1].ord, ipInt[2].ord, ipInt[3].ord]]
-       rescue SocketError # happens in certain instances...
-          return nil
-       end
-     end
-   end
-
- end
-end