specinfra 2.0.0.beta9 → 2.0.0.beta10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 572f8250ba4ca99acbaa3740b61bb646103cd041
-  data.tar.gz: d8cec18e50e69cd12c3186dbcbc7835e8896df93
+  metadata.gz: e1aff7042917b171b5d17ebf844a2d999aa6618e
+  data.tar.gz: 0b40b2253e90d2b396488e23760ba55ddbbe00d7
 SHA512:
-  metadata.gz: 7250feadcc58c2e9672a5e5580674b2283cbb2c5109ee8e3c7b3ec330e83985d3494d39c332c8ea1825ebd211f82e7a1ddafae6c7468a2c43dc94cdfa3a84518
-  data.tar.gz: a8e345e42bb720faa2d8001e17513d2b76ccc0c3135884aa0beff203f9681d04542f169b5101fbc7ff0a96925d855092f0f7f70c51cf9562713da17b6f6910ab
+  metadata.gz: 726743abc9b1a8e572e6919900d4caf7e1426e020b316ac6c2533032b7da7b8e335dbd79a9082ba3561358ff524beb6c0486fffa6f692512c2c98ab082717430
+  data.tar.gz: 95ceed7ebc6efbc6bb2a2ea6d37d991bf71145996d834521fbf7b62cbeed7d0ecebc5b53b21e4cd8aea0a72b0dfa73dbaec114698453bb39d2f0baec8e7badb3

data/lib/specinfra/backend/exec.rb

@@ -9,7 +9,7 @@ module Specinfra
       def run_command(cmd, opts={})
         cmd = build_command(cmd)
         cmd = add_pre_command(cmd)
-        stdout = run_with_no_ruby_environment do
+        stdout = with_env do
           `#{build_command(cmd)} 2>&1`
         end
         # In ruby 1.9, it is possible to use Open3.capture3, but not in 1.8
@@ -23,14 +23,26 @@ module Specinfra
         CommandResult.new :stdout => stdout, :exit_status => $?.exitstatus
       end
 
-      def run_with_no_ruby_environment
+      def with_env
         keys = %w[BUNDLER_EDITOR BUNDLE_BIN_PATH BUNDLE_GEMFILE
           RUBYOPT GEM_HOME GEM_PATH GEM_CACHE]
 
         keys.each { |key| ENV["_SPECINFRA_#{key}"] = ENV[key] ; ENV.delete(key) }
+
+        env = Specinfra.configuration.env || {}
+        env['LANG'] ||= 'C'
+
+        env.each do |key, value|
+          ENV["_SPECINFRA_#{key}"] = ENV[key];
+          ENV[key] = value
+        end
+
         yield
       ensure
         keys.each { |key| ENV[key] = ENV.delete("_SPECINFRA_#{key}") }
+        env.each do |key, value|
+          ENV[key] = ENV.delete("_SPECINFRA_#{key}");
+        end
       end
 
       def build_command(cmd)
@@ -40,7 +52,7 @@ module Specinfra
 
         path = Specinfra.configuration.path
         if path
-          cmd = "env PATH=#{path.shellescape}:\"$PATH\" #{cmd}"
+          cmd = %Q{env PATH="#{path}" #{cmd}}
         end
 
         cmd

data/lib/specinfra/backend/ssh.rb

@@ -11,7 +11,9 @@ module Specinfra
       def run_command(cmd, opt={})
         cmd = build_command(cmd)
         cmd = add_pre_command(cmd)
-        ret = ssh_exec!(cmd)
+        ret = with_env do
+          ssh_exec!(cmd)
+        end
 
         ret[:stdout].gsub!(/\r\n/, "\n")
 
@@ -23,6 +25,26 @@ module Specinfra
         CommandResult.new ret
       end
 
+      def with_env
+        env = Specinfra.configuration.env || {}
+        env['LANG'] ||= 'C'
+
+        ssh_options = Specinfra.configuration.ssh_options || {}
+        ssh_options[:send_env] ||= []
+
+        env.each do |key, value|
+          ENV["_SPECINFRA_#{key}"] = ENV[key];
+          ENV[key] = value
+          ssh_options[:send_env] << key
+        end
+
+        yield
+      ensure
+        env.each do |key, value|
+          ENV[key] = ENV.delete("_SPECINFRA_#{key}");
+        end
+      end
+
       def build_command(cmd)
         cmd = super(cmd)
         user = Specinfra.configuration.ssh_options[:user]

data/lib/specinfra/command/linux/base/lxc_container.rb

@@ -4,6 +4,6 @@ class Specinfra::Command::Linux::Base::LxcContainer < Specinfra::Command::Base::
   end
 
   def check_is_running(container)
-    "lxc-info -n #{escape(container)} -t RUNNING"
+    "lxc-info -n #{escape(container)} -s | grep -w RUNNING"
   end
 end

data/lib/specinfra/configuration.rb

@@ -2,6 +2,7 @@ module Specinfra
   module Configuration
     class << self
       VALID_OPTIONS_KEYS = [
+        :env,
         :path,
         :shell,
         :pre_command,

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta9"
+  VERSION = "2.0.0.beta10"
 end

data/spec/backend/exec/build_command_spec.rb

@@ -46,7 +46,7 @@ describe Specinfra::Backend::Exec do
 
     context 'with custom path' do
       before do
-        RSpec.configure {|c| c.path = '/opt/bin:/opt/foo/bin' }
+        RSpec.configure {|c| c.path = '/opt/bin:/opt/foo/bin:$PATH' }
       end
 
       after do
@@ -54,13 +54,13 @@ describe Specinfra::Backend::Exec do
       end
 
       it 'should use custom path' do
-        expect(backend.build_command('test -f /etc/passwd')).to eq 'env PATH=/opt/bin:/opt/foo/bin:"$PATH" /bin/sh -c test\ -f\ /etc/passwd'
+        expect(backend.build_command('test -f /etc/passwd')).to eq 'env PATH="/opt/bin:/opt/foo/bin:$PATH" /bin/sh -c test\ -f\ /etc/passwd'
       end
     end
 
     context 'with custom path that needs escaping' do
       before do
-        RSpec.configure {|c| c.path = '/opt/bin:/opt/test & spec/bin' }
+        RSpec.configure {|c| c.path = '/opt/bin:/opt/test & spec/bin:$PATH' }
       end
 
       after do
@@ -68,7 +68,7 @@ describe Specinfra::Backend::Exec do
       end
 
       it 'should use custom path' do
-        expect(backend.build_command('test -f /etc/passwd')).to eq 'env PATH=/opt/bin:/opt/test\ \&\ spec/bin:"$PATH" /bin/sh -c test\ -f\ /etc/passwd'
+        expect(backend.build_command('test -f /etc/passwd')).to eq 'env PATH="/opt/bin:/opt/test & spec/bin:$PATH" /bin/sh -c test\ -f\ /etc/passwd'
       end
     end
   end

data/spec/backend/exec/env_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe backend.run_command('echo $LANG').stdout.strip do
+  it { should eq 'C' }
+end
+
+describe do
+  before do
+    ENV['LANG'] = 'C'
+    set :env, 'LANG' => 'ja_JP.UTF-8'
+  end
+  let(:lang) { backend.run_command('echo $LANG').stdout.strip }
+  it { expect(lang).to eq 'ja_JP.UTF-8' }
+  it { expect(ENV['LANG']).to eq 'C' }
+end
+

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'specinfra'
 require 'rspec/mocks/standalone'
+require 'rspec/its'
 
 include Specinfra::Helper::Exec
 

data/specinfra.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec-its"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta9
+  version: 2.0.0.beta10
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Common layer for serverspec and configspec
 email:
 - gosukenator@gmail.com
@@ -293,6 +307,7 @@ files:
 - lib/specinfra/runner.rb
 - lib/specinfra/version.rb
 - spec/backend/exec/build_command_spec.rb
+- spec/backend/exec/env_spec.rb
 - spec/backend/ssh/build_command_spec.rb
 - spec/command/base/file_spec.rb
 - spec/command/base_spec.rb
@@ -333,6 +348,7 @@ specification_version: 4
 summary: Common layer for serverspec and configspec
 test_files:
 - spec/backend/exec/build_command_spec.rb
+- spec/backend/exec/env_spec.rb
 - spec/backend/ssh/build_command_spec.rb
 - spec/command/base/file_spec.rb
 - spec/command/base_spec.rb