specinfra 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ebda9e1a8980f9cd098f5831d06e0a7cdce6d62
-  data.tar.gz: 9bf241f31f25c1f8e5ab0260f2a3461c8e45dd0a
+  metadata.gz: affb586181cbed5a5df08b7051e34fe1b825862b
+  data.tar.gz: 38a773ddead03328e9f581ff9ba2bae517f7968d
 SHA512:
-  metadata.gz: 63aa54e8bd0578ed770798036e1f97b12868d37aefea6b163c28ee235435113d01b40d225eb03cac389d002ea4982d8e43531b292e7f1e34740a4c1574362d65
-  data.tar.gz: 7763ef61cc1fe078e44b0c4e879e2f0831ec8a67a16ab77e79ade0f57fef9fd7a4b2020811aca30260a247f2fdd4b65956256736acce0e7a267172c40384e35c
+  metadata.gz: 76f82c0a871297f8b98ee2bad8fa982bdae82d06515200fe9ac5ccc8ea896d1194f6354dddeb49d896ebb5da10df1e906a6f8e5a398cbda9f6ccb624e06a80e0
+  data.tar.gz: d5f364ea6e222a2d8ac6d82e7a4b4759ae6f126b5a0f14cb1d1dbe2ff3af8778b78e3792ee6212948e38a6cfbc24cb5cc03ce436c951557be3e1f37ba54669c8

data/lib/specinfra.rb

@@ -5,19 +5,19 @@ require "specinfra/command"
 require "specinfra/command_result"
 require "specinfra/configuration"
 
-include SpecInfra
+include Specinfra
 
-module SpecInfra
+module Specinfra
   class << self
     def configuration
-      SpecInfra::Configuration
+      Specinfra::Configuration
     end
   end
 end
 
 if defined?(RSpec)
   RSpec.configure do |c|
-    c.include(SpecInfra::Helper::Configuration)
+    c.include(Specinfra::Helper::Configuration)
     c.add_setting :os,            :default => nil
     c.add_setting :host,          :default => nil
     c.add_setting :ssh,           :default => nil
@@ -25,7 +25,7 @@ if defined?(RSpec)
     c.add_setting :sudo_password, :default => nil
     c.add_setting :winrm,         :default => nil
     c.add_setting :architecture,  :default => :x86_64
-    SpecInfra.configuration.defaults.each { |k, v| c.add_setting k, :default => v }
+    Specinfra.configuration.defaults.each { |k, v| c.add_setting k, :default => v }
     c.before :each do
       if respond_to?(:backend) && backend.respond_to?(:set_example)
         example = RSpec.respond_to?(:current_example) ? RSpec.current_example : self.example

data/lib/specinfra/backend/base.rb

@@ -1,7 +1,7 @@
 require 'singleton'
 require 'specinfra/command_result'
 
-module SpecInfra
+module Specinfra
   module Backend
     class Base
       include Singleton

data/lib/specinfra/backend/cmd.rb

@@ -1,6 +1,6 @@
 require 'open3'
 
-module SpecInfra
+module Specinfra
   module Backend
     class Cmd < Base
       include PowerShell::ScriptHelper
@@ -38,7 +38,7 @@ module SpecInfra
       private
 
       def powershell
-        architecture = @example.metadata[:architecture] || SpecInfra.configuration.architecture
+        architecture = @example.metadata[:architecture] || Specinfra.configuration.architecture
 
         case architecture
         when :i386 then x86_powershell

data/lib/specinfra/backend/docker.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Backend
     class Docker < Exec
       def initialize
@@ -31,7 +31,7 @@ module SpecInfra
       private
 
       def base_image
-        @base_image ||= ::Docker::Image.get(SpecInfra.configuration.docker_image)
+        @base_image ||= ::Docker::Image.get(Specinfra.configuration.docker_image)
       end
 
       def current_image
@@ -44,7 +44,7 @@ module SpecInfra
           'Cmd' => %W{/bin/sh -c #{cmd}},
         }.merge(opts)
 
-        if path = SpecInfra::configuration::path
+        if path = Specinfra::configuration::path
           (opts['Env'] ||= {})['PATH'] = path
         end
 

data/lib/specinfra/backend/dockerfile.rb

@@ -1,6 +1,6 @@
-module SpecInfra
+module Specinfra
   module Backend
-    class Dockerfile < SpecInfra::Backend::Base
+    class Dockerfile < Specinfra::Backend::Base
       def initialize
         @lines = []
         ObjectSpace.define_finalizer(self) {

data/lib/specinfra/backend/exec.rb

@@ -2,7 +2,7 @@ require 'singleton'
 require 'fileutils'
 require 'shellwords'
 
-module SpecInfra
+module Specinfra
   module Backend
     class Exec < Base
 
@@ -34,11 +34,11 @@ module SpecInfra
       end
 
       def build_command(cmd)
-        shell = SpecInfra.configuration.shell || '/bin/sh'
+        shell = Specinfra.configuration.shell || '/bin/sh'
         cmd = cmd.shelljoin if cmd.is_a?(Array)
         cmd = "#{shell.shellescape} -c #{cmd.shellescape}"
 
-        path = SpecInfra.configuration.path
+        path = Specinfra.configuration.path
         if path
           cmd = "env PATH=#{path.shellescape}:\"$PATH\" #{cmd}"
         end
@@ -47,8 +47,8 @@ module SpecInfra
       end
 
       def add_pre_command(cmd)
-        if SpecInfra.configuration.pre_command
-          pre_cmd = build_command(SpecInfra.configuration.pre_command)
+        if Specinfra.configuration.pre_command
+          pre_cmd = build_command(Specinfra.configuration.pre_command)
           "#{pre_cmd} && #{cmd}"
         else
           cmd
@@ -184,7 +184,7 @@ module SpecInfra
       end
 
       def check_os
-        return SpecInfra.configuration.os if SpecInfra.configuration.os
+        return Specinfra.configuration.os if Specinfra.configuration.os
         if run_command('ls /etc/redhat-release').success?
           line = run_command('cat /etc/redhat-release').stdout
           if line =~ /release (\d[\d.]*)/

data/lib/specinfra/backend/lxc.rb

@@ -1,5 +1,5 @@
 
-module SpecInfra
+module Specinfra
   module Backend
     class Lxc < Exec
       def run_command(cmd, opts={})

data/lib/specinfra/backend/powershell/command.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Backend
     module PowerShell
       class Command

data/lib/specinfra/backend/powershell/script_helper.rb

@@ -1,11 +1,11 @@
 require 'base64'
 
-module SpecInfra
+module Specinfra
   module Backend
     module PowerShell
       module ScriptHelper
         def build_command(cmd)
-          path = SpecInfra.configuration.path
+          path = Specinfra.configuration.path
           if path
             cmd.strip!
             cmd = 
@@ -18,12 +18,12 @@ EOF
         end
 
         def add_pre_command(cmd)
-          path = SpecInfra.configuration.path
-          if SpecInfra.configuration.pre_command
+          path = Specinfra.configuration.path
+          if Specinfra.configuration.pre_command
             cmd.strip!
             cmd = 
 <<-EOF
-if (#{SpecInfra.configuration.pre_command})
+if (#{Specinfra.configuration.pre_command})
 {
 #{cmd}
 }

data/lib/specinfra/backend/shellscript.rb

@@ -1,6 +1,6 @@
 require 'singleton'
 
-module SpecInfra
+module Specinfra
   module Backend
     class ShellScript < Base
       def initialize

data/lib/specinfra/backend/ssh.rb

@@ -1,6 +1,6 @@
 require 'specinfra/backend/exec'
 
-module SpecInfra
+module Specinfra
   module Backend
     class Ssh < Exec
       def run_command(cmd, opt={})
@@ -20,8 +20,8 @@ module SpecInfra
 
       def build_command(cmd)
         cmd = super(cmd)
-        user = SpecInfra.configuration.ssh.options[:user]
-        disable_sudo = SpecInfra.configuration.disable_sudo
+        user = Specinfra.configuration.ssh.options[:user]
+        disable_sudo = Specinfra.configuration.disable_sudo
         if user != 'root' && !disable_sudo
           cmd = "#{sudo} #{cmd}"
         end
@@ -29,7 +29,7 @@ module SpecInfra
       end
 
       def copy_file(from, to)
-        scp = SpecInfra.configuration.scp
+        scp = Specinfra.configuration.scp
         begin
           scp.upload!(from, to)
         rescue => e
@@ -44,11 +44,11 @@ module SpecInfra
         stderr_data = ''
         exit_status = nil
         exit_signal = nil
-        pass_prompt = SpecInfra.configuration.pass_prompt || /^\[sudo\] password for/
+        pass_prompt = Specinfra.configuration.pass_prompt || /^\[sudo\] password for/
 
-        ssh = SpecInfra.configuration.ssh
+        ssh = Specinfra.configuration.ssh
         ssh.open_channel do |channel|
-          if SpecInfra.configuration.sudo_password or SpecInfra.configuration.request_pty
+          if Specinfra.configuration.sudo_password or Specinfra.configuration.request_pty
             channel.request_pty do |ch, success|
               abort "Could not obtain pty " if !success
             end
@@ -57,7 +57,7 @@ module SpecInfra
             abort "FAILED: couldn't execute command (ssh.channel.exec)" if !success
             channel.on_data do |ch, data|
               if data.match pass_prompt
-                channel.send_data "#{SpecInfra.configuration.sudo_password}\n"
+                channel.send_data "#{Specinfra.configuration.sudo_password}\n"
               else
                 stdout_data += data
               end
@@ -65,7 +65,7 @@ module SpecInfra
 
             channel.on_extended_data do |ch, type, data|
               if data.match /you must have a tty to run sudo/
-                abort 'Please set "SpecInfra.configuration.request_pty = true" or "c.request_pty = true" in your spec_helper.rb or other appropreate file.'
+                abort 'Please set "Specinfra.configuration.request_pty = true" or "c.request_pty = true" in your spec_helper.rb or other appropreate file.'
               end
 
               if data.match /^sudo: no tty present and no askpass program specified/
@@ -89,13 +89,13 @@ module SpecInfra
       end
 
       def sudo
-        if sudo_path = SpecInfra.configuration.sudo_path
+        if sudo_path = Specinfra.configuration.sudo_path
           sudo_path += '/sudo'
         else
           sudo_path = 'sudo'
         end
 
-        sudo_options = SpecInfra.configuration.sudo_options
+        sudo_options = Specinfra.configuration.sudo_options
         if sudo_options
           sudo_options = sudo_options.shelljoin if sudo_options.is_a?(Array)
           sudo_options = ' ' + sudo_options

data/lib/specinfra/backend/winrm.rb

@@ -1,11 +1,11 @@
-module SpecInfra
+module Specinfra
   module Backend
     class WinRM < Base
       include PowerShell::ScriptHelper
 
       def run_command(cmd, opts={})
         script = create_script(cmd)
-        winrm = SpecInfra.configuration.winrm
+        winrm = Specinfra.configuration.winrm
 
         result = winrm.powershell(script)
         stdout, stderr = [:stdout, :stderr].map do |s|

data/lib/specinfra/command/aix.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class AIX < Base
       class NotImplementedError < Exception; end

data/lib/specinfra/command/arch.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class Arch < Linux
       def check_access_by_user(file, user, access)

data/lib/specinfra/command/base.rb

@@ -1,6 +1,6 @@
 require 'shellwords'
 
-module SpecInfra
+module Specinfra
   module Command
     class Base
       class NotImplementedError < Exception; end

data/lib/specinfra/command/darwin.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class Darwin < Base
       def check_file_md5checksum(file, expected)

data/lib/specinfra/command/debian.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class Debian < Linux
       def check_enabled(service, level=3)

data/lib/specinfra/command/freebsd.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class FreeBSD < Base
       def check_enabled(service, level=3)

data/lib/specinfra/command/freebsd10.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class FreeBSD10 < FreeBSD
       def check_installed(package, version=nil)

data/lib/specinfra/command/gentoo.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class Gentoo < Linux
       def check_enabled(service, level=3)

data/lib/specinfra/command/linux.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class Linux < Base
       def check_access_by_user(file, user, access)

data/lib/specinfra/command/openbsd.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class OpenBSD < Base
       def check_enabled(service, level=3)

data/lib/specinfra/command/plamo.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class Plamo < Linux
 

data/lib/specinfra/command/redhat.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class RedHat < Linux
       def check_access_by_user(file, user, access)

data/lib/specinfra/command/smartos.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class SmartOS < Solaris
       def check_installed(package, version=nil)

data/lib/specinfra/command/solaris.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class Solaris < Base
       def check_enabled(service, level=3)

data/lib/specinfra/command/solaris10.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class Solaris10 < Solaris
       # Please implement Solaris 10 specific commands

data/lib/specinfra/command/solaris11.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class Solaris11 < Solaris
       # Please implement Solaris 11 specific commands

data/lib/specinfra/command/suse.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class SuSE < Linux
       def check_enabled(service, level=3)

data/lib/specinfra/command/ubuntu.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class Ubuntu < Debian
       def check_running(service)

data/lib/specinfra/command/windows.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Command
     class Windows
       class NotSupportedError < Exception; end

data/lib/specinfra/command_result.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   class CommandResult
     attr_reader :stdout, :stderr, :exit_status, :exit_signal
 

data/lib/specinfra/configuration.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Configuration
     class << self
       VALID_OPTIONS_KEYS = [

data/lib/specinfra/helper.rb

@@ -2,7 +2,7 @@ require 'specinfra/helper/os'
 require 'specinfra/helper/detect_os'
 
 require 'specinfra/helper/backend'
-include SpecInfra::Helper::Backend
+include Specinfra::Helper::Backend
 
 require 'specinfra/helper/docker'
 require 'specinfra/helper/lxc'
@@ -10,4 +10,4 @@ require 'specinfra/helper/lxc'
 require 'specinfra/helper/configuration'
 
 require 'specinfra/helper/properties'
-include SpecInfra::Helper::Properties
+include Specinfra::Helper::Properties

data/lib/specinfra/helper/backend.rb

@@ -1,13 +1,13 @@
-module SpecInfra
+module Specinfra
   module Helper
     ['Exec', 'Ssh', 'Cmd', 'Docker', 'WinRM', 'ShellScript', 'Dockerfile', 'Lxc'].each do |type|
       eval <<-EOF
         module #{type}
           def backend(commands_object=nil)
             if ! respond_to?(:commands)
-              commands_object = SpecInfra::Command::Base.new
+              commands_object = Specinfra::Command::Base.new
             end
-            instance = SpecInfra::Backend::#{type}.instance
+            instance = Specinfra::Backend::#{type}.instance
             instance.set_commands(commands_object || commands)
             instance
           end
@@ -17,8 +17,8 @@ module SpecInfra
 
     module Backend
       def backend_for(type)
-        instance = self.class.const_get('SpecInfra').const_get('Backend').const_get(type.to_s.capitalize).instance
-        commands = self.class.const_get('SpecInfra').const_get('Command').const_get(instance.check_os[:family]).new
+        instance = self.class.const_get('Specinfra').const_get('Backend').const_get(type.to_s.capitalize).instance
+        commands = self.class.const_get('Specinfra').const_get('Command').const_get(instance.check_os[:family]).new
         instance.set_commands(commands)
         instance
       end

data/lib/specinfra/helper/configuration.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Helper
     module Configuration
       def subject
@@ -27,13 +27,13 @@ module SpecInfra
       #     end
       #   end
       def build_configurations
-        SpecInfra::Configuration.defaults.keys.each do |c|
+        Specinfra::Configuration.defaults.keys.each do |c|
           if self.respond_to?(c.to_sym)
             value = self.send(c)
           else
             value = RSpec.configuration.send(c) if defined?(RSpec)
           end
-          SpecInfra::Configuration.instance_variable_set("@#{c}", value)
+          Specinfra::Configuration.instance_variable_set("@#{c}", value)
         end
       end
     end

data/lib/specinfra/helper/detect_os.rb

@@ -1,18 +1,18 @@
-module SpecInfra
+module Specinfra
   module Helper
     module DetectOS
       def commands
         property[:os_by_host] = {} if ! property[:os_by_host]
-        host = SpecInfra.configuration.ssh ? SpecInfra.configuration.ssh.host : 'localhost'
+        host = Specinfra.configuration.ssh ? Specinfra.configuration.ssh.host : 'localhost'
 
         if property[:os_by_host][host]
           os = property[:os_by_host][host]
         else
           # Set command object explicitly to avoid `stack too deep`
-          os = backend(SpecInfra::Command::Base.new).check_os
+          os = backend(Specinfra::Command::Base.new).check_os
           property[:os_by_host][host] = os
         end
-        self.class.const_get('SpecInfra').const_get('Command').const_get(os[:family]).new
+        self.class.const_get('Specinfra').const_get('Command').const_get(os[:family]).new
       end
     end
   end

data/lib/specinfra/helper/docker.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Helper
     module Docker
       def self.included(klass)

data/lib/specinfra/helper/lxc.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Helper
     module Lxc
       def self.included(klass)

data/lib/specinfra/helper/os.rb

@@ -1,4 +1,4 @@
-module SpecInfra
+module Specinfra
   module Helper
     [
       'Base',
@@ -23,7 +23,7 @@ module SpecInfra
       eval <<-EOF
         module #{os}
           def commands
-            SpecInfra::Command::#{os}.new
+            Specinfra::Command::#{os}.new
           end
         end
       EOF

data/lib/specinfra/helper/properties.rb

@@ -1,13 +1,13 @@
 require 'specinfra/properties'
 
-module SpecInfra
+module Specinfra
   module Helper
     module Properties
       def property
-        SpecInfra::Properties.instance.properties
+        Specinfra::Properties.instance.properties
       end
       def set_property(prop)
-        SpecInfra::Properties.instance.properties(prop)
+        Specinfra::Properties.instance.properties(prop)
       end
     end
   end

data/lib/specinfra/properties.rb

@@ -1,6 +1,6 @@
 require 'singleton'
 
-module SpecInfra
+module Specinfra
   class Properties
     include Singleton
     def initialize

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
-module SpecInfra
-  VERSION = "2.0.0.beta1"
+module Specinfra
+  VERSION = "2.0.0.beta2"
 end

data/spec/backend/exec/build_command_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-include SpecInfra::Helper::Exec
+include Specinfra::Helper::Exec
 
-describe SpecInfra::Backend::Exec do
+describe Specinfra::Backend::Exec do
   describe '#build_command' do
     context 'with simple command' do
       it 'should escape spaces' do

data/spec/backend/ssh/build_command_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-include SpecInfra::Helper::Ssh
+include Specinfra::Helper::Ssh
 
-describe SpecInfra::Backend::Ssh do
+describe Specinfra::Backend::Ssh do
   describe '#build_command' do
     context 'with root user' do 
       before do

data/spec/configuration_spec.rb

@@ -5,5 +5,5 @@ RSpec.configure do |c|
 end
 
 describe RSpec.configuration.path do
-  it { should eq SpecInfra.configuration.path }
+  it { should eq Specinfra.configuration.path }
 end

data/spec/helper/backend_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe 'backend_for(:type) returns correct backend object' do
-  it 'backend_for(:exec) returns SpecInfra::Backend::Exec' do
-    expect(backend_for(:exec)).to be_an_instance_of SpecInfra::Backend::Exec
+  it 'backend_for(:exec) returns Specinfra::Backend::Exec' do
+    expect(backend_for(:exec)).to be_an_instance_of Specinfra::Backend::Exec
   end
 
-  it 'backend_for(:ssh) returns SpecInfra::Backend::Ssh' do
-    expect(backend_for(:ssh)).to be_an_instance_of SpecInfra::Backend::Ssh
+  it 'backend_for(:ssh) returns Specinfra::Backend::Ssh' do
+    expect(backend_for(:ssh)).to be_an_instance_of Specinfra::Backend::Ssh
   end
 end

data/spec/helper/properties_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include SpecInfra::Helper::Properties
+include Specinfra::Helper::Properties
 
 describe 'Properties Helper' do
   before :all do

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 require 'specinfra'
 require 'rspec/mocks/standalone'
 
-include SpecInfra::Helper::Exec
+include Specinfra::Helper::Exec
 
-module SpecInfra
+module Specinfra
   module Backend
     class Ssh
       def run_command(cmd, opts={})

data/specinfra.gemspec

@@ -5,7 +5,7 @@ require 'specinfra/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "specinfra"
-  spec.version       = SpecInfra::VERSION
+  spec.version       = Specinfra::VERSION
   spec.authors       = ["Gosuke Miyashita"]
   spec.email         = ["gosukenator@gmail.com"]
   spec.description   = %q{Common layer for serverspec and configspec}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Gosuke Miyashita