win32-api 1.5.1-universal-mingw32 → 1.5.2-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c920b8eacb567c87bdd29eacdf4c2efaa8a3743
-  data.tar.gz: 9f3da9d42ed3c5bb1c886f0c09fc01ba410fd6ad
+  metadata.gz: 40600be0a4b0d43c92a249dd1f508562d7ef399e
+  data.tar.gz: 7c13f96cb0ef6725dd590f6c93bc643aa54ba709
 SHA512:
-  metadata.gz: 3a2e33ead9630fda6b92d5e649a250bedb21f9192b2d22ce65ff5119b96d5f82613c1f22d34b547da90742aed10acb955cfd9736c58111b3e6ee1a4c8d5dafde
-  data.tar.gz: c47f3a2c23fc05820d700e0c3616d30fd9bbdd7e9905d6d578dc62498c6d6af52cf25b4e35cd96b4640edd421c9cbe5b55ca158ebdb696cbcb4a3fadfaad6477
+  metadata.gz: e48d26d32bc1ec16a985313f282f3e8d8589bc8946d3c632b6388fe273d86ca19ab3125cb735704923b6133225f0f9fec3cb1119d5532eaca2dd7c8600eebd17
+  data.tar.gz: 88912d1a2c5bf6abeb28f5f81bea9064b4faebf3bd9a9ce18a9708a12c09b01793ad7ca4f56de14b3350be5503b103d666f4aa9776cacac98898ca2b10f384a6

data/CHANGES

@@ -1,3 +1,7 @@
+== 1.5.2 - 11-Oct-2014
+* Now includes binaries for Ruby 2.1 for both 32 and 64 bit versions.
+* Some refactoring of the gem:binary task, mostly for me.
+
 == 1.5.1 - 14-Feb-2014
 * Fixed a potential zero-initialization issue. Thanks go to Peter Huene
   for the spot and the patch.

data/README

@@ -110,7 +110,7 @@
   converted to use either FFI or an OLE approach.
 
 = Copyright
-  (C) 2003-2013 Daniel J. Berger
+  (C) 2003-2014 Daniel J. Berger
   All Rights Reserved
 
 = License

data/Rakefile

@@ -60,24 +60,21 @@ namespace 'gem' do
   end
 
   desc 'Build a binary gem'
-  task :binary, :ruby18, :ruby19, :ruby2_32, :ruby2_64 do |task, args|
+  task :binary, :ruby18, :ruby19, :ruby2_32, :ruby2_64, :ruby21, :ruby21_64 do |task, args|
     require 'devkit'
 
     # These are just what's on my system at the moment. Adjust as needed.
     args.with_defaults(
-      :ruby18   => "c:/ruby187/bin/ruby",
-      :ruby19   => "c:/ruby193/bin/ruby",
-      :ruby2_32 => "c:/ruby2/bin/ruby",
-      :ruby2_64 => "c:/ruby264/bin/ruby"
+      :ruby18    => "c:/ruby187/bin/ruby",
+      :ruby19    => "c:/ruby193/bin/ruby",
+      :ruby2_32  => "c:/ruby2/bin/ruby",
+      :ruby2_64  => "c:/ruby264/bin/ruby",
+      :ruby21_32 => "c:/ruby21/bin/ruby",
+      :ruby21_64 => "c:/ruby21-x64/bin/ruby"
     )
 
     Rake::Task[:clobber].invoke
 
-    mkdir_p 'lib/win32/ruby18/win32'
-    mkdir_p 'lib/win32/ruby19/win32'
-    mkdir_p 'lib/win32/ruby2_32/win32'
-    mkdir_p 'lib/win32/ruby2_64/win32'
-
     args.each{ |key, rubyx|
       # Adjust devkit paths as needed.
       if `"#{rubyx}" -v` =~ /x64/i
@@ -86,41 +83,39 @@ namespace 'gem' do
         ENV['PATH'] = "C:/Devkit/bin;C:/Devkit/mingw/bin;" + ENV['PATH']
       end
 
+      mkdir_p "lib/win32/#{key}/win32"
+
       Dir.chdir('ext') do
         sh "make distclean" rescue nil
         sh "#{rubyx} extconf.rb"
         sh "make"
-
-        if key.to_s == 'ruby18'
-          cp 'api.so', '../lib/win32/ruby18/win32/api.so'
-        elsif key.to_s == 'ruby19'
-          cp 'api.so', '../lib/win32/ruby19/win32/api.so'
-        else
-          if `"#{rubyx}" -v` =~ /x64/i
-            cp 'api.so', '../lib/win32/ruby2_64/win32/api.so'
-          else
-            cp 'api.so', '../lib/win32/ruby2_32/win32/api.so'
-          end
-        end
+        cp 'api.so', "../lib/win32/#{key}/win32/api.so"
       end
     }
 
-    # Create a stub file that automatically require's the correct binary
-    File.open('lib/win32/api.rb', 'w'){ |fh|
-      fh.puts "if RUBY_VERSION.to_f < 1.9"
-      fh.puts "  require File.join(File.dirname(__FILE__), 'ruby18/win32/api')"
-      fh.puts "elsif RUBY_VERSION.to_f < 2.0"
-      fh.puts "  require File.join(File.dirname(__FILE__), 'ruby19/win32/api')"
-      fh.puts "else"
-      fh.puts "  require 'rbconfig'"
-      fh.puts "  if RbConfig::CONFIG['arch'] =~ /x64/i"
-      fh.puts "    require File.join(File.dirname(__FILE__), 'ruby2_64/win32/api')"
-      fh.puts "  else"
-      fh.puts "    require File.join(File.dirname(__FILE__), 'ruby2_32/win32/api')"
-      fh.puts "  end"
-      fh.puts "end"
-    }
+text = <<HERE
+case 
+  when RUBY_VERSION =~ /1\\.8/
+    require File.join(File.dirname(__FILE__), 'ruby18/win32/api')
+  when RUBY_VERSION =~ /1\\.9/
+    require File.join(File.dirname(__FILE__), 'ruby19/win32/api')
+  when RUBY_VERSION =~ /2\\.0/
+    if RbConfig::CONFIG['arch'] =~ /x64/i
+      require File.join(File.dirname(__FILE__), 'ruby2_64/win32/api')
+    else
+      require File.join(File.dirname(__FILE__), 'ruby2_32/win32/api')
+    end
+  when RUBY_VERSION =~ /2\\.1/
+    if RbConfig::CONFIG['arch'] =~ /x64/i
+      require File.join(File.dirname(__FILE__), 'ruby21_64/win32/api')
+    else
+      require File.join(File.dirname(__FILE__), 'ruby21_32/win32/api')
+    end
+end
+HERE
 
+    File.open('lib/win32/api.rb', 'w'){ |fh| fh.puts text }
+      
     spec = eval(IO.read('win32-api.gemspec'))
     spec.platform = Gem::Platform.new(['universal', 'mingw32'])
     spec.extensions = nil
@@ -129,6 +124,7 @@ namespace 'gem' do
     if Gem::VERSION.to_f < 2.0
       Gem::Builder.new(spec).build
     else
+      require 'rubygems/package'
       Gem::Package.build(spec)
     end
   end
@@ -136,7 +132,7 @@ namespace 'gem' do
   desc 'Install the gem'
   task :install => [:create] do
     file = Dir["*.gem"].first
-    sh "gem install #{file}"
+    sh "gem install -l #{file}"
   end
 end
 

data/ext/win32/api.c

@@ -37,7 +37,7 @@
 
 
 #define MAX_BUF 1024
-#define WINDOWS_API_VERSION "1.5.1"
+#define WINDOWS_API_VERSION "1.5.2"
 
 #define _T_VOID     0
 #define _T_LONG     1
@@ -971,6 +971,6 @@ void Init_api(){
 
    /* Constants */
 
-   /* 1.4.9: The version of the win32-api library */
+   /* 1.5.2: The version of the win32-api library */
    rb_define_const(cAPI, "VERSION", rb_str_new2(WINDOWS_API_VERSION));
 }

data/lib/win32/api.rb

@@ -1,12 +1,18 @@
-if RUBY_VERSION.to_f < 1.9
-  require File.join(File.dirname(__FILE__), 'ruby18/win32/api')
-elsif RUBY_VERSION.to_f < 2.0
-  require File.join(File.dirname(__FILE__), 'ruby19/win32/api')
-else
-  require 'rbconfig'
-  if RbConfig::CONFIG['arch'] =~ /x64/i
-    require File.join(File.dirname(__FILE__), 'ruby2_64/win32/api')
-  else
-    require File.join(File.dirname(__FILE__), 'ruby2_32/win32/api')
-  end
+case 
+  when RUBY_VERSION =~ /1\.8/
+    require File.join(File.dirname(__FILE__), 'ruby18/win32/api')
+  when RUBY_VERSION =~ /1\.9/
+    require File.join(File.dirname(__FILE__), 'ruby19/win32/api')
+  when RUBY_VERSION =~ /2\.0/
+    if RbConfig::CONFIG['arch'] =~ /x64/i
+      require File.join(File.dirname(__FILE__), 'ruby2_64/win32/api')
+    else
+      require File.join(File.dirname(__FILE__), 'ruby2_32/win32/api')
+    end
+  when RUBY_VERSION =~ /2\.1/
+    if RbConfig::CONFIG['arch'] =~ /x64/i
+      require File.join(File.dirname(__FILE__), 'ruby21_64/win32/api')
+    else
+      require File.join(File.dirname(__FILE__), 'ruby21_32/win32/api')
+    end
 end

data/test/test_win32_api.rb

@@ -18,7 +18,7 @@ class TC_Win32_API < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.5.1', API::VERSION)
+      assert_equal('1.5.2', API::VERSION)
    end
 
    def test_constructor_basic

data/win32-api.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-api'
-  spec.version    = '1.5.1'
+  spec.version    = '1.5.2'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob']
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -12,7 +12,6 @@ Gem::Specification.new do |spec|
   spec.extensions = ['ext/extconf.rb']
   spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
 
-  spec.rubyforge_project = 'win32utils'
   spec.required_ruby_version = '>= 1.8.2'
   spec.extra_rdoc_files = ['README', 'CHANGES', 'MANIFEST', 'ext/win32/api.c']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-api
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: universal-mingw32
 authors:
 - Daniel J. Berger
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   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: |2
@@ -54,19 +54,21 @@ extra_rdoc_files:
 - ext/win32/api.c
 files:
 - CHANGES
+- MANIFEST
+- README
+- Rakefile
+- ext/win32/api.c
 - lib/win32/api.rb
 - lib/win32/ruby18/win32/api.so
 - lib/win32/ruby19/win32/api.so
+- lib/win32/ruby21_32/win32/api.so
+- lib/win32/ruby21_64/win32/api.so
 - lib/win32/ruby2_32/win32/api.so
 - lib/win32/ruby2_64/win32/api.so
-- MANIFEST
-- Rakefile
-- README
 - test/test_win32_api.rb
 - test/test_win32_api_callback.rb
 - test/test_win32_api_function.rb
 - win32-api.gemspec
-- ext/win32/api.c
 homepage: http://github.com/djberg96/win32-api
 licenses:
 - Artistic 2.0
@@ -77,17 +79,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: win32utils
-rubygems_version: 2.0.3
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A superior replacement for Win32API