bedouin 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9b732f736f968c8b5224eaf5ec37fa40fa9bd468
-  data.tar.gz: eb16b4224fb4d08e8bc69474008c5ed347581936
+SHA256:
+  metadata.gz: 3a57b2357a08cba2ed3c5741aa78ba9aa98aeb702f7d1c110d9dc994236f13c8
+  data.tar.gz: 482b529169f583ee8ccc29e79783d2fb39ca6da988ca33a452f97c3a4a4c7819
 SHA512:
-  metadata.gz: 37f647dc61bb830eb35f30686dad9f51841cef097f32cdaec06ef7840207928d0dc8a6d7ab4a7c501243e5bb3321b3356986d6ccfce758ec377fc2b993460348
-  data.tar.gz: bba9697666dd65306dd6c0824163deb497763b9f31a0508a2bd461b16261fef98937dcc7bc5fc137ae9cf356419de11add563da6a91bc3899019a445635ac209
+  metadata.gz: 5504c086ad43e5e18bb88360773c603a41735b0fe13f09c234b65320fb091a1c1ea483febaba8905c3f55467ebfc6ab5f48074cc7c5f698578ff680cf43dd399
+  data.tar.gz: 8d657809efa4439c603d47f866edf5c068cdb3dc36e7f1d02cbd19862e0050d092083c7fc6dacc6ee721d8854b7ce73d1d71741990c2bafba51f085cbe0eace6

data/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".
 
@@ -61,6 +61,15 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+## Docker
+The Dockerfile in `docker/` is used to build an image that is capable of building Nomad for alpine. When run, that image produces a tarball which can be fed back into `docker build` to produce the final image.
+
+The `docker/build.sh` script will do this for you.
+
+`docker/build.sh <NOMAD VERSION>`
+
+`docker/build.sh 0.5.5`
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/compellon/bedouin.

data/bedouin.gemspec

@@ -13,14 +13,14 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/compellon/bedouin"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|docker)/}) }
   spec.bindir        = "bin"
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   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

data/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

data/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

data/lib/bedouin/runner.rb

@@ -5,8 +5,8 @@ module Bedouin
       @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

data/lib/bedouin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bedouin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - David Bresson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +92,7 @@ files:
 - examples/templates/echo.erb
 - lib/bedouin.rb
 - lib/bedouin/cli.rb
+- lib/bedouin/cli/params.rb
 - lib/bedouin/environment.rb
 - lib/bedouin/job.rb
 - lib/bedouin/runner.rb
@@ -116,8 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Bedouin provides a templating system for Hashicorp Nomad.