serverspec 2.0.0.beta5 → 2.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64b36a55510e28dba398ec529d17c58bd6d5d209
-  data.tar.gz: cc5a71e21b65c51ad8b09dd15b80727c02d4d149
+  metadata.gz: fa3da35f1496825983cc458a77052918cd8ed9fa
+  data.tar.gz: 63b88a49efb03e61d44c82b1908e9ad7c450b72e
 SHA512:
-  metadata.gz: 087b2a6bfc2d5f6f6df8fb81302ad0dbf9ae4d7dcf13619cfffda53106beeb36859caae13d1ee60f36d8c65118941d47c13e218f16f5fc56257885e965eed091
-  data.tar.gz: f167bc461d6fb27e4404f0015cdc7b38182e9710c120fd904c4e011520244af2487641671897b448093748f9802567380943f480094788f04f2e1208d3ec5feb
+  metadata.gz: c8fc95f52f7e6f6e6571dbdca21935ca64345ac7bf1ccc6bc2971ea4fe4cdd56071b70457ca0f4918cc774737e8093ef0608a658b8caf7c4fd2a9980f43555ab
+  data.tar.gz: 5d96c7c90724bfcc0ce4a96c7960dde0a9998595f80670ccfb9f029fe63925d0569dbc460b20223e481506ff50a32b17f920defc7148fcff70e819cb9ea66e51

data/Rakefile

@@ -1,7 +1,12 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require "octorelease"
+begin
+  require "rspec/core/rake_task"
+  require "octorelease"
+rescue LoadError
+end
 
-RSpec::Core::RakeTask.new('spec') do |t|
-  t.pattern = 'spec/*/*_spec.rb'
+if defined?(RSpec)
+  RSpec::Core::RakeTask.new('spec') do |t|
+    t.pattern = 'spec/*/*_spec.rb'
+  end
 end

data/lib/serverspec/setup.rb

@@ -94,22 +94,26 @@ EOF
       content = <<-EOF
 require 'spec_helper'
 
-describe package('httpd') do
+describe package('httpd'), :if => os[:family] == 'RedHat' do
   it { should be_installed }
 end
 
-describe service('httpd') do
+describe package('apache2'), :if => os[:family] == 'Ubuntu' do
+  it { should be_installed }
+end
+
+describe service('httpd'), :if => os[:family] == 'RedHat' do
   it { should be_enabled   }
   it { should be_running   }
 end
 
-describe port(80) do
-  it { should be_listening }
+describe service('apache2'), :if => os[:family] == 'Ubuntu' do
+  it { should be_enabled   }
+  it { should be_running   }
 end
 
-describe file('/etc/httpd/conf/httpd.conf') do
-  it { should be_file }
-  its(:content) { should match /ServerName #{@hostname}/ }
+describe port(80) do
+  it { should be_listening }
 end
 EOF
 
@@ -157,11 +161,27 @@ EOF
 require 'rake'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = 'spec/*/*_spec.rb'
-end
-
+task :spec    => 'spec:all'
 task :default => :spec
+
+namespace :spec do
+  targets = []
+  Dir.glob('./spec/*').each do |dir|
+    next unless File.directory?(dir)
+    targets << File.basename(dir)
+  end
+
+  task :all     => targets
+  task :default => :all
+
+  targets.each do |target|
+    desc "Run serverspec tests to #{target}"
+    RSpec::Core::RakeTask.new(target.to_sym) do |t|
+      ENV['TARGET_HOST'] = target
+      t.pattern = "spec/#{target}/*_spec.rb"
+    end
+  end
+end
       EOF
       if File.exists? 'Rakefile'
         old_content = File.read('Rakefile')
@@ -190,7 +210,7 @@ task :default => :spec
         list_of_vms = []
         if vagrant_list != ''
           vagrant_list.each_line do |line|
-            if match = /([\w-]+[\s]+)(created|not created|poweroff|running|saved)[\s](\(virtualbox\)|\(vmware\))/.match(line)
+            if match = /([\w-]+[\s]+)(created|aborted|not created|poweroff|running|saved)[\s](\(virtualbox\)|\(vmware\))/.match(line)
               list_of_vms << match[1].strip!
             end
           end
@@ -215,9 +235,6 @@ task :default => :spec
     def self.spec_helper_template
       template = <<-EOF
 require 'serverspec'
-<% if @os_type == 'UN*X' && @backend_type == 'Ssh' -%>
-require 'pathname'
-<% end -%>
 <% if @backend_type == 'Ssh' -%>
 require 'net/ssh'
 <% end -%>
@@ -228,64 +245,59 @@ require 'winrm'
 include Specinfra::Helper::<%= @backend_type %>
 <% if @os_type == 'UN*X' -%>
 include Specinfra::Helper::DetectOS
-<% else  -%>
+<% else -%>
 include Specinfra::Helper::Windows
 <% end -%>
 
-<% if @os_type == 'UN*X' -%>
-RSpec.configure do |c|
-  if ENV['ASK_SUDO_PASSWORD']
+<% if @os_type == 'UN*X' && @backend_type == 'Ssh' -%>
+if ENV['ASK_SUDO_PASSWORD']
+  begin
     require 'highline/import'
-    c.sudo_password = ask("Enter sudo password: ") { |q| q.echo = false }
-  else
-    c.sudo_password = ENV['SUDO_PASSWORD']
+  rescue LoadError
+    fail "highline is not available. Try installing it."
   end
-  <%- if @backend_type == 'Ssh' -%>
-  c.before :all do
-    block = self.class.metadata[:example_group_block]
-    if RUBY_VERSION.start_with?('1.8')
-      file = block.to_s.match(/.*@(.*):[0-9]+>/)[1]
-    else
-      file = block.source_location.first
-    end
-    host  = File.basename(Pathname.new(file).dirname)
-    if c.host != host
-      c.ssh.close if c.ssh
-      c.host  = host
-      options = Net::SSH::Config.for(c.host)
-      user    = options[:user] || Etc.getlogin
-    <%- if @vagrant -%>
-      vagrant_up = `vagrant up #{@hostname}`
-      config = `vagrant ssh-config #{@hostname}`
-      if config != ''
-        config.each_line do |line|
-          if match = /HostName (.*)/.match(line)
-            host = match[1]
-          elsif  match = /User (.*)/.match(line)
-            user = match[1]
-          elsif match = /IdentityFile (.*)/.match(line)
-            options[:keys] =  [match[1].gsub(/\"/,'')]
-          elsif match = /Port (.*)/.match(line)
-            options[:port] = match[1]
-          end
-        end
-      end
-    <%- end -%>
-      c.ssh   = Net::SSH.start(host, user, options)
+  set :sudo_password, ask("Enter sudo password: ") { |q| q.echo = false }
+else
+  set :sudo_password, ENV['SUDO_PASSWORD']
+end
+
+<%- if @backend_type == 'Ssh' -%>
+host    = ENV['TARGET_HOST']
+options = Net::SSH::Config.for(host)
+
+<%- if @vagrant -%>
+`vagrant up \#{ENV['TARGET_HOST']}`
+
+config = `vagrant ssh-config \#{ENV['TARGET_HOST']}`
+if config != ''
+  config.each_line do |line|
+    if match = /HostName (.*)/.match(line)
+      host = match[1]
+    elsif  match = /User (.*)/.match(line)
+      options[:user] = match[1]
+    elsif match = /IdentityFile (.*)/.match(line)
+      options[:keys] =  [match[1].gsub(/\"/,'')]
+    elsif match = /Port (.*)/.match(line)
+      options[:port] = match[1]
     end
   end
-  <%- end -%>
 end
-<% end -%>
+
+<%- end -%>
+options[:user] ||= Etc.getlogin
+
+set :host,        host
+set :ssh_options, options
+<%- end -%>
+<%- end -%>
+
 <% if @backend_type == 'WinRM'-%>
-RSpec.configure do |c|
-  user = <username>
-  pass = <password>
-  endpoint = "http://<hostname>:5985/wsman"
+user = <username>
+pass = <password>
+endpoint = "http://<hostname>:5985/wsman"
 
-  c.winrm = ::WinRM::WinRMWebService.new(endpoint, :ssl, :user => user, :pass => pass, :basic_auth_only => true)
-  c.winrm.set_timeout 300 # 5 minutes max timeout for any operation
-end
+c.winrm = ::WinRM::WinRMWebService.new(endpoint, :ssl, :user => user, :pass => pass, :basic_auth_only => true)
+c.winrm.set_timeout 300 # 5 minutes max timeout for any operation
 <% end -%>
 EOF
       template

data/lib/serverspec/version.rb

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

data/serverspec.gemspec

@@ -18,13 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "net-ssh"
   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"
+  spec.add_runtime_dependency "specinfra", "~> 2.0.0.beta4"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
-  spec.add_development_dependency "octokit", "~> 2.7.2"
-  spec.add_development_dependency "octorelease"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 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-05 00:00:00.000000000 Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,34 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: specinfra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,34 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.1
-- !ruby/object:Gem::Dependency
-  name: octokit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.7.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.7.2
-- !ruby/object:Gem::Dependency
-  name: octorelease
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: RSpec tests for your servers configured by Puppet, Chef or anything else
 email:
 - gosukenator@gmail.com