instrumental_tools 1.0.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8871b4d7d488bafeb4a58f5d82caad26ba139c00
-  data.tar.gz: 5901bebe60f6303dbb00cacba6f376ffa1b61c88
+  metadata.gz: 2a27d4c996ef62de7323120f50798c5162414783
+  data.tar.gz: e9cef00763a959a8038d740d899e9ff89d1a1c45
 SHA512:
-  metadata.gz: 71a0be3021518f008517cfbf8d0802ca80de6c3362df63f9d70aabaf0a86eac6341fec2018f7c4de1047b0e4e30639f155085182d35c3e59b7b0f23f8a55081c
-  data.tar.gz: 5c55425bdb4b2cd64adee1c7aa363d918bbb18175a106796cd29145dc3b17d69be1adba0e5f94af61ee864d98af8665a3b73143420169b2b804e1960207f82b8
+  metadata.gz: d4f571bc227d0cf8e2668337542bfb8de90ac11e57964decb105457257949483befd35f3ee1c281b6db33ca64a48deedf803e2f95535313427e2e357df2621ca
+  data.tar.gz: 670224fe2b26100ea685880bae31f9440f0d24a39604f3f27779dc0c71dd2bdc333f784e844c9e1d5bce37aec3472abda5adccd8402f6bcab86dd85fb421628d

data/BUILD.md

@@ -48,3 +48,18 @@ rake package:osx:tarball
 ```
 
 On release, the tarball should be uploaded to the Github releases page and linked to from the main README.md.
+
+## `exe` packages
+
+In order to build the Windows installer, you'll need to have [NSIS](http://nsis.sourceforge.net/Main_Page) and [Mono](http://www.mono-project.com/) installed. If you're using Mac OS X, run the following commands:
+
+```
+brew install makensis
+brew install mono
+```
+
+To build the installer:
+
+```
+rake package:win32:package
+```

data/CHANGELOG.md

@@ -1,4 +1,20 @@
-### 1.0.0 [?]
+### 1.1.3 [August 17, 2015]
+* Fix gem installation of tools
+* Use latest Instrumental Agent
+
+### 1.1.1 [August 3rd, 2015]
+* Defaults to secure protocol when connecting
+
+### 1.1.0 [August 3rd, 2015]
+* Windows support
+* Windows installer
+* Updated Chef scripts to use remote_file
+* Updated Chef script to support Windows
+* Use latest `instrumental_agent` gem
+* Add Powershell integration for custom metrics
+* Process now disconnects from Instrumental when idling between reports
+
+### 1.0.0 [May 21st, 2015]
 * Configurable pid and log file locations
 * Pid and log file default to $HOME
 * Process control commands do not require API key

data/CUSTOM_METRICS.md

@@ -62,3 +62,7 @@ You may output error information on `STDERR` of your process, and it will be out
 ### Timeouts
 
 Your script is responsible for managing timeouts. The `instrument_server` process will not attempt to terminate your process for you.
+
+### Powershell Integration
+
+Windows administrators may create Powershell scripts following the above guidelines. You should write your output to the STDOUT stream using `Write-Output`. The file extension of the Powershell script must be `.ps1` in order for it to be executd by the Instrument Server process.

data/INSTALL.md

@@ -4,13 +4,14 @@
 
 Prebuilt `deb` and `rpm` packages are available via the [packagecloud.io](https://packagecloud.io/) service. These files are also available to download directly:
 
-* 64-bit Debian package (Ubuntu, Debian) [https://s3.amazonaws.com/instrumental-tools/1.0.0/instrumental-tools_1.0.0_amd64.deb](https://s3.amazonaws.com/instrumental-tools/1.0.0/instrumental-tools_1.0.0_amd64.deb)
-* 32-bit Debian package (Ubuntu, Debian) [https://s3.amazonaws.com/instrumental-tools/1.0.0/instrumental-tools_1.0.0_i386.deb](https://s3.amazonaws.com/instrumental-tools/1.0.0/instrumental-tools_1.0.0_i386.deb)
-* 64-bit RPM package (RHEL, Amazon AMI) [https://s3.amazonaws.com/instrumental-tools/1.0.0/instrumental-tools_1.0.0_amd64.rpm](https://s3.amazonaws.com/instrumental-tools/1.0.0/instrumental-tools_1.0.0_amd64.rpm)
-* 32-bit RPM package (RHEL, Amazon AMI) [https://s3.amazonaws.com/instrumental-tools/1.0.0/instrumental-tools_1.0.0_i386.rpm](https://s3.amazonaws.com/instrumental-tools/1.0.0/instrumental-tools_1.0.0_i386.rpm)
-* 64-bit Linux tarball (CoreOS, etc.) [https://s3.amazonaws.com/instrumental-tools/1.0.0/instrumental-tools_1.0.0_linux-x86_64.tar.gz](https://s3.amazonaws.com/instrumental-tools/1.0.0/instrumental-tools_1.0.0_linux-x86_64.tar.gz)
-* 32-bit Linux tarball (CoreOS, etc.) [https://s3.amazonaws.com/instrumental-tools/1.0.0/instrumental-tools_1.0.0_linux-x86.tar.gz](https://s3.amazonaws.com/instrumental-tools/1.0.0/instrumental-tools_1.0.0_linux-x86.tar.gz)
-* 64-bit Mac OS X tarball [https://s3.amazonaws.com/instrumental-tools/1.0.0/instrumental-tools_1.0.0_osx.tar.gz](https://s3.amazonaws.com/instrumental-tools/1.0.0/instrumental-tools_1.0.0_osx.tar.gz)
+* 64-bit Debian package (Ubuntu, Debian) [https://s3.amazonaws.com/instrumental-tools/1.1.2/instrumental-tools_1.1.2_amd64.deb](https://s3.amazonaws.com/instrumental-tools/1.1.2/instrumental-tools_1.1.2_amd64.deb)
+* 32-bit Debian package (Ubuntu, Debian) [https://s3.amazonaws.com/instrumental-tools/1.1.2/instrumental-tools_1.1.2_i386.deb](https://s3.amazonaws.com/instrumental-tools/1.1.2/instrumental-tools_1.1.2_i386.deb)
+* 64-bit RPM package (RHEL, Amazon AMI) [https://s3.amazonaws.com/instrumental-tools/1.1.2/instrumental-tools_1.1.2_amd64.rpm](https://s3.amazonaws.com/instrumental-tools/1.1.2/instrumental-tools_1.1.2_amd64.rpm)
+* 32-bit RPM package (RHEL, Amazon AMI) [https://s3.amazonaws.com/instrumental-tools/1.1.2/instrumental-tools_1.1.2_i386.rpm](https://s3.amazonaws.com/instrumental-tools/1.1.2/instrumental-tools_1.1.2_i386.rpm)
+* 64-bit Linux tarball (CoreOS, etc.) [https://s3.amazonaws.com/instrumental-tools/1.1.2/instrumental-tools_1.1.2_linux-x86_64.tar.gz](https://s3.amazonaws.com/instrumental-tools/1.1.2/instrumental-tools_1.1.2_linux-x86_64.tar.gz)
+* 32-bit Linux tarball (CoreOS, etc.) [https://s3.amazonaws.com/instrumental-tools/1.1.2/instrumental-tools_1.1.2_linux-x86.tar.gz](https://s3.amazonaws.com/instrumental-tools/1.1.2/instrumental-tools_1.1.2_linux-x86.tar.gz)
+* Windows installer [https://s3.amazonaws.com/instrumental-tools/1.1.2/instrumental-tools_1.1.2_win32.exe](https://s3.amazonaws.com/instrumental-tools/1.1.2/instrumental-tools_1.1.2_win32.exe)
+* 64-bit Mac OS X tarball [https://s3.amazonaws.com/instrumental-tools/1.1.2/instrumental-tools_1.1.2_osx.tar.gz](https://s3.amazonaws.com/instrumental-tools/1.1.2/instrumental-tools_1.1.2_osx.tar.gz)
 
 # Ubuntu
 
@@ -45,6 +46,10 @@ sudo tar -zxvf ./instrumental-tools_1.0.0_linux-x86_64.tar.gz -C /opt/instrument
 sudo cp /opt/instrumental-tools/etc/instrumental.yml /etc/
 ```
 
+# Windows
+
+Download the [installer](https://s3.amazonaws.com/instrumental-tools/1.1.2/instrumental-tools_1.1.2_win32.exe) and run it, adding in your API key when prompted.
+
 # RubyGems
 
 ```sh

data/README.md

@@ -4,7 +4,7 @@ A collection of tools for monitoring servers with Instrumental ([www.instrumenta
 
 ## Operating System Support
 
-`instrumental_tools` is currently officially supported on 32-bit and 64-bit Linux, as well as Mac OS X. There are prebuilt packages available for Debian and RHEL-based systems.
+`instrumental_tools` is currently officially supported on 32-bit and 64-bit Linux, Windows systems and Mac OS X. There are prebuilt packages available for Debian, RHEL and Win32 systems.
 
 ## Installation
 
@@ -90,7 +90,7 @@ something like this in your capistrano configuration:
 namespaces[:instrumental].tasks[:restart_instrument_server].options[:roles] = [:web, :worker]
 ```
 
-### NOTEs
+### NOTES
 
 Mac OS users: Due to a bug in Ruby, instrument_server can occasionally deadlock ([bug report](http://bugs.ruby-lang.org/issues/5811)).
 

data/Rakefile

@@ -2,9 +2,13 @@
 require 'bundler/gem_tasks'
 require 'etc'
 require 'fileutils'
+require 'find'
 require 'socket'
+require 'tempfile'
 require 'yaml'
 
+task :default => 'build'
+
 PACKAGE_CATEGORY       = "Utilities"
 PACKAGECLOUD_REPO      = "expectedbehavior/instrumental"
 CONFIG_DIR             = "conf"
@@ -14,7 +18,7 @@ GEMSPEC                = Bundler::GemHelper.instance.gemspec
 SPEC_PATH              = Bundler::GemHelper.instance.spec_path
 PACKAGE_NAME           = GEMSPEC.name.gsub("_", "-") # Debian packages cannot include _ in name
 VERSION                = GEMSPEC.version
-TRAVELING_RUBY_VERSION = "20150210-2.1.5"
+TRAVELING_RUBY_VERSION = "20150517-2.1.6"
 TRAVELING_RUBY_FILE    = "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-%s.tar.gz"
 DEST_DIR               = File.join("/opt/", PACKAGE_NAME)
 PACKAGE_OUTPUT_NAME    = [PACKAGE_NAME, VERSION].join("_")
@@ -33,46 +37,81 @@ EXTRA_ARGS             = {
                          }
 
 
+WRAPPER_SCRIPT_SHELL = <<-EOSCRIPT
+#!/bin/bash
+set -e
+
+# Figure out where this script is located.
+SELFDIR="`dirname \"$0\"`"
+SELFDIR="`cd \"$SELFDIR\" && pwd`"
+
+# Tell Bundler where the Gemfile and gems are.
+export BUNDLE_GEMFILE="$SELFDIR/lib/vendor/Gemfile"
+unset BUNDLE_IGNORE_CONFIG
+
+# Run the actual app using the bundled Ruby interpreter.
+exec "$SELFDIR/lib/ruby/bin/ruby" -rbundler/setup "$SELFDIR/lib/app/%s" "$@"
+EOSCRIPT
+
+WRAPPER_SCRIPT_BAT = <<-EOSCRIPT
+@echo off
+
+:: Tell Bundler where the Gemfile and gems are.
+set "BUNDLE_GEMFILE=%%~dp0\\lib\\vendor\\Gemfile"
+set BUNDLE_IGNORE_CONFIG=
+
+:: Run the actual app using the bundled Ruby interpreter, with Bundler activated.
+@"%%~dp0\\lib\\ruby\\bin\\ruby.bat" -rbundler/setup "%%~dp0\\lib\\app\\%s" %%*
+EOSCRIPT
+
 ARCHITECTURES          = {
                            'linux-x86' => {
                              runtime:      TRAVELING_RUBY_FILE % "linux-x86",
                              arch:         "i386",
                              packages:     %w{deb rpm},
                              platform:     "linux",
-                             packagecloud: true
+                             packagecloud: true,
+                             wrapper:      WRAPPER_SCRIPT_SHELL,
+                             separator:    '/',
+                             package_from_compressed: true,
+                             dest_dir:     DEST_DIR
                             },
                            'linux-x86_64' => {
                              runtime:      TRAVELING_RUBY_FILE % "linux-x86_64",
                              arch:         "amd64",
                              packages:     %w{deb rpm},
                              platform:     "linux",
-                             packagecloud: true
+                             packagecloud: true,
+                             wrapper:      WRAPPER_SCRIPT_SHELL,
+                             separator:    '/',
+                             package_from_compressed: true,
+                             dest_dir:     DEST_DIR
                            },
                            'osx' => {
                              runtime:      TRAVELING_RUBY_FILE % "osx",
                              arch:         "x86_64",
                              packages:     [],
                              platform:     "darwin",
-                             packagecloud: false
+                             packagecloud: false,
+                             wrapper:      WRAPPER_SCRIPT_SHELL,
+                             separator:    '/',
+                             dest_dir:     DEST_DIR
+                           },
+                           'win32' => {
+                             runtime:         TRAVELING_RUBY_FILE % "win32",
+                             packages:        %w{exe},
+                             packagecloud:    false,
+                             compress_format: 'zip',
+                             wrapper:         WRAPPER_SCRIPT_BAT,
+                             separator:       '\\',
+                             extension:       '.bat',
+                             package_from_compressed: false,
+                             dest_dir:        ''
                            }
                          }
 
 
-WRAPPER_SCRIPT = <<-EOSCRIPT
-#!/bin/bash
-set -e
-
-# Figure out where this script is located.
-SELFDIR="`dirname \"$0\"`"
-SELFDIR="`cd \"$SELFDIR\" && pwd`"
-
-# Tell Bundler where the Gemfile and gems are.
-export BUNDLE_GEMFILE="$SELFDIR/lib/vendor/Gemfile"
-unset BUNDLE_IGNORE_CONFIG
 
-# Run the actual app using the bundled Ruby interpreter.
-exec "$SELFDIR/lib/ruby/bin/ruby" -rbundler/setup "$SELFDIR/lib/app/%s" "$@"
-EOSCRIPT
 
 BUNDLE_CONFIG = <<-EOBUNDLECONFIG
 BUNDLE_PATH: .
@@ -94,19 +133,27 @@ ARCHITECTURES.each do |name, config|
       task name => ["%s:package" % name]
     else
       desc "Package your app for %s" % name
-      task name => ["%s:tarball" % name]
+      task name => ["%s:compress" % name]
     end
 
     namespace name do
-      desc "Create a tarball for %s" % name
-      task "tarball" => [:bundle_install, config[:runtime]] do
-        create_tarball(create_directory_bundle(name))
+      desc "Create a compressed package for %s" % name
+      task "compress" do
+        task("package:bundle_install").invoke(name.to_sym)
+        task(config[:runtime]).invoke
+        create_compressed_package(create_directory_bundle(name, config[:wrapper], config[:separator], config[:extension]), config[:compress_format])
       end
 
       if has_packaging
         desc "Create packages (%s) for %s" % [config[:packages].join(","), name]
-        task "package" => [:bundle_install, config[:runtime]] do
-          create_packages(create_tarball(create_directory_bundle(name, DEST_DIR)), config[:platform], config[:arch], config[:packages])
+        task "package" do
+          task("package:bundle_install").invoke(name.to_sym)
+          task(config[:runtime]).invoke
+          destination = create_directory_bundle(name, config[:wrapper], config[:separator], config[:extension], config[:dest_dir])
+          if config[:package_from_compressed]
+            destination = create_compressed_package(destination, config[:compress_format])
+          end
+          create_packages(destination, config[:platform], config[:arch], config[:packages])
         end
       end
 
@@ -114,17 +161,21 @@ ARCHITECTURES.each do |name, config|
         namespace "packagecloud" do
           desc "Push packages (%s) to package_cloud" % config[:packages].join(",")
           task "push" do
-            packages     = create_packages(create_tarball(create_directory_bundle(name, DEST_DIR)), config[:platform], config[:arch], config[:packages])
+            destination = create_directory_bundle(name, config[:wrapper], config[:separator], config[:extension], config[:dest_dir])
+            if config[:package_from_compressed]
+              destination = create_compressed_package(destination, config[:compress_format])
+            end
+            packages     = create_packages(destination, config[:platform], config[:arch], config[:packages])
             by_extension = packages.group_by { |path| File.extname(path)[1..-1] }
             by_extension.each do |extension, files|
               distros = SUPPORTED_DISTROS[extension]
               distros.each do |distro|
                 repo = File.join(PACKAGECLOUD_REPO, distro)
                 files.each do |file|
-                  yank_cmd = "package_cloud yank %s %s" % [repo, file]
+                  yank_cmd = %Q{package_cloud yank "%s" "%s"} % [repo, file]
                   puts yank_cmd
                   system(yank_cmd)
-                  sh "package_cloud push %s %s" % [repo, file]
+                  sh %Q{package_cloud push "%s" "%s"} % [repo, file]
                 end
               end
             end
@@ -144,7 +195,7 @@ end
 namespace "package" do
 
   desc "Install gems to local directory"
-  task :bundle_install do
+  task :bundle_install, [:platform] do |t, args|
     if RUBY_VERSION !~ /^2\.1\./
       abort "You can only 'bundle install' using Ruby 2.1, because that's what Traveling Ruby uses."
     end
@@ -153,20 +204,23 @@ namespace "package" do
     spec_path       = SPEC_PATH
     cache_dir       = File.join("packaging", "vendor", "*", "*", "cache", "*")
 
-    sh "rm -rf %s"                     % tmp_package_dir
-    sh "mkdir -p %s"                   % tmp_package_dir
-    sh "cp %s Gemfile Gemfile.lock %s" % [spec_path, tmp_package_dir]
+    sh %Q{rm -rf "%s"}                       % tmp_package_dir
+    sh %Q{mkdir -p "%s"}                     % tmp_package_dir
+    sh %Q{cp "%s" Gemfile Gemfile.lock "%s"} % [spec_path, tmp_package_dir]
 
-    GEMSPEC.require_paths.each do |path|
-      sh "ln -sf %s %s" % [File.expand_path(path), tmp_package_dir]
-    end
+    sh %Q{ln -sf "%s" "%s"} % [File.expand_path("lib"), tmp_package_dir]
 
+    env = if args[:platform] == :win32
+            "INSTALL_WINDOWS=1"
+          else
+            ""
+          end
     Bundler.with_clean_env do
-      sh "cd %s && env BUNDLE_IGNORE_CONFIG=1 bundle install --path ../vendor --without development" % tmp_package_dir
+      sh %Q{cd "%s" && env BUNDLE_IGNORE_CONFIG=1 #{env} bundle install --path ../vendor --without development} % tmp_package_dir
     end
 
-    sh "rm -rf %s" % tmp_package_dir
-    sh "rm -f %s"  % cache_dir
+    sh %Q{rm -rf "%s"} % tmp_package_dir
+    sh %Q{rm -f "%s"}  % cache_dir
   end
 
 end
@@ -175,14 +229,33 @@ def create_packages(directory, platform, architecture, package_formats)
   Array(package_formats).map { |pkg| create_package(directory, pkg, platform, architecture) }
 end
 
-def create_package(tarball, pkg, platform, architecture)
-  output_name = [[PACKAGE_OUTPUT_NAME, architecture].join("_"), pkg].join(".")
-  extra_args  = EXTRA_ARGS[pkg] || ""
-  sh "fpm -s tar -t %s -f -n %s -v %s -a %s --license \"%s\" --vendor \"%s\" --maintainer \"%s\" --url \"%s\" --description \"%s\" --category \"%s\" --config-files %s -C %s -p %s %s %s" % [pkg, PACKAGE_NAME, VERSION, architecture, LICENSE, VENDOR, MAINTAINER, HOMEPAGE, DESCRIPTION, PACKAGE_CATEGORY, CONFIG_DEST, File.basename(tarball, ".tar.gz"), output_name, extra_args, tarball]
-  output_name
+def create_package(source, pkg, platform, architecture)
+  supported_by_fpm  = %w{deb rpm}
+  supported_by_nsis = %w{exe}
+  if supported_by_fpm.include?(pkg)
+    output_name = [[PACKAGE_OUTPUT_NAME, architecture].join("_"), pkg].join(".")
+    extra_args  = EXTRA_ARGS[pkg] || ""
+    sh %Q{fpm -s tar -t "%s" -f -n "%s" -v "%s" -a "%s" --license "%s" --vendor "%s" --maintainer "%s" --url "%s" --description "%s" --category "%s" --config-files "%s" -C "%s" -p "%s" %s "%s"} % [pkg, PACKAGE_NAME, VERSION, architecture, LICENSE, VENDOR, MAINTAINER, HOMEPAGE, DESCRIPTION, PACKAGE_CATEGORY, CONFIG_DEST, File.basename(source, ".tar.gz"), output_name, extra_args, source]
+    output_name
+  elsif supported_by_nsis.include?(pkg)
+    nsis_script    = File.join("win32", "installer.nsis.erb")
+    installer_name = File.basename(source) + ".exe"
+    template       = NSISERBContext.new(installer_name, [source], nsis_script)
+
+    temp         = Tempfile.new("nsis", ".")
+    temp.write(template.result)
+    temp.close(false)
+
+    sh %Q{makensis "%s"} % temp.path
+
+    temp.unlink
+
+  else
+    raise StandardError.new("Format %s is not supported" % pkg)
+  end
 end
 
-def create_directory_bundle(target, prefix = nil)
+def create_directory_bundle(target, wrapper_script, separator, extension = nil, prefix = nil)
   package_dir         = [PACKAGE_NAME, VERSION, target].join("_")
   prefixed_dir        = if prefix
                           File.join(package_dir, prefix)
@@ -200,52 +273,71 @@ def create_directory_bundle(target, prefix = nil)
   bundle_dir          = File.join(dest_vendor_dir, ".bundle")
 
 
-  sh "rm -rf %s"   % package_dir
-  sh "mkdir %s"    % package_dir
-  sh "mkdir -p %s" % prefixed_dir
-  sh "mkdir -p %s" % config_dest_dir
-  sh "mkdir -p %s" % app_dir
+  sh %Q{rm -rf "%s"}   % package_dir
+  sh %Q{mkdir "%s"}    % package_dir
+  sh %Q{mkdir -p "%s"} % prefixed_dir
+  sh %Q{mkdir -p "%s"} % config_dest_dir
+  sh %Q{mkdir -p "%s"} % app_dir
 
   GEMSPEC.files.each do |file|
     destination_dir = File.join(app_dir, File.dirname(file))
     FileUtils.mkdir_p(destination_dir)
 
-    sh "cp %s %s" % [file, destination_dir]
+    sh %Q{cp "%s" "%s"} % [file, destination_dir]
   end
 
   Dir[File.join(CONFIG_DIR, "*")].each do |file|
-    sh "cp %s %s" % [file, config_dest_dir]
+    sh %Q{cp "%s" "%s"} % [file, config_dest_dir]
   end
 
-  sh "mkdir %s"          % ruby_dir
-  sh "tar -xzf %s -C %s" % [traveling_ruby_file, ruby_dir]
+  sh %Q{mkdir "%s"}            % ruby_dir
+  sh %Q{tar -xzf "%s" -C "%s"} % [traveling_ruby_file, ruby_dir]
 
   GEMSPEC.executables.each do |file|
-    destination = File.join(prefixed_dir, file)
+    destination = File.join(prefixed_dir, file + extension.to_s)
 
-    File.open(destination, "w") { |f| f.write(WRAPPER_SCRIPT % File.join("bin", file)) }
+    bin_path = "bin" + separator + file
+    File.open(destination, "w") { |f| f.write(wrapper_script % bin_path) }
 
-    sh "chmod +x %s" % destination
+    sh %Q{chmod +x "%s"} % destination
   end
 
-  sh "cp -pR %s %s"                  % [vendor_dir, lib_dir]
-  sh "cp %s Gemfile Gemfile.lock %s" % [spec_path, dest_vendor_dir]
+  sh %Q{cp -pR "%s" "%s"}                  % [vendor_dir, lib_dir]
+  sh %Q{cp "%s" Gemfile Gemfile.lock "%s"} % [spec_path, dest_vendor_dir]
 
-  GEMSPEC.require_paths.each do |path|
-    sh "ln -sf ../app/%s %s" % [path, File.join(dest_vendor_dir, path)]
-  end
+
+  sh %Q{ln -sf "../app/%s" "%s"} % ["lib", File.join(dest_vendor_dir, "lib")]
 
   FileUtils.mkdir_p(bundle_dir)
   File.open(File.join(bundle_dir, "config"), "w") { |f| f.write(BUNDLE_CONFIG) }
+
+  post_build_dir      = File.join(target)
+  post_build_makefile = File.join(post_build_dir, "Makefile")
+  if File.exists?(post_build_makefile)
+    sh %Q{cd "%s" && make clean || /usr/bin/true} % post_build_dir
+    sh %Q{cd "%s" && make install prefix="%s"} % [post_build_dir, File.expand_path(package_dir)]
+  end
   package_dir
 end
 
-def create_tarball(package_dir)
-  gzip_file   = "%s.tar.gz" % package_dir
+def create_compressed_package(package_dir, format = 'tar.gz')
+  format ||= 'tar.gz'
+  case format
+  when 'tar.gz'
+    gzip_file   = "%s.tar.gz" % package_dir
+
+    sh %Q{tar -czf "%s" "%s"} % [gzip_file, package_dir]
 
-  sh "tar -czf %s %s" % [gzip_file, package_dir]
+    gzip_file
+  when 'zip'
+    zip_file    = "%s.zip" % package_dir
 
-  gzip_file
+    sh %Q{zip -r "%s" "%s"} % [zip_file, package_dir]
+
+    zip_file
+  else
+    raise StandardError.new("Format %s is not supported" % format)
+  end
 end
 
 def download_runtime(target)
@@ -256,3 +348,49 @@ def download_runtime(target)
 
   sh "cd packaging && curl -L -O --fail %s" % traveling_ruby_url
 end
+
+
+class NSISERBContext
+  attr_reader :template_path, :directories, :installer_file_name
+
+  def initialize(installer_name, directories, template_path)
+    @directories         = directories
+    @template_path       = template_path
+    @installer_file_name = installer_name
+  end
+
+  def template_source
+    File.read(template_path)
+  end
+
+  def removable_artifacts
+    removable_files       = Set.new
+    removable_directories = Set.new
+    directories.each do |dir|
+      Find.find(dir) do |path|
+        puts path.inspect
+        if File.file?(path)
+          without_base           = path.split(File::SEPARATOR)[1..-1]
+          without_file           = without_base[0..-2]
+          removable_files       << without_base.join("\\")
+          removable_directories << without_file.join("\\")
+        end
+      end
+    end
+    removable_files << "InstrumentServer.exe"
+    dirs = removable_directories.to_a.sort_by { |path| path.split("\\").size }.reverse
+    [removable_files.to_a, dirs]
+  end
+
+  def service_name
+    "instrument_server"
+  end
+
+  def uninstaller_name
+    "uninstaller.exe"
+  end
+
+  def result
+    ERB.new(template_source).result(binding)
+  end
+end