nginx_utils 0.0.5 → 0.0.6

data/spec/nginx_utils/status_spec.rb

@@ -2,22 +2,20 @@
 
 require "spec_helper"
 
-describe NginxUtils do
-  describe "Status" do
-    describe ".get" do
-      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)
-      end
+describe "NginxUtils::Status" do
+  describe ".get" do
+    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)
+    end
 
-      it "should generate an exception if status get fails" 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")
-      end
+    it "should generate an exception if status get fails" 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")
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,2 +1 @@
-require "fakefs/spec_helpers"
 require "nginx_utils"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nginx_utils
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,42 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -79,8 +79,7 @@ description: The various utilities on nginx
 email:
 - i2bskn@gmail.com
 executables:
-- nginx_logrotate
-- nginx_status
+- nginx_utils
 extensions: []
 extra_rdoc_files: []
 files:
@@ -90,14 +89,15 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/nginx_logrotate
-- bin/nginx_status
+- bin/nginx_utils
 - lib/nginx_utils.rb
+- lib/nginx_utils/cli.rb
 - lib/nginx_utils/logreader.rb
 - lib/nginx_utils/logrotate.rb
 - lib/nginx_utils/status.rb
 - lib/nginx_utils/version.rb
 - nginx_utils.gemspec
+- spec/nginx_utils/cli_spec.rb
 - spec/nginx_utils/logreader_spec.rb
 - spec/nginx_utils/logrotate_spec.rb
 - spec/nginx_utils/status_spec.rb
@@ -117,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -837549919504176739
+      hash: -2092966652116304776
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,14 +126,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -837549919504176739
+      hash: -2092966652116304776
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Nginx utilities
 test_files:
+- spec/nginx_utils/cli_spec.rb
 - spec/nginx_utils/logreader_spec.rb
 - spec/nginx_utils/logrotate_spec.rb
 - spec/nginx_utils/status_spec.rb

data/bin/nginx_logrotate

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# coding: utf-8
-
-require "optparse"
-
-begin
-  require "nginx_utils"
-rescue LoadError => e
-  puts e
-  exit 1
-end
-
-# Option parse
-options = {}
-
-opt = OptionParser.new
-Version = "0.0.1"
-opt.on("-d", "--[no-]debug", "Debug mode. Run only log output to STDOUT.") {|v| options[:debug] = v}
-opt.on("--script_log=VAL", "Log file for script.") {|v| options[:script_log] = v}
-opt.on("--log_level=VAL", "Log level of script log.") {|v| options[:log_level] = v.to_sym}
-opt.on("--root_dir=VAL", "Root directory of Nginx.") {|v| options[:root_dir] = v}
-opt.on("--target_logs=VAL", "Specify logs of target.") {|v| options[:target_logs] = v}
-opt.on("--retention=VAL", "Specify in days the retention period of log.") {|v| options[:retention] = v.to_i}
-opt.on("--pid_file=VAL", "PID file of Nginx") {|v| options[:pid_file] = v}
-
-opt.parse! ARGV
-
-rotate = NginxUtils::Logrotate.new(options)
-rotate.execute

data/bin/nginx_status

@@ -1,35 +0,0 @@
-#!/usr/bin/env ruby
-# coding: utf-8
-
-require "optparse"
-
-begin
-  require "nginx_utils"
-rescue LoadError => e
-  puts e
-  exit 1
-end
-
-# Option parse
-options = {}
-
-opt = OptionParser.new
-Version = "0.0.1"
-opt.on("--only-value", "The output only the value.") {|v| options[:only_value] = v}
-
-opt.parse! ARGV
-
-if ARGV.size > 0
-  host = ARGV.shift
-  result = NginxUtils::Status.get host: host
-else
-  result = NginxUtils::Status.get
-end
-
-if options[:only_value]
-  puts result.values.join("\t")
-else
-  puts "Active Connections: #{result[:active_connection]}"
-  puts "Accepts: #{result[:accepts]} Handled: #{result[:handled]} Requests: #{result[:requests]}"
-  puts "Reading: #{result[:reading]} Writing: #{result[:writing]} Waiting: #{result[:waiting]}"
-end