specinfra 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d32927ff79287a07faec63345c70dd4996627b8c
-  data.tar.gz: e6a138505994cd813599d380d8c5b665fbc33b0a
+  metadata.gz: 36a703933ea44bd71de0b88b0932315f8e5ec819
+  data.tar.gz: 8d6c7246f7598d31516cf86e000bc968f341b5d5
 SHA512:
-  metadata.gz: 7344c9b16ec7731961271b5e4299dff63f67d8467d62474bfa88b1055f9c43bd00b0fc63544f7f3bd0a36f884e349fe7cf61c28470d85950b345c312d2af6168
-  data.tar.gz: f7cdbe6fd68be9fd20cb29ab6dd65dcca9b32dddf54032e9a957c95f49b206d8b1db6302c2148972f164e2c222e7bf6eb83cea1facb952eb1d68bf7a73887437
+  metadata.gz: 941ef8ee1a35f4395ca16b0cee9152a078b31dfd3c178cffcb93b004b2eb872888efc2f83fce78afa0cc92fb6143aefb7998dbbdea71424f2178579818234796
+  data.tar.gz: 89e1728fe2ce6418282f441032a557505114088597ce1353dc45fd2ee158de140683590aa649850a4abaf385a44be473604e601936a4078edc3fc322a7aa81d9

data/.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+
+before_install:
+  - gem update bundler
+
+script:
+  - bundle exec rake spec
+
+matrix:
+  allow_failures:
+    - rvm: 2.0.0
+

data/lib/specinfra/backend/exec.rb

@@ -33,7 +33,7 @@ module SpecInfra
       end
 
       def build_command(cmd)
-        path = SpecInfra.configuration.path || RSpec.configuration.path
+        path = SpecInfra.configuration.path
         if path
           cmd = "env PATH=#{path}:$PATH #{cmd}"
           cmd.gsub!(/(\&\&\s*!?\(?\s*)/, "\\1env PATH=#{path}:$PATH ")
@@ -43,7 +43,7 @@ module SpecInfra
       end
 
       def add_pre_command(cmd)
-        path = SpecInfra.configuration.path || RSpec.configuration.path
+        path = SpecInfra.configuration.path
         if SpecInfra.configuration.pre_command
           cmd = "#{SpecInfra.configuration.pre_command} && #{cmd}"
           cmd = "env PATH=#{path}:$PATH #{cmd}" if path
@@ -178,7 +178,7 @@ module SpecInfra
       end
 
       def check_os
-        return RSpec.configuration.os if RSpec.configuration.os
+        return SpecInfra.configuration.os if SpecInfra.configuration.os
         if run_command('ls /etc/redhat-release')[:exit_status] == 0
           line = run_command('cat /etc/redhat-release')[:stdout]
           if line =~ /release (\d[\d.]*)/

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

@@ -5,7 +5,7 @@ module SpecInfra
     module PowerShell
       module ScriptHelper
         def build_command(cmd)
-          path = SpecInfra.configuration.path || RSpec.configuration.path
+          path = SpecInfra.configuration.path
           if path
             cmd.strip!
             cmd = 
@@ -18,7 +18,7 @@ EOF
         end
 
         def add_pre_command(cmd)
-          path = SpecInfra.configuration.path || RSpec.configuration.path
+          path = SpecInfra.configuration.path
           if SpecInfra.configuration.pre_command
             cmd.strip!
             cmd = 

data/lib/specinfra/backend/ssh.rb

@@ -20,7 +20,7 @@ module SpecInfra
 
       def build_command(cmd)
         cmd = super(cmd)
-        if RSpec.configuration.ssh.options[:user] != 'root'
+        if SpecInfra.configuration.ssh.options[:user] != 'root'
           cmd = "#{sudo} #{cmd}"
           cmd.gsub!(/(\&\&\s*!?\(?\s*)/, "\\1#{sudo} ")
           cmd.gsub!(/(\|\|\s*!?\(?\s*)/, "\\1#{sudo} ")
@@ -30,7 +30,7 @@ module SpecInfra
 
       def add_pre_command(cmd)
         cmd = super(cmd)
-        user = RSpec.configuration.ssh.options[:user]
+        user = SpecInfra.configuration.ssh.options[:user]
         pre_command = SpecInfra.configuration.pre_command
         if pre_command && user != 'root'
           cmd = "#{sudo} #{cmd}"
@@ -44,9 +44,9 @@ module SpecInfra
         stderr_data = ''
         exit_status = nil
         exit_signal = nil
-        pass_prompt = RSpec.configuration.pass_prompt || /^\[sudo\] password for/
+        pass_prompt = SpecInfra.configuration.pass_prompt || /^\[sudo\] password for/
 
-        ssh = RSpec.configuration.ssh
+        ssh = SpecInfra.configuration.ssh
         ssh.open_channel do |channel|
           channel.request_pty do |ch, success|
             abort "Could not obtain pty " if !success
@@ -55,8 +55,8 @@ module SpecInfra
             abort "FAILED: couldn't execute command (ssh.channel.exec)" if !success
             channel.on_data do |ch, data|
               if data.match pass_prompt
-                abort "Please set sudo password by using SUDO_PASSWORD or ASK_SUDO_PASSWORD environment variable" if RSpec.configuration.sudo_password.nil?
-                channel.send_data "#{RSpec.configuration.sudo_password}\n"
+                abort "Please set sudo password by using SUDO_PASSWORD or ASK_SUDO_PASSWORD environment variable" if SpecInfra.configuration.sudo_password.nil?
+                channel.send_data "#{SpecInfra.configuration.sudo_password}\n"
               else
                 stdout_data += data
               end
@@ -80,7 +80,7 @@ module SpecInfra
       end
 
       def sudo
-        sudo_path = SpecInfra.configuration.sudo_path || RSpec.configuration.sudo_path
+        sudo_path = SpecInfra.configuration.sudo_path
         if sudo_path
           "#{sudo_path}/sudo"
         else

data/lib/specinfra/backend/winrm.rb

@@ -5,7 +5,7 @@ module SpecInfra
 
       def run_command(cmd, opts={})
         script = create_script(cmd)
-        winrm = RSpec.configuration.winrm
+        winrm = SpecInfra.configuration.winrm
 
         result = winrm.powershell(script)
         stdout, stderr = [:stdout, :stderr].map do |s|

data/lib/specinfra/configuration.rb

@@ -2,11 +2,25 @@ module SpecInfra
   module Configuration
     class << self
       VALID_OPTIONS_KEYS = [:path, :pre_command, :stdout, :stderr, :sudo_path, :pass_prompt].freeze
-      attr_accessor(*VALID_OPTIONS_KEYS)
-    
+
       def defaults
         VALID_OPTIONS_KEYS.inject({}) { |o, k| o.merge!(k => send(k)) }
       end
+
+      def method_missing(meth, val=nil)
+        key = meth.to_s
+        key.gsub!(/=$/, '')
+        if val
+          instance_variable_set("@#{key}", val)
+          RSpec.configuration.send(:"#{key}=", val) if defined?(RSpec)
+        end
+
+        ret = instance_variable_get("@#{key}")
+        if ret.nil? && defined?(RSpec) && RSpec.configuration.respond_to?(key)
+          ret = RSpec.configuration.send(key)
+        end
+        ret
+      end
     end
   end
 end

data/lib/specinfra/helper/configuration.rb

@@ -27,9 +27,12 @@ module SpecInfra
       #   end
       def build_configurations
         SpecInfra::Configuration.defaults.keys.each do |c|
-          value = self.respond_to?(c.to_sym) ?
-          self.send(c) : RSpec.configuration.send(c)
-          SpecInfra::Configuration.send(:"#{c}=", value)
+          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)
         end
       end
     end

data/lib/specinfra/helper/detect_os.rb

@@ -3,7 +3,7 @@ module SpecInfra
     module DetectOS
       def commands
         property[:os_by_host] = {} if ! property[:os_by_host]
-        host = RSpec.configuration.ssh ? RSpec.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]

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/specinfra.rb

@@ -13,15 +13,17 @@ module SpecInfra
   end
 end
 
-RSpec.configure do |c|
-  c.include(SpecInfra::Helper::Configuration)
-  c.add_setting :os,            :default => nil
-  c.add_setting :host,          :default => nil
-  c.add_setting :ssh,           :default => nil
-  c.add_setting :sudo_password, :default => nil
-  c.add_setting :winrm,         :default => nil
-  SpecInfra.configuration.defaults.each { |k, v| c.add_setting k, :default => v }
-  c.before :each do
-    backend.set_example(example) if defined?(SPEC_TYPE)
+if defined?(RSpec)
+  RSpec.configure do |c|
+    c.include(SpecInfra::Helper::Configuration)
+    c.add_setting :os,            :default => nil
+    c.add_setting :host,          :default => nil
+    c.add_setting :ssh,           :default => nil
+    c.add_setting :sudo_password, :default => nil
+    c.add_setting :winrm,         :default => nil
+    SpecInfra.configuration.defaults.each { |k, v| c.add_setting k, :default => v }
+    c.before :each do
+      backend.set_example(example) if defined?(SPEC_TYPE)
+    end
   end
 end

data/spec/configurtaion_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+RSpec.configure do |c|
+  c.path = 'foo'
+end
+
+describe RSpec.configuration.path do
+  it { should eq SpecInfra.configuration.path }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-30 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -77,6 +78,7 @@ files:
 - lib/specinfra/helper/properties.rb
 - lib/specinfra/properties.rb
 - lib/specinfra/version.rb
+- spec/configurtaion_spec.rb
 - spec/helpers/properties_spec.rb
 - spec/spec_helper.rb
 - specinfra.gemspec
@@ -105,5 +107,6 @@ signing_key:
 specification_version: 4
 summary: Common layer for serverspec and configspec
 test_files:
+- spec/configurtaion_spec.rb
 - spec/helpers/properties_spec.rb
 - spec/spec_helper.rb