bosh-gen 0.11.0 → 0.12.0

data/ChangeLog.md

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

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
+source 'https://s3.amazonaws.com/bosh-jenkins-gems/' # for bosh 1.5.0.pre gems
 
 # Specify your gem's dependencies in bosh-gen.gemspec
 gemspec

data/bosh-gen.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.version       = Bosh::Gen::VERSION
   
   gem.add_dependency "thor"
-  gem.add_dependency "bosh_cli", "~> 1.0.rc1"
-  gem.add_dependency "bosh_common", "~> 0.5.1"
+  gem.add_dependency "bosh_cli"
+  gem.add_dependency "bosh_common"
   
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest", "~> 2.12"

data/lib/bosh/gen/cli.rb

@@ -74,10 +74,13 @@ module Bosh
         Bosh::Gen::Generators::JobGenerator.start([name, dependencies, 'simple'])
       end
 
-      desc "micro", "Create a micro job - a collection of all jobs and packages"
-      def micro
+      desc "micro [JOB]", "Create a micro job - a collection of all jobs and packages"
+      method_option :jobs, :aliases => ['-j'], :type => :array, 
+        :desc => "Ordered list of jobs to include"
+      def micro(job_name = "micro")
+        specific_jobs = options[:jobs] || []
         require 'bosh/gen/generators/micro_job_generator'
-        Bosh::Gen::Generators::MicroJobGenerator.start([])
+        Bosh::Gen::Generators::MicroJobGenerator.start([job_name, specific_jobs])
       end
 
       desc "template JOB FILE_PATH", 
@@ -113,13 +116,16 @@ module Bosh
         :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"
+      method_option :jobs, :type => :array,
+        :desc => "Specific jobs to include in manifest [default: all]"
       def manifest(name, release_path)
         release_path = File.expand_path(release_path)
         ip_addresses = options["addresses"] || []
+        job_names = options["jobs"] || []
         flags = { :force => options["force"] || false, :disk => options[:disk] }
         require 'bosh/gen/generators/deployment_manifest_generator'
         Bosh::Gen::Generators::DeploymentManifestGenerator.start(
-          [name, release_path, ip_addresses, flags])
+          [name, release_path, ip_addresses, job_names, flags])
       end
 
       no_tasks do

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

@@ -10,7 +10,8 @@ module Bosh::Gen
 
       argument :name
       argument :release_path
-      argument :ip_addresses
+      argument :ip_addresses, :type => :array
+      argument :requested_jobs, :type => :array
       argument :flags, :type => :hash
 
       def check_release_path_is_release
@@ -24,11 +25,16 @@ module Bosh::Gen
         end
       end
 
+      def check_valid_requested_jobs
+        if jobs.empty?
+          raise Thor::Error.new("No valid jobs specified from #{detect_jobs.inspect}")
+        end
+      end
+
       # 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]
         cloud_properties["static_ips"] = ip_addresses
@@ -55,19 +61,26 @@ module Bosh::Gen
       end
       
       def job_manifests
-        jobs = detect_jobs.map do |job_name|
+        jobs.map do |job_name|
           {
             "name" => job_name
           }
         end
-        jobs
       end
       
       # Return list of job names
       def detect_jobs
         release_detector.latest_dev_release_job_names
       end
-      
+
+      def jobs
+        job_names = if !requested_jobs || requested_jobs.size == 0
+          detect_jobs
+        else
+          requested_jobs & detect_jobs
+        end
+      end
+
       # The "release" aspect of the manifest, which has two keys: name, version
       def release_properties
         release_detector.latest_dev_release_properties
@@ -81,7 +94,7 @@ module Bosh::Gen
       #       description: Password for mysql server
       def default_properties
         properties = {}
-        detect_jobs.each do |job_name|
+        jobs.each do |job_name|
           spec = YAML.load_file(File.join(release_path, "jobs", job_name, "spec"))
           if spec_properties = spec["properties"]
             spec_properties.each_pair do |name, definition|

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

@@ -6,6 +6,9 @@ module Bosh::Gen
     class MicroJobGenerator < Thor::Group
       include Thor::Actions
 
+      argument :job_name
+      argument :specific_jobs, :type => :array
+
       def self.source_root
         File.join(File.dirname(__FILE__), "micro_job_generator", "templates")
       end
@@ -22,7 +25,11 @@ module Bosh::Gen
       end
       
       def prepare_spec_defaults_all_jobs
-        jobs = Dir[File.expand_path("jobs/*")].map {|job| File.basename(job) } - [job_name]
+        jobs = if specific_jobs.size > 0
+          specific_jobs
+        else
+          Dir[File.expand_path("jobs/*")].map {|job| File.basename(job) } - [job_name]
+        end
         spec = { "jobs" => jobs }
         create_file "jobs/#{job_name}/prepare_spec", YAML.dump(spec)
       end
@@ -44,12 +51,6 @@ module Bosh::Gen
         say ""
         say ""
       end
-      
-    private
-      # May be an argument for the generator in future
-      def job_name
-        "micro"
-      end
     end
   end
 end

data/lib/bosh/gen/generators/micro_job_generator/templates/jobs/micro/{prepare → prepare.tt}

@@ -7,7 +7,7 @@ require 'erb'
 TEMPLATES = "templates"
 OVERRIDE = "override"
 
-MICRO_JOB_NAME="micro"
+MICRO_JOB_NAME="<%= job_name %>"
 
 def job_dir(job)
   File.expand_path("../../#{job}", __FILE__)
@@ -106,18 +106,18 @@ post_install = <<POST_INSTALL
 
 for DIR in /var/vcap/jobs /var/vcap/data/jobs; do
   cd $DIR
-  for JOB in <%= jobs.join(" ") %>; do
+  for JOB in <%%= jobs.join(" ") %>; do
     mkdir -p ${JOB}/bin ${JOB}/config ${JOB}/data ${JOB}/helpers
-    for FILE in <%= MICRO_JOB_NAME %>/$JOB/bin/*; do
+    for FILE in <%%= MICRO_JOB_NAME %>/$JOB/bin/*; do
       ln -nsf /var/vcap/jobs/$FILE $JOB/bin
     done
-    for FILE in <%= MICRO_JOB_NAME %>/$JOB/config/*; do
+    for FILE in <%%= MICRO_JOB_NAME %>/$JOB/config/*; do
       ln -nsf /var/vcap/jobs/$FILE $JOB/config
     done
-    for FILE in <%= MICRO_JOB_NAME %>/$JOB/data/*; do
+    for FILE in <%%= MICRO_JOB_NAME %>/$JOB/data/*; do
       ln -nsf /var/vcap/jobs/$FILE $JOB/data
     done
-    for FILE in <%= MICRO_JOB_NAME %>/$JOB/helpers/*; do
+    for FILE in <%%= MICRO_JOB_NAME %>/$JOB/helpers/*; do
       ln -nsf /var/vcap/jobs/$FILE $JOB/helpers
     done
   done

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

@@ -39,7 +39,7 @@ module Bosh::Gen
       
       # TODO - support other blobstores
       def local_blobstore
-        config_dev = { "dev_name" => "#{project_name}-dev" }
+        config_dev = { "dev_name" => project_name }
         create_file "config/dev.yml", YAML.dump(config_dev)
 
         case blobstore_type

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

@@ -25,6 +25,7 @@ module Bosh::Gen::Models
       manifest["compilation"] = {
         "workers" => 10,
         "network" => "default",
+        "reuse_compilation_vms" => true,
         "cloud_properties" => cloud_properties.dup
       }
       manifest["update"] = {

data/lib/bosh/gen/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Gen
-    VERSION = "0.11.0"
+    VERSION = "0.12.0"
   end
 end

data/spec/fixtures/deployment_manifests/2_jobs_1_ip_8196_disk.yml

@@ -7,6 +7,7 @@ release:
 compilation:
   workers: 10
   network: default
+  reuse_compilation_vms: true
   cloud_properties:
     instance_type: m1.small
 update:

data/spec/fixtures/deployment_manifests/2_jobs_2_ips_no_disk.yml

@@ -7,6 +7,7 @@ release:
 compilation:
   workers: 10
   network: default
+  reuse_compilation_vms: true
   cloud_properties:
     instance_type: m1.small
 update:

data/spec/generators/deployment_manifest_generator_spec.rb

@@ -16,7 +16,7 @@ class DeploymentManifestGeneratorSpec < MiniTest::Spec
     setup_project_release("bosh-sample-release")
   end
 
-  it "creates deployment manifest with properties" do
+  pending "creates deployment manifest with properties" do
     release_folder = File.expand_path("../../fixtures/releases/bosh-sample-release", __FILE__)
     in_home_folder do
       generate_manifest("wordpress", release_folder)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -32,33 +32,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.rc1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.rc1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +175,7 @@ files:
 - lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_simple/templates/helpers/ctl_utils.sh
 - lib/bosh/gen/generators/job_template_generator.rb
 - lib/bosh/gen/generators/micro_job_generator.rb
-- lib/bosh/gen/generators/micro_job_generator/templates/jobs/micro/prepare
+- lib/bosh/gen/generators/micro_job_generator/templates/jobs/micro/prepare.tt
 - 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
@@ -255,7 +255,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4535094254544220290
+      hash: 3814495626982507735
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -264,10 +264,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4535094254544220290
+      hash: 3814495626982507735
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: ''