nginx_utils 0.0.8 → 0.0.9

data/lib/nginx_utils/logrotate.rb

@@ -69,6 +69,7 @@ module NginxUtils
         first = true
         @params = default_params.merge(options)
         flags = @params.keys
+        flags.delete(:script_log) if options[:debug] && options[:script_log].nil?
       else
         first = false
         flags = options.select{|k,v| @params[k] != v}.keys

data/lib/nginx_utils/status.rb

@@ -10,26 +10,29 @@ module NginxUtils
 
         req = Net::HTTP::Get.new(path)
         res = Net::HTTP.start(host, port){|http| http.request(req)}
-        parse res
+        parse res.body.split("\n").map{|l| l.split}
       end
 
       private
-      def parse(response)
-          status = response.body.split("\n")
-          formexp(status[0], status[2].split, status[3].split)
+      def parse(spbody)
+          formexp([
+            spbody[0].last,
+            spbody[2],
+            spbody[3].select{|i| /^[0-9]*$/ =~ i}
+          ].flatten.map{|i| i.to_i})
         rescue
           raise "Parse error"
       end
 
-      def formexp(ac_line, server_line, rww_line)
+      def formexp(args)
         {
-          active_connections: ac_line.split(":")[1].to_i,
-          accepts: server_line[0].to_i,
-          handled: server_line[1].to_i,
-          requests: server_line[2].to_i,
-          reading: rww_line[1].to_i,
-          writing: rww_line[3].to_i,
-          waiting: rww_line[5].to_i
+          active_connections: args[0],
+          accepts: args[1],
+          handled: args[2],
+          requests: args[3],
+          reading: args[4],
+          writing: args[5],
+          waiting: args[6]
         }
       end
     end

data/lib/nginx_utils/version.rb

@@ -1,3 +1,3 @@
 module NginxUtils
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/nginx_utils/status_spec.rb

@@ -18,20 +18,20 @@ describe "NginxUtils::Status" do
 
   describe ".parse" do
     it "should return status hash" do
-      response = double("http response mock", body: body)
-      expect(NginxUtils::Status.send(:parse, response)).to eq(status)
+      spbody = body.split("\n").map{|l| l.split}
+      expect(NginxUtils::Status.send(:parse, spbody)).to eq(status)
     end
 
     it "should generate an exception if parse failed" do
-      response = double("http response mock", body: "invalid content")
-      expect(proc{NginxUtils::Status.send(:parse, response)}).to raise_error(RuntimeError, "Parse error")
+      spbody = "invalid content".split("\n").map{|l| l.split}
+      expect(proc{NginxUtils::Status.send(:parse, spbody)}).to raise_error(RuntimeError, "Parse error")
     end
   end
 
   describe ".formexp" do
     it "should return status hash with format" do
-      args = body.split("\n")
-      expect(NginxUtils::Status.send(:formexp, args[0], args[2].split, args[3].split)).to eq(status)
+      args = [1, 4, 5, 51, 1, 3, 2]
+      expect(NginxUtils::Status.send(:formexp, args)).to eq(status)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nginx_utils
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1389210587237094459
+      hash: -3985509799625259397
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1389210587237094459
+      hash: -3985509799625259397
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25