Merge branch 'master' into staging

6 files changed, 70 insertions, 26 deletions

diff --git a/pkgs/tools/text/bcat/Gemfile b/pkgs/tools/text/bcat/Gemfile
new file mode 100644
index 000000000000..f389866324dc
--- /dev/null
+++ b/pkgs/tools/text/bcat/Gemfile
@@ -0,0 +1,2 @@
+source 'http://rubygems.org'
+gem 'bcat'
diff --git a/pkgs/tools/text/bcat/Gemfile.lock b/pkgs/tools/text/bcat/Gemfile.lock
new file mode 100644
index 000000000000..c39ebc279109
--- /dev/null
+++ b/pkgs/tools/text/bcat/Gemfile.lock
@@ -0,0 +1,15 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    bcat (0.6.2)
+      rack (~> 1.0)
+    rack (1.6.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bcat
+
+BUNDLED WITH
+   1.15.4
diff --git a/pkgs/tools/text/bcat/default.nix b/pkgs/tools/text/bcat/default.nix
new file mode 100644
index 000000000000..72fb8aa8e2ee
--- /dev/null
+++ b/pkgs/tools/text/bcat/default.nix
@@ -0,0 +1,15 @@
+{ lib, bundlerApp }:
+
+bundlerApp {
+  pname = "bcat";
+  gemdir = ./.;
+  exes = [ "bcat" "btee" "a2h" ];
+
+  meta = with lib; {
+    description = "Pipe to browser utility";
+    homepage    = http://rtomayko.github.com/bcat/;
+    license     = licenses.mit;
+    maintainers = [ maintainers.jraygauthier ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/text/bcat/gemset.nix b/pkgs/tools/text/bcat/gemset.nix
new file mode 100644
index 000000000000..0654e35399d9
--- /dev/null
+++ b/pkgs/tools/text/bcat/gemset.nix
@@ -0,0 +1,19 @@
+{
+  bcat = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["http://rubygems.org"];
+      sha256 = "0w2wwlngcs7f4lmvifixrb89bjkw2lx8z0nn72w360hz394ic651";
+      type = "gem";
+    };
+    version = "0.6.2";
+  };
+  rack = {
+    source = {
+      remotes = ["http://rubygems.org"];
+      sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza";
+      type = "gem";
+    };
+    version = "1.6.8";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/text/ruby-zoom/Gemfile.lock b/pkgs/tools/text/ruby-zoom/Gemfile.lock
index 29d5fe1da5ba..107e896dd6d6 100644
--- a/pkgs/tools/text/ruby-zoom/Gemfile.lock
+++ b/pkgs/tools/text/ruby-zoom/Gemfile.lock
@@ -1,16 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    djinni (2.0.1)
-      fagin (~> 0.1, >= 0.1.2)
-      ruby-terminfo (~> 0.1, >= 0.1.1)
-    fagin (0.1.2)
-    hilighter (0.1.7)
+    djinni (2.1.1)
+      fagin (~> 1.0, >= 1.0.0)
+    fagin (1.0.0)
+    hilighter (1.1.0)
     json_config (0.1.2)
-    ruby-terminfo (0.1.1)
-    ruby-zoom (4.1.0)
-      djinni (~> 2.0, >= 2.0.1)
-      hilighter (~> 0.1, >= 0.1.3)
+    ruby-zoom (5.0.1)
+      djinni (~> 2.1, >= 2.1.1)
+      fagin (~> 1.0, >= 1.0.0)
+      hilighter (~> 1.1, >= 1.1.0)
       json_config (~> 0.1, >= 0.1.2)
       scoobydoo (~> 0.1, >= 0.1.4)
     scoobydoo (0.1.4)
@@ -22,4 +21,4 @@ DEPENDENCIES
   ruby-zoom
 
 BUNDLED WITH
-   1.13.1
+   1.14.6
diff --git a/pkgs/tools/text/ruby-zoom/gemset.nix b/pkgs/tools/text/ruby-zoom/gemset.nix
index 7d3836a3c33a..36374e54e165 100644
--- a/pkgs/tools/text/ruby-zoom/gemset.nix
+++ b/pkgs/tools/text/ruby-zoom/gemset.nix
@@ -1,27 +1,28 @@
 {
   djinni = {
+    dependencies = ["fagin"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wl4q4qs1nyla5n2b2ys6n3i35gvli8xb8mxz2xv0ik306cikqm6";
+      sha256 = "00zfgd7zx2p9xjc64xm4iwdxq2bb6n1z09nw815c2f4lvlaq269f";
       type = "gem";
     };
-    version = "2.0.1";
+    version = "2.1.1";
   };
   fagin = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17d419vkfr26gdbad97fg2ikskhn82vs3bnxlzd27w6lwyf13qxk";
+      sha256 = "0jryqrgb5jvz0m7p91c2bhn6gdwxn9jfdaq3cfkirc3y7yfzv131";
       type = "gem";
     };
-    version = "0.1.2";
+    version = "1.0.0";
   };
   hilighter = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1a9a9clgd6kx63a82msjzi6abznfqivsgmds7qaqwb1dsl1nznbh";
+      sha256 = "0sy59nfcfk4p1fnrdkipi0mvsj9db17chrx7lb2jg3majbr1wz59";
       type = "gem";
     };
-    version = "0.1.7";
+    version = "1.1.0";
   };
   json_config = {
     source = {
@@ -31,21 +32,14 @@
     };
     version = "0.1.2";
   };
-  ruby-terminfo = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0rl4ic5pzvrpgd42z0c1s2n3j39c9znksblxxvmhkzrc0ckyg2cm";
-      type = "gem";
-    };
-    version = "0.1.1";
-  };
   ruby-zoom = {
+    dependencies = ["djinni" "fagin" "hilighter" "json_config" "scoobydoo"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "132pk0zp3rayvvbccfs5ksigg9zpflp9734b4r0jz5aimmv2qpvp";
+      sha256 = "0115kbz6l8srzizs77k9l0585lg93x90kg49jjpan7ssm786q05j";
       type = "gem";
     };
-    version = "4.1.0";
+    version = "5.0.1";
   };
   scoobydoo = {
     source = {