lbspec 0.0.2 → 0.0.3

data/Rakefile

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 require 'rake'
+require 'highline/import'
 
 task :default => :travis
 task :travis => [:spec, :rubocop, 'coveralls:push']
@@ -19,3 +20,24 @@ end
 Rubocop::RakeTask.new(:rubocop) do |task|
   task.patterns = %w(lib/**/*.rb spec/**/*.rb)
 end
+
+task :release do |t|
+  puts "Releaseing gem"
+  require_relative 'lib/lbspec'
+  version_current = Lbspec::VERSION
+  puts "now v#{version_current}"
+  version_new = ask("Input version")
+
+  file_path = 'lib/lbspec/version.rb'
+  text = File.read(file_path)
+  text = text.gsub(/#{version_current}/, version_new)
+  File.open(file_path, "w") {|file| file.puts text}
+
+  sh('gem build lbspec.gemspec')
+  if agree("Shall we continue? ( yes or no )")
+    puts "Pushing gem..."
+    sh("gem push lbspec-#{version_new}.gem")
+  else
+    puts "Exiting"
+  end
+end

data/lbspec.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "debugger"
+  spec.add_development_dependency "highline"
 
   spec.add_runtime_dependency "rspec"
   spec.add_runtime_dependency "net-ssh"

data/lib/lbspec/transfer.rb

@@ -7,6 +7,9 @@ RSpec::Matchers.define :transfer do |nodes|
   @ssh = []
   @threads = []
   @nodes_connected = []
+  @protocol = nil
+  @application = nil
+  @http_path = '/'
   @vhost_port = 80
   @node_port = 0
   @result = false
@@ -25,6 +28,28 @@ RSpec::Matchers.define :transfer do |nodes|
     @node_port = port
   end
 
+  chain :tcp do
+    @protocol = :tcp
+  end
+
+  chain :udp do
+    @protocol = :udp
+  end
+
+  chain :http do
+    @protocol = :tcp
+    @application = :http
+  end
+
+  chain :https do
+    @protocol = :tcp
+    @application = :https
+  end
+
+  chain :path do |path|
+    @http_path = path
+  end
+
   def gen_keyword
     Lbspec::Util.gen_keyword
   end
@@ -63,17 +88,15 @@ RSpec::Matchers.define :transfer do |nodes|
     channel.exec capture_cmd do |ch, stream, data|
       num_match = 0
       ch.on_data do |c, d|
-        # because of ngrep output condition first
-        # to avoid incorrect match, count 2
         num_match += 1 if /#{@keyword}/ =~ d
-        @result = true if num_match > 1
+        @result = true if num_match > 0
       end
     end
   end
 
   def capture_cmd
     port_str = @node_port > 0 ? "port #{@node_port}" : ''
-    "sudo ngrep #{@keyword} #{port_str}"
+    "sudo ngrep #{@keyword} #{port_str} | grep -v \"match:\""
   end
 
   def disconnect_nodes
@@ -90,7 +113,31 @@ RSpec::Matchers.define :transfer do |nodes|
     addr_port = Lbspec::Util.split_addr_port(vhost.to_s)
     vhost_addr, vhost_port = addr_port[:addr], addr_port[:port]
     @vhost_port = vhost_port if vhost_port > 0
-    system("echo #{@keyword} | nc #{vhost_addr} #{@vhost_port}")
+    if @application
+      send_request_application(vhost_addr, @vhost_port)
+    else
+      send_request_transport(vhost_addr, @vhost_port)
+    end
+  end
+
+  def send_request_application(addr, port)
+    case @application
+    when :http
+      query = "?#{@keyword}"
+      system("curl -sm 1 http://#{addr}:#{port}#{@http_path}#{query}")
+    when :https
+      query = "?#{@keyword}"
+      system("curl -sm 1 -k https://#{addr}:#{port}#{@http_path}#{query}")
+    end
+  end
+
+  def send_request_transport(addr, port)
+    case @protocol
+    when :udp
+      system("echo #{@keyword} | nc -u #{addr} #{port}")
+    else
+      system("echo #{@keyword} | nc #{addr} #{port}")
+    end
   end
 
   description do

data/lib/lbspec/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 # Lbspec is an RSpec plugin for easy Loadbalancer testing.
 module Lbspec
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/lbspec_transfer_spec.rb

@@ -31,5 +31,23 @@ describe Lbspec do
     it 'should test transfer vhost:80 and a node on port 80' do
       'vhost_a:80'.should transfer('node_a').port(80)
     end
+    it 'should test transfer vhost:80 and a node on port 80/tcp' do
+      'vhost_a:80'.should transfer('node_a').port(80).tcp
+    end
+    it 'should test transfer vhost:80 and a node on port 53/tcp' do
+      'vhost_a:80'.should transfer('node_a').port(53).udp
+    end
+    it 'should test transfer vhost:80 and a node with http' do
+      'vhost_a:80'.should transfer('node_a').http
+    end
+    it 'should test transfer vhost:443 and a node with https' do
+      'vhost_a:443'.should transfer('node_a').port(80).https
+    end
+    it 'should test transfer vhost:443 and a node:80 with https' do
+      'vhost_a:443'.should transfer('node_a').port(80).https
+    end
+    it 'should test transfer vhost:443 and a node with https /test' do
+      'vhost_a:443'.should transfer('node_a').https.path('/test')
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lbspec
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -180,12 +196,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4545456457714803124
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4545456457714803124
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21