specinfra 2.0.0.beta4 → 2.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9e3df085341c6a98609ce2cbeec6286def53483
-  data.tar.gz: 1d63bd9b0f96b59f4722625d023b07d737c5e6e6
+  metadata.gz: 65e4d83475bbdd34b27754036496fc53ba0a2134
+  data.tar.gz: 46cbd1679ece1082f94dea53e3cb9ed5e54974c8
 SHA512:
-  metadata.gz: a30812a5492202d26e6b0dfa88dd263a66c5ed70c051b100a03acdf408491cdf695c39195fa299b76a2dec455756b58fb5ea4237d0f5ba7e4fde2e088ed8e9a0
-  data.tar.gz: 2884c197f8e70a841d8f7f65bf5b929b745b3d8e3253a9ed3241cad4ba4e819d41838e4d9509bda6506a14aaf85bf120fccadb33cea960d8f42cc34a97500ce7
+  metadata.gz: b2d221e45cb170df18ffa898388eb7018143e828e6045591bbd63e3f2f931283899192490bcb391d107a35421f0df967cbddfc1eb98dc28bc692339b41388a5f
+  data.tar.gz: 713db6f57e9ff241a5aa23c531e3a51c2c0584114ebd9f0f1d8917b005a21ec0667032c07d7c9b6bbf8248b7568f066a0f35d52febbefbf525eab3bd963c3928

data/Rakefile

@@ -1,30 +1,35 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require "octorelease"
+begin
+  require "rspec/core/rake_task"
+  require "octorelease"
+rescue LoadError
+end
 
-task :spec => 'spec:all'
+if defined?(RSpec)
+  task :spec => 'spec:all'
 
-namespace :spec do
-  task :all => [ :helper, :backend, :configuration ]
+  namespace :spec do
+    task :all => [ :helper, :backend, :configuration ]
 
-  RSpec::Core::RakeTask.new(:helper) do |t|
-    t.pattern = "spec/helper/*_spec.rb"
-  end
+    RSpec::Core::RakeTask.new(:helper) do |t|
+      t.pattern = "spec/helper/*_spec.rb"
+    end
 
-  task :backend => 'backend:all'
-  namespace :backend do
-    backends = %w[exec ssh]
+    task :backend => 'backend:all'
+    namespace :backend do
+      backends = %w[exec ssh]
 
-    task :all => backends
+      task :all => backends
 
-    backends.each do |backend|
-      RSpec::Core::RakeTask.new(backend) do |t|
-        t.pattern = "spec/backend/#{backend}/*_spec.rb"
+      backends.each do |backend|
+        RSpec::Core::RakeTask.new(backend) do |t|
+          t.pattern = "spec/backend/#{backend}/*_spec.rb"
+        end
       end
     end
-  end
 
-  RSpec::Core::RakeTask.new(:configuration) do |t|
-    t.pattern = "spec/configuration_spec.rb"
+    RSpec::Core::RakeTask.new(:configuration) do |t|
+      t.pattern = "spec/configuration_spec.rb"
+    end
   end
 end

data/lib/specinfra/backend/docker.rb

@@ -3,6 +3,7 @@ module Specinfra
     class Docker < Exec
       def initialize
         @images = []
+        ::Docker.url = Specinfra.configuration.docker_url
       end
 
       def run_command(cmd, opts={})

data/lib/specinfra/backend/exec.rb

@@ -240,6 +240,8 @@ module Specinfra
           { :family => 'Gentoo', :release => nil, :arch => arch }
         elsif run_command('ls /usr/lib/setup/Plamo-*').success?
           { :family => 'Plamo', :release => nil, :arch => arch }
+        elsif run_command('ls /var/run/current-system/sw').success?
+          { :family => 'NixOS', :release => nil, :arch => arch }
         elsif run_command('uname -s').stdout =~ /AIX/i
           { :family => 'AIX', :release => nil, :arch => arch }
         elsif ( uname = run_command('uname -sr').stdout) && uname =~ /SunOS/i

data/lib/specinfra/backend/lxc.rb

@@ -6,9 +6,9 @@ module Specinfra
         cmd = build_command(cmd)
         cmd = add_pre_command(cmd)
         out, ret = ct.execute do
-                     out = `#{cmd}`
-                     [out, $?.dup]
-                   end
+          out = `#{cmd}  2>&1`
+          [out, $?.dup]
+        end
         if @example
           @example.metadata[:command] = cmd
           @example.metadata[:stdout]  = out

data/lib/specinfra/backend/ssh.rb

@@ -4,6 +4,10 @@ require 'net/ssh'
 module Specinfra
   module Backend
     class Ssh < Exec
+      def prompt
+        'Password: '
+      end
+
       def run_command(cmd, opt={})
         cmd = build_command(cmd)
         cmd = add_pre_command(cmd)
@@ -24,7 +28,7 @@ module Specinfra
         user = Specinfra.configuration.ssh_options[:user]
         disable_sudo = Specinfra.configuration.disable_sudo
         if user != 'root' && !disable_sudo
-          cmd = "#{sudo} #{cmd}"
+          cmd = "#{sudo} -p '#{prompt}' #{cmd}"
         end
         cmd
       end
@@ -45,7 +49,6 @@ module Specinfra
         stderr_data = ''
         exit_status = nil
         exit_signal = nil
-        pass_prompt = Specinfra.configuration.pass_prompt || /^\[sudo\] password for/
 
         if Specinfra.configuration.ssh.nil?
           Specinfra.configuration.ssh = Net::SSH.start(
@@ -65,7 +68,7 @@ module Specinfra
           channel.exec("#{command}") do |ch, success|
             abort "FAILED: couldn't execute command (ssh.channel.exec)" if !success
             channel.on_data do |ch, data|
-              if data.match pass_prompt
+              if data.match /^#{prompt}/
                 channel.send_data "#{Specinfra.configuration.sudo_password}\n"
               else
                 stdout_data += data

data/lib/specinfra/command.rb

@@ -12,6 +12,7 @@ require "specinfra/command/redhat7"
 require "specinfra/command/suse"
 require "specinfra/command/opensuse"
 require "specinfra/command/fedora"
+require "specinfra/command/nixos"
 
 # Solaris
 require "specinfra/command/solaris"

data/lib/specinfra/command/arch.rb

@@ -16,7 +16,7 @@ module Specinfra
 
       def check_installed(package,version=nil)
         if version
-          "pacman -Q | grep #{escape(package)} #{espace(version)}"
+          "pacman -Q | grep #{escape(package)} #{escape(version)}"
         else
           "pacman -Q | grep #{escape(package)}"
         end

data/lib/specinfra/command/base.rb

@@ -59,6 +59,14 @@ module Specinfra
         "test -f #{escape(file)}"
       end
 
+      def get_file_mtime(file)
+        "stat -c %Y #{escape(file)}"
+      end
+
+      def get_file_size(file)
+        "stat -c %s #{escape(file)}"
+      end
+
       def check_socket(file)
         "test -S #{escape(file)}"
       end

data/lib/specinfra/command/darwin.rb

@@ -1,6 +1,19 @@
 module Specinfra
   module Command
     class Darwin < Base
+      def check_enabled(service, level=nil)
+        "launchctl list | grep #{escape(service)}"
+      end
+
+      def check_running(service)
+        "launchctl list | grep #{escape(service)} | grep -E '^[0-9]+'"
+      end
+
+      def check_listening(port)
+        regexp = ":#{port} "
+        "lsof -nP -iTCP -sTCP:LISTEN | grep -- #{escape(regexp)}"
+      end
+
       def check_file_md5checksum(file, expected)
         "openssl md5 #{escape(file)} | cut -d'=' -f2 | cut -c 2- | grep -E ^#{escape(expected)}$"
       end

data/lib/specinfra/command/nixos.rb

@@ -0,0 +1,28 @@
+module Specinfra
+  module Command
+    class NixOS < Linux
+      def check_enabled(service,level=3)
+        level = "multi-user.target" if level == 3
+        "systemctl --plain list-dependencies #{escape(level)} | grep '#{escape(service)}.service$'"
+      end
+
+      def check_installed(package, version=nil)
+        if version
+          "nix-store -q --references /var/run/current-system/sw | grep #{escape(package)}-#{escape(version)}"
+        else
+          "nix-store -q --references /var/run/current-system/sw | grep #{escape(package)}"
+        end
+      end
+
+      alias :check_installed_by_nix :check_installed
+
+      def check_running(service)
+        "systemctl is-active #{escape(service)}.service"
+      end
+
+      def install(package)
+        "nix-env -i #{package}"
+      end
+    end
+  end
+end

data/lib/specinfra/configuration.rb

@@ -9,9 +9,9 @@ module Specinfra
         :stderr,
         :sudo_path,
         :disable_sudo,
-        :pass_prompt,
         :sudo_options,
         :docker_image,
+        :docker_url,
         :lxc,
         :request_pty,
         :ssh_options,

data/lib/specinfra/helper/os.rb

@@ -10,6 +10,7 @@ module Specinfra
       'FreeBSD',
       'FreeBSD10',
       'Gentoo',
+      'NixOS',
       'OpenBSD',
       'Plamo',
       'RedHat',

data/lib/specinfra/version.rb

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

data/spec/backend/ssh/build_command_spec.rb

@@ -30,11 +30,11 @@ describe Specinfra::Backend::Ssh do
       end
 
       it 'should prepend sudo' do
-        expect(backend.build_command('test -f /etc/passwd')).to eq 'sudo /bin/sh -c test\ -f\ /etc/passwd'
+        expect(backend.build_command('test -f /etc/passwd')).to eq %q{sudo -p 'Password: ' /bin/sh -c test\ -f\ /etc/passwd}
       end
 
       it 'should escape special characters' do
-        expect(backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq 'sudo /bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)'
+        expect(backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq %q{sudo -p 'Password: ' /bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)}
       end
     end
 
@@ -54,11 +54,11 @@ describe Specinfra::Backend::Ssh do
       end
 
       it 'command pattern 1a' do
-        expect(backend.build_command('test -f /etc/passwd')).to eq '/usr/local/bin/sudo /bin/sh -c test\ -f\ /etc/passwd'
+        expect(backend.build_command('test -f /etc/passwd')).to eq %q{/usr/local/bin/sudo -p 'Password: ' /bin/sh -c test\ -f\ /etc/passwd}
       end
 
       it 'command pattern 2a' do
-        expect(backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq '/usr/local/bin/sudo /bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)'
+        expect(backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq %q{/usr/local/bin/sudo -p 'Password: ' /bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)}
       end
     end
 
@@ -93,7 +93,6 @@ describe Specinfra::Backend::Ssh do
         RSpec.configure do |c|
           set :ssh_options, :user => 'foo'
           c.ssh = double(:ssh, Specinfra.configuration.ssh_options)
-          c.sudo_options = ['-p', '[sudo] password for']
           c.sudo_path = nil
         end
       end
@@ -106,12 +105,12 @@ describe Specinfra::Backend::Ssh do
 
       context 'command pattern 1a' do
         subject { backend.build_command('test -f /etc/passwd') }
-        it { should eq 'sudo -p \[sudo\]\ password\ for /bin/sh -c test\ -f\ /etc/passwd' }
+        it { should eq %q{sudo -p 'Password: ' /bin/sh -c test\ -f\ /etc/passwd} }
       end
 
       context 'command pattern 2a' do
         subject { backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)') }
-        it { should eq 'sudo -p \[sudo\]\ password\ for /bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)' }
+        it { should eq %q{sudo -p 'Password: ' /bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)} }
       end
     end
   end

data/specinfra.gemspec

@@ -23,6 +23,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "octokit", "~> 2.7.2"
-  spec.add_development_dependency "octorelease"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 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-06-07 00:00:00.000000000 Z
+date: 2014-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -66,34 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !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: Common layer for serverspec and configspec
 email:
 - gosukenator@gmail.com
@@ -145,6 +117,7 @@ files:
 - lib/specinfra/command/freebsd10.rb
 - lib/specinfra/command/gentoo.rb
 - lib/specinfra/command/linux.rb
+- lib/specinfra/command/nixos.rb
 - lib/specinfra/command/openbsd.rb
 - lib/specinfra/command/opensuse.rb
 - lib/specinfra/command/plamo.rb