serverspec 0.4.13 → 0.4.14

data/lib/serverspec/commands/base.rb

@@ -128,6 +128,12 @@ module Serverspec
         cmd
       end
 
+      def check_installed_by_npm name, version=nil
+        cmd = "npm ls #{escape(name)} -g"
+        cmd = "#{cmd} | grep -w -- #{escape(version)}" unless version.nil?
+        cmd
+      end
+
       def check_belonging_group user, group
         "id #{escape(user)} | awk '{print $3}' | grep -- #{escape(group)}"
       end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.4.13"
+  VERSION = "0.4.14"
 end

data/spec/darwin/matchers_spec.rb

@@ -43,6 +43,8 @@ describe 'Serverspec matchers of Darwin' do
 
   it_behaves_like 'support be_installed.by(gem) matcher', 'jekyll'
   it_behaves_like 'support be_installed.by(gem).with_version matcher', 'jekyll', '1.0.0'
+  it_behaves_like 'support be_installed.by(npm) matcher', 'bower'
+  it_behaves_like 'support be_installed.by(npm).with_version matcher', 'bower', '0.9.2'
 
   it_behaves_like 'support belong_to_group matcher', 'root', 'root'
   it_behaves_like 'support have_gid matcher', 'root', 0

data/spec/darwin/package_spec.rb

@@ -5,4 +5,6 @@ include Serverspec::Helper::Darwin
 describe 'Serverspec package matchers of Darwin family' do
   it_behaves_like 'support package installed by gem matcher', 'jekyll'
   it_behaves_like 'support package installed by gem with version matcher', 'jekyll', '1.1.1'
+  it_behaves_like 'support package installed by npm matcher', 'bower'
+  it_behaves_like 'support package installed by npm with version matcher', 'bower', '0.9.2'
 end

data/spec/debian/matchers_spec.rb

@@ -43,6 +43,8 @@ describe 'Serverspec matchers of Debian family' do
 
   it_behaves_like 'support be_installed.by(gem) matcher', 'jekyll'
   it_behaves_like 'support be_installed.by(gem).with_version matcher', 'jekyll', '1.0.0'
+  it_behaves_like 'support be_installed.by(npm) matcher', 'bower'
+  it_behaves_like 'support be_installed.by(npm).with_version matcher', 'bower', '0.9.2'
 
   it_behaves_like 'support belong_to_group matcher', 'root', 'root'
   it_behaves_like 'support have_gid matcher', 'root', 0

data/spec/debian/package_spec.rb

@@ -6,4 +6,6 @@ describe 'Serverspec package matchers of Debian family' do
   it_behaves_like 'support package installed matcher', 'httpd'
   it_behaves_like 'support package installed by gem matcher', 'jekyll'
   it_behaves_like 'support package installed by gem with version matcher', 'jekyll', '1.1.1'
+  it_behaves_like 'support package installed by npm matcher', 'bower'
+  it_behaves_like 'support package installed by npm with version matcher', 'bower', '0.9.2'
 end

data/spec/gentoo/matchers_spec.rb

@@ -44,6 +44,8 @@ describe 'Serverspec matchers of Gentoo family' do
 
   it_behaves_like 'support be_installed.by(gem) matcher', 'jekyll'
   it_behaves_like 'support be_installed.by(gem).with_version matcher', 'jekyll', '1.0.0'
+  it_behaves_like 'support be_installed.by(npm) matcher', 'bower'
+  it_behaves_like 'support be_installed.by(npm).with_version matcher', 'bower', '0.9.2'
 
   it_behaves_like 'support belong_to_group matcher', 'root', 'root'
   it_behaves_like 'support have_gid matcher', 'root', 0

data/spec/gentoo/package_spec.rb

@@ -6,4 +6,6 @@ describe 'Serverspec package matchers of Gentoo family' do
   it_behaves_like 'support package installed matcher', 'httpd'
   it_behaves_like 'support package installed by gem matcher', 'jekyll'
   it_behaves_like 'support package installed by gem with version matcher', 'jekyll', '1.1.1'
+  it_behaves_like 'support package installed by npm matcher', 'bower'
+  it_behaves_like 'support package installed by npm with version matcher', 'bower', '0.9.2'
 end

data/spec/redhat/matchers_spec.rb

@@ -45,6 +45,8 @@ describe 'Serverspec matchers of Red Hat family' do
 
   it_behaves_like 'support be_installed.by(gem) matcher', 'jekyll'
   it_behaves_like 'support be_installed.by(gem).with_version matcher', 'jekyll', '1.0.0'
+  it_behaves_like 'support be_installed.by(npm) matcher', 'bower'
+  it_behaves_like 'support be_installed.by(npm).with_version matcher', 'bower', '0.9.2'
 
   it_behaves_like 'support belong_to_group matcher', 'root', 'root'
   it_behaves_like 'support have_gid matcher', 'root', 0

data/spec/redhat/package_spec.rb

@@ -6,4 +6,6 @@ describe 'Serverspec package matchers of Red Hat family' do
   it_behaves_like 'support package installed matcher', 'httpd'
   it_behaves_like 'support package installed by gem matcher', 'jekyll'
   it_behaves_like 'support package installed by gem with version matcher', 'jekyll', '1.1.1'
+  it_behaves_like 'support package installed by npm matcher', 'bower'
+  it_behaves_like 'support package installed by npm with version matcher', 'bower', '0.9.2'
 end

data/spec/solaris/matchers_spec.rb

@@ -44,6 +44,8 @@ describe 'Serverspec matchers of Solaris family' do
 
   it_behaves_like 'support be_installed.by(gem) matcher', 'jekyll'
   it_behaves_like 'support be_installed.by(gem).with_version matcher', 'jekyll', '1.0.0'
+  it_behaves_like 'support be_installed.by(npm) matcher', 'bower'
+  it_behaves_like 'support be_installed.by(npm).with_version matcher', 'bower', '0.9.2'
 
   it_behaves_like 'support belong_to_group matcher', 'root', 'root'
   it_behaves_like 'support have_gid matcher', 'root', 0

data/spec/solaris/package_spec.rb

@@ -6,4 +6,6 @@ describe 'Serverspec package matchers of Solaris family' do
   it_behaves_like 'support package installed matcher', 'httpd'
   it_behaves_like 'support package installed by gem matcher', 'jekyll'
   it_behaves_like 'support package installed by gem with version matcher', 'jekyll', '1.1.1'
+  it_behaves_like 'support package installed by npm matcher', 'bower'
+  it_behaves_like 'support package installed by npm with version matcher', 'bower', '0.9.2'
 end

data/spec/support/shared_commands_examples.rb

@@ -8,6 +8,16 @@ shared_examples_for 'support command check_installed_by_gem with_version' do |pa
   it { should eq "gem list --local | grep -w -- ^#{package} | grep -w -- ^#{version}" }
 end
 
+shared_examples_for 'support command check_installed_by_npm' do |package|
+  subject { commands.check_installed_by_npm(package) }
+  it { should eq "npm ls #{package} -g" }
+end
+
+shared_examples_for 'support command check_installed_by_npm with_version' do |package, version|
+  subject { commands.check_installed_by_npm(package) }
+  it { should eq "npm ls #{package} -g | grep -w -- #{version}" }
+end
+
 shared_examples_for 'support command check_file' do |file|
   subject { commands.check_file(file) }
   it { should eq "test -f #{file}" }

data/spec/support/shared_matcher_examples.rb

@@ -653,6 +653,30 @@ shared_examples_for 'support be_installed.by(gem).with_version matcher' do |name
   end
 end
 
+shared_examples_for 'support be_installed.by(npm) matcher' do |name|
+  describe 'be_installed.by(npm)' do
+    describe name do
+      it { should be_installed.by('npm') }
+    end
+
+    describe 'invalid-npm' do
+      it { should_not be_installed.by('npm') }
+    end
+  end
+end
+
+shared_examples_for 'support be_installed.by(npm).with_version matcher' do |name, version|
+  describe 'be_installed.by(npm).with_version' do
+    describe name do
+      it { should be_installed.by('npm').with_version(version) }
+    end
+
+    describe name do
+      it { should_not be_installed.by('npm').with_version('invalid-version') }
+    end
+  end
+end
+
 shared_examples_for 'support belong_to_group matcher' do |user, group|
   describe 'belong_to_group' do
     describe user do

data/spec/support/shared_package_examples.rb

@@ -33,3 +33,27 @@ shared_examples_for 'support package installed by gem with version matcher' do |
     end
   end
 end
+
+shared_examples_for 'support package installed by npm matcher' do |name|
+  describe 'installed by npm' do
+    describe package(name) do
+      it { should be_installed.by('npm') }
+    end
+
+    describe 'invalid-npm' do
+      it { should_not be_installed.by('npm') }
+    end
+  end
+end
+
+shared_examples_for 'support package installed by npm with version matcher' do |name, version|
+  describe 'installed by npm with version' do
+    describe package(name) do
+      it { should be_installed.by('npm').with_version(version) }
+    end
+
+    describe package(name) do
+      it { should_not be_installed.by('npm').with_version('invalid-version') }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
   prerelease: 
 platform: ruby
 authors: