serverspec 2.0.0.beta14 → 2.0.0.beta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10e0a503abed00be31b8a9824c6fabd65493265f
-  data.tar.gz: 4633170014576075194dc5190171cbc9f8101008
+  metadata.gz: 9682b482313465065c99631bd9d6406eee5fccba
+  data.tar.gz: f2abbbc406c36925dbac6c6c6dc5cdea5f869a66
 SHA512:
-  metadata.gz: b59be2057429d85e4231467ef79ed844364453eca3c041400d56b1709be454c8c1996e642e25b5133ff5cfc290c2da4666f8e41fdca46aa4081cdeb40575fede
-  data.tar.gz: c480f1dc7ac100e1c7ae24b1a82b04e17d0131fe32ceef6b372c56264c1b51033edcfaa8cae0d1a3cbd8c81b3534282dfc3a981d7d0ab5beb3bd62d5cfe55d06
+  metadata.gz: a40b33c9ee24d24566dd3af6be3b88ab79e2b52cf5d29e4a1dd53f005a4d66ad46fd396aa46233000cf10cab0807a321ddb62b6feb9a58d9083ae4b8602c9beb
+  data.tar.gz: 4be745c4c19ae16a62892a0e32391b25560f88e7eb2557f0a8cbb8adb7858cd954c4da706c27ddfd728ed2fb3e687db8693236564861ea7c3fbfe30bee7d60c5

data/Rakefile

@@ -9,7 +9,7 @@ if defined?(RSpec)
   task :spec => 'spec:all'
 
   namespace :spec do
-    task :all => [ 'spec:type:all', 'spec:helper', 'spec:unit' ]
+    task :all => [ 'spec:type:all', 'spec:helper' ]
 
     namespace :type do
       oses = Dir.glob('spec/type/*').map {|d| File.basename(d)}
@@ -26,9 +26,5 @@ if defined?(RSpec)
     RSpec::Core::RakeTask.new(:helper) do |t|
         t.pattern = "spec/helper/*_spec.rb"
     end
-
-    RSpec::Core::RakeTask.new(:unit) do |t|
-        t.pattern = "spec/unit/*_spec.rb"
-    end
   end
 end

data/lib/serverspec/setup.rb

@@ -13,7 +13,7 @@ module Serverspec
         ask_windows_backend
       end
 
-      if @backend_type == 'Ssh'
+      if @backend_type == 'ssh'
         print 'Vagrant instance y/n: '
         @vagrant = $stdin.gets.chomp
         if @vagrant =~ (/(true|t|yes|y|1)$/i)
@@ -72,7 +72,7 @@ EOF
       num = $stdin.gets.to_i - 1
       puts
 
-      @backend_type = ['Ssh', 'Exec'][num] || 'Exec'
+      @backend_type = ['ssh', 'exec'][num] || 'exec'
     end
 
     def self.ask_windows_backend
@@ -88,7 +88,7 @@ EOF
       num = $stdin.gets.to_i - 1
       puts
 
-      @backend_type = ['WinRM', 'Cmd'][num] || 'Exec'
+      @backend_type = ['winrm', 'cmd'][num] || 'exec'
     end
 
     def self.safe_create_spec
@@ -241,22 +241,19 @@ end
     def self.spec_helper_template
       template = <<-'EOF'
 require 'serverspec'
-<% if @backend_type == 'Ssh' -%>
+<% if @backend_type == 'ssh' -%>
 require 'net/ssh'
 <% end -%>
 <%- if @vagrant -%>
 require 'tempfile'
 <% end -%>
-<% if @backend_type == 'WinRM' -%>
+<% if @backend_type == 'winrm' -%>
 require 'winrm'
 <% end -%>
 
-include Specinfra::Helper::<%= @backend_type %>
-<% if @os_type != 'UN*X' -%>
-include Specinfra::Helper::Windows
-<% end -%>
+set :backend, :<%= @backend_type %>
 
-<% if @os_type == 'UN*X' && @backend_type == 'Ssh' -%>
+<% if @os_type == 'UN*X' && @backend_type == 'ssh' -%>
 if ENV['ASK_SUDO_PASSWORD']
   begin
     require 'highline/import'
@@ -268,7 +265,7 @@ else
   set :sudo_password, ENV['SUDO_PASSWORD']
 end
 
-<%- if @backend_type == 'Ssh' -%>
+<%- if @backend_type == 'ssh' -%>
 host = ENV['TARGET_HOST']
 
 <%- if @vagrant -%>
@@ -298,7 +295,7 @@ set :ssh_options, options
 # Set PATH
 # set :path, '/sbin:/usr/local/sbin:$PATH'
 
-<% if @backend_type == 'WinRM'-%>
+<% if @backend_type == 'winrm'-%>
 user = <username>
 pass = <password>
 endpoint = "http://<hostname>:5985/wsman"

data/lib/serverspec/type/file.rb

@@ -74,7 +74,7 @@ module Serverspec
       end
 
       def immutable?
-        backend.check_file_is_immutable(@name)
+        @runner.check_file_is_immutable(@name)
       end
 
       def match_checksum(checksum)
@@ -101,13 +101,19 @@ module Serverspec
       end
 
       def mtime
-        d = backend.get_file_mtime(@name).stdout.strip
+        d = @runner.get_file_mtime(@name).stdout.strip
         DateTime.strptime(d, '%s').new_offset(DateTime.now.offset)
       end
 
       def size
-        backend.get_file_size(@name).stdout.strip.to_i
+        @runner.get_file_size(@name).stdout.strip.to_i
       end
     end
   end
 end
+
+
+
+
+
+

data/lib/serverspec/type/ppa.rb

@@ -2,11 +2,11 @@ module Serverspec
   module Type
     class Ppa < Base
       def exists?
-        backend.check_ppa_exists(@name)
+        @runner.check_ppa_exists(@name)
       end
 
       def enabled?
-        backend.check_ppa_is_enabled(@name)
+        @runner.check_ppa_is_enabled(@name)
       end
     end
   end

data/lib/serverspec/type/user.rb

@@ -10,7 +10,7 @@ module Serverspec
       end
 
       def belongs_to_primary_group?(group)
-        backend.check_user_belongs_to_primary_group(@name, group)
+        @runner.check_user_belongs_to_primary_group(@name, group)
       end
 
       def has_uid?(uid)

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.0.0.beta14"
+  VERSION = "2.0.0.beta15"
 end

data/serverspec.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "rspec", "~> 3.0.0"
   spec.add_runtime_dependency "rspec-its"
-  spec.add_runtime_dependency "specinfra", "~> 2.0.0.beta13"
+  spec.add_runtime_dependency "specinfra", "~> 2.0.0.beta15"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
 end

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'serverspec'
 require 'pathname'
 require 'rspec/mocks/standalone'
 
-include Specinfra::Helper::Exec
+set :backend, :exec
 
 PROJECT_ROOT = (Pathname.new(File.dirname(__FILE__)) + '..').expand_path
 

data/spec/type/windows/command_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
-
+set :backend, :cmd
 set :os, :family => 'windows'
 
 describe command('test_cmd /test/path/file') do

data/spec/type/windows/feature_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

data/spec/type/windows/file_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

data/spec/type/windows/group_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

data/spec/type/windows/host_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 set :os, :family => 'windows'
 
 describe host('127.0.0.1') do

data/spec/type/windows/hot_fix_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

data/spec/type/windows/iis_app_pool_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

data/spec/type/windows/iis_webisite_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

data/spec/type/windows/package_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

data/spec/type/windows/port_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

data/spec/type/windows/registry_key_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 set :os, :family => 'windows'
 
 describe windows_registry_key('PATH/TO/THE_KEY') do

data/spec/type/windows/scheduled_task_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

data/spec/type/windows/service_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

data/spec/type/windows/user_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Cmd
+set :backend, :cmd
 
 set :os, :family => 'windows'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta14
+  version: 2.0.0.beta15
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta13
+        version: 2.0.0.beta15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta13
+        version: 2.0.0.beta15
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -266,7 +266,6 @@ files:
 - spec/type/windows/scheduled_task_spec.rb
 - spec/type/windows/service_spec.rb
 - spec/type/windows/user_spec.rb
-- spec/unit/command_spec.rb
 - wercker.yml
 homepage: http://serverspec.org/
 licenses:
@@ -398,4 +397,3 @@ test_files:
 - spec/type/windows/scheduled_task_spec.rb
 - spec/type/windows/service_spec.rb
 - spec/type/windows/user_spec.rb
-- spec/unit/command_spec.rb

data/spec/unit/command_spec.rb

@@ -1,81 +0,0 @@
-require 'spec_helper'
-
-describe Serverspec::Type::Command do
-  subject { command('echo banana') }
-
-  before :each do
-    allow(subject.backend).to receive(:run_command).and_return(
-        CommandResult.new({
-          :stdout      => "banana\n",
-          :stderr      => "split\n",
-          :exit_status => "42",         # Command should convert this to an integer
-        })
-    )
-  end
-
-  it 'has stdout' do
-    expect(subject.stdout).to be == "banana\n"
-  end
-
-  it 'has stderr' do
-    expect(subject.stderr).to be == "split\n"
-  end
-
-  it 'has exit_status' do
-    expect(subject.exit_status).to be == 42
-  end
-
-  it 'does not conflate stdout and stderr' do
-    expect(subject.stdout).to eq("banana\n")
-    expect(subject.stderr).to eq("split\n")
-  end
-
-  it 'runs the command lazily' do
-    expect(subject.backend).to receive(:run_command).exactly(0).times
-
-    # Not sending any messages to the subject.
-  end
-
-  it 'does not run the command more than once' do
-    expect(subject.backend).to receive(:run_command).once
-
-    # We can send all these messages, but the command is invoked only once.
-    subject.stdout
-    subject.stderr
-    subject.exit_status
-    subject.return_stdout? 'foo'
-    subject.return_stderr? 'foo'
-    subject.return_exit_status? 0
-  end
-
-  describe '#return_stdout?' do
-    it 'matches against a string, stripping whitespace' do
-      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_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_truthy
-      expect(subject.return_stderr? 'pancake').to be_falsey
-    end
-
-    it 'matches against a regex' do
-      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_truthy
-      expect(subject.return_exit_status? 43).to be_falsey
-    end
-  end
-end