specinfra 2.0.0.beta5 → 2.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65e4d83475bbdd34b27754036496fc53ba0a2134
-  data.tar.gz: 46cbd1679ece1082f94dea53e3cb9ed5e54974c8
+  metadata.gz: c59de503cd2a6e1e99e571d21abe145d4901c62e
+  data.tar.gz: 4c84a1001c9c5df401c3195fd9c957b33c43b8c0
 SHA512:
-  metadata.gz: b2d221e45cb170df18ffa898388eb7018143e828e6045591bbd63e3f2f931283899192490bcb391d107a35421f0df967cbddfc1eb98dc28bc692339b41388a5f
-  data.tar.gz: 713db6f57e9ff241a5aa23c531e3a51c2c0584114ebd9f0f1d8917b005a21ec0667032c07d7c9b6bbf8248b7568f066a0f35d52febbefbf525eab3bd963c3928
+  metadata.gz: 4367b260c7854879384d8f9292fdd9ae4eda45693445d951e675c91140e0c068ff76e52df1b8f7b878b77063410f84680f7b51713b499219e0c543536fe02c4b
+  data.tar.gz: c69205dad07e42abab0fab31fdfdd8873a3964cd50395ec4c9f9b2223154803d42da040407600b8d2511828b852575f9a25793ac6f9fdb6113893467641cf2d6

data/Rakefile

@@ -31,5 +31,9 @@ if defined?(RSpec)
     RSpec::Core::RakeTask.new(:configuration) do |t|
       t.pattern = "spec/configuration_spec.rb"
     end
+
+    RSpec::Core::RakeTask.new(:command) do |t|
+      t.pattern = "spec/command/*.rb"
+    end
   end
 end

data/lib/specinfra/backend/ssh.rb

@@ -77,7 +77,7 @@ module Specinfra
 
             channel.on_extended_data do |ch, type, data|
               if data.match /you must have a tty to run sudo/
-                abort 'Please set "Specinfra.configuration.request_pty = true" or "c.request_pty = true" in your spec_helper.rb or other appropreate file.'
+                abort 'Please set "SpecInfra.configuration.request_pty = true" or "c.request_pty = true" in your spec_helper.rb or other appropriate file.'
               end
 
               if data.match /^sudo: no tty present and no askpass program specified/

data/lib/specinfra/command/base.rb

@@ -80,7 +80,7 @@ module Specinfra
       end
 
       def check_group(group)
-        "getent group | grep -wq -- #{escape(group)}"
+        "getent group #{escape(group)}"
       end
 
       def check_installed(package, version=nil)
@@ -95,14 +95,15 @@ module Specinfra
         raise NotImplementedError.new
       end
 
-      def check_listening(port)
-        regexp = ":#{port} "
-        "netstat -tunl | grep -- #{escape(regexp)}"
+      def check_listening(port, options = {})
+        pattern = ":#{port}"
+        pattern = " #{options[:local_address]}#{pattern}" if options[:local_address]
+        pattern = "^#{options[:protocol]} .*#{pattern}" if options[:protocol]
+        "netstat -tunl | grep -- #{escape(pattern)}"
       end
 
       def check_listening_with_protocol(port, protocol)
-        regexp = "^#{protocol} .*:#{port} "
-        "netstat -tunl | grep -- #{escape(regexp)}"
+        check_listening port, {:protocol => protocol}
       end
 
       def check_running(service)
@@ -200,7 +201,7 @@ module Specinfra
       end
 
       def check_cron_entry(user, entry)
-        entry_escaped = entry.gsub(/\*/, '\\*')
+        entry_escaped = entry.gsub(/\*/, '\\*').gsub(/\[/, '\\[').gsub(/\]/, '\\]')
         if user.nil?
           "crontab -l | grep -v \"#\" -- | grep -- #{escape(entry_escaped)}"
         else

data/lib/specinfra/command/solaris.rb

@@ -28,7 +28,7 @@ module Specinfra
       end
 
       def check_cron_entry(user, entry)
-        entry_escaped = entry.gsub(/\*/, '\\*')
+        entry_escaped = entry.gsub(/\*/, '\\*').gsub(/\[/, '\\[').gsub(/\]/, '\\]')
         if user.nil?
           "crontab -l | grep -- #{escape(entry_escaped)}"
         else

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta5"
+  VERSION = "2.0.0.beta6"
 end

data/spec/backend/exec/build_command_spec.rb

@@ -78,7 +78,7 @@ describe 'check_os' do
   context 'test ubuntu with lsb_release command' do
     subject { backend.check_os }
     it do
-      backend.should_receive(:run_command).at_least(1).times do |args|
+      expect(backend).to receive(:run_command).at_least(1).times do |args|
         if ['ls /etc/debian_version', 'lsb_release -ir'].include? args
           double(
             :run_command_response,
@@ -98,7 +98,7 @@ describe 'check_os' do
   context 'test ubuntu with /etc/lsb-release' do
     subject { backend.check_os }
     it do
-      backend.should_receive(:run_command).at_least(1).times do |args|
+      expect(backend).to receive(:run_command).at_least(1).times do |args|
         if ['ls /etc/debian_version', 'cat /etc/lsb-release'].include? args
           double(
             :run_command_response,
@@ -123,7 +123,7 @@ EOF
   context 'test debian (no lsb_release or lsb-release)' do
     subject { backend.check_os }
     it do
-      backend.should_receive(:run_command).at_least(1).times do |args|
+      expect(backend).to receive(:run_command).at_least(1).times do |args|
         if args == 'ls /etc/debian_version'
           double :run_command_response, :success? => true
         elsif args == 'uname -m'

data/spec/command/base.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Specinfra::Command::Base do
+  describe '#check_listening' do
+    let(:port) { 80 }
+    let(:options) { {} }
+    subject { described_class.new.check_listening(port, options) }
+
+    it { should_not be_empty }
+    it { should start_with('netstat') }
+    it { should include(':80') }
+    it { should be_a_kind_of(String) }
+
+    context 'with protocol' do
+      let(:protocol) { 'tcp' }
+      let(:options) { {:protocol => protocol} }
+
+      it { should include(protocol) }
+    end
+
+    context 'with local_address' do
+      let(:local_address) { '127.0.0.1' }
+      let(:options) { {:local_address => local_address} }
+
+      it { should include(local_address) }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta5
+  version: 2.0.0.beta6
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-15 00:00:00.000000000 Z
+date: 2014-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -146,6 +146,7 @@ files:
 - lib/specinfra/version.rb
 - spec/backend/exec/build_command_spec.rb
 - spec/backend/ssh/build_command_spec.rb
+- spec/command/base.rb
 - spec/configuration_spec.rb
 - spec/helper/backend_spec.rb
 - spec/helper/properties_spec.rb
@@ -180,6 +181,7 @@ summary: Common layer for serverspec and configspec
 test_files:
 - spec/backend/exec/build_command_spec.rb
 - spec/backend/ssh/build_command_spec.rb
+- spec/command/base.rb
 - spec/configuration_spec.rb
 - spec/helper/backend_spec.rb
 - spec/helper/properties_spec.rb