bosh-gen 0.3.4 → 0.4.0

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.DS_Store

data/ChangeLog.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 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
+
 ## v0.3
 
 Added:

data/lib/bosh/gen/cli.rb

@@ -48,10 +48,12 @@ module Bosh
       
       desc "job NAME", "Create a new job"
       method_option :dependencies, :aliases => ['-d'], :type => :array, :desc => "List of package dependencies"
+      method_option :ruby, :type => :boolean, :desc => "Use templates for running Ruby/Rack process"
       def job(name)
+        flags = { :ruby => options["ruby"] || false }
         dependencies   = options[:dependencies] || []
         require 'bosh/gen/generators/job_generator'
-        Bosh::Gen::Generators::JobGenerator.start([name, dependencies])
+        Bosh::Gen::Generators::JobGenerator.start([name, dependencies, flags])
       end
       
       desc "template JOB FILE_PATH", "Add a Job template (example FILE_PATH: config/httpd.conf)"
@@ -63,10 +65,11 @@ module Bosh
       desc "manifest NAME PATH UUID", "Creates a deployment manifest based on the release located at PATH"
       method_option :force, :type => :boolean, :desc => "Force override existing target manifest file"
       method_option :addresses, :aliases => ['-a'], :type => :array, :desc => "List of IP addresses available for jobs"
+      method_option :disk, :aliases => ['-d'], :type => :string, :desc => "Attach persistent disks to VMs of specific size, e.g. 8196"
       def manifest(name, release_path, uuid)
         release_path = File.expand_path(release_path)
         ip_addresses = options["addresses"] || []
-        flags = { :force => options["force"] || false }
+        flags = { :force => options["force"] || false, :disk => options[:disk] }
         require 'bosh/gen/generators/deployment_manifest_generator'
         Bosh::Gen::Generators::DeploymentManifestGenerator.start([name, release_path, uuid, ip_addresses, flags])
       end

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

@@ -26,6 +26,7 @@ module Bosh::Gen
       # Create a deployment manifest (initially for AWS only)
       def create_deployment_manifest
         cloud_properties = { "instance_type" => "m1.small", "availability_zone" => "us-east-1e" }
+        cloud_properties[:persistent_disk] = flags[:disk] if flags[:disk]
         manifest = Bosh::Gen::Models::DeploymentManifest.new(name, director_uuid, release_properties, cloud_properties)
         manifest.jobs = job_manifests(ip_addresses)
         create_file manifest_file_name, manifest.to_yaml, :force => flags[:force]

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

@@ -8,6 +8,7 @@ module Bosh::Gen
 
       argument :job_name
       argument :dependencies, :type => :array
+      argument :flags, :type => :hash
       
       def self.source_root
         File.join(File.dirname(__FILE__), "job_generator", "templates")
@@ -33,7 +34,11 @@ module Bosh::Gen
       end
       
       def template_files
-        directory "jobs/%job_name%"
+        if ruby?
+          directory "jobs/%job_name%_rubyrack", "jobs/#{job_name}"
+        else
+          directory "jobs/%job_name%"
+        end
         @template_files = { "#{job_name}_ctl" => "bin/#{job_name}_ctl" }
       end
       
@@ -59,6 +64,10 @@ module Bosh::Gen
         File.join("jobs", job_name, path)
       end
       
+      def ruby?
+        flags[:ruby]
+      end
+      
       # Run a command in git.
       #
       # ==== Examples

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

@@ -1,15 +1,30 @@
 #!/bin/bash
 
-# Control script to start/stop <%= job_name %> job on a BOSH controlled VM
+# Control script to start/stop ruby/rack <%= job_name %> job on a BOSH controlled VM
 #
+# In local development, this script can be run manually. Examples below assume you are in the root of this release project.
+#
+# Start process example:
+# APP_DIR=/path/to/<%= job_name %> RACK_ENV=development COMMAND=shotgun PORT=9393 jobs/<%= job_name %>/templates/<%= job_name %>_ctl start
+#
+# View STDOUT/STDERR logs:
+# jobs/<%= job_name %>/templates/<%= job_name %>_ctl logs
+#
+# Clear logs:
+# jobs/<%= job_name %>/templates/<%= job_name %>_ctl clearlogs
+
 # TODO - change "EXECUTABLE_SERVER" to the command to run
-# TODO - ensure executable stores PID in $PIDFILE
 
 RUN_DIR=/var/vcap/sys/run/<%= job_name %>
 LOG_DIR=/var/vcap/sys/log/<%= job_name %>
 STORE=/var/vcap/store/<%= job_name %>
 PIDFILE=$RUN_DIR/<%= job_name %>.pid
 
+export PATH=/var/vcap/packages/ruby/bin:$PATH
+
+COMMAND=${COMMAND:-/var/vcap/packages/<%= job_name %>/bin/EXECUTABLE_SERVER}
+HOME=${HOME:-/home/vcap}
+
 case $1 in
 
   start)
@@ -19,7 +34,7 @@ case $1 in
 
     echo $$ > $PIDFILE
 
-    exec /var/vcap/packages/<%= job_name %>/bin/EXECUTABLE_SERVER >>$LOG_DIR/<%= job_name %>.stdout.log 2>>$LOG_DIR/<%= job_name %>.stderr.log
+    exec $COMMAND >>$LOG_DIR/<%= job_name %>.stdout.log 2>>$LOG_DIR/<%= job_name %>.stderr.log
     ;;
 
   stop)
@@ -29,7 +44,19 @@ case $1 in
     rm -f $PIDFILE
     ;;
 
+  logs)
+    cat $LOG_DIR/*
+    ;;
+
+  tail)
+    tail -f $LOG_DIR/*
+    ;;
+
+  clearlogs)
+    rm $LOG_DIR/*
+    ;;
+
   *)
-  echo "Usage: <%= job_name %>_ctl {start|stop}" ;;
+  echo "Usage: <%= job_name %>_ctl {start|stop|logs|tail|clearlogs}" ;;
 esac
 exit 0

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

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

data/lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_rubyrack/templates/%job_name%_ctl.tt

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+# Control script to start/stop ruby/rack <%= job_name %> job on a BOSH controlled VM
+#
+# In local development, this script can be run manually. Examples below assume you are in the root of this release project.
+#
+# Start process example:
+# APP_DIR=/path/to/<%= job_name %> RACK_ENV=development COMMAND=shotgun PORT=9393 jobs/<%= job_name %>/templates/<%= job_name %>_ctl start
+#
+# View STDOUT/STDERR logs:
+# jobs/<%= job_name %>/templates/<%= job_name %>_ctl logs
+#
+# Clear logs:
+# jobs/<%= job_name %>/templates/<%= job_name %>_ctl clearlogs
+
+RUN_DIR=/var/vcap/sys/run/<%= job_name %>
+LOG_DIR=/var/vcap/sys/log/<%= job_name %>
+STORE=/var/vcap/store/<%= job_name %>
+PIDFILE=$RUN_DIR/<%= job_name %>.pid
+
+export PATH=/var/vcap/packages/ruby/bin:$PATH
+
+COMMAND=${COMMAND:-/var/vcap/packages/ruby/bin/bundle exec rackup}
+APP_DIR=${APP_DIR:-/var/vcap/packages/<%= job_name %>/}
+PORT=${PORT:-5000}
+RACK_ENV=${RACK_ENV:-production}
+HOME=${HOME:-/home/vcap}
+
+case $1 in
+
+  start)
+    mkdir -p $RUN_DIR
+    mkdir -p $LOG_DIR
+    mkdir -p $STORE
+
+    echo $$ > $PIDFILE
+
+    cd $APP_DIR
+    exec ${COMMAND} -p $PORT -E $RACK_ENV >>$LOG_DIR/<%= job_name %>.stdout.log 2>>$LOG_DIR/<%= job_name %>.stderr.log
+    ;;
+
+  stop)
+    PID=$(head -1 $PIDFILE)
+    kill $PID
+    while [ -e /proc/$PID ]; do sleep 0.1; done
+    rm -f $PIDFILE
+    ;;
+
+  logs)
+    cat $LOG_DIR/*
+    ;;
+
+  tail)
+    tail -f $LOG_DIR/*
+    ;;
+
+  clearlogs)
+    rm $LOG_DIR/*
+    ;;
+
+  *)
+  echo "Usage: <%= job_name %>_ctl {start|stop|logs|tail|clearlogs}" ;;
+esac
+exit 0

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

@@ -23,6 +23,10 @@ module Bosh::Gen
         template "README.md.tt", "README.md"
       end
       
+      def rakefile
+        copy_file "Rakefile"
+      end
+      
       def directories
         %w[jobs packages src blobs].each do |dir|
           directory dir

data/lib/bosh/gen/generators/new_release_generator/templates/Rakefile

@@ -0,0 +1,15 @@
+desc "Generates a properties file for each job based on properties.X.Y used in templates"
+task :job_properties do
+  require "fileutils"
+  Dir["jobs/*"].each do |path|
+    puts "Searching job #{File.basename(path)}..."
+    FileUtils.chdir(path) do
+      properties = []
+      Dir["templates/*.erb"].each do |template_path|
+        properties |= File.read(template_path).scan(/\bproperties\.[\w\.]*\b/)
+        puts properties.join("\n")
+        File.open("properties", "w") { |file| file << properties.join("\n") }
+      end
+    end
+  end
+end

data/lib/bosh/gen/models/deployment_manifest.rb

@@ -10,6 +10,8 @@ module Bosh::Gen::Models
       @security_groups = ["default"]
       @stemcell_version = "0.5.1"
       @stemcell = { "name" => "bosh-stemcell", "version" => @stemcell_version }
+      @persistent_disk = cloud_properties.delete(:persistent_disk)
+      
       manifest["name"] = name
       manifest["director_uuid"] = director_uuid
       manifest["release"] = release_properties.dup
@@ -46,6 +48,7 @@ module Bosh::Gen::Models
           "cloud_properties" => cloud_properties.dup
         }
       ]
+      manifest["resource_pools"].first["persistent_disk"] = @persistent_disk if @persistent_disk
       manifest["jobs"] = []
       manifest["properties"] = {}
     end

data/lib/bosh/gen/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Gen
-    VERSION = "0.3.4"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2012-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -132,9 +132,13 @@ files:
 - lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%/TODO.md.tt
 - lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%/monit.tt
 - lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%/templates/%job_name%_ctl.tt
+- lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_rubyrack/TODO.md.tt
+- lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_rubyrack/monit.tt
+- lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_rubyrack/templates/%job_name%_ctl.tt
 - lib/bosh/gen/generators/job_template_generator.rb
 - lib/bosh/gen/generators/new_release_generator.rb
 - lib/bosh/gen/generators/new_release_generator/templates/README.md.tt
+- lib/bosh/gen/generators/new_release_generator/templates/Rakefile
 - lib/bosh/gen/generators/new_release_generator/templates/blobs/.gitkeep
 - lib/bosh/gen/generators/new_release_generator/templates/jobs/.gitkeep
 - lib/bosh/gen/generators/new_release_generator/templates/packages/.gitkeep
@@ -168,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 983046583635840744
+      hash: -3504528361068900288
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 983046583635840744
+      hash: -3504528361068900288
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23