bosh-gen 0.16.2 → 0.17.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 2b8bef11d778d849e2b0dd3d258fbaa16460951b
-  data.tar.gz: ea6ed1e3c9b929f6c79b48fec68c8c21ec172d9d
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmY5YjI3MTFiNTQ5YWVlNzZiODVjNTkzMjc5ZTUyOWI3YjcwOGZiNA==
+  data.tar.gz: !binary |-
+    N2UxN2QxZTQ2MjNhMTY0YjNlMWRhZjRjYTg0ZWJmMjE5ZmQxYmZiYw==
 SHA512:
-  metadata.gz: 94390d7d2e4b1a648fc9d6e8d0395c4b360e1a5412c8bd77f181eae625a91abb15ee33597b82c09468253f62d8d76b5955841e25a8cc8d363ac87e2d431fd842
-  data.tar.gz: 1ad80fce083b510811135c95e1a6446ba9074c1cc9ec093ae33bd901a3fd9f1333b8d258427e96c86ccb762bc217b36098912a539599f37c240a1a268d681861
+  metadata.gz: !binary |-
+    MWMwN2NmNTc5OTYwYTYwMjMxODdkODMwNTRlOGE1NjhjYmNkMjViZTJhZDQx
+    NjUxOWVlNzZhMDAyMWMyOTFjNGFjN2Q4YmExNGVlZmQzNGQwMmE1MjY1OGFi
+    Njg4YTE5ODAxMWNlNGE2ZDEwZmQ2ZTA4ZmI4YWNkNWVjNDhlMzk=
+  data.tar.gz: !binary |-
+    YjBmODA3NzM3MzVhYmI4MTg3ZDYyMzQ3ZWUyMzZjODMwNGRmNGEyMjRmMzNj
+    NmRmNGZlODk2Zjk4Njc3OTllMzJjYjY1NTAyMjEyYjAyNmM1ZjZiMzM5NjU3
+    OGJhNDE3OGM2MmM2NDc5YzcyYTFiODY1YTQ4MWUwZWQ0NzM5NTg=

data/.rspec

@@ -0,0 +1,3 @@
+--format progress
+--color
+--require spec_helper

data/.travis.yml

@@ -0,0 +1,16 @@
+language: ruby
+script: bundle exec rake spec
+rvm:
+  - ruby-1.9.3
+  # - rbx-19mode
+  - ruby-2.0.0
+  - ruby-2.1.0
+notifications:
+  email:
+    recipients:
+      - drnicwilliams@gmail.com
+    on_success: change
+    on_failure: always
+env:
+  global:
+    - secure: ""

data/ChangeLog.md

@@ -1,57 +1,68 @@
-# Change Log
+Change Log
+==========
 
-## v0.16.0
+v0.17.0
+-------
 
-* `new` creates an initial job of the same name.
-* default to running job process as vcap:vcap [v0.16.1]
-* Default $INCLUDE_PATH & $LD_LIBRARY_PATH to '' if not set [v0.16.1]
-* Fix make_manifest for aws-ec2 [v0.16.2]
-* Remove references to OpenStack until we have spiff templates generated [v0.16.2]
+- `new --s3` - no more read-only credentials; no more encryption keys
+
+v0.16.0
+-------
+
+- `new` creates an initial job of the same name.
+- default to running job process as vcap:vcap [v0.16.1]
+- Default $INCLUDE_PATH & $LD_LIBRARY_PATH to '' if not set [v0.16.1]
+- Fix make_manifest for aws-ec2 [v0.16.2]
+- Remove references to OpenStack until we have spiff templates generated [v0.16.2]
 
 The initial job is configured to have the xyz.leader_address property, and an example conf file that shows how to use it.
 
-## v0.15.0
+v0.15.0
+-------
 
-* Create packages from existing Aptitude .deb packages with `package --apt`
-* Assume project & job names have hyphens in templates
-* Templates default to latest stemcell [Aristoteles Neto]
+- Create packages from existing Aptitude .deb packages with `package --apt`
+- Assume project & job names have hyphens in templates
+- Templates default to latest stemcell [Aristoteles Neto]
 
-## v0.14.0
+v0.14.0
+-------
 
-* templates/make_manifest & example spiff templates generated
-* no more static example bosh-lite.yml templates
+- templates/make_manifest & example spiff templates generated
+- no more static example bosh-lite.yml templates
 
-## v0.13.0
+v0.13.0
+-------
 
-* bosh-lite example manifests generated for new releases
-* created folder always has -boshrelease suffix [v0.13.1]
-* use public https in generated readme [v0.13.2]
-* bosh-lite-solo.yml is a template [v0.13.3]
+- bosh-lite example manifests generated for new releases
+- created folder always has -boshrelease suffix [v0.13.1]
+- use public https in generated readme [v0.13.2]
+- bosh-lite-solo.yml is a template [v0.13.3]
 
-## v0.12.0
+v0.12.0
+-------
 
-* Supports bosh_cli 1.5.0.pre gems
-* dev.yml uses same release name as final.yml for blob reuse
-* sets reuse_compilation_vms: true now
-* generated project README focuses on final releases [v0.12.1]
-* Default bucket name is project folder name [v0.12.1]
+- Supports bosh_cli 1.5.0.pre gems
+- dev.yml uses same release name as final.yml for blob reuse
+- sets reuse_compilation_vms: true now
+- generated project README focuses on final releases [v0.12.1]
+- Default bucket name is project folder name [v0.12.1]
 
-## v0.11.0
+v0.11.0
+-------
 
 Added:
 
-* New blobstore provider: OpenStack Swift [thanks Ferran!]
-* `package` --src/-s specifies already internal sources/blobs; example: --src 'myapp/**/*'
-* `job` includes an empty `templates/config` to suggest where config templates should go
+- New blobstore provider: OpenStack Swift [thanks Ferran!]
+- `package` --src/-s specifies already internal sources/blobs; example: --src 'myapp/**/*'
+- `job` includes an empty `templates/config` to suggest where config templates should go
 
 Improved:
 
-* `new` - --s3 flag looks for `~/.bosh_s3_credentials` file for default AWS S3 credentials
+- `new` - --s3 flag looks for `~/.bosh_s3_credentials` file for default AWS S3 credentials
 
-For common defaults on s3 blobstore credentials, create an
-`~/.bosh_s3_credentials` file that looks like:
+For common defaults on s3 blobstore credentials, create an`~/.bosh_s3_credentials` file that looks like:
 
-``` yaml
+```yaml
 readonly_access_key: XXX
 readonly_secret_access_key: XXX
 readwrite_access_key: XXX
@@ -60,45 +71,48 @@ readwrite_secret_access_key: XXX
 
 Other changes:
 
-* Using 1.0 release candidate for bosh_cli
-* `micro` - fix accidental gitignore of prepare/prepare_spec
-* `new` - `bosh-gen new project-boshrelease`; name is "project", initial dev name is "project-dev"
-* `manifest` - default stemcell is bosh-stemcell-0.6.4
-* `manifest` - creates `#{name}.yml` instead of `#{name}/manifest.yml`
-* `job` - example file not in a subfolder anymore
+- Using 1.0 release candidate for bosh_cli
+- `micro` - fix accidental gitignore of prepare/prepare_spec
+- `new` - `bosh-gen new project-boshrelease`; name is "project", initial dev name is "project-dev"
+- `manifest` - default stemcell is bosh-stemcell-0.6.4
+- `manifest` - creates `#{name}.yml` instead of `#{name}/manifest.yml`
+- `job` - example file not in a subfolder anymore
 
-## v0.10.0
+v0.10.0
+-------
 
 Added:
 
-* `micro` - create a "micro" job that packages all/some jobs into a single VM
+- `micro` - create a "micro" job that packages all/some jobs into a single VM
 
 Improved:
 
-* `new` - read/write credentials now in private.yml; more useful default README
+- `new` - read/write credentials now in private.yml; more useful default README
 
-## v0.9.0
+v0.9.0
+------
 
 Major news
 
-* `job` - more powerful initial scripts; templates nested in folders; scripts are much cleaner to read; scripts in bin/ & helpers/ do not have ERb; only data/properties.sh.erb & config/ are for ERb.
+- `job` - more powerful initial scripts; templates nested in folders; scripts are much cleaner to read; scripts in bin/ & helpers/ do not have ERb; only data/properties.sh.erb & config/ are for ERb.
 
 Other changes:
 
-* `package` - detects .zip files (in addition to .tar.gz) and includes useful default unpacking script in `packaging`; describe available env vars in `packaging` script
-* `manifest` - auto-detects current BOSH UUID
-* `extract-pkg` - now a single argument - the path of the source package folder
-* `extract-job` - now a single argument - the path of the source job folder
+- `package` - detects .zip files (in addition to .tar.gz) and includes useful default unpacking script in `packaging`; describe available env vars in `packaging` script
+- `manifest` - auto-detects current BOSH UUID
+- `extract-pkg` - now a single argument - the path of the source package folder
+- `extract-job` - now a single argument - the path of the source job folder
 
-## v0.8.0
+v0.8.0
+------
 
 Changed:
 
-* `package` - the `packaging` script include default tar/configure/make sequence for all tarballs
+- `package` - the `packaging` script include default tar/configure/make sequence for all tarballs
 
 For example, `bosh-gen package nginx -f ..../blobs/nginx/`, the resulting `packaging` is:
 
-``` bash
+```bash
 set -e # exit immediately if a simple command exits with a non-zero status
 set -u # report the usage of uninitialized variables
 
@@ -115,94 +129,101 @@ make install
 
 Changed:
 
-* `extract-job` & `extract-pkg` - copies files mentioned in specs
-* `package` - large files go into blobs/ folder
+- `extract-job` & `extract-pkg` - copies files mentioned in specs
+- `package` - large files go into blobs/ folder
 
 ### v0.8.2
 
 Bug fixes:
 
-* `extract-pkg` - missing #source_file helper
+- `extract-pkg` - missing #source_file helper
 
-## v0.7.0
+v0.7.0
+------
 
 Added:
 
-* `extract-pkg` - extract a package and its dependencies from a target release
+- `extract-pkg` - extract a package and its dependencies from a target release
 
 Changed/Renamed:
 
-* `extract` -> `extract-job`
-* `new` -> `.gitignore` includes `.vagrant`, to support `bosh-solo`
-* `manifest` -> update to soon-to-be-released stemcell 0.6.2
+- `extract` -> `extract-job`
+- `new` -> `.gitignore` includes `.vagrant`, to support `bosh-solo`
+- `manifest` -> update to soon-to-be-released stemcell 0.6.2
 
-## v0.6.0
+v0.6.0
+------
 
 Added:
 
-* `extract` - extract a job and its dependent packages to the current release
+- `extract` - extract a job and its dependent packages to the current release
 
 ### v0.6.1
 
-* `new` - ignore .blobs folder in releases
-* `manifest` - persistent_disk is an integer; added to common job too
+- `new` - ignore .blobs folder in releases
+- `manifest` - persistent_disk is an integer; added to common job too
 
 ### v0.6.2
 
-* `manifest` - provided IP addresses are distributed across jobs until it runs out
-* `manifest` - fix to allocation of persistent disk
+- `manifest` - provided IP addresses are distributed across jobs until it runs out
+- `manifest` - fix to allocation of persistent disk
 
-## v0.5.0
+v0.5.0
+------
 
-* `job` - takes a COMMAND argument
-* `source --blob/-b` - file stored in blobs/ folder instead of src/
-* `source` - packaging script includes standard configure/make/make install if .tar.gz or .tgz
+- `job` - takes a COMMAND argument
+- `source --blob/-b` - file stored in blobs/ folder instead of src/
+- `source` - packaging script includes standard configure/make/make install if .tar.gz or .tgz
 
-## v0.4
+v0.4
+----
 
-* `job` - added --ruby flag to include a ruby/rack-specifc ctl script
-* releases include a rake task to document what properties are required
-* `manifest` - has a --disk/-d flag to assign a persistent disk to all VMs (common pool)
-* `job` - export some variables in ctl scripts so they are available to application
-* `job` - ctl script has logs/tail/clearlogs commands
+- `job` - added --ruby flag to include a ruby/rack-specifc ctl script
+- releases include a rake task to document what properties are required
+- `manifest` - has a --disk/-d flag to assign a persistent disk to all VMs (common pool)
+- `job` - export some variables in ctl scripts so they are available to application
+- `job` - ctl script has logs/tail/clearlogs commands
 
-## v0.3
+v0.3
+----
 
 Added:
 
-* `template` - add a template/file to a job
-* `source` - download and add a source file/tarball to a package
+- `template` - add a template/file to a job
+- `source` - download and add a source file/tarball to a package
 
 ### v0.3.1 (never released)
 
 Added:
 
-* `manifest` - generate a deployment manifest for a release
+- `manifest` - generate a deployment manifest for a release
 
 Fixed:
 
-* `job` - creates a monit script and a stub control script
+- `job` - creates a monit script and a stub control script
 
 ### v0.3.2
 
-* `job` - ctl file has TODO to remind about PID file
-* `job` - use the provided release path to detect jobs
+- `job` - ctl file has TODO to remind about PID file
+- `job` - use the provided release path to detect jobs
 
 ### v0.3.3
 
-* `manifest` - introspect the release project for release + job information
+- `manifest` - introspect the release project for release + job information
 
 ### v0.3.4
 
-* `manifest` - Force us-east-1e to ensure all VMs and volumes are always in the same AZ
+- `manifest` - Force us-east-1e to ensure all VMs and volumes are always in the same AZ
 
-## v0.2
+v0.2
+----
 
 Added:
 
-* `package` - create package scaffold, including source files
-* `job` - create job scaffold
+- `package` - create package scaffold, including source files
+- `job` - create job scaffold
 
-## v0.1
+v0.1
+----
 
-* `new` - create new release
+- `new` - create new release

data/Gemfile

@@ -3,5 +3,11 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in bosh-gen.gemspec
 gemspec
 
+if File.directory?("../cyoi")
+  gem "cyoi", path: "../cyoi"
+end
+
 gem 'bosh_cli', '~> 1.1750'
-gem 'bosh_common', '~> 1.1750'
+gem 'bosh_common', '~> 1.1750'
+
+gem 'guard-rspec'

data/Guardfile

@@ -1,9 +1,5 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'minitest' do
-  # with Minitest::Spec
-  watch(%r|^spec/(.*)_spec\.rb|)
-  watch(%r|^lib/bosh/gen/(.*)([^/]+)\.rb|)     { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r|^spec/spec_helper\.rb|)    { "spec" }
+guard 'rspec', spec_paths: ["spec"] do
+  watch(%r{^spec/(.+_spec)\.rb$})
+  watch(%r{^lib/bosh/gen/(.+)\.rb$})    { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
 end

data/README.md

@@ -1,30 +1,57 @@
-# BOSH Generators
+BOSH Generators
+===============
 
 Generators for creating BOSH releases.
 
-## Installation
+New in 0.17: Creates blobstore/bucket when creating new release.
+
+Installation
+------------
 
 This application requires Ruby 1.9 or 2.0 and is installed via RubyGems:
 
 $ gem install bosh-gen
 
-## Usage
+Usage
+-----
 
 ```
-$ bosh-gen new my-new-project --s3
-$ bosh-gen new my-new-project --atmos
-$ bosh-gen new my-new-project --swift
-$ bosh-gen new my-new-project # local blobstore with a warning
+$ bosh-gen new my-project
+      create  
+Auto-detected infrastructure API credentials at ~/.fog (override with $FOG)
+1. AWS (community)
+2. Alternate credentials
+Choose an auto-detected infrastructure: 2
+
+      create  README.md
+      create  Rakefile
+      create  jobs
+      create  jobs/my-project/templates/bin/my_project_ctl
+      ...
+      create  config/blobs.yml
+      create  config/dev.yml
+      create  config/private.yml
+      create  config/final.yml
+      create  .gitignore
+         run  git init from "."
+
+Next, change to BOSH release location:
+cd ./my-project-boshrelease
+
+Finally...
+Attempting to create blobstore my-project-boshrelease... done
 
-$ cd my-new-project
+Confirming: Using blobstore my-project-boshrelease
 ```
 
-**NEXT:** Edit `config/final.yml` with your S3, ATMOS or Swift credentials
+Your project is now in the folder mentioned above:
 
 ```
-$ bosh create release
+$ cd ./my-project-boshrelease
+```
 
-$ wget -P /tmp http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz 
+```
+$ wget -P /tmp http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz
 $ bosh-gen package ruby -f /tmp/ruby-1.9.3-p194.tar.gz
 
 $ bosh-gen job some-ruby-job -d ruby
@@ -53,7 +80,8 @@ $ bosh-gen template some-ruby-job config/some-config.ini
      force  jobs/some-ruby-job/spec
 ```
 
-## Quickly creating packages
+Quickly creating packages
+-------------------------
 
 There is a slow way to create a package, and there are three faster ways. Slow vs fast is not a debated about best vs worse. But sometimes you're in a hurry.
 
@@ -112,12 +140,13 @@ source /var/vcap/packages/apache2/profile.sh
 
 This is the last option, and it is not the best option. Many Debian packages will also start processes that have default configuration that is not correct for your use case. It may be fast to get the Debian packages; but additional work may be required by your jobs to stop and unhook the processes that are automatically started upon installation.
 
-## Tutorial
+Tutorial
+--------
 
-To see how the various commands work together, let's create a new bosh release for [Cassandra](http://cassandra.apache.org/ "The Apache Cassandra Project").
+To see how the various commands work together, let's create a new bosh release for [Cassandra](http://cassandra.apache.org/).
 
 ```
-$ bosh-gen new cassandra --s3
+$ bosh-gen new cassandra
 $ cd cassandra
 $ bosh-gen extract-pkg ../cf-release/packages/dea_jvm7
       create  packages/dea_jvm7
@@ -163,12 +192,12 @@ Look at all that goodness!
 
 A quick summary of these files:
 
-* The `monit` script uses `bin/monit_debugger` to help you debug any glitches in starting/stopping processes.
-* `ctl_setup.sh` setups up lots of common folders and env vars.
-* `ctl_utils.sh` comes from cf-release's common/utils.sh with some extra helper functions
-* `data/properties.sh.erb` is where you extract any `<%= properties.cassandra... %>` values from the deployment manifest.
-* `bin/cassandra_ctl` no longer needs to be an unreadable ERb template! Use the env variables you create in `data/properties.sh.erb` and normal bash if statements instead of ERb `<% if ... %>` templates.
-* `examples/...` is a folder for documenting example, valid deployment manifest properties for the release.
+- The `monit` script uses `bin/monit_debugger` to help you debug any glitches in starting/stopping processes.
+- `ctl_setup.sh` setups up lots of common folders and env vars.
+- `ctl_utils.sh` comes from cf-release's common/utils.sh with some extra helper functions
+- `data/properties.sh.erb` is where you extract any `<%= properties.cassandra... %>` values from the deployment manifest.
+- `bin/cassandra_ctl` no longer needs to be an unreadable ERb template! Use the env variables you create in `data/properties.sh.erb` and normal bash if statements instead of ERb `<% if ... %>` templates.
+- `examples/...` is a folder for documenting example, valid deployment manifest properties for the release.
 
 In `bin/cassandra_ctl` you now change "TODO" to `cassandra` and the rest of the tutorial is left to you, dear cassandra lover.
 
@@ -181,7 +210,8 @@ bosh upload release
 
 When you create a final release, you will first need to setup your AWS credentials in `config/final.yml`
 
-## Contributing
+Contributing
+------------
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)