serverspec 2.0.0.beta4 → 2.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1809aeacf6e576b6db3d8a02fa16dc10ff1cb6e
-  data.tar.gz: 31c07182a7d9cccda87cc495f82a0deccfd67715
+  metadata.gz: 64b36a55510e28dba398ec529d17c58bd6d5d209
+  data.tar.gz: cc5a71e21b65c51ad8b09dd15b80727c02d4d149
 SHA512:
-  metadata.gz: 5e02326bf9b8c04328bdb8d01e4b4bdadc9b467705e46e0bc7ae340d27c4458fc097540871f3a726a77628d229e1743d248d6cb832e428b3147b425f410b853e
-  data.tar.gz: 2dbd444b9ba8e80368832c35ca78a6f86bbc9207f0e00140cd2e90b6e950f397482df0cebc43c234e8bc3b34068a4ffa2bc682c9357f404b8836aee390de726c
+  metadata.gz: 087b2a6bfc2d5f6f6df8fb81302ad0dbf9ae4d7dcf13619cfffda53106beeb36859caae13d1ee60f36d8c65118941d47c13e218f16f5fc56257885e965eed091
+  data.tar.gz: f167bc461d6fb27e4404f0015cdc7b38182e9710c120fd904c4e011520244af2487641671897b448093748f9802567380943f480094788f04f2e1208d3ec5feb

data/lib/serverspec.rb

@@ -10,38 +10,24 @@ require 'serverspec/subject'
 require 'serverspec/commands/base'
 require 'rspec/core/formatters/base_formatter'
 
-module RSpec
-  module Core
-    module Formatters
-      class BaseTextFormatter < BaseFormatter
-        def dump_failure_info(example)
-          exception = example.execution_result[:exception]
-          exception_class_name = exception_class_name_for(exception)
-          output.puts "#{long_padding}#{failure_color("Failure/Error:")} #{failure_color(read_failed_line(exception, example).strip)}"
-          output.puts "#{long_padding}#{failure_color(exception_class_name)}: #{failure_color(exception.message)}" unless exception_class_name =~ /RSpec/
-          output.puts "#{long_padding}  #{failure_color(example.metadata[:command])}" if example.metadata[:command]
-          output.puts "#{long_padding}  #{failure_color(example.metadata[:stdout])}" if example.metadata[:stdout] != ''
-          exception.message.to_s.split("\n").each { |line| output.puts "#{long_padding}  #{failure_color(line)}" } if exception.message
-
-          if shared_group = find_shared_group(example)
-            dump_shared_failure_info(shared_group)
-          end
+module RSpec::Core::Notifications
+  class FailedExampleNotification < ExampleNotification
+    def message_lines
+      @lines ||=
+        begin
+          lines = ["Failure/Error: #{read_failed_line.strip}"]
+          lines << "#{exception_class_name}:" unless exception_class_name =~ /RSpec/
+          exception.message.to_s.split("\n").each do |line|
+          lines << "  #{line}" if exception.message
+          lines << "  #{example.metadata[:command]}"
+          lines << "  #{example.metadata[:stdout]}" if example.metadata[:stdout]
+          lines << "  #{example.metadata[:stderr]}" if example.metadata[:stderr]
         end
-      end
-      class ProgressFormatter < BaseTextFormatter
-        def dump_failure_info(example)
-          exception = example.execution_result[:exception]
-          exception_class_name = exception_class_name_for(exception)
-          output.puts "#{long_padding}#{failure_color("Failure/Error:")} #{failure_color(read_failed_line(exception, example).strip)}"
-          output.puts "#{long_padding}#{failure_color(exception_class_name)}: #{failure_color(exception.message)}" unless exception_class_name =~ /RSpec/
-          output.puts "#{long_padding}  #{failure_color(example.metadata[:command])}" if example.metadata[:command]
-          output.puts "#{long_padding}  #{failure_color(example.metadata[:stdout])}" if example.metadata[:stdout] != ''
-          exception.message.to_s.split("\n").each { |line| output.puts "#{long_padding}  #{failure_color(line)}" } if exception.message
-
-          if shared_group = find_shared_group(example)
-            dump_shared_failure_info(shared_group)
-          end
+        if shared_group
+          lines << "Shared Example Group: \"#{shared_group.metadata[:shared_group_name]}\"" +
+            " called from #{backtrace_formatter.backtrace_line(shared_group.location)}"
         end
+        lines
       end
     end
   end

data/lib/serverspec/helper/type.rb

@@ -4,7 +4,7 @@ module Serverspec
       types = %w(
         base cgroup command cron default_gateway file group host iis_website iis_app_pool interface
         ipfilter ipnat iptables kernel_module linux_kernel_parameter lxc mail_alias
-        package php_config port process routing_table selinux service user yumrepo
+        package php_config port ppa process routing_table selinux service user yumrepo
         windows_feature windows_hot_fix windows_registry_key windows_scheduled_task zfs
       )
 

data/lib/serverspec/type/ppa.rb

@@ -0,0 +1,13 @@
+module Serverspec
+  module Type
+    class Ppa < Base
+      def exists?
+        backend.check_ppa(@name)
+      end
+
+      def enabled?
+        backend.check_ppa_enabled(@name)
+      end
+    end
+  end
+end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.0.0.beta4"
+  VERSION = "2.0.0.beta5"
 end

data/serverspec.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "net-ssh"
-  spec.add_runtime_dependency "rspec", "~> 3.0.0.rc"
+  spec.add_runtime_dependency "rspec", "~> 3.0.0"
   spec.add_runtime_dependency "rspec-its"
   spec.add_runtime_dependency "highline"
   spec.add_runtime_dependency "specinfra", "~> 2.0.0.beta2"

data/spec/unit/command_spec.rb

@@ -50,32 +50,32 @@ describe Serverspec::Type::Command do
 
   describe '#return_stdout?' do
     it 'matches against a string, stripping whitespace' do
-      expect(subject.return_stdout? 'banana').to be_true
-      expect(subject.return_stdout? 'pancake').to be_false
+      expect(subject.return_stdout? 'banana').to be_truthy
+      expect(subject.return_stdout? 'pancake').to be_falsey
     end
 
     it 'matches against a regex' do
-      expect(subject.return_stdout? /anan/).to be_true
-      expect(subject.return_stdout? /^anan/).to be_false
+      expect(subject.return_stdout? /anan/).to be_truthy
+      expect(subject.return_stdout? /^anan/).to be_falsey
     end
   end
 
   describe '#return_stderr?' do
     it 'matches against a string, stripping whitespace' do
-      expect(subject.return_stderr? 'split').to be_true
-      expect(subject.return_stderr? 'pancake').to be_false
+      expect(subject.return_stderr? 'split').to be_truthy
+      expect(subject.return_stderr? 'pancake').to be_falsey
     end
 
     it 'matches against a regex' do
-      expect(subject.return_stderr? /pli/).to be_true
-      expect(subject.return_stderr? /^pli/).to be_false
+      expect(subject.return_stderr? /pli/).to be_truthy
+      expect(subject.return_stderr? /^pli/).to be_falsey
     end
   end
 
   describe '#return_stderr?' do
     it 'matches against an integer' do
-      expect(subject.return_exit_status? 42).to be_true
-      expect(subject.return_exit_status? 43).to be_false
+      expect(subject.return_exit_status? 42).to be_truthy
+      expect(subject.return_exit_status? 43).to be_falsey
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta4
+  version: 2.0.0.beta5
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +203,7 @@ files:
 - lib/serverspec/type/package.rb
 - lib/serverspec/type/php_config.rb
 - lib/serverspec/type/port.rb
+- lib/serverspec/type/ppa.rb
 - lib/serverspec/type/process.rb
 - lib/serverspec/type/routing_table.rb
 - lib/serverspec/type/selinux.rb