specinfra 2.0.0.beta43 → 2.0.0.beta44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a06b77b911ce755c1986e00e888fe05daba5f26a
-  data.tar.gz: 254bfa7133035990605a1de17e1fa50875903bc7
+  metadata.gz: 7e06e2085c8a22f674bc94c57c8915bb79029774
+  data.tar.gz: 07b5050a0cd064f0aa9a4a56a1258b2aae747bbb
 SHA512:
-  metadata.gz: 207c342c8bed16c798138c5123084bbf188de49372dc2ff6247798daa954da5ac152514c0ae68b1337e20801ef07110a9a06b8d3da213afa54c5b93e0da9d7ea
-  data.tar.gz: f43b065d0ec5f6126e04e50089dcdd19b74c3ea343acf325c19fde9976878b8f4ac2ba5b26f27282ff9abed8c07d00c5ee6b10bd633f9d9aa0fa001e30ec8d51
+  metadata.gz: 2d15fb703b1b5894fcbc5ab87ca8571482a0b06abd704d0a15a727e3d19c18c14976bf51017e558298a71d103dd1d20c2c83595ad25c8ac51d3ecdbf93313fc5
+  data.tar.gz: ac34fb786f096fd8024665dc8ee07b47e21ff591ada409d0a3a61a4a444c9d13a53a7a960cd098bc145bc9df9ab7e77458efb298d136ccaea1f24848897444a0

data/lib/specinfra/backend/ssh.rb

@@ -91,6 +91,7 @@ module Specinfra::Backend
       stderr_data = ''
       exit_status = nil
       exit_signal = nil
+      retry_prompt = /^Sorry, try again/
 
       if Specinfra.configuration.ssh.nil?
         Specinfra.configuration.ssh = create_ssh
@@ -106,7 +107,9 @@ module Specinfra::Backend
         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 /^#{prompt}/
+            if data.match retry_prompt
+              abort 'Wrong sudo password! Please confirm your password.'
+            elsif data.match /^#{prompt}/
               channel.send_data "#{Specinfra.configuration.sudo_password}\n"
             else
               stdout_data += data

data/lib/specinfra/command/module/systemd.rb

@@ -3,35 +3,38 @@ module Specinfra::Command::Module::Systemd
     if level.to_s =~ /^\d+$/
       level = "runlevel#{level}.target"
     end
+    unless service.include?('.')
+      service += '.service'
+    end
 
-    "systemctl --plain list-dependencies #{level} | grep '^#{escape(service)}.service$'"
+    "systemctl --plain list-dependencies #{level} | grep '\\(^\\| \\)#{escape(service)}$'"
   end
 
   def check_is_running(service)
-    "systemctl is-active #{escape(service)}.service"
+    "systemctl is-active #{escape(service)}"
   end
 
   def enable(service)
-    "systemctl enable #{escape(service)}.service"
+    "systemctl enable #{escape(service)}"
   end
 
   def disable(service)
-    "systemctl disable #{escape(service)}.service"
+    "systemctl disable #{escape(service)}"
   end
 
   def start(service)
-    "systemctl start #{escape(service)}.service"
+    "systemctl start #{escape(service)}"
   end
 
   def stop(service)
-    "systemctl stop #{escape(service)}.service"
+    "systemctl stop #{escape(service)}"
   end
 
   def restart(service)
-    "systemctl restart #{escape(service)}.service"
+    "systemctl restart #{escape(service)}"
   end
 
   def reload(service)
-    "systemctl reload #{escape(service)}.service"
+    "systemctl reload #{escape(service)}"
   end
 end

data/lib/specinfra/runner.rb

@@ -4,16 +4,16 @@ module Specinfra
       backend   = Specinfra.backend
       processor = Specinfra::Processor
       
-      if os.include?(:family) && os[:family] == 'windows'
-        if backend.respond_to?(meth)
+      if ! os.include?(:family) || os[:family] != 'windows'
+        if processor.respond_to?(meth)
+          processor.send(meth, *args)
+        elsif backend.respond_to?(meth)
           backend.send(meth, *args)
         else
           run(meth, *args)
         end
       else
-        if processor.respond_to?(meth)
-          processor.send(meth, *args)
-        elsif backend.respond_to?(meth)
+        if backend.respond_to?(meth)
           backend.send(meth, *args)
         else
           run(meth, *args)

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta43"
+  VERSION = "2.0.0.beta44"
 end

data/spec/command/module/systemd_spec.rb

@@ -2,10 +2,11 @@ require 'spec_helper'
 
 describe Specinfra::Command::Redhat::V7::Service do
   let(:klass) { Specinfra::Command::Redhat::V7::Service }
-  it { expect(klass.check_is_enabled('httpd')).to eq "systemctl --plain list-dependencies multi-user.target | grep '^httpd.service$'" }
-  it { expect(klass.check_is_enabled('httpd', 'multi-user.target')).to eq "systemctl --plain list-dependencies multi-user.target | grep '^httpd.service$'" }
-  it { expect(klass.check_is_enabled('httpd', 3)).to eq "systemctl --plain list-dependencies runlevel3.target | grep '^httpd.service$'" }
-  it { expect(klass.check_is_enabled('httpd', '3')).to eq "systemctl --plain list-dependencies runlevel3.target | grep '^httpd.service$'" }
+  it { expect(klass.check_is_enabled('httpd')).to eq "systemctl --plain list-dependencies multi-user.target | grep '\\(^\\| \\)httpd.service$'" }
+  it { expect(klass.check_is_enabled('httpd', 'multi-user.target')).to eq "systemctl --plain list-dependencies multi-user.target | grep '\\(^\\| \\)httpd.service$'" }
+  it { expect(klass.check_is_enabled('httpd', 3)).to eq "systemctl --plain list-dependencies runlevel3.target | grep '\\(^\\| \\)httpd.service$'" }
+  it { expect(klass.check_is_enabled('httpd', '3')).to eq "systemctl --plain list-dependencies runlevel3.target | grep '\\(^\\| \\)httpd.service$'" }
+  it { expect(klass.check_is_enabled('sshd.socket')).to eq "systemctl --plain list-dependencies multi-user.target | grep '\\(^\\| \\)sshd.socket$'" }
 end
 
 

data/spec/command/redhat7/service_spec.rb

@@ -4,25 +4,29 @@ property[:os] = nil
 set :os, :family => 'redhat', :release => '7'
 
 describe get_command(:enable_service, 'httpd') do
-  it { should eq 'systemctl enable httpd.service' }
+  it { should eq 'systemctl enable httpd' }
 end
 
 describe get_command(:disable_service, 'httpd') do
-  it { should eq 'systemctl disable httpd.service' }
+  it { should eq 'systemctl disable httpd' }
 end
 
 describe get_command(:start_service, 'httpd') do
-  it { should eq 'systemctl start httpd.service' }
+  it { should eq 'systemctl start httpd' }
 end
 
 describe get_command(:stop_service, 'httpd') do
-  it { should eq 'systemctl stop httpd.service' }
+  it { should eq 'systemctl stop httpd' }
 end
 
 describe get_command(:restart_service, 'httpd') do
-  it { should eq 'systemctl restart httpd.service' }
+  it { should eq 'systemctl restart httpd' }
 end
 
 describe get_command(:reload_service, 'httpd') do
-  it { should eq 'systemctl reload httpd.service' }
+  it { should eq 'systemctl reload httpd' }
+end
+
+describe get_command(:enable_service, 'sshd.socket') do
+  it { should eq 'systemctl enable sshd.socket' }
 end

data/wercker.yml

@@ -28,7 +28,7 @@ build:
         cwd: $WORKING_DIR
     - script:
         name: Run itamae
-        code: bundle exec ./itamae.rb centos65
+        code: bundle exec itamae ssh --host centos65 --vagrant recipe.rb
         cwd: $WORKING_DIR
     - script:
         name: Run vagrant reload centos65
@@ -44,7 +44,7 @@ build:
         cwd: $WORKING_DIR
     - script:
         name: Run itamae
-        code: bundle exec ./itamae.rb centos70
+        code: bundle exec itamae ssh --host centos70 --vagrant recipe.rb
         cwd: $WORKING_DIR
     - script:
         name: Run vagrant reload centos70
@@ -60,7 +60,7 @@ build:
         cwd: $WORKING_DIR
     - script:
         name: Run itamae
-        code: bundle exec ./itamae.rb ubuntu1404
+        code: bundle exec itamae ssh --host ubuntu1404 --vagrant recipe.rb
         cwd: $WORKING_DIR
     - script:
         name: Run vagrant reload ubuntu1404

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta43
+  version: 2.0.0.beta44
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh