specinfra 2.0.0.beta3 → 2.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6f99779115167f0d7345a3ba9261f32f01754b5
-  data.tar.gz: f9643ec0810fddd98b30816509711d7d6b64db09
+  metadata.gz: b9e3df085341c6a98609ce2cbeec6286def53483
+  data.tar.gz: 1d63bd9b0f96b59f4722625d023b07d737c5e6e6
 SHA512:
-  metadata.gz: eb6aee27e06d5116f93650bec947195de18b01abc9d2be7eeabf4491827549e166e568cb2261187f15bc24001b6f56eee31cbb3332f455504c096e63c0a2a8fb
-  data.tar.gz: 9c80d72827ac059467fcd71b34d562fb3232220a40cd5c204c9f9a7d5cbcb04761d1dc9cade8dc79deb8d1e56b43fc3333d966ba3cb7055622ed703b14eb4cc4
+  metadata.gz: a30812a5492202d26e6b0dfa88dd263a66c5ed70c051b100a03acdf408491cdf695c39195fa299b76a2dec455756b58fb5ea4237d0f5ba7e4fde2e088ed8e9a0
+  data.tar.gz: 2884c197f8e70a841d8f7f65bf5b929b745b3d8e3253a9ed3241cad4ba4e819d41838e4d9509bda6506a14aaf85bf120fccadb33cea960d8f42cc34a97500ce7

data/lib/specinfra/backend/exec.rb

@@ -211,8 +211,12 @@ module Specinfra
           line = run_command('cat /etc/SuSE-release').stdout
           if line =~ /SUSE Linux Enterprise Server (\d+)/
             release = $1
+            family = 'SuSE'
+          elsif line =~ /openSUSE (\d+\.\d+|\d+)/
+            release = $1
+            family = 'OpenSUSE'
           end
-          { :family => 'SuSE', :release => release, :arch => arch }
+          { :family => family, :release => release, :arch => arch }
         elsif run_command('ls /etc/debian_version').success?
           lsb_release = run_command("lsb_release -ir")
           if lsb_release.success?

data/lib/specinfra/backend/ssh.rb

@@ -1,4 +1,5 @@
 require 'specinfra/backend/exec'
+require 'net/ssh'
 
 module Specinfra
   module Backend
@@ -20,7 +21,7 @@ module Specinfra
 
       def build_command(cmd)
         cmd = super(cmd)
-        user = Specinfra.configuration.ssh.options[:user]
+        user = Specinfra.configuration.ssh_options[:user]
         disable_sudo = Specinfra.configuration.disable_sudo
         if user != 'root' && !disable_sudo
           cmd = "#{sudo} #{cmd}"
@@ -46,6 +47,14 @@ module Specinfra
         exit_signal = nil
         pass_prompt = Specinfra.configuration.pass_prompt || /^\[sudo\] password for/
 
+        if Specinfra.configuration.ssh.nil?
+          Specinfra.configuration.ssh = Net::SSH.start(
+            Specinfra.configuration.host,
+            Specinfra.configuration.ssh_options[:user],
+            Specinfra.configuration.ssh_options
+          )
+        end
+
         ssh = Specinfra.configuration.ssh
         ssh.open_channel do |channel|
           if Specinfra.configuration.sudo_password or Specinfra.configuration.request_pty

data/lib/specinfra/command.rb

@@ -10,6 +10,7 @@ require "specinfra/command/plamo"
 require "specinfra/command/redhat"
 require "specinfra/command/redhat7"
 require "specinfra/command/suse"
+require "specinfra/command/opensuse"
 require "specinfra/command/fedora"
 
 # Solaris

data/lib/specinfra/command/base.rb

@@ -121,6 +121,10 @@ module Specinfra
         "ps aux | grep -w -- #{escape(process)} | grep -qv grep"
       end
 
+      def check_process_count(process,count)
+        "test $(ps aux | grep -w -- #{escape(process)} | grep -v grep | wc -l) -eq #{escape(count)}"
+      end
+
       def get_process(process, opts)
         "ps -C #{escape(process)} -o #{opts[:format]} | head -1"
       end

data/lib/specinfra/command/opensuse.rb

@@ -0,0 +1,14 @@
+module Specinfra
+  module Command
+    class OpenSUSE < SuSE
+      def check_enabled(service, level=nil)
+        "systemctl is-enabled #{escape(service)}.service"
+      end
+
+      def check_running(service)
+        "systemctl is-active #{escape(service)}.service"
+      end
+
+    end
+  end
+end

data/lib/specinfra/command/ubuntu.rb

@@ -4,6 +4,20 @@ module Specinfra
       def check_running(service)
         "service #{escape(service)} status && service #{escape(service)} status | grep 'running'"
       end
+
+      def check_ppa(package)
+        %Q{find /etc/apt/ -name \*.list | xargs grep -o "deb http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
+      end
+
+      def check_ppa_enabled(package)
+        %Q{find /etc/apt/ -name \*.list | xargs grep -o "^deb http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
+      end
+
+      private
+
+      def to_apt_line_uri(repo)
+        escape(repo.gsub(/^ppa:/,''))
+      end
     end
   end
 end

data/lib/specinfra/configuration.rb

@@ -14,6 +14,7 @@ module Specinfra
         :docker_image,
         :lxc,
         :request_pty,
+        :ssh_options,
       ].freeze
 
       def defaults

data/lib/specinfra/helper.rb

@@ -11,3 +11,6 @@ require 'specinfra/helper/configuration'
 
 require 'specinfra/helper/properties'
 include Specinfra::Helper::Properties
+
+require 'specinfra/helper/set'
+include Specinfra::Helper::Set

data/lib/specinfra/helper/os.rb

@@ -15,6 +15,7 @@ module Specinfra
       'RedHat',
       'RedHat7',
       'SuSE',
+      'OpenSUSE',
       'SmartOS',
       'Solaris',
       'Solaris10',

data/lib/specinfra/helper/set.rb

@@ -0,0 +1,5 @@
+module Specinfra::Helper::Set
+  def set(param, *value)
+    Specinfra.configuration.send(param, *value)
+  end
+end

data/lib/specinfra/version.rb

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

data/spec/backend/ssh/build_command_spec.rb

@@ -7,7 +7,8 @@ describe Specinfra::Backend::Ssh do
     context 'with root user' do 
       before do
         RSpec.configure do |c|
-          c.ssh = double(:ssh, :options => { :user => 'root' })
+          set :ssh_options, :user => 'root'
+          c.ssh = double(:ssh, Specinfra.configuration.ssh_options)
         end
       end
 
@@ -23,7 +24,8 @@ describe Specinfra::Backend::Ssh do
     context 'with non-root user' do
       before do
         RSpec.configure do |c|
-          c.ssh = double(:ssh, :options => { :user => 'foo' })
+          set :ssh_options, :user => 'foo'
+          c.ssh = double(:ssh, Specinfra.configuration.ssh_options)
         end
       end
 
@@ -39,7 +41,8 @@ describe Specinfra::Backend::Ssh do
     context 'with custom sudo path' do
       before do
         RSpec.configure do |c|
-          c.ssh = double(:ssh, :options => { :user => 'foo' })
+          set :ssh_options, :user => 'foo'
+          c.ssh = double(:ssh, Specinfra.configuration.ssh_options)
           c.sudo_path = '/usr/local/bin'
         end
       end
@@ -62,7 +65,8 @@ describe Specinfra::Backend::Ssh do
     context 'without sudo' do
       before do
         RSpec.configure do |c|
-          c.ssh = double(:ssh, :options => { :user => 'foo' })
+          set :ssh_options, :user => 'foo'
+          c.ssh = double(:ssh, Specinfra.configuration.ssh_options)
           c.disable_sudo = true
         end
       end
@@ -87,7 +91,8 @@ describe Specinfra::Backend::Ssh do
     context 'with sudo on alternative path' do
       before do
         RSpec.configure do |c|
-          c.ssh = double(:ssh, :options => { :user => 'foo' })
+          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

data/spec/helper/backend_spec.rb

@@ -1,6 +1,12 @@
 require 'spec_helper'
 
 describe 'backend_for(:type) returns correct backend object' do
+  before do
+    RSpec.configure do |c|
+      c.ssh = double(:ssh, :options => { :user => 'root' })
+    end
+  end
+
   it 'backend_for(:exec) returns Specinfra::Backend::Exec' do
     expect(backend_for(:exec)).to be_an_instance_of Specinfra::Backend::Exec
   end

data/spec/helper/set_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe 'set method set value to Specinfra.configuration' do
+  it 'set method handle string value correctly' do
+    set :host, 'localhost'
+    expect(Specinfra.configuration.host).to eq 'localhost'
+  end
+
+  it 'set method handle hash value correctly' do
+    set :ssh_options, :password => 'password', :port => 2222
+    ssh_options = { :password => 'password', :port => 2222 }
+    expect(Specinfra.configuration.ssh_options).to eq ssh_options
+  end
+end

data/specinfra.gemspec

@@ -18,6 +18,8 @@ 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_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
   spec.add_development_dependency "rspec"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta3
+  version: 2.0.0.beta4
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +146,7 @@ files:
 - lib/specinfra/command/gentoo.rb
 - lib/specinfra/command/linux.rb
 - lib/specinfra/command/openbsd.rb
+- lib/specinfra/command/opensuse.rb
 - lib/specinfra/command/plamo.rb
 - lib/specinfra/command/redhat.rb
 - lib/specinfra/command/redhat7.rb
@@ -152,6 +167,7 @@ files:
 - lib/specinfra/helper/lxc.rb
 - lib/specinfra/helper/os.rb
 - lib/specinfra/helper/properties.rb
+- lib/specinfra/helper/set.rb
 - lib/specinfra/properties.rb
 - lib/specinfra/runner.rb
 - lib/specinfra/version.rb
@@ -160,6 +176,7 @@ files:
 - spec/configuration_spec.rb
 - spec/helper/backend_spec.rb
 - spec/helper/properties_spec.rb
+- spec/helper/set_spec.rb
 - spec/spec_helper.rb
 - specinfra.gemspec
 - wercker.yml
@@ -193,4 +210,5 @@ test_files:
 - spec/configuration_spec.rb
 - spec/helper/backend_spec.rb
 - spec/helper/properties_spec.rb
+- spec/helper/set_spec.rb
 - spec/spec_helper.rb