tmuxinator-bosh-console 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2e1fe18712e9dea2cdeb85656dc8832fc7bf214
-  data.tar.gz: d7c4d46b8244541f0fbcc800a5e1560ea5589644
+  metadata.gz: fed7bba2c5ce851367554e8b5cfbec831077a36b
+  data.tar.gz: b6986938f82ccf78d487bee16f76758e29b0ee93
 SHA512:
-  metadata.gz: 7dadc7fce7daf4490f68761bb207fb3148d701d08e3609a0ec7aa900501b68d580544f134018ccc46054e53f2f222043ddffa9f75e1973c002f8bb893486a356
-  data.tar.gz: 183f8d6ab4cab8e9066eae557acd9f98a5907ee589fa88ce956befe32fd13d64cc5f150d2e2b3ff1932d0648e47786f409bca1258dcbfbb0f45792e9210c3cdf
+  metadata.gz: 78e1a2988d056cc147120c6020a9eab258015f7bc4bca70e997afbcee5bc83bf9bd16761c29d34e66d03cb974cdc5d74ae95e6457aa5c21aeddedd1a5f287301
+  data.tar.gz: 7b3c106e8d6f22a99ec0c748d87ddd44565cb531e23d04541c82077816d54d43f675e6b57a8c7550ac2f4c566d7e2752564e78764842f7c59b590b60056303eb

data/.gitignore

@@ -1,3 +1,4 @@
+.rake_t_cache
 /.bundle/
 /.envrc/
 /Gemfile.lock

data/.rspec

@@ -1,3 +1,4 @@
 --format documentation
 --require spec_helper
 --color
+--order random

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   Include:
     - '**/Gemfile'
     - '**/Guardfile'
@@ -31,6 +31,11 @@ Lint/UnusedMethodArgument:
 Metrics/AbcSize:
   Enabled: false
 
+Metrics/BlockLength:
+  Exclude:
+    - '*.gemspec'
+    - spec/**/*
+
 Metrics/ClassLength:
   Enabled: false
 

data/.travis.yml

@@ -3,4 +3,6 @@ language: ruby
 rvm:
   - 2.3.1
   - 2.4.0
-before_install: gem install bundler -v 1.13.2
+before_install: gem install bundler
+script:
+- bundle exec rake spec:ci

data/Guardfile

@@ -8,5 +8,5 @@ end
 
 guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+/.+)\.rb$}) { |m| "spec/unit/#{m[1]}_spec.rb" }
 end

data/README.markdown

@@ -1,5 +1,7 @@
 # BOSH tmuxinator console
 
+[![Build Status](https://travis-ci.org/suhlig/tmuxinator-bosh-console.svg?branch=master)](https://travis-ci.org/suhlig/tmuxinator-bosh-console)
+
 ## Synopsis
 
 ```bash
@@ -20,3 +22,9 @@ $ gem install tmuxinator-bosh-console
 ## Prerequisites
 
 `bosh instances` must return a zero or more instances.
+
+## TODO
+
+* repeated `--include`s
+* `--exclude` this VM (blacklisting); may be repeated
+* `--custom` bosh ssh command, e.g. gateway-host

data/Rakefile

@@ -10,4 +10,9 @@ RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end
 
+namespace :spec do
+  desc 'Run ci tests'
+  task ci: ['rubocop', :spec]
+end
+
 task default: ['rubocop:auto_correct', :spec]

data/exe/tmuxinator-bosh-console

@@ -3,18 +3,31 @@
 
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 
-require 'erb'
+require 'optparse'
 require 'pathname'
+require 'tmuxinator/bosh/console/director_gateway'
+require 'tmuxinator/bosh/console/template'
 
 def die(msg)
   warn "Error: #{msg}"
   exit(1)
 end
 
-# TODO
-# --include only this VM (whitelisting); may be repeated
-# --exclude this VM (blacklisting); may be repeated
-# --custom bosh ssh command, e.g. gateway-host
+filter = {}
+
+OptionParser.new do |opts|
+  opts.banner = "Generates a tmuxinator configuration for the VMs of a BOSH deployment\n\n" + opts.banner
+  opts.separator "\nOptions:"
+
+  opts.on('-IFILTER', '--include=FILTER', 'include only jobs with a name matching FILTER') do |f|
+    filter[:include] = Regexp.new(f)
+  end
+
+  opts.on('-XFILTER', '--exclude=FILTER', 'exclude jobs with a name matching FILTER') do |f|
+    filter[:exclude] = Regexp.new(f)
+  end
+end.parse!
+
 project_name = ARGV.first || die('Missing argument for the tmuxinator project name')
 project_file = Pathname("~/.tmuxinator/#{project_name}.yml").expand_path
 
@@ -22,16 +35,9 @@ if project_file.exist?
   die("Not overriding tmuxinator project file #{project_file}")
 end
 
-vms = `bosh instances`.lines.map { |line|
-  md = line.match(%r{\| (?<job>\w+)\/(?<index>\d+)})
-
-  if md
-    {
-      job: md['job'],
-      index: md['index'],
-    }
-  end
-}.compact
+include Tmuxinator::BOSH::Console
+template = Template.new(Pathname(__dir__) / '../templates/bosh-console.yml')
 
-template = Pathname(__dir__) / '../templates/bosh-console.yml'
-project_file.write(ERB.new(Pathname(template).read).result(binding))
+instances = DirectorGateway.new.instances(filter)
+output = template.render(binding)
+project_file.write(output)

data/lib/tmuxinator/bosh/console/director_gateway.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+require 'tmuxinator/bosh/console/job'
+
+module Tmuxinator
+  module BOSH
+    module Console
+      #
+      # Gateway to the BOSH director
+      #
+      class DirectorGateway
+        def initialize(report=`bosh instances`)
+          @report = report
+        end
+
+        def instances(filter={})
+          @report.lines.map { |line|
+            md = line.match(%r{\| (?<job>\w+)\/(?<index>\d+)})
+            Job.new(md['job'], md['index']) if md
+          }.compact.tap do |result|
+            result.select! { |job| filter[:include].match?(job.name) } if filter[:include]
+            result.reject! { |job| filter[:exclude].match?(job.name) } if filter[:exclude]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tmuxinator/bosh/console/job.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module Tmuxinator
+  module BOSH
+    module Console
+      Job = Struct.new(:name, :index) do
+        def to_s
+          "#{name}/#{index}"
+        end
+      end
+    end
+  end
+end

data/lib/tmuxinator/bosh/console/template.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+require 'erb'
+
+module Tmuxinator
+  module BOSH
+    module Console
+      class Template
+        def initialize(io)
+          @content = io.read
+        end
+
+        def render(source_binding)
+          ERB.new(@content).result(source_binding)
+        end
+      end
+    end
+  end
+end

data/lib/tmuxinator/bosh/console/version.rb

@@ -2,7 +2,7 @@
 module Tmuxinator
   module BOSH
     module Console
-      VERSION = '0.1.3'
+      VERSION = '0.2.0'
     end
   end
 end

data/templates/bosh-console.yml

@@ -3,18 +3,18 @@
 name: <%= project_name %>
 
 windows:
-  <% vms.each do |vm| %>
-  - <%= vm[:job] %>/<%= vm[:index] %>:
+  <% instances.each do |vm| %>
+  - <%= vm.name %>/<%= vm.index %>:
       layout: main-vertical
       panes:
         - shell:
-          - bosh ssh <%= vm[:job] %>/<%= vm[:index] %>
+          - bosh ssh <%= vm.name %>/<%= vm.index %>
           - sudo su -
           - cd /var/vcap
         - monit:
-          - bosh ssh <%= vm[:job] %>/<%= vm[:index] %>
+          - bosh ssh <%= vm.name %>/<%= vm.index %>
           - sudo watch -n 1 /var/vcap/bosh/bin/monit summary
         - logs:
-          - bosh ssh <%= vm[:job] %>/<%= vm[:index] %>
+          - bosh ssh <%= vm.name %>/<%= vm.index %>
           - tail -f /var/vcap/sys/log/*/*
   <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tmuxinator-bosh-console
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Steffen Uhlig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -171,6 +171,9 @@ files:
 - README.markdown
 - Rakefile
 - exe/tmuxinator-bosh-console
+- lib/tmuxinator/bosh/console/director_gateway.rb
+- lib/tmuxinator/bosh/console/job.rb
+- lib/tmuxinator/bosh/console/template.rb
 - lib/tmuxinator/bosh/console/version.rb
 - templates/bosh-console.yml
 - tmuxinator-bosh-console.gemspec
@@ -194,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Generates the tmuxinator configuration for all VMs of a BOSH deployment