rangeclient 0.0.7 → 0.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a72cd3b4ccd4b6b3f32a68d5f406bab49ff6b2f8
+  data.tar.gz: c3371d09c8bcc60604898b99c0679d1a33e30ff8
+SHA512:
+  metadata.gz: 0afc535ec3ea7a21241c9ba47fc8db00d0e175cccf899634808e2320b7817d7afa2f03b3a5156b9afd981c8f58a61b0340ce2abf03317442be6d7eb2f633ef5b
+  data.tar.gz: c60c6f5e0871dbfaa04b24282b33d97028c57d61ccb98b36792bd50c9868843c13d73177a697d5a2c9b085c3fe75a7ef0094cc6e6fd757d1332df02833d1baf2

data/README.md

@@ -1,17 +1,16 @@
-rangeclient synopsis
-============================
+# rangeclient synopsis
 
 
-  rangehost = ARGV.shift
-  rangearg = ARGV.shift
+    rangehost = ARGV.shift
+    rangearg = ARGV.shift
 
-  # Create range object for communication with ranged
-  r = Range::Client.new({:host => rangehost})
+    # Create range object for communication with ranged
+    r = Range::Client.new({:host => rangehost})
 
-  # use ranged to expand the range expression into an Array
-  # "foo10..12" => [ foo10, foo11, foo12 ] OR %foo => [ foo10, foo11, foo12 ]
-  hosts =  r.expand(rangearg)
+    # use ranged to expand the range expression into an Array
+    # "foo10..12" => [ foo10, foo11, foo12 ] OR %foo => [ foo10, foo11, foo12 ]
+    hosts =  r.expand(rangearg)
 
-  # use ranged to compress the array of hostnames into a range expression
-  # [ foo10, foo11, foo12 ] => "foo10..12"
-  range_exp = r.compress(hosts)
+    # use ranged to compress the array of hostnames into a range expression
+    # [ foo10, foo11, foo12 ] => "foo10..12"
+    range_exp = r.compress(hosts)

data/bin/er

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'rangeclient'
 
 require 'optparse'
-require 'ostruct'
+
 options = {
   :timeout => 60,
 }
@@ -15,23 +15,36 @@ optparse = OptionParser.new do |opts|
   opts.on('-c', '--count', 'Print the count of range elements, not the range itself') do |arg|
     options[:count] = arg 
   end
+  opts.on('-s', '--sort', 'Sort expanded output') do |arg|
+    options[:sorted] = arg 
+  end
   opts.on('-v', '--vip range:80', 'Which host or host:port to query') do |arg|
-    options[:vip] = arg 
+    host, port = arg.split(':', 2)
+    options[:host] = host
+    options[:port] = port unless port.nil?
   end
   opts.on('-p', '--port 80', 'Port to use when connecting') do |arg|
     options[:port] = arg 
   end
-  opts.on('-t', '--timeout', "Wait this long for a response ") do |arg|
-    options[:timeout] = arg 
+  opts.on('-t', '--timeout TIMEOUT', "Wait this long for a response") do |arg|
+    options[:timeout] = arg.to_i
+  end
+  opts.on_tail('-h', '--help', "This help message") do
+    puts opts
+    exit
   end
 end
 optparse.parse!
 
-range = Range::Client.new
+range = Range::Client.new(options)
 
 in_range = ARGV.join ','
 
-raise "No range given" if in_range.empty?
+if in_range.empty?
+  puts optparse
+  puts "[ERROR] No range specified"
+  exit 1
+end
 
 if in_range  == '-'
   in_range = STDIN.readlines.map { |l| l.chomp }.join ','
@@ -45,6 +58,7 @@ if options[:count]
 elsif not nodes.size.zero?
   # if we got a result, display it accordingly
   if options[:expand]
+    nodes.sort! if options[:sorted]
     nodes.each do |node|
       puts node
     end
@@ -52,6 +66,6 @@ elsif not nodes.size.zero?
     puts range.compress(nodes)
   end
 else
-  # no nodes returned.
-  raise "No nodes specified"
+  puts "[WARNING] No nodes returned"
+  exit 1
 end

data/bin/range-compress

@@ -0,0 +1,39 @@
+#!/usr/bin/ruby
+
+require 'rubygems'
+require 'rangeclient'
+require 'pp'
+
+require 'optparse'
+
+optparse = OptionParser.new do |opts|
+  opts.banner = "Usage: #{__FILE__} <range to compress>"
+  opts.on_tail('-h', '--help', "This help message") do
+    puts opts
+    exit
+  end
+end
+optparse.parse!
+
+range = Range::Client.new()
+
+in_range = ARGV.join(',')
+
+if in_range.empty?
+  puts optparse
+  puts "[ERROR] No range specified"
+  exit 1
+end
+
+if in_range  == '-'
+  in_range = STDIN.readlines.map { |l| l.chomp }.join(',')
+end
+
+nodes = range.compress(in_range.split(','))
+
+if not nodes.size.zero?
+  puts nodes
+else
+  puts "[WARNING] No nodes returned"
+  exit 1
+end

data/bin/range_split

@@ -0,0 +1,36 @@
+#!/usr/bin/ruby
+# given a range and N buckets, slice the range
+# into N buckets, attempting even bucket distribution
+# based on hostname
+
+require 'rubygems'
+require 'rangeclient'
+
+range_arg = ARGV.shift;
+num_buckets = ARGV.shift;
+num_buckets = num_buckets.to_i
+
+r = Range::Client.new
+hosts = r.expand(range_arg)
+hosts.sort!
+
+buckets = []
+
+# if we asked for more buckets than exist for hosts
+# reduce the number of buckets to be 1:1 with number of hosts
+num_buckets = hosts.length if num_buckets > hosts.length
+
+num_buckets.times do |ii|
+  buckets << []
+end
+
+current_bucket = 0
+hosts.each do |host|
+  buckets[current_bucket] << host
+  current_bucket += 1
+  current_bucket = current_bucket % num_buckets
+end
+
+buckets.each do |hosts|
+  puts r.compress(hosts)
+end

data/lib/range/fake_client.rb

@@ -0,0 +1,9 @@
+class Range
+  # Provide a fake client for use in testing. Ideally a set of tests should be
+  # run against both this and the real client to ensure they are sync.
+  FakeClient = Struct.new(:responses) do
+    def expand(query)
+      responses.fetch(query)
+    end
+  end
+end

data/lib/rangeclient.rb

@@ -1,10 +1,11 @@
 #!/usr/bin/ruby
 
 require 'rubygems'
-require 'rest_client'
+require 'net/http'
 require 'cgi'
 
 class Range::Client
+  attr_accessor :host, :port, :timeout
 
   # used to split hostnames into component parts for compression
   @@NodeRegx = /
@@ -14,20 +15,25 @@ class Range::Client
                /x;
 
   def initialize(options = {})
-    default_host = 'range'
-    default_host = ENV['RANGE_HOST'] if ENV.has_key?('RANGE_HOST')
-    default_port = '80'
-    default_port = ENV['RANGE_PORT'] if ENV.has_key?('RANGE_PORT')
-    @options = {
-      :host => default_host,
-      :port => default_port,
-    }.merge(options)
+    @host = 'range'
+    @host = ENV['RANGE_HOST'] if ENV.has_key?('RANGE_HOST')
+    @host = options[:host] if options.member?(:host)
+
+    @port = '80'
+    @port = ENV['RANGE_PORT'] if ENV.has_key?('RANGE_PORT')
+    @port = options[:port] if options.member?(:port)
+
+    @timeout = 60
+    @timeout = options[:timeout] if options.member?(:timeout)
   end
   
   def expand(arg)
     escaped_arg = CGI.escape arg
-    res = RestClient.get "http://#{@options[:host]}:#{@options[:port]}/range/list?#{escaped_arg}"
-    return res.split "\n"
+    http = Net::HTTP.new(@host, @port)
+    http.read_timeout = @timeout
+    req = Net::HTTP::Get.new('/range/list?' + escaped_arg)
+    resp = http.request(req)
+    return resp.body.split "\n"
   end
 
 
@@ -82,7 +88,7 @@ class Range::Client
       node.gsub!(/^([a-z]+)(\d+)([a-z]\w+)\./) { "#{$1}#{$2}.UNDOXXX#{$3}." }
     end
     result = _simple_compress(nodes)
-    result.each do |r|
+    result.each_char do |r|
       r.gsub!(/(\d+\.\.\d+)\.UNDOXXX/) {"{#{$1}}"}
       r.gsub!(/(\d+)\.UNDOXXX/) {"#{$1}"}
     end

metadata

@@ -1,84 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rangeclient
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 7
-  version: 0.0.7
+version: !ruby/object:Gem::Version
+  version: 0.0.9
 platform: ruby
-authors: 
+authors:
 - Evan Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rest-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-description: Use with ranged from https://github.com/ytoolshed/range
-email: 
+date: 2013-11-18 00:00:00.000000000 Z
+dependencies: []
+description: Use with range from https://github.com/square/libcrange
+email:
 - evan@squareup.com
-executables: 
+executables:
 - er
+- range-compress
+- range_split
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.md
-files: 
+files:
+- lib/range/fake_client.rb
 - lib/rangeclient.rb
 - bin/er
+- bin/range-compress
+- bin/range_split
 - README.md
 - LICENSE.md
 homepage: https://github.com/square/prodeng/tree/master/ruby_rangeclient
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key: 
-specification_version: 3
-summary: Simple ranged client for ruby.
+specification_version: 4
+summary: Simple range client for ruby.
 test_files: []
-