specinfra 2.0.0.beta24 → 2.0.0.beta25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cd4a2f0043137e883ac5bc8d1c39bb16e3befab
-  data.tar.gz: fb184638708430d79e6d315b3ba26cdfbbc7f76c
+  metadata.gz: 24ce450626fa848a1956f904c62f132ef4c72a48
+  data.tar.gz: e3d006fd2e4b9e275b2df7e971be7664bf027949
 SHA512:
-  metadata.gz: 8570cdc9ab705ebebc81fbd38993cbbe02a9ab4be8cb111e1543deccc8e882b11bf2301352d482a15233a7c074d5bf74f7a76ebe3437eb94af3aaeecff44fd8f
-  data.tar.gz: 45b0adc803fa83452708cb024720adbf58e8f38b350f5caaa1b4d2c3a9b0906ce3fe39ed5a0105ca81c06421b73ebbc298142db9511c397b7defdf838982c94e
+  metadata.gz: ecd328a61efbd1eebc319b4c071ec7669f99642c0c54ea1e867c350918e4878b8cc3c74cc3418b4c660a382952879efe62616282909be301ddbdc13d0225929f
+  data.tar.gz: bf8524a84cb798e02d8fe2dd9c05a66f5d8ecd08f200518c5128f2ace79186f9e75451ff6b9bf64c0160d421c0747811d821c58fd556901820d12222a1cc33a7

data/lib/specinfra.rb

@@ -9,22 +9,23 @@ require 'specinfra/runner'
 include Specinfra
 
 module Specinfra
-  @@backend = nil
-  def self.configuration
-    Specinfra::Configuration
-  end
+  class << self
+    def configuration
+      Specinfra::Configuration
+    end
 
-  def self.command
-    Specinfra::Command::Base
-  end
+    def command
+      Specinfra::Command::Base
+    end
 
-  def self.backend
-    type = Specinfra.configuration.backend
-    if type.nil?
-      warn "No backend type is specified. Fall back to :exec type."
-      type = :exec
+    def backend
+      type = Specinfra.configuration.backend
+      if type.nil?
+        warn "No backend type is specified. Fall back to :exec type."
+        type = :exec
+      end
+      eval "Specinfra::Backend::#{type.to_s.to_camel_case}.instance"
     end
-    @@backend ||= Specinfra::Backend.new(type, Specinfra.configuration)
   end
 end
 

data/lib/specinfra/backend.rb

@@ -9,12 +9,3 @@ require 'specinfra/backend/lxc'
 require 'specinfra/backend/winrm'
 require 'specinfra/backend/shellscript'
 require 'specinfra/backend/dockerfile'
-
-module Specinfra
-  class Backend
-    def Backend.new(type, config)
-      eval "Specinfra::Backend::#{type.to_s.to_camel_case}.new(config)"
-    end
-  end
-end
-

data/lib/specinfra/backend/base.rb

@@ -3,11 +3,9 @@ require 'specinfra/command_result'
 require 'specinfra/command/processor'
 
 module Specinfra
-  class Backend
+  module Backend
     class Base
-      def initialize(config)
-        @config = config
-      end
+      include Singleton
 
       def set_example(e)
         @example = e

data/lib/specinfra/backend/cmd.rb

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

data/lib/specinfra/backend/docker.rb

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

data/lib/specinfra/backend/dockerfile.rb

@@ -1,5 +1,5 @@
 module Specinfra
-  class Backend
+  module Backend
     class Dockerfile < Specinfra::Backend::Base
       def initialize
         @lines = []

data/lib/specinfra/backend/exec.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 require 'shellwords'
 
 module Specinfra
-  class Backend
+  module Backend
     class Exec < Base
 
       def run_command(cmd, opts={})
@@ -29,7 +29,7 @@ module Specinfra
 
         keys.each { |key| ENV["_SPECINFRA_#{key}"] = ENV[key] ; ENV.delete(key) }
 
-        env = @config[:env] || {}
+        env = Specinfra.configuration.env || {}
         env[:LANG] ||= 'C'
 
         env.each do |key, value|
@@ -48,11 +48,11 @@ module Specinfra
       end
 
       def build_command(cmd)
-        shell = @config[:shell] || '/bin/sh'
+        shell = Specinfra.configuration.shell || '/bin/sh'
         cmd = cmd.shelljoin if cmd.is_a?(Array)
         cmd = "#{shell.shellescape} -c #{cmd.shellescape}"
 
-        path = @config[:path]
+        path = Specinfra.configuration.path
         if path
           cmd = %Q{env PATH="#{path}" #{cmd}}
         end
@@ -61,8 +61,8 @@ module Specinfra
       end
 
       def add_pre_command(cmd)
-        if @config[:pre_command]
-          pre_cmd = build_command(@config[:pre_command])
+        if Specinfra.configuration.pre_command
+          pre_cmd = build_command(Specinfra.configuration.pre_command)
           "#{pre_cmd} && #{cmd}"
         else
           cmd

data/lib/specinfra/backend/lxc.rb

@@ -1,5 +1,6 @@
+
 module Specinfra
-  class Backend
+  module Backend
     class Lxc < Exec
       def run_command(cmd, opts={})
         cmd = build_command(cmd)
@@ -27,7 +28,7 @@ module Specinfra
       end
 
       def ct
-        @ct ||= ::LXC::Container.new(@config[:lxc])
+        @ct ||= ::LXC::Container.new(RSpec.configuration.lxc)
       end
     end
   end

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

@@ -1,5 +1,5 @@
 module Specinfra
-  class Backend
+  module Backend
     module PowerShell
       class Command
         attr_reader :import_functions, :script

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

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

data/lib/specinfra/backend/shellscript.rb

@@ -1,7 +1,7 @@
 require 'singleton'
 
 module Specinfra
-  class Backend
+  module Backend
     class ShellScript < Base
       def initialize
         @lines = [ "#!/bin/sh", "" ]

data/lib/specinfra/backend/ssh.rb

@@ -2,7 +2,7 @@ require 'specinfra/backend/exec'
 require 'net/ssh'
 require 'net/scp'
 module Specinfra
-  class Backend
+  module Backend
     class Ssh < Exec
       def prompt
         'Password: '
@@ -26,10 +26,10 @@ module Specinfra
       end
 
       def with_env
-        env = @config[:env] || {}
+        env = Specinfra.configuration.env || {}
         env[:LANG] ||= 'C'
 
-        ssh_options = @config[:ssh_options] || {}
+        ssh_options = Specinfra.configuration.ssh_options || {}
         ssh_options[:send_env] ||= []
 
         env.each do |key, value|
@@ -49,8 +49,8 @@ module Specinfra
 
       def build_command(cmd)
         cmd = super(cmd)
-        user = @config[:ssh_options][:user]
-        disable_sudo = @config[:disable_sudo]
+        user = Specinfra.configuration.ssh_options[:user]
+        disable_sudo = Specinfra.configuration.disable_sudo
         if user != 'root' && !disable_sudo
           cmd = "#{sudo} -p '#{prompt}' #{cmd}"
         end
@@ -58,25 +58,25 @@ module Specinfra
       end
 
       def copy_file(from, to)
-        if @config[:scp].nil?
-          @config[:scp] = create_scp
+        if Specinfra.configuration.scp.nil?
+          Specinfra.configuration.scp = create_scp
         end
 
-        scp = @config[:scp]
+        scp = Specinfra.configuration.scp
         scp.upload!(from, to)
       end
 
       private
       def create_ssh
         Net::SSH.start(
-          @config[:host],
-          @config[:ssh_options][:user],
-          @config[:ssh_options]
+          Specinfra.configuration.host,
+          Specinfra.configuration.ssh_options[:user],
+          Specinfra.configuration.ssh_options
         )
       end
 
       def create_scp
-        ssh = @config[:ssh]
+        ssh = Specinfra.configuration.ssh
         if ssh.nil?
           ssh = create_ssh
         end
@@ -89,13 +89,13 @@ module Specinfra
         exit_status = nil
         exit_signal = nil
 
-        if @config[:ssh].nil?
-          @config[:ssh] = create_ssh
+        if Specinfra.configuration.ssh.nil?
+          Specinfra.configuration.ssh = create_ssh
         end
 
-        ssh = @config[:ssh]
+        ssh = Specinfra.configuration.ssh
         ssh.open_channel do |channel|
-          if @config[:sudo_password] or @config[: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
@@ -104,7 +104,7 @@ module Specinfra
             abort "FAILED: couldn't execute command (ssh.channel.exec)" if !success
             channel.on_data do |ch, data|
               if data.match /^#{prompt}/
-                channel.send_data "#{@config[:sudo_password]}\n"
+                channel.send_data "#{Specinfra.configuration.sudo_password}\n"
               else
                 stdout_data += data
               end
@@ -112,7 +112,7 @@ module Specinfra
 
             channel.on_extended_data do |ch, type, data|
               if data.match /you must have a tty to run sudo/
-                abort 'Please write "set :request_pty, true" in your spec_helper.rb or other appropriate file.'
+                abort 'Please set "Specinfra.configuration.request_pty = true" or "c.request_pty = true" in your spec_helper.rb or other appropriate file.'
               end
 
               if data.match /^sudo: no tty present and no askpass program specified/
@@ -136,13 +136,13 @@ module Specinfra
       end
 
       def sudo
-        if sudo_path = @config[:sudo_path]
+        if sudo_path = Specinfra.configuration.sudo_path
           sudo_path += '/sudo'
         else
           sudo_path = 'sudo'
         end
 
-        sudo_options = @config[: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
-  class Backend
+  module Backend
     class WinRM < Base
       include PowerShell::ScriptHelper
 
       def run_command(cmd, opts={})
         script = create_script(cmd)
-        winrm = @config[:winrm]
+        winrm = Specinfra.configuration.winrm
 
         result = winrm.powershell(script)
         stdout, stderr = [:stdout, :stderr].map do |s|

data/lib/specinfra/configuration.rb

@@ -33,14 +33,6 @@ module Specinfra
         @os
       end
 
-      def [](key)
-        self.send(key)
-      end
-
-      def []=(key, val)
-        self.send(key, val)
-      end
-
       def method_missing(meth, val=nil)
         key = meth.to_s
         key.gsub!(/=$/, '')

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta24"
+  VERSION = "2.0.0.beta25"
 end

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'rspec/its'
 set :backend, :exec
 
 module Specinfra
-  class Backend
+  module Backend
     class Ssh
       def run_command(cmd, opts={})
         CommandResult.new :stdout => nil, :exit_status => 0

metadata

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