specinfra 2.59.0 → 2.59.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 210fcf5adc3d236c053cc1fba165798c36229b5b
-  data.tar.gz: 05f2723bb8a523c802db1b9f624095a9f56f2e7a
+  metadata.gz: 00e53eab4c97eb81a8f2de61ae34027275188745
+  data.tar.gz: f51442118eaa30a9d61d5cfb401842ad7bf516fb
 SHA512:
-  metadata.gz: 52574f4fb340b334b5e0fbd55b3cab6157ac2f726e9f2be1e8aaed6deef86db9bc3be3259f48d4093c8a358510c5434d71a6c2e6a5d0f410397c06b2c5c29358
-  data.tar.gz: def2c971e0393aabfa5e5f8414b042a1a1ce7d70441a1cf06433608fc3cd752a9c9329fb328a734ef5b9090553b47d0381b1b3958258839d58d48a6be7848c44
+  metadata.gz: 2c81d761e731636248b559c997ea4dac406aab2ff398c546d5a894acc3b2ea365d11240b5ca98c1cf5ae3218513bdb58fabe76d57ad79675b98c0efd2d4ff5e8
+  data.tar.gz: 64b32779ebf803ef7201efb803a37914ea4eab9ca85daff1da36997906098f6c59e48e79337601b04366e77204c8d663fd815a3b1668482e27f42a8a175ab022

data/.gitignore

@@ -19,3 +19,5 @@ tmp
 .ruby-gemset
 .ruby-version
 .rvmrc
+upstream.sh
+

data/Gemfile

@@ -3,7 +3,22 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in specinfra.gemspec
 gemspec
 
-if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
+ruby_version = Gem::Version.new(RUBY_VERSION.dup)
+if ruby_version < Gem::Version.new('2.0.0')
   # net-ssh 3.x dropped Ruby 1.8 and 1.9 support.
   gem 'net-ssh', '~> 2.7'
 end
+if ruby_version < Gem::Version.new('1.9.3')
+  # listen 2.0 dropped Ruby 1.8 support
+  gem 'listen', '< 2.0'
+  gem 'guard-rspec', '< 4.0'
+  gem 'guard', '< 2.0'
+  # hitimes 1.2.3 dropped Ruby 1.8 support
+  gem 'hitimes', '< 1.2.3'
+elsif ruby_version < Gem::Version.new('2.0.0')
+  # listen 3.0 dropped Ruby 1.8 and 1.9 support
+  gem 'listen', '< 3.0'
+elsif ruby_version < Gem::Version.new('2.2.3')
+  # listen 3.1 dropped support for Ruby 2.1 and lower
+  gem 'listen', '< 3.1'
+end

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard :rspec do
+guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch('spec/spec_helper.rb')  { 'spec' }
 end

data/README.md

@@ -10,12 +10,22 @@ Add this line to your application's Gemfile:
 
 And then execute:
 
-    $ bundle
+  ```
+  bundle
+  ```
 
 Or install it yourself as:
 
-    $ gem install specinfra
+  ```
+  gem install specinfra
+  ```
 
+## Running tests
+
+  ```
+  bundle exec rake
+  ```
+  
 ## Usage
 
 TODO: Write usage instructions here

data/Rakefile

@@ -7,6 +7,7 @@ end
 
 if defined?(RSpec)
   task :spec => 'spec:all'
+  task :default => 'spec:all'
 
   namespace :spec do
     task :all => [ :helper, :backend, :configuration, :command, :host_inventory ]

data/lib/specinfra/command/freebsd/base/inventory.rb

@@ -24,5 +24,9 @@ class Specinfra::Command::Freebsd::Base::Inventory < Specinfra::Command::Base::I
     def get_filesystem
       'df -k'
     end
+
+    def get_system_product_name
+      'kenv smbios.system.product'
+    end
   end
 end

data/lib/specinfra/ext/class.rb

@@ -2,6 +2,7 @@ class Class
   def subclasses
     result = []
     ObjectSpace.each_object(Class) do |k|
+      next if k.name.nil?
       result << k if k < self
     end
     result

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.59.0"
+  VERSION = "2.59.1"
 end

data/spec/backend/exec/build_command_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe Specinfra::Backend::Exec do
+  before :all do
+    set :backend, :exec
+  end
+
   describe '#build_command' do
     context 'with simple command' do
       it 'should escape spaces' do
@@ -107,13 +111,13 @@ end
 describe 'os' do
   before do
     # clear os information cache
-    property[:os_by_host] = {}
+    property[:os] = nil
+    Specinfra.configuration.instance_variable_set(:@os, nil)
   end
 
   context 'test ubuntu with lsb_release command' do
-    subject { os }
-    it do
-      expect(Specinfra.backend).to receive(:run_command).at_least(1).times do |args|
+    before do
+      allow(Specinfra.backend).to receive(:run_command) do |args|
         if ['ls /etc/debian_version', 'lsb_release -ir'].include? args
           double(
             :run_command_response,
@@ -126,17 +130,17 @@ describe 'os' do
           double :run_command_response, :success? => false, :stdout => nil
         end
       end
+    end
+    subject! { os }
+    it do
+      expect(Specinfra.backend).to have_received(:run_command).at_least(1).times
       should eq({:family => 'ubuntu', :release => '12.04', :arch => 'x86_64' })
     end
   end
 
   context 'test ubuntu with /etc/lsb-release' do
     before do
-      property[:os] = nil
-    end
-    subject { os }
-    it do
-      expect(Specinfra.backend).to receive(:run_command).at_least(1).times do |args|
+      allow(Specinfra.backend).to receive(:run_command) do |args|
         if ['ls /etc/debian_version', 'cat /etc/lsb-release'].include? args
           double(
             :run_command_response,
@@ -154,17 +158,17 @@ EOF
           double :run_command_response, :success? => false, :stdout => nil
         end
       end
+    end
+    subject! { os }
+    it do
+      expect(Specinfra.backend).to have_received(:run_command).at_least(1).times
       should eq({:family => 'ubuntu', :release => '12.04', :arch => 'x86_64' })
     end
   end
 
   context 'test debian (no lsb_release or lsb-release)' do
     before do
-      property[:os] = nil
-    end
-    subject { os }
-    it do
-      expect(Specinfra.backend).to receive(:run_command).at_least(1).times do |args|
+      allow(Specinfra.backend).to receive(:run_command) do |args|
         if args == 'ls /etc/debian_version'
           double :run_command_response, :success? => true, :stdout => nil
         elsif args == 'uname -m'
@@ -173,6 +177,10 @@ EOF
           double :run_command_response, :success? => false, :stdout => nil
         end
       end
+    end
+    subject! { os }
+    it do
+      expect(Specinfra.backend).to have_received(:run_command).at_least(1).times
       should eq({:family => 'debian', :release => nil, :arch => 'x86_64' })
     end
   end

data/spec/backend/exec/child_process_spec.rb

@@ -3,6 +3,10 @@
 require 'spec_helper'
 
 context "when executed process launches child process like a daemon, and the daemon doesn't close stdout,err" do
+  before :all do
+    set :backend, :exec
+  end
+
   subject(:result) { Specinfra::Runner.run_command("ruby -e 'pid = fork { sleep 10; puts :bye }; Process.detach(pid); puts pid'") }
 
   it "doesn't block" do

data/spec/backend/exec/consume_exited_process_spec.rb

@@ -1,36 +1,42 @@
 require 'spec_helper'
 
-context 'when executed process had exited before read stdout and stderr,' do
-  let(:backend) { Specinfra::Backend::Exec.new }
-
-  it 'can consume stdout and stderr from buffer' do
-    allow(IO).to receive(:select).and_wrap_original { |m, *args| sleep 1; m.call(*args) }
-    result = backend.run_command("ruby -e 'STDOUT.puts \"stdout\"; STDERR.puts \"stderr\"'")
-    expect(result.stdout.chomp).to eq('stdout')
-    expect(result.stderr.chomp).to eq('stderr')
+RSpec.describe 'exec backend' do
+  before :all do
+    set :backend, :exec
   end
-end
 
-context 'when executed process has exited between reading stdout and stderr,' do
-  let(:backend) { Specinfra::Backend::Exec.new }
+  context 'when executed process had exited before read stdout and stderr,' do
+    let(:backend) { Specinfra::Backend::Exec.new }
 
-  it 'can consume stdout and stderr from buffer' do
-    backend.stdout_handler = proc { |o| sleep 1 }
-    result = backend.run_command("ruby -e 'STDOUT.puts \"stdout\"; STDOUT.close; STDERR.puts \"stderr\"'")
-    expect(result.stdout.chomp).to eq('stdout')
-    expect(result.stderr.chomp).to eq('stderr')
+    it 'can consume stdout and stderr from buffer' do
+      allow(IO).to receive(:select).and_wrap_original { |m, *args| sleep 1; m.call(*args) }
+      result = backend.run_command("ruby -e 'STDOUT.puts \"stdout\"; STDERR.puts \"stderr\"'")
+      expect(result.stdout.chomp).to eq('stdout')
+      expect(result.stderr.chomp).to eq('stderr')
+    end
   end
-end
 
-context 'Output of stderr_handler' do
-  let(:backend) { Specinfra::Backend::Exec.new }
-  subject(:stderr) do
-    allow(IO).to receive(:select).and_wrap_original { |m, *args| sleep 1; m.call(*args) }
-    err = ''
-    backend.stderr_handler = proc { |e| err += e }
-    backend.run_command('echo foo 1>&2')
-    err
+  context 'when executed process has exited between reading stdout and stderr,' do
+    let(:backend) { Specinfra::Backend::Exec.new }
+
+    it 'can consume stdout and stderr from buffer' do
+      backend.stdout_handler = proc { |o| sleep 1 }
+      result = backend.run_command("ruby -e 'STDOUT.puts \"stdout\"; STDOUT.close; STDERR.puts \"stderr\"'")
+      expect(result.stdout.chomp).to eq('stdout')
+      expect(result.stderr.chomp).to eq('stderr')
+    end
   end
 
-  it { expect(stderr).to eq "foo\n" }
+  context 'Output of stderr_handler' do
+    let(:backend) { Specinfra::Backend::Exec.new }
+    subject(:stderr) do
+      allow(IO).to receive(:select).and_wrap_original { |m, *args| sleep 1; m.call(*args) }
+      err = ''
+      backend.stderr_handler = proc { |e| err += e }
+      backend.run_command('echo foo 1>&2')
+      err
+    end
+
+    it { expect(stderr).to eq "foo\n" }
+  end
 end

data/spec/backend/exec/env_spec.rb

@@ -1,11 +1,15 @@
 require 'spec_helper'
 
+set :backend, :exec
+
 describe Specinfra.backend.run_command('echo $LANG').stdout.strip do
   it { should eq 'C' }
 end
 
 describe do
   before do
+    set :backend, :exec
+
     ENV['LANG'] = 'C'
     set :env, :LANG => 'ja_JP.UTF-8'
   end

data/spec/backend/exec/read_noblock_spec.rb

@@ -38,6 +38,10 @@ shared_examples "IO checks" do
 end
 
 describe "buffer overflow problem" do
+    before :all do
+        set :backend, :exec
+    end
+
     context "with small output amount" do
         let (:max) { 10 }
         include_examples "IO checks"

data/spec/backend/ssh/build_command_spec.rb

@@ -1,8 +1,16 @@
 require 'spec_helper'
 
-set :backend, :ssh
-
 describe Specinfra::Backend::Ssh do
+  before(:all) do
+    set :backend, :ssh
+  end
+
+  after(:all) do
+    if Specinfra.configuration.instance_variable_defined?(:@ssh_options)
+      Specinfra.configuration.instance_variable_set(:@ssh_options, nil)
+    end
+  end
+
   describe '#build_command' do
     context 'with root user' do 
       before do
@@ -12,6 +20,12 @@ describe Specinfra::Backend::Ssh do
         end
       end
 
+      after do
+        RSpec.configure do |c|
+          c.ssh = nil
+        end
+      end
+
       it 'should not prepend sudo' do
         expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
       end
@@ -29,6 +43,12 @@ describe Specinfra::Backend::Ssh do
         end
       end
 
+      after do
+        RSpec.configure do |c|
+          c.ssh = nil
+        end
+      end
+
       it 'should prepend sudo' do
         expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq %q{sudo -p 'Password: ' /bin/sh -c test\ -f\ /etc/passwd}
       end
@@ -49,6 +69,7 @@ describe Specinfra::Backend::Ssh do
 
       after do
         RSpec.configure do |c|
+          c.ssh = nil
           c.sudo_path = nil
         end
       end
@@ -73,6 +94,7 @@ describe Specinfra::Backend::Ssh do
 
       after do
         RSpec.configure do |c|
+          c.ssh = nil
           c.disable_sudo = false
         end
       end
@@ -97,6 +119,7 @@ describe Specinfra::Backend::Ssh do
 
       after do
         RSpec.configure do |c|
+          c.ssh = nil
           c.sudo_options = nil
         end
       end

data/spec/configuration_spec.rb

@@ -1,10 +1,20 @@
 require 'spec_helper'
 
-RSpec.configure do |c|
-  c.path = 'foo'
-end
+describe 'RSpec.configuration.path' do
+  before do
+    RSpec.configure do |c|
+      c.path = 'foo'
+    end
+  end
+
+  after do
+    RSpec.configure do |c|
+      c.path = nil
+    end
+  end
+
+  subject { RSpec.configuration.path }
 
-describe RSpec.configuration.path do
   it { should eq Specinfra.configuration.path }
 end
 
@@ -12,3 +22,9 @@ Specinfra.configuration.os = 'foo'
 describe Specinfra.configuration.os do
   it { should eq 'foo' }
 end
+
+Specinfra.configuration.instance_variable_set(:@os, nil)
+RSpec.configuration.os = nil
+describe Specinfra.configuration.os do
+  it { should be_nil }
+end

data/spec/helper/detect_os/darwin_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'specinfra/helper/detect_os/darwin'
 
 describe Specinfra::Helper::DetectOs::Darwin do
-  darwin = Specinfra::Helper::DetectOs::Darwin.new(:exec)
+  darwin = Specinfra::Helper::DetectOs::Darwin.new(Specinfra.backend)
   it 'Should return darwin 13.4.0 when Mac OS X 10.9.5 (Mavericks) is installed.' do
     allow(darwin).to receive(:run_command) {
       CommandResult.new(:stdout => 'Darwin 13.4.0', :exit_status => 0)

data/spec/helper/os_spec.rb

@@ -1,58 +1,60 @@
 require 'spec_helper'
 
-def set_stub_chain(keys, value)
-    allow(Specinfra).to receive_message_chain([:configuration, keys].flatten).and_return(value)
-end
-
-describe 'no ssh connection without cache' do
-  before do
-    property[:os] = nil
-    set_stub_chain(:ssh, nil)
-    set_stub_chain(:ssh_options, nil)
-    set_stub_chain(:host, 'localhost')
-    set_stub_chain(:os, :family => 'redhat')
+RSpec.describe 'os', :order => :defined do
+  def set_stub_chain(keys, value)
+      allow(Specinfra).to receive_message_chain([:configuration, keys].flatten).and_return(value)
   end
 
-  it { expect(os[:family]).to eq 'redhat' }
-end
+  describe 'no ssh connection without cache' do
+    before do
+      property[:os] = nil
+      set_stub_chain(:ssh, nil)
+      set_stub_chain(:ssh_options, nil)
+      set_stub_chain(:host, 'localhost')
+      set_stub_chain(:os, :family => 'redhat')
+    end
 
-describe 'no ssh connection with cache' do
-  it { expect(property[:os]).to eq(:family => 'redhat') }
-end
+    it { expect(os[:family]).to eq 'redhat' }
+  end
 
-describe 'ssh_options without cache' do
-  before do
-    property[:os] = nil
-    set_stub_chain(:ssh, nil)
-    set_stub_chain(:ssh_options, :port => 22)
-    set_stub_chain(:host, 'localhost')
-    set_stub_chain(:os, :family => 'ubuntu')
+  describe 'no ssh connection with cache' do
+    it { expect(property[:os]).to eq(:family => 'redhat') }
   end
 
-  it { expect(os[:family]).to eq 'ubuntu' }
-end
+  describe 'ssh_options without cache' do
+    before do
+      property[:os] = nil
+      set_stub_chain(:ssh, nil)
+      set_stub_chain(:ssh_options, :port => 22)
+      set_stub_chain(:host, 'localhost')
+      set_stub_chain(:os, :family => 'ubuntu')
+    end
 
-describe 'ssh_options with cache' do
-  it { expect(property[:os]).to eq(:family => 'ubuntu') }
-end
+    it { expect(os[:family]).to eq 'ubuntu' }
+  end
 
-describe 'ssh_connection without cache' do
-  before do
-    property[:os] = nil
-    set_stub_chain([:ssh, :host], 'localhost')
-    set_stub_chain([:ssh, :options], :port => 2222)
-    set_stub_chain(:os, :family => 'nixos')
+  describe 'ssh_options with cache' do
+    it { expect(property[:os]).to eq(:family => 'ubuntu') }
   end
 
-  it { expect(os[:family]).to eq 'nixos' }
-end
+  describe 'ssh_connection without cache' do
+    before do
+      property[:os] = nil
+      set_stub_chain([:ssh, :host], 'localhost')
+      set_stub_chain([:ssh, :options], :port => 2222)
+      set_stub_chain(:os, :family => 'nixos')
+    end
 
-describe 'ssh_connection wit cache' do
-  before do
-    set_stub_chain([:ssh, :host], 'localhost')
-    set_stub_chain([:ssh, :options], :port => 2222)
-    set_stub_chain(:os, :family => 'nixos')
+    it { expect(os[:family]).to eq 'nixos' }
   end
 
-  it { expect(property[:os]).to eq(:family => 'nixos') }
+  describe 'ssh_connection with cache' do
+    before do
+      set_stub_chain([:ssh, :host], 'localhost')
+      set_stub_chain([:ssh, :options], :port => 2222)
+      set_stub_chain(:os, :family => 'nixos')
+    end
+
+    it { expect(property[:os]).to eq(:family => 'nixos') }
+  end
 end

data/spec/host_inventory/linux/virtualization_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 
-set :os, { :family => 'linux' } 
-
 describe Specinfra::HostInventory::Virtualization do
+  before :all do
+    set :os, { :family => 'linux' }
+  end
+
   virt = Specinfra::HostInventory::Virtualization.new(host_inventory) 
   let(:host_inventory) { nil }
   it 'Docker Image should return :system => "docker"' do

data/spec/host_inventory/openbsd/virtualization_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 
-set :os, { :family => 'openbsd' } 
-
 describe Specinfra::HostInventory::Virtualization do
+  before :all do
+    set :os, { :family => 'openbsd' }
+  end
+
   virt = Specinfra::HostInventory::Virtualization.new(host_inventory) 
 
   let(:host_inventory) { nil }

data/spec/host_inventory/solaris/virtualization_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 
-set :os, { :family => 'solaris' } 
-
 describe Specinfra::HostInventory::Virtualization do
+  before :all do
+    set :os, { :family => 'solaris' }
+  end
+
   virt = Specinfra::HostInventory::Virtualization.new(host_inventory) 
 
   let(:host_inventory) { nil }

data/specinfra.gemspec

@@ -28,4 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.1.1"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-its"
+  spec.add_development_dependency "guard"
+  spec.add_development_dependency "guard-rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.59.0
+  version: 2.59.1
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -128,6 +128,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  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'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  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: Common layer for serverspec and itamae
 email:
 - gosukenator@gmail.com
@@ -483,7 +511,7 @@ files:
 - spec/command/base/group_spec.rb
 - spec/command/base/host_spec.rb
 - spec/command/base/localhost_spec.rb
-- spec/command/base/mail_alias.rb
+- spec/command/base/mail_alias_spec.rb
 - spec/command/base/package_spec.rb
 - spec/command/base/process_spec.rb
 - spec/command/base/user_spec.rb
@@ -596,7 +624,7 @@ test_files:
 - spec/command/base/group_spec.rb
 - spec/command/base/host_spec.rb
 - spec/command/base/localhost_spec.rb
-- spec/command/base/mail_alias.rb
+- spec/command/base/mail_alias_spec.rb
 - spec/command/base/package_spec.rb
 - spec/command/base/process_spec.rb
 - spec/command/base/user_spec.rb