nginx_utils 0.0.6 → 0.0.7

data/README.md

@@ -24,18 +24,18 @@ Or install it yourself as:
 
 From console:
 
-    $ nginx_logrotate -h
-    Usage: nginx_logrotate [options]
-    -d, --[no-]debug                 Debug mode. Run only log output to STDOUT.
-        --script_log=VAL             Log file for script.
-        --log_level=VAL              Log level of script log.
-        --root_dir=VAL               Root directory of Nginx.
-        --target_logs=VAL            Specify logs of target.
-        --retention=VAL              Specify in days the retention period of log.
-        --pid_file=VAL               PID file of Nginx
-    $ nginx_status -h
-    Usage: nginx_status [options]
-        --only-value                 The output only the value.
+    $ nginx_utils [status|logrotate] [options]
+    Commands:
+    nginx_utils help [COMMAND]      # Describe available commands or one specific command
+    nginx_utils logrotate -d        # Nginx logrotate
+    nginx_utils status example.com  # Print status of Nginx
+
+    $ nginx_utils status
+    Active Connections: 1
+    Accepts: 4 Handled: 5 Requests: 51
+    Reading: 1 Writing: 3 Waiting: 2
+
+    $ nginx_utils logrotate
 
 From ruby:
 

data/lib/nginx_utils/cli.rb

@@ -12,7 +12,7 @@ module NginxUtils
       if options[:only_value]
         puts result.values.join("\t")
       else
-        puts "Active Connections: #{result[:active_connection]}"
+        puts "Active Connections: #{result[:active_connections]}"
         puts "Accepts: #{result[:accepts]} Handled: #{result[:handled]} Requests: #{result[:requests]}"
         puts "Reading: #{result[:reading]} Writing: #{result[:writing]} Waiting: #{result[:waiting]}"
       end

data/lib/nginx_utils/logreader.rb

@@ -29,15 +29,12 @@ module NginxUtils
     def parse(line)
       case @format.to_sym
       when :ltsv then
-        row = line.split("\t").map do |f|
-          c = f.split(":")
-          if c == 2
-            [c[0].to_sym, c[1]]
-          else
-            [c[0].to_sym, c[1..-1].join(":")]
+        Hash[
+          line.split("\t").map do |f|
+            a = f.split(":")
+            a.size > 2 ? [a[0].to_sym, a[1..-1].join(":")] : [a[0].to_sym, a[1]]
           end
-        end
-        Hash[row]
+        ]
       when :combined then
         if /([0-9.]+)\s-\s([^\s]+)\s\[(.*?)\]\s"(.*?)"\s([0-9]+)\s([0-9]+)\s"(.*?)"\s"(.*?)".*/ =~ line
           {

data/lib/nginx_utils/version.rb

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

data/spec/nginx_utils/cli_spec.rb

@@ -29,7 +29,7 @@ describe "NginxUtils::CLI" do
       }
     }
 
-    before(:each) {NginxUtils::Status.should_receive(:get).and_return(result)}
+    before {NginxUtils::Status.should_receive(:get).and_return(result)}
 
     it "default output" do
       args = ["status"]
@@ -37,10 +37,10 @@ describe "NginxUtils::CLI" do
         capture(:stdout) {
           NginxUtils::CLI.start(args)
         }
-      ).to eq("Active Connections: \nAccepts: 4 Handled: 5 Requests: 51\nReading: 1 Writing: 3 Waiting: 2\n")
+      ).to eq("Active Connections: 1\nAccepts: 4 Handled: 5 Requests: 51\nReading: 1 Writing: 3 Waiting: 2\n")
     end
 
-    it "only value output" do 
+    it "only value output" do
       args = ["status", "--only_value"]
       expect(
         capture(:stdout) {
@@ -51,62 +51,63 @@ describe "NginxUtils::CLI" do
   end
 
   describe "#logrotate" do
-    before(:each) do
-      @rotate = double("lotate mock")
-      @rotate.should_receive(:execute).and_return(true)
-    end
+    let!(:rotate) {
+      rotate = double("lotate mock")
+      rotate.should_receive(:execute).and_return(true)
+      rotate
+    }
 
     it "logrotate should be execute" do
-      NginxUtils::Logrotate.should_receive(:new).and_return(@rotate)
+      NginxUtils::Logrotate.should_receive(:new).and_return(rotate)
       args = ["logrotate"]
       NginxUtils::CLI.start(args)
     end
 
     it "debug option" do
       options = {"debug" => true}
-      NginxUtils::Logrotate.should_receive(:new).with(options).and_return(@rotate)
+      NginxUtils::Logrotate.should_receive(:new).with(options).and_return(rotate)
       args = ["logrotate", "-d"]
       NginxUtils::CLI.start(args)
     end
 
     it "script_log option" do
       options = {"script_log" => "/var/log/nginx_rotate.log"}
-      NginxUtils::Logrotate.should_receive(:new).with(options).and_return(@rotate)
+      NginxUtils::Logrotate.should_receive(:new).with(options).and_return(rotate)
       args = ["logrotate", "--script_log", "/var/log/nginx_rotate.log"]
       NginxUtils::CLI.start(args)
     end
 
     it "log_level option" do
       options = {"log_level" => "warn"}
-      NginxUtils::Logrotate.should_receive(:new).with(options).and_return(@rotate)
+      NginxUtils::Logrotate.should_receive(:new).with(options).and_return(rotate)
       args = ["logrotate", "--log_level", "warn"]
       NginxUtils::CLI.start(args)
     end
 
     it "root_dir option" do
       options = {"root_dir" => "/usr/local/nginx_other"}
-      NginxUtils::Logrotate.should_receive(:new).with(options).and_return(@rotate)
+      NginxUtils::Logrotate.should_receive(:new).with(options).and_return(rotate)
       args = ["logrotate", "--root_dir", "/usr/local/nginx_other"]
       NginxUtils::CLI.start(args)
     end
 
     it "target_logs option" do
       options = {"target_logs" => "*_log"}
-      NginxUtils::Logrotate.should_receive(:new).with(options).and_return(@rotate)
+      NginxUtils::Logrotate.should_receive(:new).with(options).and_return(rotate)
       args = ["logrotate", "--target_logs", "*_log"]
       NginxUtils::CLI.start(args)
     end
 
     it "retention option" do
       options = {"retention" => "30"}
-      NginxUtils::Logrotate.should_receive(:new).with(options).and_return(@rotate)
+      NginxUtils::Logrotate.should_receive(:new).with(options).and_return(rotate)
       args = ["logrotate", "--retention", "30"]
       NginxUtils::CLI.start(args)
     end
 
     it "pid_file option" do
       options = {"pid_file" => "/var/run/nginx.pid"}
-      NginxUtils::Logrotate.should_receive(:new).with(options).and_return(@rotate)
+      NginxUtils::Logrotate.should_receive(:new).with(options).and_return(rotate)
       args = ["logrotate", "--pid_file", "/var/run/nginx.pid"]
       NginxUtils::CLI.start(args)
     end

data/spec/nginx_utils/logreader_spec.rb

@@ -25,7 +25,7 @@ describe "NginxUtils::Logreader" do
       end
 
       it "default parser should be nil" do
-        expect(reader.instance_eval{@parser}).to eq(nil)
+        expect(reader.instance_eval{@parser}).to be_nil
       end
     end
 

data/spec/nginx_utils/logrotate_spec.rb

@@ -32,7 +32,7 @@ describe "NginxUtils::Logrotate" do
       let(:execute) {rotate.instance_eval{@execute}}
 
       it "@execute should be true" do
-        expect(execute).to eq(true)
+        expect(execute).to be_true
       end
 
       it "@logger should be created" do
@@ -77,11 +77,11 @@ describe "NginxUtils::Logrotate" do
       end
 
       it "@rename_logs should be created" do
-        expect(rotate.rename_logs).not_to eq(nil)
+        expect(rotate.rename_logs).not_to be_nil
       end
 
       it "@delete_logs should be created" do
-        expect(rotate.delete_logs).not_to eq(nil)
+        expect(rotate.delete_logs).not_to be_nil
       end
     end
 
@@ -91,7 +91,7 @@ describe "NginxUtils::Logrotate" do
       let(:execute) {debug_rotate.instance_eval{@execute}}
 
       it "@execute should be false" do
-        expect(execute).to eq(false)
+        expect(execute).to be_false
       end
 
       it "@logger should be created with STDOUT" do
@@ -113,7 +113,7 @@ describe "NginxUtils::Logrotate" do
     context "with custom params" do
       it "@logger should be false if script_log is false" do
         rotate = NginxUtils::Logrotate.new(script_log: false)
-        expect(rotate.logger).to eq(false)
+        expect(rotate.logger).to be_false
       end
 
       it "@logger.level should be a specified level" do
@@ -154,18 +154,18 @@ describe "NginxUtils::Logrotate" do
     it "@execute should be a false if debug is true" do
       Logger.should_receive(:new).with(STDOUT)
       rotate.config debug: true
-      expect(execute).to eq(false)
+      expect(execute).to be_false
     end
 
     it "@execute should be a true if debug is false" do
       rotate = NginxUtils::Logrotate.new(debug: true)
       rotate.config debug: false
-      expect(rotate.instance_eval{@execute}).to eq(true)
+      expect(rotate.instance_eval{@execute}).to be_true
     end
 
     it "@logger should be a false if script_log is false" do
       rotate.config script_log: false
-      expect(rotate.logger).to eq(false)
+      expect(rotate.logger).to be_false
     end
 
     it "@logger.level should be a specified level" do
@@ -205,7 +205,7 @@ describe "NginxUtils::Logrotate" do
   end
 
   describe "#rename" do
-    before(:each) do
+    before do
       Dir.should_receive(:glob).exactly(2).times.and_return(files)
       File.stub(:rename).and_return(true)
     end
@@ -241,7 +241,7 @@ describe "NginxUtils::Logrotate" do
   end
 
   describe "#delete" do
-    before(:each) do
+    before do
       Dir.should_receive(:glob).exactly(2).times.and_return(files)
       delete_time = Time.now - ((default[:retention] + 1) * 3600 * 24)
       File.stub(:stat).and_return(double("time mock", mtime: delete_time))
@@ -272,7 +272,7 @@ describe "NginxUtils::Logrotate" do
   end
 
   describe "#restart" do
-    before(:each) do
+    before do
       File.stub(:exists?).and_return(true)
       File.stub(:read).and_return("2000")
       Process.stub(:kill).and_return(1)
@@ -320,7 +320,7 @@ describe "NginxUtils::Logrotate" do
   end
 
   describe "#execute" do
-    before(:each) do
+    before do
       NginxUtils::Logrotate.any_instance.stub(:rename).and_return(true)
       NginxUtils::Logrotate.any_instance.stub(:delete).and_return(true)
       NginxUtils::Logrotate.any_instance.stub(:restart).and_return(true)
@@ -343,5 +343,5 @@ describe "NginxUtils::Logrotate" do
       rotate.config script_log: false
       rotate.execute
     end
-  end  
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nginx_utils
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -117,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2092966652116304776
+      hash: -574939535063558817
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,10 +126,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2092966652116304776
+      hash: -574939535063558817
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Nginx utilities