tmuxinator-bosh-console 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ac0145c5921ef309202a382403b408a6753243d
-  data.tar.gz: 8a440cf9a4ee22fad3dea29c878ffed5af9ef028
+  metadata.gz: d17c7d707598215c08242d1535df7035a581ba0d
+  data.tar.gz: 2ec3b78d6e5a9adb0d55b734ce9a4c96c5576808
 SHA512:
-  metadata.gz: 7407bbe34c539642f0aba90a0877eca0947d2c6d48501b6efa54724ec5ae42d5e60db7cec82b46448b07f264925620c8239ddf39797fd77f8b8d11f53c8e0f2a
-  data.tar.gz: ddaaa82f89fbbe81f68d39ac002eb24475391c74b651610724525ad1c620f0e39ce227f9d8d8bf5dda663103b7fb2a06c0454cd696f04fe454a52f252b800aeb
+  metadata.gz: a4dd249ab1b26ef346bde6dc293c08d4c5de0740e90b41f8649c73c850d2208cc982f868bd4f711420ee77a22461c6136f2803f46f2c0797aeb1745a427d1503
+  data.tar.gz: 30797c3d5fc72781c2c409041a761337a99ec803aac00a9460015b1208bd3bf19300a67063443dd1d475cbb1dacf375f855072bf1992a8d7694cfe578a6078b7

data/.gitignore

@@ -1,7 +1,6 @@
 .rake_t_cache
 /.bundle/
 /.envrc/
-/Gemfile.lock
 /pkg/
 /spec/reports/
 /tmp/

data/.travis.yml

@@ -3,6 +3,8 @@ language: ruby
 rvm:
   - 2.3.1
   - 2.4.0
-before_install: gem install bundler
+before_install:
+  - gem update --system --no-doc
+  - gem install bundler
 script:
 - bundle exec rake spec:ci

data/Gemfile.lock

@@ -0,0 +1,150 @@
+PATH
+  remote: .
+  specs:
+    tmuxinator-bosh-console (0.3.0)
+      bosh_cli
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.3.0)
+    aws-sdk-core (2.2.0)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.2.0)
+      aws-sdk-core (= 2.2.0)
+    blobstore_client (1.3262.24.0)
+      aws-sdk-resources (= 2.2.0)
+      bosh_common (~> 1.3262.24.0)
+      httpclient (= 2.7.1)
+      multi_json (~> 1.1)
+    bosh-template (1.3262.24.0)
+      semi_semantic (~> 1.2.0)
+    bosh_cli (1.3262.24.0)
+      blobstore_client (~> 1.3262.24.0)
+      bosh-template (~> 1.3262.24.0)
+      bosh_common (~> 1.3262.24.0)
+      cf-uaa-lib (~> 3.2.1)
+      highline (~> 1.6.2)
+      httpclient (= 2.7.1)
+      json_pure (~> 1.7)
+      minitar (~> 0.5.4)
+      net-scp (~> 1.1.0)
+      net-ssh (= 2.9.2)
+      net-ssh-gateway (~> 1.2.0)
+      netaddr (~> 1.5.0)
+      progressbar (~> 0.9.0)
+      sshkey (~> 1.7.0)
+      terminal-table (~> 1.4.3)
+    bosh_common (1.3262.24.0)
+      logging (~> 1.8.2)
+      semi_semantic (~> 1.2.0)
+    cf-uaa-lib (3.2.5)
+      multi_json
+    coderay (1.1.1)
+    diff-lcs (1.3)
+    ffi (1.9.17)
+    formatador (0.2.5)
+    guard (2.14.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-bundler (2.1.0)
+      bundler (~> 1.0)
+      guard (~> 2.2)
+      guard-compat (~> 1.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    highline (1.6.21)
+    httpclient (2.7.1)
+    jmespath (1.3.1)
+    json_pure (1.8.6)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    little-plugger (1.1.4)
+    logging (1.8.2)
+      little-plugger (>= 1.1.3)
+      multi_json (>= 1.8.4)
+    lumberjack (1.0.11)
+    method_source (0.8.2)
+    minitar (0.5.4)
+    multi_json (1.12.1)
+    nenv (0.3.0)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    netaddr (1.5.1)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    parser (2.3.3.1)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    progressbar (0.9.2)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rainbow (2.2.1)
+    rake (12.0.0)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.8)
+      ffi (>= 0.5.0)
+    rb-readline (0.5.3)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.47.1)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    ruby_dep (1.5.0)
+    semi_semantic (1.2.0)
+    shellany (0.0.1)
+    slop (3.6.0)
+    sshkey (1.7.0)
+    terminal-table (1.4.5)
+    thor (0.19.4)
+    unicode-display_width (1.1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  guard
+  guard-bundler
+  guard-rspec
+  pry
+  rake
+  rb-readline
+  rspec
+  rubocop
+  tmuxinator-bosh-console!
+
+BUNDLED WITH
+   1.13.7

data/README.markdown

@@ -6,13 +6,20 @@
 
 ```bash
 $ tmuxinator-bosh-console cf-warden
-$ tmuxinator cf-warden
 ```
 
 will create a new tmuxinator project 'cf-warden'. Each instance (VM) will get its own tmux window with some panes, according to the provided template.
 
 The list of instances is generated by executing `bosh instances` and therefore lists only the VMs of the current deployment.
 
+Once created, tmuxinator can be used as usual to launch the project:
+
+```bash
+$ tmuxinator cf-warden
+```
+
+Anything appearing after a single `--` argument is appended to `bosh ssh`, e.g. `--gateway-host` etc.
+
 ## Installation
 
 ```bash
@@ -21,10 +28,8 @@ $ gem install tmuxinator-bosh-console
 
 ## Prerequisites
 
-`bosh instances` must return a zero or more instances.
+`bosh instances` must return zero or more instances.
 
 ## TODO
 
-* repeated `--include`s
-* `--exclude` this VM (blacklisting); may be repeated
-* `--custom` bosh ssh command, e.g. gateway-host
+* repeated `--include`s and `--exclude`s will make less complex regexes

data/exe/tmuxinator-bosh-console

@@ -14,6 +14,7 @@ def die(msg)
 end
 
 filter = {}
+force = false
 
 OptionParser.new do |opts|
   opts.banner = "Generates a tmuxinator configuration for the VMs of a BOSH deployment\n\n" + opts.banner
@@ -26,12 +27,18 @@ OptionParser.new do |opts|
   opts.on('-XFILTER', '--exclude=FILTER', 'exclude jobs with a name matching FILTER') do |f|
     filter[:exclude] = Regexp.new(f)
   end
+
+  opts.on('-F', '--force', 'force overriding of the project file') do
+    force = true
+  end
 end.parse!
 
-project_name = ARGV.first || die('Missing argument for the tmuxinator project name')
+project_name = ARGV.shift || die('Missing argument for the tmuxinator project name')
+additional_args = ARGV
+
 project_file = Pathname("~/.tmuxinator/#{project_name}.yml").expand_path
 
-if project_file.exist?
+if project_file.exist? && !force
   die("Not overriding tmuxinator project file #{project_file}")
 end
 

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

@@ -2,7 +2,7 @@
 module Tmuxinator
   module BOSH
     module Console
-      VERSION = '0.2.1'
+      VERSION = '0.3.0'
     end
   end
 end

data/templates/bosh-console.yml

@@ -1,20 +1,17 @@
 # ~/.tmuxinator/<%= project_name %>.yml
 
 name: <%= project_name %>
-
 windows:
   <% instances.each do |vm| %>
   - <%= vm.name %>/<%= vm.index %>:
       layout: main-vertical
+      pre: bosh ssh <%= vm.name %>/<%= vm.index %> <%= additional_args.join(' ') %>
       panes:
         - shell:
-          - bosh ssh <%= vm.name %>/<%= vm.index %>
           - sudo su -
           - cd /var/vcap
         - monit:
-          - bosh ssh <%= vm.name %>/<%= vm.index %>
           - sudo watch -n 1 /var/vcap/bosh/bin/monit summary
         - logs:
-          - 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.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Steffen Uhlig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -166,6 +166,7 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.markdown