win32-api 1.6.1.beta1-universal-mingw32 → 1.6.1.2-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dada24a38e865d08383d103716fe378173833df9
-  data.tar.gz: 712f6233d7a525736c68a7c3d776725235d23121
+  metadata.gz: b6f98adc93ce159542eff34d770f82cafd104b7a
+  data.tar.gz: c3356912152cc4a1a855e5f7fed6990c6cab8b73
 SHA512:
-  metadata.gz: 66dfbfa65e69bc57484b9f542656363b20c0316697417b3a5d01edbda747934abd31c96befa8b613e687a538216dbfafe2bca2a322d869bdc67dedd86c0495f4
-  data.tar.gz: e425cc8c8a7b61912983c31299ae38436c22a3cadbf114fced7ac92f74a1c38d7268a7b59e49038a712626379e4ce293c350bb760ba561addc29e6959016f641
+  metadata.gz: dedad26960b16f70ed1d6274ab25c025fb69233d0831615503304d17830c3c93f70230095b9914c9529e8bcdf1188dd97d78af4a7123958cd9cebbf614edbf2e
+  data.tar.gz: 5ed7cfdc147c90bc154fc11ccc4637dbf92c9826eaeb2e0efd07132a379b47282b061da3f637caebc3c03aedaaa42e38a98fa06b7fa32e971c2329d85e144f2d

data/CHANGES

@@ -1,4 +1,13 @@
-== 1.6.1.beta1 - 14-Jan-201
+== 1.6.1.2 - 2-Feb-2017
+* Fix wrong gem packaging.
+
+== 1.6.1.1 - 31-Jan-2017 (yanked)
+* Fix wrong returning version number
+
+== 1.6.1 - 31-Jan-2017 (yanked)
+* Depends on MSYS2 based RubyInstaller2 to create binaries for Ruby 2.4.0.
+
+== 1.6.1.beta1 - 14-Jan-2017
 * Now includes binaries for Ruby 2.4 for both 32 and 64 bit versions.
 * Try to depends on MSYS2 based RubyInstaller2 on Ruby 2.4.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    win32-api (1.6.1.beta1)
+    win32-api (1.6.1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -21,4 +21,4 @@ DEPENDENCIES
   win32-api!
 
 BUNDLED WITH
-   1.13.6
+   1.14.2

data/Rakefile

@@ -81,18 +81,17 @@ namespace 'gem' do
     args.each{ |key|
       default_path = ENV['PATH']
 
-      if key[1][:msys] == :msys1
+      if key.last[:msys] == :msys1
         # Adjust devkit paths as needed.
-        if `"#{key[1][:path]}" -v` =~ /x64/i
+        if `"#{key.last[:path]}" -v` =~ /x64/i
           ENV['PATH'] = "C:/Devkit64/bin;C:/Devkit64/mingw/bin;" + ENV['PATH']
         else
           ENV['PATH'] = "C:/Devkit/bin;C:/Devkit/mingw/bin;" + ENV['PATH']
         end
-      elsif key[1][:msys] == :msys2
+      elsif key.last[:msys] == :msys2
         ENV.delete('RI_DEVKIT')
-        devkit = nil
         # Adjust devkit paths as needed.
-        if `"#{key[1][:path]}" -v` =~ /x64/i
+        if `"#{key.last[:path]}" -v` =~ /x64/i
           ENV['PATH'] = "C:/msys64/usr/bin;C:/msys64/mingw64/bin;" + ENV['PATH']
         else
           ENV['PATH'] = "C:/msys64/usr/bin;C:/msys64/mingw32/bin;" + ENV['PATH']
@@ -102,7 +101,7 @@ namespace 'gem' do
 
       Dir.chdir('ext') do
         sh "make distclean" rescue nil
-        sh "#{key[1][:path]} extconf.rb"
+        sh "#{key.last[:path]} extconf.rb"
         sh "make"
         cp 'api.so', "../lib/win32/#{key.first}/win32/api.so"
       end

data/appveyor.yml

@@ -6,49 +6,60 @@ install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - "%devkit64%\\devkitvars.bat"
   - "%devkit32%\\devkitvars.bat"
-  # Update pacman database.
-  - c:/msys64/usr/bin/bash -lc "pacman -Sy --noconfirm"
-  - c:/msys64/usr/bin/bash -lc "pacman -S --noconfirm pacman"
-  - c:/msys64/usr/bin/bash -lc "pacman -R --noconfirm repman-git"
-  # for 32 bit ext library.
-  - c:/msys64/usr/bin/bash -lc "pacman -S --noconfirm --needed base-devel mingw-w64-i686-toolchain"
-  # for 64 bit ext library.
-  - c:/msys64/usr/bin/bash -lc "pacman -S --noconfirm --needed base-devel mingw-w64-x86_64-toolchain"
-  - ps: Start-FileDownload https://github.com/larskanis/rubyinstaller2/releases/download/2.4.0-6/rubyinstaller-2.4.0-6-x86.exe
-  - rubyinstaller-2.4.0-6-x86.exe TYPE=full /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /CLOSEAPPLICATIONS /NORESTARTAPPLICATIONS /DIR="C:\Ruby24"
-  - ps: Start-FileDownload https://github.com/larskanis/rubyinstaller2/releases/download/2.4.0-6/rubyinstaller-2.4.0-6-x64.exe
-  - rubyinstaller-2.4.0-6-x64.exe TYPE=full /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /CLOSEAPPLICATIONS /NORESTARTAPPLICATIONS /DIR="C:\Ruby24-x64"
+  - ps: Start-FileDownload https://github.com/larskanis/rubyinstaller2/releases/download/2.4.0-7/rubyinstaller-2.4.0-7-x86.exe
+  - rubyinstaller-2.4.0-7-x86.exe TYPE=full /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /CLOSEAPPLICATIONS /NORESTARTAPPLICATIONS /DIR="C:\Ruby24"
+  - ps: Start-FileDownload https://github.com/larskanis/rubyinstaller2/releases/download/2.4.0-7/rubyinstaller-2.4.0-7-x64.exe
+  - rubyinstaller-2.4.0-7-x64.exe TYPE=full /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /CLOSEAPPLICATIONS /NORESTARTAPPLICATIONS /DIR="C:\Ruby24-x64"
   - ruby --version
   - gem --version
+  - IF %msys2%==1 ridk.cmd enable
+  - IF %msys2%==1 gem install bundler
   - bundle install
 build: off
 test_script:
   - bundle exec rake gem:binary
-  - bundle exec rake test:all
+  - IF %msys2%==0 bundle exec rake test:all
+  - IF %msys2%==1 ridk.cmd exec bundle exec rake test:all
 
 environment:
   matrix:
+    - ruby_version: "24-x64"
+      devkit64: C:\Ruby23-x64\DevKit
+      devkit32: C:\Ruby23\DevKit
+      msys2: 1
+    - ruby_version: "24"
+      devkit64: C:\Ruby23-x64\DevKit
+      devkit32: C:\Ruby23\DevKit
+      msys2: 1
     - ruby_version: "23-x64"
       devkit64: C:\Ruby23-x64\DevKit
       devkit32: C:\Ruby23\DevKit
+      msys2: 0
     - ruby_version: "23"
       devkit64: C:\Ruby23-x64\DevKit
       devkit32: C:\Ruby23\DevKit
+      msys2: 0
     - ruby_version: "22-x64"
       devkit64: C:\Ruby23-x64\DevKit
       devkit32: C:\Ruby23\DevKit
+      msys2: 0
     - ruby_version: "22"
       devkit64: C:\Ruby23-x64\DevKit
       devkit32: C:\Ruby23\DevKit
+      msys2: 0
     - ruby_version: "21-x64"
       devkit64: C:\Ruby23-x64\DevKit
       devkit32: C:\Ruby23\DevKit
+      msys2: 0
     - ruby_version: "21"
       devkit64: C:\Ruby23-x64\DevKit
       devkit32: C:\Ruby23\DevKit
+      msys2: 0
     - ruby_version: "200-x64"
       devkit64: C:\Ruby23-x64\DevKit
       devkit32: C:\Ruby23\DevKit
+      msys2: 0
     - ruby_version: "200"
       devkit64: C:\Ruby23-x64\DevKit
       devkit32: C:\Ruby23\DevKit
+      msys2: 0

data/ext/win32/api.c

@@ -37,7 +37,7 @@
 
 
 #define MAX_BUF 1024
-#define WINDOWS_API_VERSION "1.6.0"
+#define WINDOWS_API_VERSION "1.6.1.2"
 
 #define _T_VOID     0
 #define _T_LONG     1

data/test/test_win32_api.rb

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

data/win32-api.gemspec

@@ -2,9 +2,9 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-api'
-  spec.version    = '1.6.1.beta1'
+  spec.version    = '1.6.1.2'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob', 'Hiroshi Hatake']
-  spec.license    = 'Artistic 2.0'
+  spec.license    = 'Artistic-2.0'
   spec.email      = 'djberg96@gmail.com'
   spec.homepage   = 'http://github.com/djberg96/win32-api'
   spec.summary    = 'A superior replacement for Win32API'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-api
 version: !ruby/object:Gem::Version
-  version: 1.6.1.beta1
+  version: 1.6.1.2
 platform: universal-mingw32
 authors:
 - Daniel J. Berger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -61,7 +61,6 @@ files:
 - README
 - Rakefile
 - appveyor.yml
-- appveyor/build.cmd
 - ext/win32/api.c
 - lib/win32/api.rb
 - lib/win32/ruby21_32/win32/api.so
@@ -80,7 +79,7 @@ files:
 - win32-api.gemspec
 homepage: http://github.com/djberg96/win32-api
 licenses:
-- Artistic 2.0
+- Artistic-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -93,9 +92,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8

data/appveyor/build.cmd

@@ -1,3 +0,0 @@
-call C:\Ruby24-x64\bin\rubydevkit.cmd
-call bundle exec rake gem:binary
-call bundle exec rake test:all