add support for passing options to nomad

README.md

@@ -22,7 +22,7 @@ Or install it yourself as:
 
 Create one or more environment files and one or more ERB job templates, and then execute:
 
-    $ bedouin <environment file> <template1> <template2> ...
+    $ bedouin [nomad option ...] [--] <environment file> <template1> <template2> ...
 
 Bedouin will evaluate each template with any attributes from the environment file available as instance variables. Bedouin will then run the results of each with "nomad run".
 

bedouin.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "erubis", "~> 2.7"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

lib/bedouin/cli.rb

@@ -1,12 +1,14 @@
+require 'bedouin/cli/params'
 module Bedouin
   class CLI
-    def execute(env_path, *template_paths)
-      e = Bedouin.environment_for(env_path)
+    def execute(*params)
+      p = Params.new(params)
+      e = Bedouin.environment_for(p.env_path)
 
-      template_paths.lazy.map do |path|
+      p.template_paths.lazy.map do |path|
         t = Bedouin.template_for(path)
         j = Bedouin::Job.new(e, t)
-        Bedouin::Runner.new.run(j)
+        Bedouin::Runner.new.run(job: j, opts: p.opts)
       end.reduce(0) do |m,j|
         puts j.to_s
         j.status == 0 ? m : 1

lib/bedouin/cli/params.rb

@@ -0,0 +1,21 @@
+module Bedouin
+  class CLI
+    class Params
+      attr_reader :opts, :env_path, :template_paths
+      def initialize(params)
+        index_of_opt_terminator = params.find_index('--')
+        unchecked_params = params.slice!((index_of_opt_terminator)..-1) if index_of_opt_terminator
+
+        if args_count = params.reverse_each.find_index {|p| p.start_with? '-' }
+          args, @opts  = params.pop(args_count), params
+        else
+          args, @opts = params, []
+        end
+
+        args.concat(unchecked_params.drop(1)) if unchecked_params
+
+        @env_path, *@template_paths = *args
+      end
+    end
+  end
+end

lib/bedouin/runner.rb

@@ -5,8 +5,8 @@ def initialize(cfg = { nomad: "nomad" })
       @cfg = cfg
     end
 
-    def run(job)
-      Open3.popen3(@cfg[:nomad], "run", job.file_path) do |stdin, stdout, stderr, wait_thr|
+    def run(job:, opts: [])
+      Open3.popen3(@cfg[:nomad], "run", *opts, '--', job.file_path) do |stdin, stdout, stderr, wait_thr|
         job.status = wait_thr.value
         job.stdout = stdout.read
         job.stderr = stderr.read

lib/bedouin/version.rb

@@ -1,3 +1,3 @@
 module Bedouin
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

spec/bedouin/cli/params_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+require 'bedouin/cli/params'
+
+describe Bedouin::CLI::Params do
+  [
+    {
+      params: %w(environment foo),
+      expect: {
+        opts: [],
+        env_path: 'environment',
+        template_paths: ['foo']
+      }
+    },
+    {
+      params: %w(-- environment foo),
+      expect: {
+        opts: [],
+        env_path: 'environment',
+        template_paths: ['foo']
+      }
+    },
+    {
+      params: %w(environment foo bar),
+      expect: {
+        opts: [],
+        env_path: 'environment',
+        template_paths: ['foo', 'bar']
+      }
+    },
+    {
+      params: %w(-a -b -c environment foo bar),
+      expect: {
+        opts: ['-a', '-b', '-c'],
+        env_path: 'environment',
+        template_paths: ['foo', 'bar']
+      }
+    },
+    {
+      params: %w(-a -b -c -- environment foo bar),
+      expect: {
+        opts: ['-a', '-b', '-c'],
+        env_path: 'environment',
+        template_paths: ['foo', 'bar']
+      }
+    },
+    {
+      params: %w(-a -b -c -- -environment foo bar),
+      expect: {
+        opts: ['-a', '-b', '-c'],
+        env_path: '-environment',
+        template_paths: ['foo', 'bar']
+      }
+    }
+  ].each do |c|
+    context "for various parameter situations" do
+      it "extracts cli parameters into opts, env_path, and template_paths" do
+        p = Bedouin::CLI::Params.new(c[:params])
+        expect(p).to have_attributes(c[:expect])
+      end
+    end
+  end
+end

spec/bedouin/runner_spec.rb

@@ -6,19 +6,28 @@
   it "runs nomad's 'run' command with the job's tempfile" do
     job = instance_double("job", file_path: "/foo/bar")
 
-    expect(Open3).to receive(:popen3) { ["nomad", "run", "/foo/bar"] }
+    expect(Open3).to receive(:popen3) { ["nomad", "run", "-", "/foo/bar"] }
 
     r = Bedouin::Runner.new
-    r.run(job)
+    r.run(job: job)
   end
 
   it "returns the job with status, stdout, and stderr set" do
     job = instance_double("job", file_path: "/foo/bar")
     expect(job).to receive(:status=).with(0)
-    expect(job).to receive(:stdout=).with("run /foo/bar\n")
+    expect(job).to receive(:stdout=).with("run -- /foo/bar\n")
     expect(job).to receive(:stderr=).with("")
 
     runner = Bedouin::Runner.new({ nomad: "echo" })
-    expect(runner.run(job)).to be job
+    expect(runner.run(job: job)).to be job
+  end
+
+  it "accepts options and passes them to nomad" do
+    job = instance_double("job", file_path: "/foo/bar")
+
+    expect(Open3).to receive(:popen3) { ["nomad", "run", "--foo", "-", "/foo/bar"] }
+
+    r = Bedouin::Runner.new
+    r.run(job: job, opts: ["-foo"])
   end
 end