serverspec 2.0.0.beta6 → 2.0.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa3da35f1496825983cc458a77052918cd8ed9fa
-  data.tar.gz: 63b88a49efb03e61d44c82b1908e9ad7c450b72e
+  metadata.gz: 86276d22b163697d65c60b346e9b6e6b0ff9e5cb
+  data.tar.gz: 58808a070ee544fe9a86a7a3f50c52a35149ebcc
 SHA512:
-  metadata.gz: c8fc95f52f7e6f6e6571dbdca21935ca64345ac7bf1ccc6bc2971ea4fe4cdd56071b70457ca0f4918cc774737e8093ef0608a658b8caf7c4fd2a9980f43555ab
-  data.tar.gz: 5d96c7c90724bfcc0ce4a96c7960dde0a9998595f80670ccfb9f029fe63925d0569dbc460b20223e481506ff50a32b17f920defc7148fcff70e819cb9ea66e51
+  metadata.gz: cf3996aefa9f11b279130f27ea47b27673d47e0ae25d9929b9e3103294c59c645a91911d1e3e099250db39925c39402109cb39ca5fb9593a623acd97e556a8a1
+  data.tar.gz: 1f91b85d4ea7f6bc52d54afbc13244b689bb97ac93d7ada9544b980181b64bacb0cabfa2879e8773c0f2b1cd216dffbd5cbc8ad89b8c972c7ceae40363697f67

data/lib/serverspec/helper.rb

@@ -1,5 +1,3 @@
-require 'serverspec/helper/os'
-
 # Subject type helper
 require 'serverspec/helper/type'
 extend Serverspec::Helper::Type

data/lib/serverspec/setup.rb

@@ -103,13 +103,18 @@ describe package('apache2'), :if => os[:family] == 'Ubuntu' do
 end
 
 describe service('httpd'), :if => os[:family] == 'RedHat' do
-  it { should be_enabled   }
-  it { should be_running   }
+  it { should be_enabled }
+  it { should be_running }
 end
 
 describe service('apache2'), :if => os[:family] == 'Ubuntu' do
-  it { should be_enabled   }
-  it { should be_running   }
+  it { should be_enabled }
+  it { should be_running }
+end
+
+describe service('org.apache.httpd'), :if => os[:family] == 'Darwin' do
+  it { should be_enabled }
+  it { should be_running }
 end
 
 describe port(80) do
@@ -117,16 +122,16 @@ describe port(80) do
 end
 EOF
 
-      if File.exists? "spec/#{@hostname}/httpd_spec.rb"
-        old_content = File.read("spec/#{@hostname}/httpd_spec.rb")
+      if File.exists? "spec/#{@hostname}/sample_spec.rb"
+        old_content = File.read("spec/#{@hostname}/sample_spec.rb")
         if old_content != content
-          $stderr.puts "!! spec/#{@hostname}/httpd_spec.rb already exists and differs from template"
+          $stderr.puts "!! spec/#{@hostname}/sample_spec.rb already exists and differs from template"
         end
       else
-        File.open("spec/#{@hostname}/httpd_spec.rb", 'w') do |f|
+        File.open("spec/#{@hostname}/sample_spec.rb", 'w') do |f|
           f.puts content
         end
-        puts " + spec/#{@hostname}/httpd_spec.rb"
+        puts " + spec/#{@hostname}/sample_spec.rb"
       end
     end
 
@@ -233,11 +238,14 @@ end
     end
 
     def self.spec_helper_template
-      template = <<-EOF
+      template = <<-'EOF'
 require 'serverspec'
 <% if @backend_type == 'Ssh' -%>
 require 'net/ssh'
 <% end -%>
+<%- if @vagrant -%>
+require 'tempfile'
+<% end -%>
 <% if @backend_type == 'WinRM' -%>
 require 'winrm'
 <% end -%>
@@ -262,31 +270,22 @@ else
 end
 
 <%- if @backend_type == 'Ssh' -%>
-host    = ENV['TARGET_HOST']
-options = Net::SSH::Config.for(host)
+host = ENV['TARGET_HOST']
 
 <%- if @vagrant -%>
-`vagrant up \#{ENV['TARGET_HOST']}`
-
-config = `vagrant ssh-config \#{ENV['TARGET_HOST']}`
-if config != ''
-  config.each_line do |line|
-    if match = /HostName (.*)/.match(line)
-      host = match[1]
-    elsif  match = /User (.*)/.match(line)
-      options[:user] = match[1]
-    elsif match = /IdentityFile (.*)/.match(line)
-      options[:keys] =  [match[1].gsub(/\"/,'')]
-    elsif match = /Port (.*)/.match(line)
-      options[:port] = match[1]
-    end
-  end
-end
+`vagrant up #{host}`
+
+config = Tempfile.new('', Dir.tmpdir)
+`vagrant ssh-config #{host} > #{config.path}`
 
+options = Net::SSH::Config.for(host, [config.path])
+<%- else -%>
+options = Net::SSH::Config.for(host)
 <%- end -%>
+
 options[:user] ||= Etc.getlogin
 
-set :host,        host
+set :host,        options[:host_name] || host
 set :ssh_options, options
 <%- end -%>
 <%- end -%>

data/lib/serverspec/type/file.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 module Serverspec
   module Type
     class File < Base
@@ -93,6 +95,15 @@ module Serverspec
       def version?(version)
         @runner.check_file_version(@name, version)
       end
+
+      def mtime
+        d = backend.get_file_mtime(@name).stdout.strip
+        DateTime.strptime(d, '%s').new_offset(DateTime.now.offset)
+      end
+
+      def size
+        backend.get_file_size(@name).stdout.strip.to_i
+      end
     end
   end
 end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.0.0.beta6"
+  VERSION = "2.0.0.beta7"
 end

data/serverspec.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "rspec", "~> 3.0.0"
   spec.add_runtime_dependency "rspec-its"
-  spec.add_runtime_dependency "specinfra", "~> 2.0.0.beta4"
+  spec.add_runtime_dependency "specinfra", "~> 2.0.0.beta6"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta6
+  version: 2.0.0.beta7
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta4
+        version: 2.0.0.beta6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta4
+        version: 2.0.0.beta6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +101,6 @@ files:
 - lib/serverspec.rb
 - lib/serverspec/commands/base.rb
 - lib/serverspec/helper.rb
-- lib/serverspec/helper/os.rb
 - lib/serverspec/helper/properties.rb
 - lib/serverspec/helper/type.rb
 - lib/serverspec/matchers.rb

data/lib/serverspec/helper/os.rb

@@ -1,29 +0,0 @@
-module Serverspec
-  module Helper
-    [
-      'DetectOS',
-      'AIX',
-      'Arch',
-      'Darwin',
-      'Debian',
-      'Fedora',
-      'FreeBSD',
-      'FreeBSD10',
-      'Gentoo',
-      'Plamo',
-      'RedHat',
-      'RedHat7',
-      'SmartOS',
-      'Solaris',
-      'Solaris10',
-      'Solaris11',
-      'Windows',
-    ].each do |os|
-      eval <<-EOF
-        module #{os}
-          include self.class.const_get('Specinfra').const_get('Helper').const_get('#{os}')
-        end
-      EOF
-    end
-  end
-end