[Pkg-puppet-devel] [facter] 135/180: (FACT-567) Support bundler workflow on x64

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository facter.

commit 72f820d0176ab90a61cf0bf9221fe21dca26576f
Author: Josh Cooper <josh at puppetlabs.com>
Date:   Mon Jun 16 15:32:55 2014 -0700

    (FACT-567) Support bundler workflow on x64
    
    This commit moves windows gem dependencies back into the Gemfile
    because of problems trying to express dependencies for x86 and x64
    simultaneously. For example, in ruby 1.9, rubygems does not know about
    the x64_mingw platform. Also win32console is only a dependency in ruby
    1.9 x86, but not in ruby 2 x86 or x64.
---
 Gemfile               | 14 ++++++++++++++
 ext/project_data.yaml | 11 ++++-------
 spec/spec_helper.rb   |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1e03d94..e8e8c6a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,6 +30,20 @@ data['gem_platform_dependencies'].each_pair do |gem_platform, info|
   end
 end
 
+platform(:mingw_19) do
+  gem 'win32console', '~> 1.3.2'
+end
+
+mingw = [:mingw]
+mingw << :x64_mingw if Bundler::Dsl::VALID_PLATFORMS.include?(:x64_mingw)
+
+platform(*mingw) do
+  gem 'ffi', '~> 1.9.3'
+  gem 'win32-dir', '~> 0.4.8'
+  gem 'windows-pr', '~> 1.2'
+  gem 'win32-security', '>= 0.2.0'
+end
+
 gem 'facter', ">= 1.0.0", :path => File.expand_path("..", __FILE__)
 
 if File.exists? "#{__FILE__}.local"
diff --git a/ext/project_data.yaml b/ext/project_data.yaml
index 2fb0ad3..763265a 100644
--- a/ext/project_data.yaml
+++ b/ext/project_data.yaml
@@ -18,15 +18,12 @@ gem_platform_dependencies:
     gem_runtime_dependencies:
       CFPropertyList: '~> 2.2.6'
   x86-mingw32:
-    gem_runtime_dependencies:
-      ffi: '1.9.0'
-      win32-api: '1.4.8'
-      win32-dir: '~> 0.4.3'
-      windows-api: '~> 0.4.2'
-      windows-pr: '~> 1.2.2'
-      win32console: '~> 1.3.2'
+    gem_runtime_dependencies: {}
+  x64-mingw32:
+    gem_runtime_dependencies: {}
 bundle_platforms:
   universal-darwin: ruby
   x86-mingw32: mingw
+  x64-mingw32: x64_mingw
 pre_tasks:
   'package:apple': 'cfpropertylist'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index be48104..ec976c2 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -38,7 +38,7 @@ LogSpecOrder.log_spec_order
 RSpec.configure do |config|
   config.mock_with :mocha
 
-  if Facter::Util::Config.is_windows?
+  if Facter::Util::Config.is_windows? && RUBY_VERSION =~ /^1\./
     require 'win32console'
     config.output_stream = $stdout
     config.error_stream = $stderr

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git