nutcracker-web 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9281586f00f21e9be35313a09d3442054b060d8e
-  data.tar.gz: 5985c18a684e7a4d601aaba1a2e1a568de5c5d74
+  metadata.gz: 9556cc53f5173af776c4137acabe20ec300a5a53
+  data.tar.gz: b8592b44ae6f60b1f13c9f82ece5ea7c44be10fb
 SHA512:
-  metadata.gz: 58da78811af97d7d5aab4c703cada506128467a157fb1945bfdd55b6931ed4631367cc6e1322324a30c16256f4ad1d747243909ee9a4fb1162cc59425c6b0df9
-  data.tar.gz: d747a544587eeeca2426eeb5d92ea8c6c87f93e525c9ed1eae872efaa29569ea96e3d8de00ebcb50d986de766ac46826e5647d710f044c1ddabf7f85da403bf1
+  metadata.gz: 5dce95488c0bbc7cf78556c27b02925cc8be10b6c769e0a0438651fe7c140882164248e115c4ae34b8505c7bcc6d72e4bb35dc01ca9dae9b440cbcba9d738d2f
+  data.tar.gz: a25465a6cae3856b36073e968f243c38e7606585d5a8d9dd334c513fbdd5f3170b9e56e330e3907ab011d5d363811f60327f67e4f6b0c77b84f3f65a0babca4b

data/Gemfile

@@ -8,4 +8,4 @@ gem 'coffee-script'
 gem 'eco'
 gem 'json'
 gem 'uglifier'
-gem 'nutcracker'
+gem 'nutcracker', ">=0.4.1.20"

data/Gemfile.lock

@@ -16,12 +16,12 @@ GEM
     haml (4.0.7)
       tilt
     json (1.8.3)
-    nutcracker (0.4.1.18)
+    nutcracker (0.4.1.20)
       redis
     rack (1.6.4)
     rack-protection (1.5.3)
       rack
-    redis (3.2.1)
+    redis (3.3.2)
     sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -45,11 +45,11 @@ DEPENDENCIES
   eco
   haml
   json
-  nutcracker
+  nutcracker (>= 0.4.1.20)
   sinatra
   sprockets
   thin
   uglifier
 
 BUNDLED WITH
-   1.10.4
+   1.11.2

data/bin/nutcracker-web

@@ -7,8 +7,9 @@ require 'optparse'
 require 'fileutils'
 require 'socket'
 require 'open3'
+require 'uri'
 
-options = { stats_port: 22222 }
+options = { stats_uri: URI("tcp://localhost:22222") }
 
 OptionParser.new do |opts|
   opts.set_summary_indent "  "
@@ -17,9 +18,9 @@ OptionParser.new do |opts|
   opts.separator ""
   opts.separator "[web-options]"
   opts.separator ""
-  
-  opts.on("-s", "--stats-port PORT", "Nutcracker stats port - #{options[:stats_port]}") do |v|
-    options[:stats_port] = v.to_i
+
+  opts.on("-u", "--stats-uri URI", "Nutcracker stats uri, default is tcp://localhost:22222") do |v|
+    options[:stats_uri] = URI(v)
   end
 
   opts.on("-c","--config FILE", "Nutcracker cluster config file") do |v|
@@ -63,7 +64,7 @@ abort "Please specified nutcracker config file" if options[:config_file].nil?
 abort "Can't find the specified config file @ #{options[:config_file]}" unless File.exists? options[:config_file]
 
 args = ARGV.to_a
-args << "--stats-port" << options[:stats_port]
+args << "--stats-port" << options[:stats_uri].port
 
 if options[:pid]
   args << "--pid-file" << options[:nutcracker_pid]
@@ -88,11 +89,11 @@ end
 if options[:launch_nutcracker]
   nutcracker = Nutcracker.start(options.merge(args: args))
 else
-  if (TCPSocket.new('127.0.0.1',options[:stats_port]) rescue nil)
+  if (TCPSocket.new(options[:stats_uri].host,options[:stats_uri].port) rescue nil)
     nutcracker = Nutcracker.attach(options)
   else
-   abort "Failed to attach, are you sure that Nutcracker is running ?\n"             + 
-         "the specified stats port is closed ( #{options[:stats_port]} )\n"          +
+   abort "Failed to attach, are you sure that Nutcracker is running ?\n" + 
+         "the specified stats port is closed ( #{options[:stats_uri].host}:#{options[:stats_uri].port} )\n" +
          "If you want to launch Nutcracker instance as well use the --launch switch"
   end
 end

data/lib/nutcracker/web/version.rb

@@ -1,5 +1,5 @@
 module Nutcracker
   module Web
-    VERSION="0.0.10"
+    VERSION="0.0.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutcracker-web
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Eran Barak Levi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4.5
+        version: 0.4.1.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4.5
+        version: 0.4.1.20
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement