netrand 0.0.2 → 1.0.0

data/CHANGELOG

@@ -1,3 +1,10 @@
+1.0.0
+=====
+*Added Netrand.string method
+*Removed Netrand.uniqint method
+*Added ability to produce unique numbers to Netrand.int method
+*Added usage page to CL interface
+
 0.0.2
 ======
 Changed the description and the homepage of gem.

data/Examples/random.rb

@@ -1,2 +1,2 @@
-require "netrand"
+require_relative "../lib/netrand.rb"
 print Netrand.uniqint(100, 10000)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    netrand (0.0.2)
+    netrand (1.0.0)
 
 GEM
   specs:

data/Rakefile

@@ -1,9 +1,11 @@
+# coding: utf-8
 begin
   require "bundler"
   Bundler.setup
 rescue LoadError
   $stderr.puts "You need to have Bundler installed to be able build this gem."
 end
+require "fileutils"
 
 gemspec = eval(File.read(Dir["*.gemspec"].first))
 
@@ -23,4 +25,15 @@ end
 desc "Install gem locally"
 task :install => :build do
   system "gem install pkg/#{gemspec.name}-#{gemspec.version}"
+end
+
+desc "Clean automatically generated files"
+task :clean => :build do
+  fileutils.mv "./pkg", ".."
+  fileutils.rm_rf "."
+end
+
+desc "Publish the gem"
+task :publish => :build do
+  system "gem push ./pkg/#{gemspec.name}-#{gemspec.version}"
 end

data/bin/netrand

@@ -1,18 +1,34 @@
 #!/usr/bin/env ruby
-require "netrand"
+require_relative "../lib/netrand.rb"
+def self.loadstring
+  upperalpha  = ARGV.include?("-ua")  ? :upperalpha : nil
+  loweralpha  = ARGV.include?("-la")  ? :loweralpha : nil
+  digits      = ARGV.include?("-d")   ? :digits : nil
+  unique      = ARGV.include?("-u")   ? :unique : nil
+  Netrand.string(ARGV[1].to_i, ARGV[2].to_i, digits, upperalpha, loweralpha, unique)
+end
+
+def self.usage
+  puts "netrand int|uniqint|order|string"
+  puts "You provide additional arguments according to documentation in ri Netrand"
+  puts "You can force int to provide unique numbers by using -u flag at the end of command."
+  puts "Only in string mode, there are some changes."
+  puts ":upperalpha is activated using -ua switch"
+  puts ":loweralpha using -la"
+  puts ":digits using -d"
+  puts ":unique using -u"
+end
+
 case ARGV[0]
   when "int"
-    puts Netrand.int(ARGV[1].to_i, ARGV[2].to_i, ARGV[3].to_i)
+    puts Netrand.int(ARGV[1].to_i, ARGV[2].to_i, ARGV[3].to_i, if ARGV[4] == "-u" then :unique end)
   when "uniqint"
     puts Netrand.uniqint(ARGV[1].to_i, ARGV[2].to_i, ARGV[3].to_i)
   when "order"
     puts Netrand.uniqint(ARGV[1].to_i, ARGV[2].to_i)
+  when "string"
+    puts self.loadstring
   else
-    usage
+    self.usage
 end
 
-
-
-def usage()
-  #put up usage banner
-end

data/lib/netrand.rb

@@ -4,24 +4,9 @@ module Netrand
   #Generates numget random numbers using random.org service.
   #You must set maximum and can set minimum number. 
   #Returns Array of numbers.
+  #If you use :unique flag, then there won't be two same numbers in the array.
   
-  def Netrand.int(numget, max, min = 1)
-    if numget == 0 then raise ArgumentError, "You must ask for more numbers than 0" end
-    if max == 0 then raise ArgumentError, "Maximum number must be bigger than 0" end
-    if min > max then raise ArgumentError, "max must be bigger than min!" end
-    values = Array.new
-    self.check_quota
-    open("http://www.random.org/integers/?num=#{numget}&min=#{min}&max=#{max}&format=plain&col=1&base=10") do |c|
-      c.each_line {|l| values << l.chop.to_i}
-    end
-    values
-  end
-  
-  #Generates numget random numbers using random.org service.
-  #You must set maximum and can set minimum number. 
-  #Returns Array of numbers in which there won't be two same numbers.
-  
-  def Netrand.uniqint(numget, max, min = 1)
+  def Netrand.int(numget, max, min = 1, uniq = :notuniq)
     if numget == 0 then raise ArgumentError, "You must ask for more numbers than 0" end
     if max == 0 then raise ArgumentError, "Maximum number must be bigger than 0" end
     if min > max then raise ArgumentError, "max must be bigger than min!" end
@@ -33,10 +18,12 @@ module Netrand
     end
     self.check_quota
     random.call(numget, max, min)
-    values.uniq!
-    while values.length != numget do
-      random.call(numget - values.length, max, min)
+    if uniq == :unique
       values.uniq!
+      while values.length != numget do
+        random.call(numget - values.length, max, min)
+        values.uniq!
+      end
     end
     values
   end
@@ -54,12 +41,34 @@ module Netrand
     order
   end
   
+  #Generates num random strings of len length.
+  #They can contain digits, uppercase and lowercase letters.
+  #They can be set to be unique.
+  
+  def Netrand.string(num, len, *opts)
+    digits      = opts.include?(:digits)      ? "on" : "off"
+    upperalpha  = opts.include?(:upperalpha)  ? "on" : "off"
+    loweralpha  = opts.include?(:loweralpha)  ? "on" : "off"
+    unique      = opts.include?(:unique)      ? "on" : "off"
+    if len == 0 then raise ArgumentError, "Strings must be longer than 0 characters." end
+    if digits == "off" && upperalpha == "off" && loweralpha == "off" then raise ArgumentError, "You disabled every type of character." end
+    values = Array.new
+    self.check_quota
+    open("http://www.random.org/strings/?num=#{num}&len=#{len}&digits=#{digits}&upperalpha=#{upperalpha}&loweralpha=#{loweralpha}&unique=#{unique}&format=plain") do |c|
+      c.each_line {|l| values << l.chop}
+    end
+    values
+  end
+  
   #Generates exception if quota of random.org is exhausted.
   
   def Netrand.check_quota
+    quota = nil
     open("http://www.random.org/quota/?format=plain") do |c|
-      if c.read.to_i < 0 then raise QuotaExhaustedException, "Random.org quota exhausted, please try again after 0:00 UTC" end
+      quota = c.read.to_i
+      if quota < 0 then raise QuotaExhaustedException, "Random.org quota exhausted, please try again after 0:00 UTC" end
     end
+    quota
   end
   
   class QuotaExhaustedException < RuntimeError

data/netrand.gemspec

@@ -5,11 +5,10 @@ Gem::Specification.new do |s|
   s.summary    = "Generate true random numbers using random.org"
   s.description= "Wrapper around some of the Random.org's functions. To be exact, you can use sequence randomizer and integer generator. There is also one more function, which makes list, in which every integer will be unique."
   s.requirements =  [ 'Working internet connection' ]
-  s.version     = "0.0.2"
+  s.version     = "1.0.0"
   s.author      = "Róbert Selvek"
   s.email       = "me@sellweek.eu"
   s.homepage    = "http://github.com/sellweek/netrand"
-  s.platform    = Gem::Platform::RUBY
   s.required_ruby_version = '>=1.9'
   s.files       = Dir['**/**']
   s.executables = [ 'netrand' ]

data/tests/Testint.rb

@@ -1,10 +1,10 @@
-require "netrand"
+require_relative "../lib/netrand.rb"
 require "test/unit"
-class Testint < MiniTest::Unit::TestCase
+class TestInt < MiniTest::Unit::TestCase
   
   def test_not_same
-    nums1 = Netrand.int(3, 100)
-    nums2 = Netrand.int(3, 100)
+    nums1 = Netrand.int(5, 100)
+    nums2 = Netrand.int(5, 100)
     refute_equal(nums1, nums2)
   end
   
@@ -13,5 +13,11 @@ class Testint < MiniTest::Unit::TestCase
     assert_raises(ArgumentError) {Netrand.int(100, 0)}
     assert_raises(ArgumentError) {Netrand.int(100, 999999, 9999991)}
   end
+  
+  def test_uniq
+    nums = Netrand.int(150, 10000, 1, :unique)
+    assert_equal(nums.uniq.length, nums.length)
+    assert_equal(150, nums.length)
+  end
 
 end

data/tests/Testorder.rb

@@ -1,4 +1,4 @@
-require "netrand"
+require_relative "../lib/netrand.rb"
 require "test/unit"
 class Testorder < MiniTest::Unit::TestCase
   def test_randomization

data/tests/Teststring.rb

@@ -0,0 +1,43 @@
+require_relative "../lib/netrand.rb"
+require "test/unit"
+class TestString < MiniTest::Unit::TestCase
+  def test_not_same
+     str1 = Netrand.string(10, 8, :upperalpha, :loweralpha)
+     str2 = Netrand.string(10, 8, :upperalpha, :loweralpha)
+     refute_equal(str1, str2)
+   end
+   
+   def test_uniq
+     str = Netrand.string(10, 8, :loweralpha)
+     assert_equal(str.uniq.length, str.length)
+   end
+   
+  def test_error_handling
+    assert_raises(ArgumentError) {Netrand.string(10, 0, :digits, :upperalpha)}
+    assert_raises(ArgumentError) {Netrand.string(10, 8)}
+  end  
+  
+  def test_digits
+    s1 = Netrand.string(10, 8, :digits)
+    s1.each do |s|
+      s.each_char do |c|
+        assert(c.to_i.integer?, "#{c} in #{s} not a number!")
+      end
+    end
+  end
+  
+  def test_upcase
+    s1 = Netrand.string(10, 8, :upperalpha)
+    s2 = s1.map {|s| s.upcase}
+    assert_equal(s2, s1)
+  end
+  
+  def test_downcase
+    s1 = Netrand.string(10, 8, :loweralpha)
+    s2 = s1.map {|s| s.downcase}
+    assert_equal(s2, s1)
+  end
+  
+
+  
+end

data/tests/test.rb

@@ -1,4 +1,4 @@
 puts "WARNING: This can take looong time!"
-require_relative "TestuniqInt"
 require_relative "Testint"
-require_relative "Testorder"
+require_relative "Testorder"
+require_relative "Teststring"

metadata

@@ -2,7 +2,7 @@
 name: netrand
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors: 
 - "R\xC3\xB3bert Selvek"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 Z
+date: 2011-04-23 00:00:00 Z
 dependencies: []
 
 description: Wrapper around some of the Random.org's functions. To be exact, you can use sequence randomizer and integer generator. There is also one more function, which makes list, in which every integer will be unique.
@@ -30,12 +30,13 @@ files:
 - lib/netrand.rb
 - LICENSE
 - netrand.gemspec
+- pkg/netrand-1.0.0.gem
 - Rakefile
 - README.md
 - tests/test.rb
 - tests/Testint.rb
 - tests/Testorder.rb
-- tests/TestuniqInt.rb
+- tests/Teststring.rb
 homepage: http://github.com/sellweek/netrand
 licenses: []
 
@@ -55,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1900981784567918505
+      hash: -1149190834117444518
       segments: 
       - 0
       version: "0"

data/tests/TestuniqInt.rb

@@ -1,23 +0,0 @@
-require "netrand"
-require "test/unit"
-class TestInt < MiniTest::Unit::TestCase
-
-  def test_uniq
-    nums = Netrand.uniqint(150, 10000)
-    assert_equal(nums.uniq.length, nums.length)
-    assert_equal(150, nums.length)
-  end
-  
-  def test_not_same
-    nums1 = Netrand.uniqint(3, 100)
-    nums2 = Netrand.uniqint(3, 100)
-    refute_equal(nums1, nums2)
-  end
-  
-  def test_error_handling
-    assert_raises(ArgumentError) {Netrand.uniqint(0, 10)}
-    assert_raises(ArgumentError) {Netrand.uniqint(100, 0)}
-    assert_raises(ArgumentError) {Netrand.uniqint(100, 999999, 9999991)}
-  end
-
-end