cmdstan 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f52650c597cfa86c4e1bd0f095a2b321e906285df981f9f345bde5054fb8cc80
-  data.tar.gz: 3c98b6ff5c800ad9ecd28e325ed6f97d576306567a4ac8530bb117f948c6c321
+  metadata.gz: 2f7dfd62b5effc22b11650772a01893fb816bba2f7565cadbcf8c1b74e3addfb
+  data.tar.gz: 17bdf86aff8dcff9bef87b7c48026bcf777371f6334c9785bc64b2c861f4396b
 SHA512:
-  metadata.gz: ddab8b6b73175afcbee65f5653deee681b746fe2083015ec06b65866bc467ca2bb7ec6cc475a65bc83976ff4f13e8911ac08d999703c52e96d529f8b68408554
-  data.tar.gz: c8316343f62159e1963f7835bb231114275b15ab7fd982f3ae58f50c7168aad08e6448c6c2fd6110910f061595f586f3882a7a38a9e377c332b8b5a381bc4acb
+  metadata.gz: 78bb7822a7e02d83b1141a67c9432ceaf1f08bd3a2aa0dbd81dd0edca8a105304c546b30b75fb9efd39fcf807ff088346ea748179125852d888c5e2142b6a5fa
+  data.tar.gz: c1be456cc760a8785472386a7bdaabf8aade3ff6d5a6d06b2b60fcf74b9d38a08e96dad84e06d0f882edaf02a403ba27074530610eded5359774e670a43c49b3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.1 (2020-04-09)
+
+- Added support for Windows
+
 ## 0.1.0 (2020-04-08)
 
 - First release

data/README.md

@@ -2,6 +2,8 @@
 
 Bayesian inference for Ruby, powered by [CmdStan](https://github.com/stan-dev/cmdstan)
 
+[![Build Status](https://travis-ci.org/ankane/cmdstan.svg?branch=master)](https://travis-ci.org/ankane/cmdstan) [![Build status](https://ci.appveyor.com/api/projects/status/n9sp7b34m6du5ltw/branch/master?svg=true)](https://ci.appveyor.com/project/ankane/cmdstan/branch/master)
+
 ## Installation
 
 Add this line to your application’s Gemfile:
@@ -79,6 +81,6 @@ To get started with development:
 git clone https://github.com/ankane/cmdstan.git
 cd cmdstan
 bundle install
-ruby ext/cmdstan/extconf.rb
+bundle exec ruby ext/cmdstan/extconf.rb
 bundle exec rake test
 ```

data/ext/cmdstan/extconf.rb

@@ -7,6 +7,8 @@ version = "2.22.1"
 checksum = "d12e46bda4bd3db9e8abe0554712b56e41f8e7843900338446d9a3b1acc2d0ce"
 url = "https://github.com/stan-dev/cmdstan/releases/download/v#{version}/cmdstan-#{version}.tar.gz"
 
+$stdout.sync = true
+
 def download_file(url, download_path, checksum)
   uri = URI(url)
   location = nil
@@ -54,7 +56,9 @@ path = ENV["CMDSTAN"] || File.expand_path("../../tmp/cmdstan", __dir__)
 FileUtils.mkdir_p(path)
 Dir.chdir(path)
 # TODO use Gem::Package::TarReader from Rubygems
-system "tar", "zxvf", download_path, "-C", path, "--strip-components=1"
+tar_args = Gem.win_platform? ? ["--force-local"] : []
+system "tar", "zxf", download_path, "-C", path, "--strip-components=1", *tar_args
 
 # build
-system "make", "build", "-j"
+make_command = Gem.win_platform? ? "mingw32-make" : "make"
+system make_command, "build", "-j"

data/lib/cmdstan/mcmc.rb

@@ -26,7 +26,7 @@ module CmdStan
 
     def summary
       csv_file = Tempfile.new
-      run_command "#{CmdStan.path}/bin/stansummary", "--csv_file=#{csv_file.path}", *@output_files.map(&:path)
+      run_command "#{CmdStan.path}/bin/stansummary#{extension}", "--csv_file=#{csv_file.path}", *@output_files.map(&:path)
 
       result = {}
       CSV.foreach(csv_file.path, headers: true, converters: :numeric) do |row|

data/lib/cmdstan/model.rb

@@ -9,8 +9,8 @@ module CmdStan
       stan_file = File.expand_path(stan_file) if stan_file
 
       @stan_file = stan_file
-      @exe_file = exe_file || stan_file.sub(/.stan\z/, "")
-      @name = File.basename(@exe_file)
+      @exe_file = exe_file || stan_file.sub(/.stan\z/, extension)
+      @name = File.basename(@exe_file, extension)
 
       if compile && !exe_file
         self.compile
@@ -19,7 +19,7 @@ module CmdStan
 
     def compile
       Dir.chdir(CmdStan.path) do
-        run_command "make", @exe_file
+        run_command make_command, @exe_file
       end
     end
 

data/lib/cmdstan/utils.rb

@@ -3,14 +3,25 @@ module CmdStan
     private
 
     def run_command(*args)
-      # use popen3 since it does escaping (like system)
-      Open3.popen3(*args) do |i, o, e, t|
-        if t.value.exitstatus != 0
-          $stderr.puts o.read
-          $stderr.puts e.read
-          raise Error, "Command failed"
-        end
+      # use an open3 method since it does escaping (like system)
+      # use capture2e so we don't need to worry about deadlocks
+      output, status = Open3.capture2e(*args)
+      if status.exitstatus != 0
+        $stderr.puts output
+        raise Error, "Command failed"
       end
     end
+
+    def make_command
+      windows? ? "mingw32-make" : "make"
+    end
+
+    def extension
+      windows? ? ".exe" : ""
+    end
+
+    def windows?
+      Gem.win_platform?
+    end
   end
 end

data/lib/cmdstan/version.rb

@@ -1,3 +1,3 @@
 module CmdStan
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmdstan
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler