bosh-gen 0.95.0 → 0.96.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1cfc4a215ddf754dcd6510a6f7a33a9a11dbb70
-  data.tar.gz: 26199f5c15857f4e7a028885b69e9f546e571fad
+  metadata.gz: 1ece591a7a7c0e87b516792c42779191fc9fc092
+  data.tar.gz: b08c4f05ca34ad67ad3efc30f81b9f97a94c8466
 SHA512:
-  metadata.gz: 1bc0fa1eb18596f9ef591dc3569d256731fec3bcb37cd8fef8c8e703ea424da4d108a624b0bf065947fafa6dccbe59195dd8e79ba4334389827ac727d84c3156
-  data.tar.gz: 6d80e76fac0ae6014b6ae359346a002a9cd54ae440093edbde48fc8bda6d7c95d6502891dbf5d2b40e957055485851f8bee42164405d5254f1c95643d8db2979
+  metadata.gz: a6820845800b4a4abfbc00a6b60e31a7bdb8d01c636d30a30dd908a51f93c239f0de675e3978fe612ebb0f20e7b280dd82c1019385f9ede9ede3b32a65091cd7
+  data.tar.gz: f163a68e509785684c0c5057853d28504f9a10e2de44fa26e4011c2df600ad77bd0e967acdbbc87acaa61e866efb4e2ecf49515a47cd4ca0d317c2e184de5e27

data/lib/bosh/gen/cli.rb

@@ -70,10 +70,13 @@ module Bosh
       desc "job NAME", "Create a new job"
       method_option :dependencies, :aliases => ['-d'], :type => :array,
         :desc => "List of package dependencies"
+      method_option :bpm, :type => :boolean, :default => true,
+        :desc => "Use bpm to containerise job processes"
       def job(name)
         dependencies = options[:dependencies] || []
         require 'bosh/gen/generators/job_generator'
-        Bosh::Gen::Generators::JobGenerator.start([name, dependencies, 'simple'])
+        job_type = options[:bpm] ? 'bpm' : 'simple'
+        Bosh::Gen::Generators::JobGenerator.start([name, dependencies, job_type])
       end
 
       desc "errand NAME", "Create a new errand"

data/lib/bosh/gen/generators/job_generator.rb

@@ -70,7 +70,7 @@ module Bosh::Gen
       end
 
       def valid_purposes
-        %w[simple]
+        %w[bpm simple]
       end
 
       # Run a command in git.

data/lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_bpm/monit.tt

@@ -0,0 +1,5 @@
+check process <%= job_name %>
+  with pidfile /var/vcap/sys/run/bpm/<%= job_name %>/<%= job_name %>.pid
+  start program "/var/vcap/jobs/bpm/bin/bpm start <%= job_name %>"
+  stop program "/var/vcap/jobs/bpm/bin/bpm stop <%= job_name %>"
+  group vcap

data/lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_bpm/spec.tt

@@ -0,0 +1,21 @@
+---
+name: <%= job_name %>
+
+packages: []
+templates:
+  config/bpm.yml: config/bpm.yml
+
+# Documentation https://bosh.io/docs/links.html
+# Tutorial      https://gist.github.com/Amit-PivotalLabs/c39528248b8cdc4ba8e347f8aa68abb6
+consumes: []
+
+provides:
+- name: <%= job_name %>
+  type: <%= job_name %>
+  properties:
+  - port
+
+properties:
+  port:
+    description: Bind to this port
+    default: 8080

data/lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_bpm/templates/config/bpm.yml.tt

@@ -0,0 +1,15 @@
+---
+processes:
+- name: <%= job_name %>
+  executable: /var/vcap/packages/<%= job_name %>/bin/<%= job_name %>
+  args: []
+  ephemeral_disk: true
+  persistent_disk: false
+  env:
+    PORT: <%%= p("port") %>
+  limits:
+    memory: 1G
+    open_files: 1024
+
+# example at https://github.com/cloudfoundry-incubator/bpm-release/blob/master/jobs/bpm-test-agent/templates/bpm.yml.erb
+# example at https://github.com/cloudfoundry-incubator/bpm-release/blob/master/jobs/bpm-test-agent/templates/bpm.yml.erb

data/lib/bosh/gen/generators/new_release_generator/templates/manifests/%project_name%.yml.tt

@@ -1,6 +1,12 @@
 ---
 name: <%= project_name %>
 
+addons:
+- name: bpm
+  jobs:
+  - name: bpm
+    release: bpm
+
 instance_groups:
 - name: <%= project_name %>
   azs: [z1, z2, z3]
@@ -28,6 +34,9 @@ update:
   serial: false
 
 releases:
+- name: bpm
+  version: 0.2.0
+  url: git+https://github.com/cloudfoundry-incubator/bpm-release
 - name: <%= project_name %>
   version: latest # TODO: update after first final release
   # url:            TODO: update after first final release

data/lib/bosh/gen/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Gen
-    VERSION = "0.95.0"
+    VERSION = "0.96.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.95.0
+  version: 0.96.0
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -183,6 +183,9 @@ files:
 - lib/bosh/gen/generators/extract_package_generator.rb
 - lib/bosh/gen/generators/job_generator.rb
 - lib/bosh/gen/generators/job_generator/templates/.gitkeep
+- lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_bpm/monit.tt
+- lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_bpm/spec.tt
+- lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_bpm/templates/config/bpm.yml.tt
 - lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_simple/monit.tt
 - lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_simple/spec.tt
 - lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_simple/templates/bin/ctl.tt