nginx_utils 0.0.7 → 0.0.8

data/.coveralls.yml

@@ -0,0 +1 @@
+repo_token: j5c7RRcpsMCwX1qif9oQyvF6qOfqKv0CV

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in nginx_utils.gemspec
 gemspec
+
+group :test do
+  gem 'coveralls', require: false
+end

data/README.md

@@ -1,6 +1,10 @@
 # NginxUtils
 
+[![Gem Version](https://badge.fury.io/rb/nginx_utils.png)](http://badge.fury.io/rb/nginx_utils)
 [![Build Status](https://travis-ci.org/i2bskn/nginx_utils.png?branch=master)](https://travis-ci.org/i2bskn/nginx_utils)
+[![Coverage Status](https://coveralls.io/repos/i2bskn/nginx_utils/badge.png?branch=master)](https://coveralls.io/r/i2bskn/nginx_utils?branch=master)
+[![Code Climate](https://codeclimate.com/github/i2bskn/nginx_utils.png)](https://codeclimate.com/github/i2bskn/nginx_utils)
+
 
 Nginx utilities.
 

data/lib/nginx_utils/status.rb

@@ -7,24 +7,30 @@ module NginxUtils
         host = options[:host] || "localhost"
         port = options[:port] || 80
         path = options[:path] || "/nginx_status"
-        begin
-          req = Net::HTTP::Get.new(path)
-          res = Net::HTTP.start(host, port){|http| http.request(req)}
-          status = res.body.split("\n")
-          server = status[2].split.map{|i| i.to_i}
-          rww = status[3].split.select{|i| /^[0-9]+$/ =~ i}.map{|i| i.to_i}
-          {
-            active_connections: status[0].split(":").last.gsub(/\s/, "").to_i,
-            accepts: server[0],
-            handled: server[1],
-            requests: server[2],
-            reading: rww[0],
-            writing: rww[1],
-            waiting: rww[2]
-          }
+
+        req = Net::HTTP::Get.new(path)
+        res = Net::HTTP.start(host, port){|http| http.request(req)}
+        parse res
+      end
+
+      private
+      def parse(response)
+          status = response.body.split("\n")
+          formexp(status[0], status[2].split, status[3].split)
         rescue
-          raise "Nginx status get failed"
-        end
+          raise "Parse error"
+      end
+
+      def formexp(ac_line, server_line, rww_line)
+        {
+          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
+        }
       end
     end
   end

data/lib/nginx_utils/version.rb

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

data/spec/nginx_utils/status_spec.rb

@@ -3,19 +3,35 @@
 require "spec_helper"
 
 describe "NginxUtils::Status" do
+  let(:body) {"Active connections: 1 \nserver accepts handled requests\n 4 5 51 \nReading: 1 Writing: 3 Waiting: 2 \n"}
+  let(:status) {{active_connections: 1, accepts: 4, handled: 5, requests: 51, reading: 1, writing: 3, waiting: 2}}
+
   describe ".get" do
+    before {NginxUtils::Status.stub(:parse).and_return(nil)}
+
     it "should get status" do
-      body = "Active connections: 1 \nserver accepts handled requests\n 4 5 51 \nReading: 1 Writing: 3 Waiting: 2 \n"
-      status = {active_connections: 1, accepts: 4, handled: 5, requests: 51, reading: 1, writing: 3, waiting: 2}
       response = double("http response mock", body: body)
       Net::HTTP.should_receive(:start).and_return(response)
-      expect(NginxUtils::Status.get).to eq(status)
+      expect(proc{NginxUtils::Status.get}).not_to raise_error
+    end
+  end
+
+  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)
     end
 
-    it "should generate an exception if status get fails" do
+    it "should generate an exception if parse failed" do
       response = double("http response mock", body: "invalid content")
-      Net::HTTP.should_receive(:start).and_return(response)
-      expect(proc{NginxUtils::Status.get}).to raise_error("Nginx status get failed")
+      expect(proc{NginxUtils::Status.send(:parse, response)}).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)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1 +1,4 @@
 require "nginx_utils"
+
+require "coveralls"
+Coveralls.wear!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nginx_utils
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -83,6 +83,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -117,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -574939535063558817
+      hash: -1389210587237094459
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -574939535063558817
+      hash: -1389210587237094459
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25