specinfra 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0496b81232f15579c3efcce2bef98adc764fc7d
-  data.tar.gz: 70085d506610ee34667126938d98cb84ed2606e6
+  metadata.gz: 5b4eed13de93f62f2bbb57ce355ea22684606c06
+  data.tar.gz: 14c461c8b5fc9c94761dede212cd8f67d69a60b8
 SHA512:
-  metadata.gz: f8dca453bd2d181b32f79f0c7b6f1812bb1cc583820b0a6cf6708ff4d22dd076489e376de3be732a2d81148c920e185b843874bac21d6013bd8d6fd40e50f37a
-  data.tar.gz: d43cc4d1909e48c10db30350298ff814e6b12c505191162ce6b79fe361599b74d8258bb537749e571d0e6c04466e5486791868d920e5c081507171c064535902
+  metadata.gz: 1310556dbf0eac4ea57809c3e8a9c19c8f3b6edd4d735333e6b7d63cc2f89839c359ebc49542b2bbf995dd4b3cc1137819175f29bfa23a1a7cc5f8e2d664563a
+  data.tar.gz: 5efff319c39a3328d342b49936c45e8b6079208e715ae279e2b3dda7ca047fa126df39c5e7abd8d702b96f1a159ed4a1a587b6a733a94c16b0bf1eeba8c82e79

data/lib/specinfra/backend/cmd.rb

@@ -7,7 +7,7 @@ module SpecInfra
 
       def run_command(cmd, opts={})
         script = create_script(cmd)
-        result = execute_script %Q{powershell -encodedCommand #{encode_script(script)}}
+        result = execute_script %Q{#{powershell} -encodedCommand #{encode_script(script)}}
 
         if @example
           @example.metadata[:command] = script
@@ -34,6 +34,32 @@ module SpecInfra
         # Dirty hack for specs
         'Windows'
       end
+
+      private
+
+      def powershell
+         architecture = @example.metadata[:architecture] || SpecInfra.configuration.architecture
+
+         case architecture
+         when :i386 then x86_powershell
+         when :x86_64 then x64_powershell
+         else raise ArgumentError, "invalid architecture [#{architecture}]"
+         end
+      end
+
+      def x64_powershell
+        find_powershell(%w(sysnative system32))
+      end
+
+      def x86_powershell
+        find_powershell(%w(syswow64 system32))
+      end
+
+      def find_powershell(dirs)
+        dirs.map { |dir| "#{ENV['WINDIR']}\\#{dir}\\WindowsPowerShell\\v1.0\\powershell.exe" }
+          .find { |exe| File.exists?(exe) } || 'powershell'
+      end
+
     end
   end
 end

data/lib/specinfra/command/windows.rb

@@ -66,6 +66,10 @@ module SpecInfra
         end
       end
 
+      def get_file_content(file)
+        "[Io.File]::ReadAllText('#{file}')"
+      end
+
       def check_access_by_user(file, user, access)
         case access
         when 'r'
@@ -229,61 +233,61 @@ module SpecInfra
           using 'list_windows_features.ps1'
           exec cmd
         end
-       end
+      end
 
-       def check_file_version(name,version)
-          cmd = "((Get-Command '#{name}').FileVersionInfo.ProductVersion -eq '#{version}') -or ((Get-Command '#{name}').FileVersionInfo.FileVersion -eq '#{version}')"
-          Backend::PowerShell::Command.new { exec cmd }
-       end
+      def check_file_version(name,version)
+        cmd = "((Get-Command '#{name}').FileVersionInfo.ProductVersion -eq '#{version}') -or ((Get-Command '#{name}').FileVersionInfo.FileVersion -eq '#{version}')"
+        Backend::PowerShell::Command.new { exec cmd }
+      end
 
-       def check_iis_website_enabled(name)
-          Backend::PowerShell::Command.new do
-            using 'find_iis_component.ps1'
-            exec "(FindIISWebsite -name '#{name}').serverAutoStart -eq $true"
-          end
-       end
+      def check_iis_website_enabled(name)
+        Backend::PowerShell::Command.new do
+          using 'find_iis_component.ps1'
+          exec "(FindIISWebsite -name '#{name}').serverAutoStart -eq $true"
+        end
+      end
 
-       def check_iis_website_installed(name)
-          Backend::PowerShell::Command.new do
-            using 'find_iis_component.ps1'
-            exec "@(FindIISWebsite -name '#{name}').count -gt 0"
-          end
-       end
+      def check_iis_website_installed(name)
+        Backend::PowerShell::Command.new do
+          using 'find_iis_component.ps1'
+          exec "@(FindIISWebsite -name '#{name}').count -gt 0"
+        end
+      end
 
-       def check_iis_website_running(name)
-          Backend::PowerShell::Command.new do
-            using 'find_iis_component.ps1'
-            exec "(FindIISWebsite -name '#{name}').state -eq 'Started'"
-          end
-       end
+      def check_iis_website_running(name)
+        Backend::PowerShell::Command.new do
+          using 'find_iis_component.ps1'
+          exec "(FindIISWebsite -name '#{name}').state -eq 'Started'"
+        end
+      end
 
-       def check_iis_website_app_pool(name, app_pool)
+      def check_iis_website_app_pool(name, app_pool)
         Backend::PowerShell::Command.new do
-              using 'find_iis_component.ps1'
-              exec "(FindIISWebsite -name '#{name}').applicationPool -match '#{app_pool}'"
-            end
+          using 'find_iis_component.ps1'
+          exec "(FindIISWebsite -name '#{name}').applicationPool -match '#{app_pool}'"
         end
+      end
 
-        def check_iis_website_path(name, path)
-            Backend::PowerShell::Command.new do
-              using 'find_iis_component.ps1'
-              exec "[System.Environment]::ExpandEnvironmentVariables( ( FindIISWebsite -name '#{name}' ).physicalPath ).replace('\\', '/' ) -eq ('#{path}'.trimEnd('/').replace('\\', '/'))"
-            end
+      def check_iis_website_path(name, path)
+        Backend::PowerShell::Command.new do
+          using 'find_iis_component.ps1'
+          exec "[System.Environment]::ExpandEnvironmentVariables( ( FindIISWebsite -name '#{name}' ).physicalPath ).replace('\\', '/' ) -eq ('#{path}'.trimEnd('/').replace('\\', '/'))"
         end
+      end
 
-        def check_iis_app_pool(name)
-            Backend::PowerShell::Command.new do
-              using 'find_iis_component.ps1'
-              exec "@(FindIISAppPool -name '#{name}').count -gt 0"
-            end
+      def check_iis_app_pool(name)
+        Backend::PowerShell::Command.new do
+          using 'find_iis_component.ps1'
+          exec "@(FindIISAppPool -name '#{name}').count -gt 0"
         end
+      end
 
-        def check_iis_app_pool_dotnet(name, dotnet)
-            Backend::PowerShell::Command.new do
-              using 'find_iis_component.ps1'
-              exec "(FindIISAppPool -name '#{name}').managedRuntimeVersion -match 'v#{dotnet}'"
-            end
+      def check_iis_app_pool_dotnet(name, dotnet)
+        Backend::PowerShell::Command.new do
+          using 'find_iis_component.ps1'
+          exec "(FindIISAppPool -name '#{name}').managedRuntimeVersion -match 'v#{dotnet}'"
         end
+      end
 
       private
 

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module SpecInfra
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/specinfra.rb

@@ -24,6 +24,7 @@ if defined?(RSpec)
     c.add_setting :scp,           :default => nil
     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 }
     c.before :each do
       if respond_to?(:backend) && backend.respond_to?(:set_example)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler