Support Windows

Author: pezholio

.gitignore

@@ -2,4 +2,7 @@
 .bundle
 hello-1.0.0-*
 *.tar.gz
+*.zip
 vendor
+
+!packaging/*-win32-ffi*.tar.gz

Gemfile.lock

@@ -1,15 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.4)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
+    addressable (2.4.0)
     colorize (0.7.7)
-    csvlint (0.2.4)
+    csvlint (0.3.1)
       activesupport
       addressable
       colorize
@@ -19,20 +19,22 @@ GEM
       thor
       typhoeus
       uri_template
-    escape_utils (1.1.0)
-    ethon (0.8.0)
+    escape_utils (1.2.1)
+    ethon (0.9.0)
       ffi (>= 1.3.0)
     ffi (1.9.6)
     i18n (0.7.0)
     json (1.8.3)
-    mime-types (2.6.2)
-    minitest (5.8.1)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    minitest (5.9.0)
     open_uri_redirections (0.2.1)
     rake (10.4.2)
     thor (0.19.1)
     thread_safe (0.3.5)
-    typhoeus (0.8.0)
-      ethon (>= 0.8.0)
+    typhoeus (1.0.2)
+      ethon (>= 0.9.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uri_template (0.7.0)
@@ -45,3 +47,6 @@ DEPENDENCIES
   ffi (= 1.9.6)
   rake
   thor
+
+BUNDLED WITH
+   1.11.2

README.md

@@ -4,10 +4,12 @@ This uses the power of [Traveling Ruby](https://github.com/phusion/traveling-rub
 
 # Support
 
-Currently, we support all Linux platforms (32bit and 64bit) and OSX. Windows support may be forthcoming in the future.
+We support all Linux platforms (32bit and 64bit), OSX and Windows
 
 # Installation
 
+## Linux and OSX
+
 To install CSVlint, you'll need `curl` installed on your system.
 
 For Linux:
@@ -23,21 +25,21 @@ For OS X:
 brew install curl
 ```
 
-## Simple installation
+### Simple installation
 
 From a Linux or OSX terminal, you can then run the following command to download and unpack CSVlint and set up your `$PATH`:
 
 ```
 curl -s https://raw.githubusercontent.com/theodi/csvlint.sh/master/scripts/install.sh | bash
 ```
 
-## Step by step install
+### Step by step install
 
 Download the relevant file, based on your platform:
 
-* [Linux 32 bit](https://github.com/theodi/csvlint.sh/releases/download/v1.0.0/csvlint-1.0.0-linux-x86.tar.gz)
-* [Linux 64 bit](https://github.com/theodi/csvlint.sh/releases/download/v1.0.0/csvlint-1.0.0-linux-x86_64.tar.gz)
-* [OSX](https://github.com/theodi/csvlint.sh/releases/download/v1.0.0/csvlint-1.0.0-osx.tar.gz)
+* [Linux 32 bit](https://github.com/theodi/csvlint.sh/releases/download/v0.3.1/csvlint-0.3.1-linux-x86.tar.gz)
+* [Linux 64 bit](https://github.com/theodi/csvlint.sh/releases/download/v0.3.1/csvlint-0.3.1-linux-x86_64.tar.gz)
+* [OSX](https://github.com/theodi/csvlint.sh/releases/download/v0.3.1/csvlint-0.3.1-osx.tar.gz)
 
 You can then untar the file like so:
 
@@ -47,6 +49,14 @@ tar xzf csvlint*.tar.gz
 
 Then copy the resulting folder to a sensible place. Make sure to add the location of the `csvlint` binary to your `$PATH`.
 
+## Windows
+
+There is currently no automatic way to install csvlint on Windows, but you can simply [download the zip](https://github.com/theodi/csvlint.sh/releases/download/v0.3.1/csvlint-0.3.1-win32.zip), extract to a folder, then add to your PATH like so:
+
+```
+set PATH=%PATH%;C:\{folder you extracted csvlint to}
+```
+
 # Generate application files yourself
 
 If you're interested in how this thing works, you can generate the application files yourself.
@@ -62,13 +72,14 @@ Choose below, depending on your platform:
 ```
 rake package:linux:x86    # For Linux 32 bit systems
 rake package:linux:x86_64 # For Linux 64 bit systems
-rake package:linux:x86    # For OSX
+rake package:osx          # For OSX
+rake package:win32        # For OSX
 ```
 
+This generates a `tar.gz` file (`zip` for Windows), which you can then use as per the installation instructions.
+
 If you're hacking around and want to have a look what all packages look like, you can run the following to package all versions
 
 ```
 rake package
 ```
-
-This generates a `tar.gz` file, which you can then use as per the installation instructions.

Rakefile

@@ -2,12 +2,12 @@
 require 'bundler/setup'
 
 PACKAGE_NAME = "csvlint"
-VERSION = "1.0.0"
+VERSION = "0.3.1"
 TRAVELING_RUBY_VERSION = "20150210-2.1.5"
 FFI_VERSION = "1.9.6"
 
 desc "Package your app"
-task :package => ['package:linux:x86', 'package:linux:x86_64', 'package:osx']
+task :package => ['package:linux:x86', 'package:linux:x86_64', 'package:osx', 'package:win32']
 
 namespace :package do
   namespace :linux do
@@ -30,6 +30,13 @@ namespace :package do
     create_package("osx")
   end
 
+  desc "Package your app for Windows"
+  task :win32 => [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-win32.tar.gz",
+    "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-win32-ffi-#{FFI_VERSION}.tar.gz"] do
+    create_package("win32", :win32)
+  end
+
+
   desc "Install gems to local directory"
   task :bundle_install do
     if RUBY_VERSION !~ /^2\.1\./
@@ -62,6 +69,10 @@ file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz" do
   download_runtime("osx")
 end
 
+file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-win32.tar.gz" do
+  download_runtime("win32")
+end
+
 file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86-ffi-#{FFI_VERSION}.tar.gz" do
   download_native_extension("linux-x86", "ffi-#{FFI_VERSION}")
 end
@@ -74,22 +85,32 @@ file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx-ffi-#{FFI_VERSION}.
   download_native_extension("osx", "ffi-#{FFI_VERSION}")
 end
 
-def create_package(target)
+def create_package(target, os_type = :unix)
   package_dir = "#{PACKAGE_NAME}-#{VERSION}-#{target}"
   sh "rm -rf #{package_dir}"
   sh "mkdir #{package_dir}"
   sh "mkdir -p #{package_dir}/lib/app"
   sh "mkdir #{package_dir}/lib/ruby"
   sh "tar -xzf packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz -C #{package_dir}/lib/ruby"
-  sh "cp packaging/wrapper.sh #{package_dir}/#{PACKAGE_NAME}"
+  if os_type == :unix
+    sh "cp packaging/wrapper.sh #{package_dir}/#{PACKAGE_NAME}"
+  else
+    sh "cp csvlint.rb #{package_dir}/lib/app/csvlint.rb"
+    sh "cp packaging/wrapper.bat #{package_dir}/#{PACKAGE_NAME}.bat"
+    sh "cp -a packaging/curl/. #{package_dir}/lib/ruby/bin"
+  end
   sh "cp -pR packaging/vendor #{package_dir}/lib/"
   sh "cp Gemfile Gemfile.lock #{package_dir}/lib/vendor/"
   sh "mkdir #{package_dir}/lib/vendor/.bundle"
   sh "cp packaging/bundler-config #{package_dir}/lib/vendor/.bundle/config"
   sh "tar -xzf packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}-ffi-#{FFI_VERSION}.tar.gz " +
     "-C #{package_dir}/lib/vendor/ruby"
   if !ENV['DIR_ONLY']
-    sh "tar -czf #{package_dir}.tar.gz #{package_dir}"
+    if os_type == :unix
+      sh "tar -czf #{package_dir}.tar.gz #{package_dir}"
+    else
+      sh "zip -9r #{package_dir}.zip #{package_dir}"
+    end
     sh "rm -rf #{package_dir}"
   end
 end

csvlint.rb

@@ -0,0 +1,8 @@
+require 'csvlint'
+require 'csvlint/cli'
+
+if ARGV == ["help"]
+  Csvlint::Cli.start(["help"])
+else
+  Csvlint::Cli.start(ARGV.unshift("validate"))
+end