specinfra 2.35.1 → 2.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14e06d19c0a3038546153e4085ad0becd03b94f9
-  data.tar.gz: ccc0e91ca160daf01e681b277f82976d76edfd46
+  metadata.gz: ba72337ccaf4712a530e15f891406045d124b271
+  data.tar.gz: 273a5118e176f1bc48aa8057b6c4e46b3eadf20d
 SHA512:
-  metadata.gz: 8ea4a629909c618faf67f9b9c3a4e966059f3e066db749b290a18620f7b90c5bdf4eca337e677a196ee174ffd6fec8b5427bdccdc0a770b2e6a5a486c61834a7
-  data.tar.gz: c436115f88456d1c30b4fcc62a377a5f4f6bf4052cc6248f9b2361436eb97594d98a0d389e5b0db45d575b79396ce5948ab16379ce1fceee70c96a3d455cf183
+  metadata.gz: d63e38da22c28976d54e5b33f75a6f433862b0ccc2f1e1406898c29c87e6108309fd48ea5e8673de1339726e745472d73990c9c997836eba262e68870e06628e
+  data.tar.gz: 4e078c7326cf195ea3392c5f211279d29638069bbca6239d85254e863d13ee5ea496563ceeb6e9e948f48724fc0de1c7f3ef7398bf6646233aa8ada548d6415f

data/lib/specinfra/command.rb

@@ -100,6 +100,10 @@ require 'specinfra/command/fedora/base/service'
 require 'specinfra/command/fedora/v15'
 require 'specinfra/command/fedora/v15/service'
 
+# Amazon Linux (inherit RedHat)
+require 'specinfra/command/amazon'
+require 'specinfra/command/amazon/base'
+
 # AIX (inherit Base)
 require 'specinfra/command/aix'
 require 'specinfra/command/aix/base'

data/lib/specinfra/command/amazon.rb

@@ -0,0 +1,2 @@
+class Specinfra::Command::Amazon;end
+

data/lib/specinfra/command/amazon/base.rb

@@ -0,0 +1,2 @@
+class Specinfra::Command::Amazon::Base < Specinfra::Command::Redhat::Base
+end

data/lib/specinfra/helper/detect_os/redhat.rb

@@ -16,7 +16,11 @@ class Specinfra::Helper::DetectOs::Redhat < Specinfra::Helper::DetectOs
 
       { :family => 'redhat', :release => release }
     elsif run_command('ls /etc/system-release').success?
-      { :family => 'redhat', :release => nil  } # Amazon Linux
+      line = run_command('cat /etc/system-release').stdout
+      if line =~ /release (\d[\d.]*)/
+        release = $1
+      end
+      { :family => 'amazon', :release => release }
     end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.35.1"
+  VERSION = "2.36.0"
 end

data/spec/command/amazon/interface_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, { :family => 'amazon', :release => nil }
+
+describe Specinfra.command.send(:create_command_class, 'interface') do
+   it { should be_an_instance_of(Specinfra::Command::Linux::Base::Interface) }
+end
+

data/spec/command/amazon/package_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+set :os, { :family => 'amazon' }
+
+describe  get_command(:check_package_is_installed, 'httpd') do
+  it { should eq 'rpm -q httpd' }
+end

data/spec/command/amazon/service_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'amazon'
+
+describe get_command(:enable_service, 'httpd') do
+  it { should eq 'chkconfig httpd on' }
+end
+
+describe get_command(:disable_service, 'httpd') do
+  it { should eq 'chkconfig httpd off' }
+end
+
+describe get_command(:start_service, 'httpd') do
+  it { should eq 'service httpd start' }
+end
+
+describe get_command(:stop_service, 'httpd') do
+  it { should eq 'service httpd stop' }
+end
+
+describe get_command(:restart_service, 'httpd') do
+  it { should eq 'service httpd restart' }
+end
+
+describe get_command(:reload_service, 'httpd') do
+  it { should eq 'service httpd reload' }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.35.1
+  version: 2.36.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -152,6 +152,8 @@ files:
 - lib/specinfra/command/alpine/base.rb
 - lib/specinfra/command/alpine/base/package.rb
 - lib/specinfra/command/alpine/base/process.rb
+- lib/specinfra/command/amazon.rb
+- lib/specinfra/command/amazon/base.rb
 - lib/specinfra/command/arch.rb
 - lib/specinfra/command/arch/base.rb
 - lib/specinfra/command/arch/base/file.rb
@@ -394,6 +396,9 @@ files:
 - spec/backend/exec/build_command_spec.rb
 - spec/backend/exec/env_spec.rb
 - spec/backend/ssh/build_command_spec.rb
+- spec/command/amazon/interface_spec.rb
+- spec/command/amazon/package_spec.rb
+- spec/command/amazon/service_spec.rb
 - spec/command/base/file_spec.rb
 - spec/command/base/group_spec.rb
 - spec/command/base/localhost_spec.rb
@@ -460,6 +465,9 @@ test_files:
 - spec/backend/exec/build_command_spec.rb
 - spec/backend/exec/env_spec.rb
 - spec/backend/ssh/build_command_spec.rb
+- spec/command/amazon/interface_spec.rb
+- spec/command/amazon/package_spec.rb
+- spec/command/amazon/service_spec.rb
 - spec/command/base/file_spec.rb
 - spec/command/base/group_spec.rb
 - spec/command/base/localhost_spec.rb